[kdbus] Do not set body message if signature field is empty

[platform/upstream/glib.git] / gio / gunixfdlist.c

diff --git a/gio/gunixfdlist.c b/gio/gunixfdlist.c
index aab39a6..5808e40 100644 (file)
--- a/gio/gunixfdlist.c
+++ b/gio/gunixfdlist.c
@@ -26,9 +26,9 @@
  * the %G_SOCKET_ADDRESS_UNIX family by using g_socket_send_message()
  * and received using g_socket_receive_message().
  *
- * Note that <filename>&lt;gio/gunixfdlist.h&gt;</filename> belongs to
- * the UNIX-specific GIO interfaces, thus you have to use the
- * <filename>gio-unix-2.0.pc</filename> pkg-config file when using it.
+ * Note that `<gio/gunixfdlist.h>` belongs to the UNIX-specific GIO
+ * interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config
+ * file when using it.
  */
 
 #include "config.h"
@@ -53,7 +53,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GUnixFDList, g_unix_fd_list, G_TYPE_OBJECT)
 static void
 g_unix_fd_list_init (GUnixFDList *list)
 {
-  list->priv = g_unix_fd_list_get_private (list);
+  list->priv = g_unix_fd_list_get_instance_private (list);
 }
 
 static void
@@ -183,7 +183,8 @@ g_unix_fd_list_new_from_array (const gint *fds,
   list->priv->fds = g_new (gint, n_fds + 1);
   list->priv->nfd = n_fds;
 
-  memcpy (list->priv->fds, fds, sizeof (gint) * n_fds);
+  if (n_fds > 0)
+    memcpy (list->priv->fds, fds, sizeof (gint) * n_fds);
   list->priv->fds[n_fds] = -1;
 
   return list;