From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Fri, 9 Dec 2011 17:33:37 +0000 (-0200)
Subject: Do not allocate path for known places an close resource asap
X-Git-Tag: v1~55^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4272d087800dea1754d15762ae022ead05cc35ed;p=thirdparty%2Fkmod.git

Do not allocate path for known places an close resource asap

This place is not supposed to exceed PATH_MAX. So, use snprintf instead
of asprintf.

Close the index before iterating the values.
---

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 975b4b48..f91e74fc 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -358,23 +358,23 @@ static int kmod_lookup_alias_from_alias_bin(struct kmod_ctx *ctx,
 						const char *name,
 						struct kmod_list **list)
 {
-	char *fn;
+	char fn[PATH_MAX];
 	int err, nmatch = 0;
 	struct index_file *idx;
 	struct index_value *realnames, *realname;
 
-	if (asprintf(&fn, "%s/%s.bin", ctx->dirname, file) < 0)
-		return -ENOMEM;
+	fn[PATH_MAX - 1] = '\0';
+	snprintf(fn, sizeof(fn) - 1, "%s/%s.bin", ctx->dirname, file);
 
 	DBG(ctx, "file=%s name=%s\n", fn, name);
 
 	idx = index_file_open(fn);
-	if (idx == NULL) {
-		free(fn);
+	if (idx == NULL)
 		return -ENOSYS;
-	}
 
 	realnames = index_searchwild(idx, name);
+	index_file_close(idx);
+
 	for (realname = realnames; realname; realname = realnames->next) {
 		struct kmod_module *mod;
 
@@ -389,8 +389,6 @@ static int kmod_lookup_alias_from_alias_bin(struct kmod_ctx *ctx,
 	}
 
 	index_values_free(realnames);
-	index_file_close(idx);
-	free(fn);
 
 	return nmatch;