Attachment 7516 Details for Bug 8759 – Make sure servicedir list is unique

[patch] Make sure servicedir list is unique

dbus-0.94-config-parser-dir-list-unique.patch (text/plain), 2.05 KB, created by John (J5) Palmieri on 2006-10-25 13:45:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John (J5) Palmieri

Created: 2006-10-25 13:45:54 UTC

Size: 2.05 KB

patch

obsolete

>--- dbus-0.94/bus/config-parser.c.activation-fix	2006-10-25 15:46:03.000000000 -0400
>+++ dbus-0.94/bus/config-parser.c	2006-10-25 16:21:47.000000000 -0400
>@@ -287,6 +287,52 @@
> }
> 
> static dbus_bool_t
>+service_dirs_find_dir (DBusList **service_dirs,
>+                       const char *dir)
>+{
>+  DBusList *link;
>+
>+  _dbus_assert (dir != NULL);
>+
>+  for (link = *service_dirs; link; link = link->next)
>+    {
>+      const char *link_dir;
>+      
>+      link_dir = (const char *)link->data;
>+      if (link_dir && !strcmp (dir, link_dir))
>+        return TRUE;
>+    }
>+
>+  return FALSE;
>+}
>+
>+static dbus_bool_t
>+service_dirs_append_unique_or_free (DBusList **service_dirs,
>+                                    char *dir)
>+{
>+  if (!service_dirs_find_dir (service_dirs, dir))
>+    return _dbus_list_append (service_dirs, dir);  
>+
>+  dbus_free (dir);
>+  return TRUE;
>+}
>+
>+static void 
>+service_dirs_append_link_unique_or_free (DBusList **service_dirs,
>+                                         DBusList *dir_link)
>+{
>+  if (!service_dirs_find_dir (service_dirs, dir_link->data))
>+    {
>+      _dbus_list_append_link (service_dirs, dir_link);
>+    }
>+  else
>+    {
>+      dbus_free (dir_link->data);
>+      _dbus_list_free_link (dir_link);
>+    }
>+}
>+
>+static dbus_bool_t
> merge_included (BusConfigParser *parser,
>                 BusConfigParser *included,
>                 DBusError       *error)
>@@ -338,7 +384,7 @@
>     _dbus_list_append_link (&parser->mechanisms, link);
> 
>   while ((link = _dbus_list_pop_first_link (&included->service_dirs)))
>-    _dbus_list_append_link (&parser->service_dirs, link);
>+    service_dirs_append_link_unique_or_free (&parser->service_dirs, link);
> 
>   while ((link = _dbus_list_pop_first_link (&included->conf_dirs)))
>     _dbus_list_append_link (&parser->conf_dirs, link);
>@@ -2312,7 +2358,7 @@
>             goto nomem;
>           }
> 
>-        if (!_dbus_list_append (&parser->service_dirs, s))
>+        if (!service_dirs_append_unique_or_free (&parser->service_dirs, s))
>           {
>             _dbus_string_free (&full_path);
>             dbus_free (s);

Actions: View | Splinter Review

Attachments on bug 8759: 7516

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.