devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 20:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

avatar: make _avatar_metadata_handler safer

Browse Source
This commit is contained in:
Michael Vetter
2021-03-25 16:34:20 +01:00
parent b584a1ecd0
commit 44343a5c37
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/xmpp/avatar.c
View File

@@ -113,6 +113,9 @@ static int
_avatar_metadata_handler(xmpp_stanza_t* const stanza, void* const userdata) _avatar_metadata_handler(xmpp_stanza_t* const stanza, void* const userdata)
{ {
const char* from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); const char* from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if (!from) {
return 1;
}
if (!g_hash_table_contains(looking_for, from)) { if (!g_hash_table_contains(looking_for, from)) {
return 1; return 1;
@@ -141,22 +144,28 @@ _avatar_metadata_handler(xmpp_stanza_t* const stanza, void* const userdata)
xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(items, "item"); xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(items, "item");
if (item) { if (item) {
xmpp_stanza_t* metadata = xmpp_stanza_get_child_by_name(item, "metadata"); xmpp_stanza_t* metadata = xmpp_stanza_get_child_by_name(item, "metadata");
if (!metadata) if (metadata) {
return 1;
xmpp_stanza_t* info = xmpp_stanza_get_child_by_name(metadata, "info"); xmpp_stanza_t* info = xmpp_stanza_get_child_by_name(metadata, "info");
if (info) {
const char* id = xmpp_stanza_get_id(info); const char* id = xmpp_stanza_get_id(info);
const char* type = xmpp_stanza_get_attribute(info, "type"); const char* type = xmpp_stanza_get_attribute(info, "type");
log_debug("Avatar ID for %s is: %s", from, id); if(id && type) {
log_debug("Avatar ID for %s is: %s", from, id);
avatar_metadata* data = malloc(sizeof(avatar_metadata)); avatar_metadata* data = malloc(sizeof(avatar_metadata));
data->type = strdup(type); if(data) {
data->id = strdup(id); data->type = strdup(type);
data->id = strdup(id);
// request the actual (image) data // request the actual (image) data
_avatar_request_item_by_id(from, data); _avatar_request_item_by_id(from, data);
}
}
}
}
} }
return 1; return 1;