Ian Kent 0e5314
autofs-5.1.0 - fix memory leak in get_defaults_entry()
Ian Kent 0e5314
Ian Kent 0e5314
From: Ian Kent <ikent@redhat.com>
Ian Kent 0e5314
Ian Kent 0e5314
In get_defaults_entry(), if parsing of the expanded defaults string fails
Ian Kent 0e5314
the expanded string used for the parse is not freed.
Ian Kent 0e5314
---
Ian Kent 0e5314
 CHANGELOG           |    1 +
Ian Kent 0e5314
 modules/parse_amd.c |    4 +++-
Ian Kent 0e5314
 2 files changed, 4 insertions(+), 1 deletion(-)
Ian Kent 0e5314
Ian Kent 0e5314
diff --git a/CHANGELOG b/CHANGELOG
Ian Kent 0e5314
index 2bb0500..439a51f 100644
Ian Kent 0e5314
--- a/CHANGELOG
Ian Kent 0e5314
+++ b/CHANGELOG
Ian Kent 0e5314
@@ -25,6 +25,7 @@
Ian Kent 0e5314
 - fix hosts map options check in lookup_amd_instance().
Ian Kent 0e5314
 - fix memory leak in create_client().
Ian Kent 0e5314
 - fix memory leak in get_exports().
Ian Kent 0e5314
+- fix memory leak in get_defaults_entry().
Ian Kent 0e5314
 
Ian Kent 0e5314
 04/06/2014 autofs-5.1.0
Ian Kent 0e5314
 =======================
Ian Kent 0e5314
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
Ian Kent 0e5314
index a912385..ebf3807 100644
Ian Kent 0e5314
--- a/modules/parse_amd.c
Ian Kent 0e5314
+++ b/modules/parse_amd.c
Ian Kent 0e5314
@@ -1797,8 +1797,10 @@ static struct amd_entry *get_defaults_entry(struct autofs_point *ap,
Ian Kent 0e5314
 		char *expand;
Ian Kent 0e5314
 		if (!expand_selectors(ap, defaults, &expand, sv))
Ian Kent 0e5314
 			goto out;
Ian Kent 0e5314
-		if (amd_parse_list(ap, expand, &dflts, &sv))
Ian Kent 0e5314
+		if (amd_parse_list(ap, expand, &dflts, &sv)) {
Ian Kent 0e5314
+			free(expand);
Ian Kent 0e5314
 			goto out;
Ian Kent 0e5314
+		}
Ian Kent 0e5314
 		entry = select_default_entry(ap, &dflts, sv);
Ian Kent 0e5314
 		if (!entry->map_type) {
Ian Kent 0e5314
 			/*