diff options
Diffstat (limited to 'src/xmpp/omemo.c')
-rw-r--r-- | src/xmpp/omemo.c | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/src/xmpp/omemo.c b/src/xmpp/omemo.c index 1a10e374..6c57781b 100644 --- a/src/xmpp/omemo.c +++ b/src/xmpp/omemo.c @@ -70,6 +70,10 @@ omemo_bundle_publish(void) signed_prekey_signature, signed_prekey_signature_length, prekeys, ids, lengths); + g_list_free_full(prekeys, free); + g_list_free(lengths); + g_list_free(ids); + Jid *jid = jid_create(connection_get_fulljid()); if (caps_jid_has_feature(jid->barejid, XMPP_FEATURE_PUBSUB_PUBLISH_OPTIONS)) { stanza_attach_publish_options(ctx, iq, "pubsub#access_model", "open"); @@ -157,7 +161,9 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons if (!prekey_text) { return 1; } - key->data = g_base64_decode(xmpp_stanza_get_text(prekey_text), &key->length); + char *prekey_b64 = xmpp_stanza_get_text(prekey_text); + key->data = g_base64_decode(prekey_b64, &key->length); + free(prekey_b64); key->prekey = TRUE; key->device_id = device_id; @@ -178,7 +184,9 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons return 1; } size_t signed_prekey_len; - unsigned char *signed_prekey_raw = g_base64_decode(xmpp_stanza_get_text(signed_prekey_text), &signed_prekey_len); + char *signed_prekey_b64 = xmpp_stanza_get_text(signed_prekey_text); + unsigned char *signed_prekey_raw = g_base64_decode(signed_prekey_b64, &signed_prekey_len); + free(signed_prekey_b64); xmpp_stanza_t *signed_prekey_signature = xmpp_stanza_get_child_by_name(bundle, "signedPreKeySignature"); if (!signed_prekey_signature) { @@ -189,7 +197,9 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons return 1; } size_t signed_prekey_signature_len; - unsigned char *signed_prekey_signature_raw = g_base64_decode(xmpp_stanza_get_text(signed_prekey_signature_text), &signed_prekey_signature_len); + char *signed_prekey_signature_b64 = xmpp_stanza_get_text(signed_prekey_signature_text); + unsigned char *signed_prekey_signature_raw = g_base64_decode(signed_prekey_signature_b64, &signed_prekey_signature_len); + free(signed_prekey_signature_b64); xmpp_stanza_t *identity_key = xmpp_stanza_get_child_by_name(bundle, "identityKey"); if (!identity_key) { @@ -200,11 +210,18 @@ omemo_start_device_session_handle_bundle(xmpp_stanza_t *const stanza, void *cons return 1; } size_t identity_key_len; - unsigned char *identity_key_raw = g_base64_decode(xmpp_stanza_get_text(identity_key_text), &identity_key_len); + char *identity_key_b64 = xmpp_stanza_get_text(identity_key_text); + unsigned char *identity_key_raw = g_base64_decode(identity_key_b64, &identity_key_len); + free(identity_key_b64); omemo_start_device_session(from, device_id, prekeys_list, signed_prekey_id, signed_prekey_raw, signed_prekey_len, signed_prekey_signature_raw, signed_prekey_signature_len, identity_key_raw, identity_key_len); + + g_list_free_full(prekeys_list, (GDestroyNotify)omemo_key_free); + g_free(signed_prekey_raw); + g_free(identity_key_raw); + g_free(signed_prekey_signature_raw); return 1; } @@ -233,23 +250,23 @@ omemo_receive_message(xmpp_stanza_t *const stanza) if (!iv) { return NULL; } - const char *iv_text = xmpp_stanza_get_text(iv); + char *iv_text = xmpp_stanza_get_text(iv); if (!iv_text) { return NULL; } size_t iv_len; - const unsigned char *iv_raw = g_base64_decode(iv_text, &iv_len); + unsigned char *iv_raw = g_base64_decode(iv_text, &iv_len); xmpp_stanza_t *payload = xmpp_stanza_get_child_by_name(encrypted, "payload"); if (!payload) { return NULL; } - const char *payload_text = xmpp_stanza_get_text(payload); + char *payload_text = xmpp_stanza_get_text(payload); if (!payload_text) { return NULL; } size_t payload_len; - const unsigned char *payload_raw = g_base64_decode(payload_text, &payload_len); + unsigned char *payload_raw = g_base64_decode(payload_text, &payload_len); GList *keys = NULL; xmpp_stanza_t *key_stanza; @@ -259,7 +276,7 @@ omemo_receive_message(xmpp_stanza_t *const stanza) } omemo_key_t *key = malloc(sizeof(omemo_key_t)); - const char *key_text = xmpp_stanza_get_text(key_stanza); + char *key_text = xmpp_stanza_get_text(key_stanza); if (!key_text) { goto skip; } @@ -271,6 +288,7 @@ omemo_receive_message(xmpp_stanza_t *const stanza) goto skip; } key->data = g_base64_decode(key_text, &key->length); + free(key_text); key->prekey = g_strcmp0(xmpp_stanza_get_attribute(key_stanza, "prekey"), "true") == 0; keys = g_list_append(keys, key); continue; @@ -285,6 +303,12 @@ skip: keys, payload_raw, payload_len, g_strcmp0(type, STANZA_TYPE_GROUPCHAT) == 0); + g_list_free_full(keys, (GDestroyNotify)omemo_key_free); + g_free(iv_raw); + g_free(payload_raw); + g_free(iv_text); + g_free(payload_text); + return plaintext; } |