Attachment 42049 Details for Bug 33128 – free more stuff in dbus-cleanup-sockets

[patch] free more stuff in dbus-cleanup-sockets

CID-2125.patch (text/plain), 1015 bytes, created by Simon McVittie on 2011-01-14 10:21:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-14 10:21:53 UTC

Size: 1015 bytes

patch

obsolete

>diff --git a/tools/dbus-cleanup-sockets.c b/tools/dbus-cleanup-sockets.c
>index 487c4b0..d97d014 100644
>--- a/tools/dbus-cleanup-sockets.c
>+++ b/tools/dbus-cleanup-sockets.c
>@@ -138,16 +138,31 @@ socket_entry_new (const char *dir,
>   return se;
> }
> 
>-#if 0
> static void
> free_socket_entry (SocketEntry *se)
> {
>-  free (se->name);
>-  if (se->fd >= 0)
>-    close (se->fd);
>-  free (se);
>+  if (se)
>+    {
>+      free (se->name);
>+      if (se->fd >= 0)
>+        close (se->fd);
>+      free (se);
>+    }
>+}
>+
>+static void
>+free_socket_entries (SocketEntry** entries,
>+                     int           n_entries)
>+{
>+  int i;
>+
>+  if (entries)
>+    {
>+      for (i = 0; i < n_entries; ++i)
>+        free_socket_entry (entries[i]);
>+      free (entries);
>+    }
> }
>-#endif
> 
> static void
> read_sockets (const char    *dir,
>@@ -350,6 +365,8 @@ clean_dir (const char *dir)
>     }
> 
>   unhandled_count += (n_entries - alive_count - cleaned_count);
>+
>+  free_socket_entries (entries, n_entries);
> }
> 
> #endif /* AF_UNIX */

Actions: View | Splinter Review

Attachments on bug 33128: 42049 | 42050 | 42051 | 42053 | 42054 | 42055 | 42056 | 42057 | 42058 | 42059 | 42060 | 42061 | 42543 | 42544

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.