emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure FILE pointer returned by hdopen() is not leaked even if the

Browse Source 
pointer returned can be casted to a negative long value (Coverity CIDs
1164478 and 1164477).
This commit is contained in:
Petter Reinholdtsen 2014-01-26 16:40:03 +00:00
parent 7d6e3683b0
commit 2d0b513b8a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/hddown.c
View File

@ -93,8 +93,8 @@ static char *list_disks(DIR* blk, unsigned int* flags)
int ret; int ret;
fp = hdopen(SYS_BLK "/%s/removable", d->d_name); fp = hdopen(SYS_BLK "/%s/removable", d->d_name);
if ((long)fp <= 0) { if (0 == (long)fp || -1 == (long)fp) {
if ((long)fp < 0) if (-1 == (long)fp)
goto empty; /* error */ goto empty; /* error */
continue; /* no entry `removable' */ continue; /* no entry `removable' */
} }
@ -137,8 +137,8 @@ static char *list_disks(DIR* blk, unsigned int* flags)
continue; /* should not happen */ continue; /* should not happen */
fp = hdopen(SYS_CLASS "/%s/manage_start_stop", ptr); fp = hdopen(SYS_CLASS "/%s/manage_start_stop", ptr);
if ((long)fp <= 0) { if (0 == (long)fp || -1 == (long)fp) {
if ((long)fp < 0) if (-1 == (long)fp)
goto empty; /* error */ goto empty; /* error */
} else { } else {
ret = getc(fp); ret = getc(fp);
@ -151,8 +151,8 @@ static char *list_disks(DIR* blk, unsigned int* flags)
} }
fp = hdopen(SYS_BLK "/%s/device/vendor", d->d_name); fp = hdopen(SYS_BLK "/%s/device/vendor", d->d_name);
if ((long)fp <= 0) { if (0 == (long)fp || -1 == (long)fp) {
if ((long)fp < 0) if (-1 == (long)fp)
goto empty; /* error */ goto empty; /* error */
continue; /* no entry `device/vendor' */ continue; /* no entry `device/vendor' */
} }
@ -306,8 +306,9 @@ static char *strstrip(char *str)
} }
/* /*
* Open a sysfs file without getting a controlling tty * Open a sysfs file without getting a controlling tty and return
* and return FILE* pointer. * FILE* pointer. Return 0 if the file didn't exist, or (FILE*)-1 if
* something else went wrong.
*/ */
static FILE *hdopen(const char* const format, const char* const name) static FILE *hdopen(const char* const format, const char* const name)
{ {
@ -350,8 +351,8 @@ static int flush_cache_ext(const char *device)
FILE *fp; FILE *fp;
fp = hdopen(SYS_BLK "/%s/size", device); fp = hdopen(SYS_BLK "/%s/size", device);
if ((long)fp <= 0) { if (0 == (long)fp || -1 == (long)fp) {
if ((long)fp < 0) if (-1 == (long)fp)
return -1; /* error */ return -1; /* error */
goto out; /* no entry `size' */ goto out; /* no entry `size' */
} }