ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmount: use fmemopen() in more robust way [coverity scan] 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-09-20 13:00:19 +02:00
parent d978ec31f7
commit 026f7d3020
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmount/src/utils.c
View File

@ -1242,20 +1242,26 @@ success:
*/
FILE *mnt_get_procfs_memstream(int fd, char **membuf)
{
FILE *memf;
size_t sz = 0;
off_t cur;
*membuf = NULL;
/* in case of error, rewind to the original position */
cur = lseek(fd, 0, SEEK_CUR);
if (read_procfs_file(fd, membuf, &sz) == 0
&& sz > 0
&& (memf = fmemopen(*membuf, sz, "r")))
return memf;
if (read_procfs_file(fd, membuf, &sz) == 0 && sz > 0) {
FILE *memf = fmemopen(*membuf, sz, "r");
if (memf)
return memf; /* success */
free(membuf);
*membuf = NULL;
}
/* error */
lseek(fd, cur, SEEK_SET);
if (cur != (off_t) -1)
lseek(fd, cur, SEEK_SET);
return NULL;
}
#else