[PATCH] radeon mkregtable: Add missing fclose() calls

Jesper Juhl jj at chaosbits.net
Sat Feb 5 11:51:53 PST 2011


drivers/gpu/drm/radeon/mkregtable.c:parser_auth() almost always remembers 
to fclose(file) before returning, but it misses two spots.

This is not really important since the process will exit shortly after and 
thus close the file for us, but being explicit prevents static analysis 
tools from complaining about leaked memory and missing fclose() calls and 
it also seems to be the prefered style of the existing code to explicitly 
close the file.

So, here's a patch to add the two missing fclose() calls.

Signed-off-by: Jesper Juhl <jj at chaosbits.net>
---
 mkregtable.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
index 607241c..5a82b6b 100644
--- a/drivers/gpu/drm/radeon/mkregtable.c
+++ b/drivers/gpu/drm/radeon/mkregtable.c
@@ -673,8 +673,10 @@ static int parser_auth(struct table *t, const char *filename)
 	last_reg = strtol(last_reg_s, NULL, 16);
 
 	do {
-		if (fgets(buf, 1024, file) == NULL)
+		if (fgets(buf, 1024, file) == NULL) {
+			fclose(file);
 			return -1;
+		}
 		len = strlen(buf);
 		if (ftell(file) == end)
 			done = 1;
@@ -685,6 +687,7 @@ static int parser_auth(struct table *t, const char *filename)
 				fprintf(stderr,
 					"Error matching regular expression %d in %s\n",
 					r, filename);
+				fclose(file);
 				return -1;
 			} else {
 				buf[match[0].rm_eo] = 0;


-- 
Jesper Juhl <jj at chaosbits.net>            http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.



More information about the dri-devel mailing list