fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 03:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus_message_demarshal: Set error if we can't allocate the loader

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2017-11-27 19:13:25 +00:00
parent 7fe435b5c2
commit ecbcffae19
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dbus/dbus-message.c
View file

@ -5086,7 +5086,7 @@ dbus_message_demarshal (const char *str,
int len, int len,
DBusError *error) DBusError *error)
{ {
DBusMessageLoader *loader; DBusMessageLoader *loader = NULL;
DBusString *buffer; DBusString *buffer;
DBusMessage *msg; DBusMessage *msg;
@ -5095,7 +5095,7 @@ dbus_message_demarshal (const char *str,
loader = _dbus_message_loader_new (); loader = _dbus_message_loader_new ();
if (loader == NULL) if (loader == NULL)
return NULL; goto fail_oom;
_dbus_message_loader_get_buffer (loader, &buffer, NULL, NULL); _dbus_message_loader_get_buffer (loader, &buffer, NULL, NULL);
@ -5126,7 +5126,10 @@ dbus_message_demarshal (const char *str,
fail_oom: fail_oom:
_DBUS_SET_OOM (error); _DBUS_SET_OOM (error);
_dbus_message_loader_unref (loader);
if (loader != NULL)
_dbus_message_loader_unref (loader);
return NULL; return NULL;
} }