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

fts_close calls free(sp), the ISSET(FTS_NOCHDIR) which is a macro that

Browse Source 
references sp. The free needs to follow ISSET

PR:		7148
Reviewed by:	phk
Submitted by:	Ken Mayer <kmayer@freegate.com>
This commit is contained in:
Poul-Henning Kamp 1998-07-03 08:21:05 +00:00
parent e25169f239
commit 8a507b98ab
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=37349
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/gen/fts-compat.c
View File

@ -241,14 +241,15 @@ fts_close(sp)
(void)close(sp->fts_rfd);
}
/* Free up the stream pointer. */
free(sp);
/* Set errno and return. */
if (!ISSET(FTS_NOCHDIR) && saved_errno) {
/* Free up the stream pointer. */
free(sp);
errno = saved_errno;
return (-1);
}
/* Free up the stream pointer. */
free(sp);
return (0);
}

7
lib/libc/gen/fts.c
View File

@ -241,14 +241,15 @@ fts_close(sp)
(void)close(sp->fts_rfd);
}
/* Free up the stream pointer. */
free(sp);
/* Set errno and return. */
if (!ISSET(FTS_NOCHDIR) && saved_errno) {
/* Free up the stream pointer. */
free(sp);
errno = saved_errno;
return (-1);
}
/* Free up the stream pointer. */
free(sp);
return (0);
}