DomainKey-Signature: a=rsa-sha1; c=nofws; d=cs.rpi.edu; h=from:to:cc
	:subject:date:message-id; q=dns; s=default; b=XRgRNfMyh1see/P6b+
	jtPi3vcxVfvF6dE/BysPB0fGyLA+XOF66A0oTdg82H0YtdWJhC1tQmS0eDDfsJxr
	1rpj3Ije/+80PLF1Vis0RuRQ7KjpEEk6c1EtjjeofZd2JTPf27MCkdc2T8J8tIr/
	XEJvfcrQyBQTmgUL5WxHhzzXc=
From: Ethan Glasser-Camp <glasse@cs.rpi.edu>
To: notmuch@notmuchmail.org
Subject: [PATCH] Free the results of scandir()
Date: Mon,  6 Feb 2012 17:02:49 -0500
Message-Id: <1328565769-29414-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.
---

This should fix a minor memory leak in notmuch-new. Please confirm I'm
reading the manpage correctly ;)

 notmuch-new.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/notmuch-new.c b/notmuch-new.c
index a569a54..c536873 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)
-- 
1.7.5.4