Merge remote-tracking branch 'origin/dbus-1.8'

1 files changed, 7 insertions, 1 deletions

diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index 44c46b2f..c46f15ac 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -78,7 +78,13 @@ do_check_nonce (int fd, const DBusString *nonce, DBusError *error)
         }
       else
         {
-          _dbus_string_append_len(&buffer, _dbus_string_get_const_data (&p), n);
+          if (!_dbus_string_append_len (&buffer, _dbus_string_get_const_data (&p), n))
+            {
+              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+              _dbus_string_free (&p);
+              _dbus_string_free (&buffer);
+              return FALSE;
+            }
           nleft -= n;
         }
     }