DomainKey-Signature: a=rsa-sha1; c=nofws; d=cs.rpi.edu; h=from:to:cc
	:subject:date:message-id; q=dns; s=default; b=kcGAKoT+RRkv/BxmFJ
	zIsLWIoL/RfiZbZ/Ch/jwT+eOwbzhg1p2BxELBERpcDUxrCH7E93F9JaVrS/UOE5
	ZTZGb9L7jvzMS+XAk5glhorTLnVO4rDqLoMXC0MTZMdfHo4hpI2QGXwc2ZwRhG9q
	oEsnZxY40KHheXWGUaRniKfFY=
From: Ethan Glasser-Camp <glasse@cs.rpi.edu>
To: notmuch@notmuchmail.org
Subject: [PATCH] Free the results of scandir()
Date: Tue,  7 Feb 2012 05:05:03 -0500
Message-Id: <1328609103-7870-1-git-send-email-glasse@cs.rpi.edu>
Cc: Ethan Glasser-Camp <ethan@betacantrips.com>
Precedence: list

From: Ethan Glasser-Camp <ethan@betacantrips.com>

scandir() returns "strings allocated via malloc(3)" which are then
"collected in array namelist which is allocated via
malloc(3)". Currently we just free the array namelist. Instead, free
all the entries of namelist, and then free namelist.

entry only points to elements of namelist, so we don't free it
separately.
---

v3: I'm still learning the house style. Thanks Dmitry.

 notmuch-new.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/notmuch-new.c b/notmuch-new.c
index a569a54..8dbebb3 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -559,12 +559,14 @@ add_files_recursive (notmuch_database_t *notmuch,
   DONE:
     if (next)
 	talloc_free (next);
-    if (entry)
-	free (entry);
     if (dir)
 	closedir (dir);
-    if (fs_entries)
+    if (fs_entries) {
+	for (i = 0; i < num_fs_entries; i++)
+	    free (fs_entries[i]);
+
 	free (fs_entries);
+    }
     if (db_subdirs)
 	notmuch_filenames_destroy (db_subdirs);
     if (db_files)
@@ -704,10 +706,12 @@ count_files (const char *path, int *count)
     }
 
   DONE:
-    if (entry)
-	free (entry);
-    if (fs_entries)
+    if (fs_entries) {
+	for (i = 0; i < num_fs_entries; i++)
+	    free (fs_entries[i]);
+
         free (fs_entries);
+    }
 }
 
 static void
-- 
1.7.5.4