[main] Handle OOM in reload watch

http://bugs.freedesktop.org/show_bug.cgi?id=12953

Wait for memory if we can't init the string.

Based on an original patch by Kimmo Hämäläinen <kimmo.hamalainen@nokia.com>

diff --git a/bus/main.c b/bus/main.c
index 7f9e98f3a0be506c1bf4d043b76d116ef32fae9b..e3650f1b14cabe0f1a171a8c3b6b24cf6997cfdd 100644 (file)
--- a/bus/main.c
+++ b/bus/main.c
@@ -156,7 +156,10 @@ handle_reload_watch (DBusWatch    *watch,
 {
   DBusError error;
   DBusString str;
-  _dbus_string_init (&str);
+
+  while (!_dbus_string_init (&str))
+    _dbus_wait_for_memory ();
+
   if ((reload_pipe[RELOAD_READ_END] > 0) &&
       _dbus_read_socket (reload_pipe[RELOAD_READ_END], &str, 1) != 1)
     {