From 3982458fd881cf547f62b1eb9a3f7bf4688b9536 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2011 17:32:00 +0100 Subject: [PATCH 21/25] dbus_g_proxy_begin_call_internal: 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 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c index 8c2034f..14bbd38 100644 --- a/dbus/dbus-gproxy.c +++ b/dbus/dbus-gproxy.c @@ -2209,8 +2209,10 @@ dbus_g_proxy_begin_call_internal (DBusGProxy *proxy, pending = NULL; message = dbus_g_proxy_marshal_args_to_message (proxy, method, args); + + /* can only happen on a programming error or OOM; we already critical'd */ if (!message) - goto oom; + return 0; if (!dbus_connection_send_with_reply (priv->manager->connection, message, -- 1.7.4.1