Attachment 90139 Details for Bug 69332 – [PATCH 1/3] Fix memory leak for kqueue: replace tab with space

[patch] [PATCH 1/3] Fix memory leak for kqueue: replace tab with space

0001-Fix-memory-leak-for-kqueue-replace-tab-with-space.patch (text/plain), 4.66 KB, created by Chengwei Yang on 2013-12-03 04:55:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-12-03 04:55:46 UTC

Size: 4.66 KB

patch

obsolete

>From 9277bf5dcdaeba4af49e7442cf4035cd2f942726 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Sun, 1 Dec 2013 19:40:21 +0800
>Subject: [PATCH 1/3] Fix memory leak for kqueue: replace tab with space
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69332
>---
> bus/dir-watch-kqueue.c |  102 ++++++++++++++++++++++++------------------------
> 1 file changed, 51 insertions(+), 51 deletions(-)
>
>diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
>index c60560f..065fabb 100644
>--- a/bus/dir-watch-kqueue.c
>+++ b/bus/dir-watch-kqueue.c
>@@ -73,12 +73,12 @@ _handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
>     {
>       kq = -1;
>       if (watch != NULL)
>-	{
>-	  _dbus_loop_remove_watch (loop, watch);
>+        {
>+          _dbus_loop_remove_watch (loop, watch);
>           _dbus_watch_invalidate (watch);
>           _dbus_watch_unref (watch);
>-	  watch = NULL;
>-	}
>+          watch = NULL;
>+        }
>       pid = getpid ();
>       _dbus_verbose ("Sending SIGHUP signal since kqueue has been closed\n");
>       (void) kill (pid, SIGHUP);
>@@ -99,32 +99,32 @@ _init_kqueue (BusContext *context)
>       if (kq < 0)
>         {
>           _dbus_warn ("Cannot create kqueue; error '%s'\n", _dbus_strerror (errno));
>-	  goto out;
>-	}
>-
>-        loop = bus_context_get_loop (context);
>-
>-        watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
>-                                 _handle_kqueue_watch, NULL, NULL);
>-
>-	if (watch == NULL)
>-          {
>-            _dbus_warn ("Unable to create kqueue watch\n");
>-	    close (kq);
>-	    kq = -1;
>-	    goto out;
>-	  }
>-
>-	if (!_dbus_loop_add_watch (loop, watch))
>-          {
>-            _dbus_warn ("Unable to add reload watch to main loop");
>-	    _dbus_watch_invalidate (watch);
>-	    _dbus_watch_unref (watch);
>-	    watch = NULL;
>-	    close (kq);
>-	    kq = -1;
>-            goto out;
>-	  }
>+          goto out;
>+        }
>+
>+      loop = bus_context_get_loop (context);
>+
>+      watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
>+                               _handle_kqueue_watch, NULL, NULL);
>+
>+      if (watch == NULL)
>+        {
>+          _dbus_warn ("Unable to create kqueue watch\n");
>+          close (kq);
>+          kq = -1;
>+          goto out;
>+        }
>+
>+      if (!_dbus_loop_add_watch (loop, watch))
>+        {
>+          _dbus_warn ("Unable to add reload watch to main loop");
>+          _dbus_watch_invalidate (watch);
>+          _dbus_watch_unref (watch);
>+          watch = NULL;
>+          close (kq);
>+          kq = -1;
>+          goto out;
>+        }
>     }
> 
>   ret = 1;
>@@ -169,12 +169,12 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories)
>           if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
>             {
>               new_fds[i] = fds[j];
>-	      new_dirs[i] = dirs[j];
>-	      fds[j] = -1;
>-	      dirs[j] = NULL;
>-	      break;
>-	    }
>-	}
>+              new_dirs[i] = dirs[j];
>+              fds[j] = -1;
>+              dirs[j] = NULL;
>+              break;
>+            }
>+        }
>     }
> 
>   /* Any directory we find in "fds" with a nonzero fd must
>@@ -185,10 +185,10 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories)
>       if (fds[j] != -1)
>         {
>           close (fds[j]);
>-	  dbus_free (dirs[j]);
>-	  fds[j] = -1;
>-	  dirs[j] = NULL;
>-	}
>+          dbus_free (dirs[j]);
>+          fds[j] = -1;
>+          dirs[j] = NULL;
>+        }
>     }
> 
>   for (i = 0; new_dirs[i]; i++)
>@@ -196,8 +196,8 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories)
>       if (new_fds[i] == -1)
>         {
>           /* FIXME - less lame error handling for failing to add a watch;
>-	   * we may need to sleep.
>-	   */
>+           * we may need to sleep.
>+           */
>           fd = open (new_dirs[i], O_RDONLY);
>           if (fd < 0)
>             {
>@@ -223,18 +223,18 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories)
>               goto out;
>             }
> 
>-	  new_fds[i] = fd;
>-	  new_dirs[i] = _dbus_strdup (new_dirs[i]);
>-	  if (!new_dirs[i])
>+          new_fds[i] = fd;
>+          new_dirs[i] = _dbus_strdup (new_dirs[i]);
>+          if (!new_dirs[i])
>             {
>               /* FIXME have less lame handling for OOM, we just silently fail to
>-	       * watch.  (In reality though, the whole OOM handling in dbus is
>-	       * stupid but we won't go into that in this comment =) )
>-	       */
>+               * watch.  (In reality though, the whole OOM handling in dbus is
>+               * stupid but we won't go into that in this comment =) )
>+               */
>               close (fd);
>-	      new_fds[i] = -1;
>-	    }
>-	}
>+              new_fds[i] = -1;
>+            }
>+        }
>     }
> 
>   num_fds = i;
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 69332: 90139 | 90140 | 90141 | 90143 | 90153

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.