From a794dadfa960506b0653ea87de675bb42cfe1644 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 24 Apr 2019 15:20:54 +0200 Subject: OMEMO: Check if ID is present before using it Fixes https://github.com/boothj5/profanity/issues/1079 --- src/xmpp/omemo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/xmpp/omemo.c b/src/xmpp/omemo.c index 4b77ef23..ccf3c55b 100644 --- a/src/xmpp/omemo.c +++ b/src/xmpp/omemo.c @@ -359,7 +359,11 @@ _omemo_receive_devicelist(xmpp_stanza_t *const stanza, void *const userdata) xmpp_stanza_t *device; for (device = xmpp_stanza_get_children(list); device != NULL; device = xmpp_stanza_get_next(device)) { const char *id = xmpp_stanza_get_id(device); - device_list = g_list_append(device_list, GINT_TO_POINTER(strtoul(id, NULL, 10))); + if (id != NULL) { + device_list = g_list_append(device_list, GINT_TO_POINTER(strtoul(id, NULL, 10))); + } else { + log_error("OMEMO: received device without ID"); + } } } omemo_set_device_list(from, device_list); -- cgit 1.4.1-2-gfad0