From c8e29a910b33911a5d695976a78ae3705819745f Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Mon, 14 Jan 2008 18:09:14 -0500 Subject: return message loader buffer in case of OOM (FDO Bug#12666) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-01-14 John (J5) Palmieri * patch by Kimmo Hämäläinen * dbus/dbus-transport-socket.c(do_reading): return message loader buffer in case of OOM (FDO Bug#12666) --- ChangeLog | 7 +++++++ dbus/dbus-transport-socket.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index a458d00c..a8a63e0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-14 John (J5) Palmieri + + * patch by Kimmo Hämäläinen + + * dbus-1.0.2/dbus/dbus-transport-socket.c(do_reading): return message + loader buffer in case of OOM (FDO Bug#12666) + 2008-01-14 John (J5) Palmieri * configure.in: add warning to output when libxml is selected since diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 05e3f3ae..10b671c2 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -724,6 +724,10 @@ do_reading (DBusTransport *transport) buffer)) { _dbus_verbose ("Out of memory decoding incoming data\n"); + _dbus_message_loader_return_buffer (transport->loader, + buffer, + _dbus_string_get_length (buffer) - orig_len); + oom = TRUE; goto out; } -- cgit