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

Fix another buffer overflow.

Browse Source 
PR:		15593
Submitted by:	Przemyslaw Frasunek <venglin@lagoon.FreeBSD.lublin.pl>
This commit is contained in:
Thomas Gellekum 2001-06-28 12:02:45 +00:00
parent ddfe059bf8
commit 5a7e416108
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/doscmd/cwd.c
View File

@ -225,12 +225,12 @@ dos_makepath(u_char *where, u_char *newpath)
np = newpath;
if (*where != '\\' && *where != '/') {
ustrcpy(tmppath, d->cwd);
ustrncpy(tmppath, d->cwd, 1024);
if (d->cwd[1])
ustrcat(tmppath, (u_char *)"/");
ustrcat(tmppath, where);
ustrncat(tmppath, (u_char *)"/", 1024 - ustrlen(tmppath));
ustrncat(tmppath, where, 1024 - ustrlen(tmppath));
} else {
ustrcpy(tmppath, where);
ustrncpy(tmppath, where, 1024 - ustrlen(tmppath));
}
dirs = get_entries(tmppath);

10
usr.bin/doscmd/cwd.h
View File

@ -45,7 +45,13 @@ ustrcat(u_char *s1, u_char *s2)
}
static inline u_char *
ustrncpy(u_char *s1, u_char *s2, unsigned n)
ustrncat(u_char *s1, u_char *s2, size_t n)
{
return((u_char *)strncat((char *)s1, (char *)s2, n));
}
static inline u_char *
ustrncpy(u_char *s1, u_char *s2, size_t n)
{
return((u_char *)strncpy((char *)s1, (char *)s2, n));
}
@ -57,7 +63,7 @@ ustrcmp(u_char *s1, u_char *s2)
}
static inline int
ustrncmp(u_char *s1, u_char *s2, unsigned n)
ustrncmp(u_char *s1, u_char *s2, size_t n)
{
return(strncmp((char *)s1, (char *)s2, n));
}