devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-28 06:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle potential NULL from malloc in OMEMO fingerprint decoding

Browse Source
This commit is contained in:
Michael Vetter
2026-02-26 21:59:17 +01:00
parent 4ee35028e5
commit 65ca3c448b
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/omemo/omemo.c
View File

@@ -1046,8 +1046,10 @@ omemo_format_fingerprint(const char* const fingerprint)
static char* static char*
_omemo_unformat_fingerprint(const char* const fingerprint_formatted) _omemo_unformat_fingerprint(const char* const fingerprint_formatted)
{ {
/* Unformat fingerprint */
char* fingerprint = malloc(strlen(fingerprint_formatted)); char* fingerprint = malloc(strlen(fingerprint_formatted));
if (!fingerprint)
return NULL;
int i; int i;
int j; int j;
for (i = 0, j = 0; fingerprint_formatted[i] != '\0'; i++) { for (i = 0, j = 0; fingerprint_formatted[i] != '\0'; i++) {
@@ -1129,6 +1131,10 @@ _omemo_fingerprint(ec_public_key* identity, gboolean formatted)
identity_public_key_data = &identity_public_key_data[1]; identity_public_key_data = &identity_public_key_data[1];
char* fingerprint = malloc(identity_public_key_len * 2 + 1); char* fingerprint = malloc(identity_public_key_len * 2 + 1);
if (!fingerprint) {
signal_buffer_free(identity_public_key);
return NULL;
}
for (i = 0; i < identity_public_key_len; i++) { for (i = 0; i < identity_public_key_len; i++) {
fingerprint[i * 2] = (identity_public_key_data[i] & 0xf0) >> 4; fingerprint[i * 2] = (identity_public_key_data[i] & 0xf0) >> 4;
@@ -1160,6 +1166,10 @@ static unsigned char*
_omemo_fingerprint_decode(const char* const fingerprint, size_t* len) _omemo_fingerprint_decode(const char* const fingerprint, size_t* len)
{ {
unsigned char* output = malloc(strlen(fingerprint) / 2 + 1); unsigned char* output = malloc(strlen(fingerprint) / 2 + 1);
if (!output) {
*len = 0;
return NULL;
}
size_t i; size_t i;
size_t j; size_t j;
@@ -1192,6 +1202,11 @@ omemo_trust(const char* const jid, const char* const fingerprint_formatted)
} }
char* fingerprint = _omemo_unformat_fingerprint(fingerprint_formatted); char* fingerprint = _omemo_unformat_fingerprint(fingerprint_formatted);
if (!fingerprint) {
log_warning("[OMEMO] cannot unformat fingerprint");
cons_show("Cannot unformat fingerprint");
return;
}
uint32_t device_id = GPOINTER_TO_INT(g_hash_table_lookup(known_identities, fingerprint)); uint32_t device_id = GPOINTER_TO_INT(g_hash_table_lookup(known_identities, fingerprint));
free(fingerprint); free(fingerprint);
@@ -1227,6 +1242,8 @@ omemo_untrust(const char* const jid, const char* const fingerprint_formatted)
{ {
size_t len; size_t len;
unsigned char* identity = _omemo_fingerprint_decode(fingerprint_formatted, &len); unsigned char* identity = _omemo_fingerprint_decode(fingerprint_formatted, &len);
if (!identity)
return;
GHashTableIter iter; GHashTableIter iter;
gpointer key, value; gpointer key, value;
@@ -1250,6 +1267,11 @@ omemo_untrust(const char* const jid, const char* const fingerprint_formatted)
free(identity); free(identity);
auto_char char* fingerprint = _omemo_unformat_fingerprint(fingerprint_formatted); auto_char char* fingerprint = _omemo_unformat_fingerprint(fingerprint_formatted);
if (!fingerprint) {
log_warning("[OMEMO] cannot unformat fingerprint");
cons_show("Cannot unformat fingerprint");
return;
}
/* Remove existing session */ /* Remove existing session */
GHashTable* known_identities = g_hash_table_lookup(omemo_ctx.known_devices, jid); GHashTable* known_identities = g_hash_table_lookup(omemo_ctx.known_devices, jid);