Coverity fix

Change-Id: I57c318bdf8a0e2d8d731c002185946930392718e

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 6952fe4..7fec313 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -5708,8 +5708,10 @@ _dbus_message_remarshal (DBusMessage *message, dbus_bool_t gvariant)
   for (i = 0; i < message->n_unix_fds; ++i) {
     ret->unix_fds[i] = _dbus_dup(message->unix_fds[i], NULL);
 
-    if (ret->unix_fds[i] < 0)
+    if (ret->unix_fds[i] < 0) {
+      ret->n_unix_fds = i;
       goto err;
+    }
   }
 
   ret->n_unix_fds = message->n_unix_fds;
@@ -5776,8 +5778,11 @@ err:
   _dbus_string_free (&ret->body);
 
 #ifdef HAVE_UNIX_FD_PASSING
-  close_unix_fds(ret->unix_fds, &ret->n_unix_fds);
-  dbus_free(ret->unix_fds);
+  if (ret->unix_fds)
+    {
+      close_unix_fds(ret->unix_fds, &ret->n_unix_fds);
+      dbus_free(ret->unix_fds);
+    }
 #endif
 
   return NULL;