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

Be more paranoid about unlinking files. From mhpower@MIT.EDU by way of

Browse Source 
Theo de Raadt.

Likely 2.2.5R candidate.
Obtained from: OpenBSD
This commit is contained in:
Warner Losh 1997-10-06 03:58:48 +00:00
parent 01f370b672
commit ed4d1cf9cc
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/lpr/common_source/recvjob.c
View File

@ -43,7 +43,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95";
#endif
static const char rcsid[] =
"$Id$";
"$Id: recvjob.c,v 1.10 1997/09/24 06:47:55 charnier Exp $";
#endif /* not lint */
/*
@ -263,7 +263,8 @@ readfile(file, size)
if (err)
frecverr("%s: write error", file);
if (noresponse()) { /* file sent had bad data in it */
(void) unlink(file);
if (strchr(file, '/') == NULL)
(void) unlink(file);
return(0);
}
ack();
@ -328,15 +329,16 @@ static void
rcleanup(signo)
int signo;
{
if (tfname[0])
if (tfname[0] && strchr(tfname, '/') == NULL)
(void) unlink(tfname);
if (dfname[0])
if (dfname[0] && strchr(dfname, '/') == NULL) {
do {
do
(void) unlink(dfname);
while (dfname[2]-- != 'A');
dfname[2] = 'z';
} while (dfname[0]-- != 'd');
}
dfname[0] = '\0';
}

10
usr.sbin/lpr/lpd/recvjob.c
View File

@ -43,7 +43,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95";
#endif
static const char rcsid[] =
"$Id$";
"$Id: recvjob.c,v 1.10 1997/09/24 06:47:55 charnier Exp $";
#endif /* not lint */
/*
@ -263,7 +263,8 @@ readfile(file, size)
if (err)
frecverr("%s: write error", file);
if (noresponse()) { /* file sent had bad data in it */
(void) unlink(file);
if (strchr(file, '/') == NULL)
(void) unlink(file);
return(0);
}
ack();
@ -328,15 +329,16 @@ static void
rcleanup(signo)
int signo;
{
if (tfname[0])
if (tfname[0] && strchr(tfname, '/') == NULL)
(void) unlink(tfname);
if (dfname[0])
if (dfname[0] && strchr(dfname, '/') == NULL) {
do {
do
(void) unlink(dfname);
while (dfname[2]-- != 'A');
dfname[2] = 'z';
} while (dfname[0]-- != 'd');
}
dfname[0] = '\0';
}