50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 407df48ed36526f773dcc60ab6cef0f5ce441fe7 Mon Sep 17 00:00:00 2001
|
|
From: David Herrmann <dh.herrmann@gmail.com>
|
|
Date: Wed, 4 Sep 2013 12:36:19 +0200
|
|
Subject: [PATCH] libudev: fix memleak when enumerating childs
|
|
|
|
We need to free udev-devices again if they don't match. Funny that no-one
|
|
noticed it yet since valgrind is quite verbose about it.
|
|
Fix it and free non-matching devices.
|
|
---
|
|
src/libudev/libudev-enumerate.c | 14 +++++++++-----
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
|
|
index 3e79107..b96e5b2 100644
|
|
--- a/src/libudev/libudev-enumerate.c
|
|
+++ b/src/libudev/libudev-enumerate.c
|
|
@@ -829,23 +829,27 @@ nomatch:
|
|
static int parent_add_child(struct udev_enumerate *enumerate, const char *path)
|
|
{
|
|
struct udev_device *dev;
|
|
+ int r = 0;
|
|
|
|
dev = udev_device_new_from_syspath(enumerate->udev, path);
|
|
if (dev == NULL)
|
|
return -ENODEV;
|
|
|
|
if (!match_subsystem(enumerate, udev_device_get_subsystem(dev)))
|
|
- return 0;
|
|
+ goto nomatch;
|
|
if (!match_sysname(enumerate, udev_device_get_sysname(dev)))
|
|
- return 0;
|
|
+ goto nomatch;
|
|
if (!match_property(enumerate, dev))
|
|
- return 0;
|
|
+ goto nomatch;
|
|
if (!match_sysattr(enumerate, dev))
|
|
- return 0;
|
|
+ goto nomatch;
|
|
|
|
syspath_add(enumerate, udev_device_get_syspath(dev));
|
|
+ r = 1;
|
|
+
|
|
+nomatch:
|
|
udev_device_unref(dev);
|
|
- return 1;
|
|
+ return r;
|
|
}
|
|
|
|
static int parent_crawl_children(struct udev_enumerate *enumerate, const char *path, int maxdepth)
|