From: Rob Landley <rob@landley.net>
Date: Thu, 18 May 2006 20:41:43 +0000 (-0000)
Subject: Avoid a memory leak pointed out by Lucas C. Villa Real.
X-Git-Tag: 1_2_0~356
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3afb070e6df906570f3ad1b0df099517bff6537a;p=oweals%2Fbusybox.git

Avoid a memory leak pointed out by Lucas C. Villa Real.
---

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 2925dd28d..3f68d64ea 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -388,15 +388,14 @@ static struct dep_t *build_dep ( void )
 	}
 
 	filename = bb_xasprintf("/lib/modules/%s/modules.dep", un.release );
-
-	if (( fd = open ( filename, O_RDONLY )) < 0 ) {
-
+	fd = open ( filename, O_RDONLY );
+	if (ENABLE_FEATURE_CLEAN_UP) free(filename);
+	if (fd < 0) {
 		/* Ok, that didn't work.  Fall back to looking in /lib/modules */
 		if (( fd = open ( "/lib/modules/modules.dep", O_RDONLY )) < 0 ) {
 			return 0;
 		}
 	}
-	free(filename);
 
 	while ( reads ( fd, buffer, sizeof( buffer ))) {
 		int l = strlen ( buffer );