changeset
Minor merge duplication.
Mon, 31 Aug 2009 20:12:25 +0000
- author
- Paul Aurich <darkrain42@pidgin.im>
- date
- Mon, 31 Aug 2009 20:12:25 +0000
- changeset 28447
- 1c533c2efd06
- parent 28444
- 8eccffa3d7be
- child 28448
- c5ca106a9c74
- child 28450
- 19c55a6cca66
Minor merge duplication.
| libpurple/protocols/jabber/data.c | file | annotate | diff | comparison | revisions |
--- a/libpurple/protocols/jabber/data.c Mon Aug 31 20:10:35 2009 +0000 +++ b/libpurple/protocols/jabber/data.c Mon Aug 31 20:12:25 2009 +0000 @@ -76,17 +76,12 @@ raw_data = xmlnode_get_data(tag); - if (raw_data == NULL) { + if (raw_data == NULL || *raw_data == '\0') { purple_debug_error("jabber", "data element was empty"); g_free(data); return NULL; } - if (raw_data == NULL || *raw_data == '\0') { - g_free(raw_data); - return NULL; - } - data = g_new0(JabberData, 1); data->data = purple_base64_decode(raw_data, &data->size); g_free(raw_data);
