d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tidy-ups on uninitialized scalar variable

Browse Source 
As a followup to r278363, there is one more case where
stayopen can be accessed uninitialized, but even after
swapping arguments, access is possible in some other
cases so prevent it completely by initializing stayopen.

CID:	1018729
CID:	1018732
This commit is contained in:
pfg 2015-02-15 16:50:21 +00:00
parent 483241d127
commit 642d51969a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/gen/getgrent.c
View File

@ -1303,7 +1303,7 @@ compat_group(void *retval, void *mdata, va_list ap)
void *discard;
size_t bufsize, linesize;
off_t pos;
int rv, stayopen, *errnop;
int rv, stayopen = 0, *errnop;
#define set_lookup_type(x, y) do { \
int i; \
@ -1450,7 +1450,7 @@ docompat:
pos = ftello(st->fp);
}
fin:
if (!stayopen && st->fp != NULL) {
if (st->fp != NULL || !stayopen) {
fclose(st->fp);
st->fp = NULL;
}

2
lib/libc/gen/getpwent.c
View File

@ -815,7 +815,7 @@ files_passwd(void *retval, void *mdata, va_list ap)
size_t bufsize, namesize;
uid_t uid;
uint32_t store;
int rv, stayopen, *errnop;
int rv, stayopen = 0, *errnop;
name = NULL;
uid = (uid_t)-1;