From b65a66301c05f69bc65a5db77c2d81dfbac87d59 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2011 17:32:11 +0100 Subject: [PATCH 22/25] dbus_g_proxy_call_no_reply: don't assume NULL message means OOM It might either be OOM or bad arguments, probably the latter. That's programming error, but we already raised a critical warning, so be silent. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171 --- dbus/dbus-gproxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c index 14bbd38..0d2b000 100644 --- a/dbus/dbus-gproxy.c +++ b/dbus/dbus-gproxy.c @@ -2708,8 +2708,9 @@ dbus_g_proxy_call_no_reply (DBusGProxy *proxy, g_value_array_free (in_args); va_end (args); + /* can only happen on a programming error or OOM; we already critical'd */ if (!message) - goto oom; + return; dbus_message_set_no_reply (message, TRUE); -- 1.7.4.1