Commit 6953b62

committed

util: Don't leak a file descriptor in read_file

If memory allocation fails, we should close the file descriptor before returning the error. Also remove unneeded parentheses on return, return isn't a function. Signed-off-by: Jean Delvare <jdelvare@suse.de> Fixes: 2339e72 ("util: Add read_file() function for reading sysfs files")

1 parent 2dd4896 commit 6953b62Copy full SHA for 6953b62

File tree

2 files changed

+10

-5

lines changed

CHANGELOG
util.c

2 files changed

+10

-5

lines changed

`‎CHANGELOG‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
	`1`	`+2017年04月11日 Jean Delvare <jdelvare@suse.de>`
	`2`	`+`
	`3`	`+ * util.c: Don't leak a file descriptor in function read_file.`
	`4`	`+`
`1`	`5`	`2017年04月10日 Jean Delvare <jdelvare@suse.de>`
`2`	`6`
`3`	`7`	`* dmidecode.c: Decode the processor ID of the Intel Core M, AMD`

`‎util.c‎`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,13 +113,13 @@ void read_file(size_t max_len, const char *filename)`
`113`	`113`	`{`
`114`	`114`	`if (errno != ENOENT)`
`115`	`115`	`perror(filename);`
`116`		`- return(NULL);`
	`116`	`+ returnNULL;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if ((p = malloc(*max_len)) == NULL)`
`120`	`120`	`{`
`121`	`121`	`perror("malloc");`
`122`		`- returnNULL;`
	`122`	`+ goto out;`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`do`
`@@ -129,19 +129,20 @@ void read_file(size_t max_len, const char *filename)`
`129`	`129`	`{`
`130`	`130`	`if (errno != EINTR)`
`131`	`131`	`{`
`132`		`- close(fd);`
`133`	`132`	`perror(filename);`
`134`	`133`	`free(p);`
`135`		`- return NULL;`
	`134`	`+ p = NULL;`
	`135`	`+ goto out;`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`	`else`
`139`	`139`	`r2 += r;`
`140`	`140`	`}`
`141`	`141`	`while (r != 0);`
`142`	`142`
`143`		`- close(fd);`
`144`	`143`	`*max_len = r2;`
	`144`	`+out:`
	`145`	`+ close(fd);`
`145`	`146`
`146`	`147`	`return p;`
`147`	`148`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 6953b62

File tree

2 files changed

2 files changed

`‎CHANGELOG‎`

`‎util.c‎`

0 commit comments