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

Fix a malloc overrun in 32-bit compat libmap lookup code.

Browse Source
This commit is contained in:
Peter Wemm 2006-01-31 06:08:28 +00:00
parent fb1a11d799
commit 8c6a035ead
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=155084
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/rtld-elf/libmap.c
View File

@ -263,14 +263,12 @@ lm_findn (const char *p, const char *f, const int n)
{
char pathbuf[64], *s, *t;
if (n < sizeof(pathbuf) - 1) {
memcpy(pathbuf, f, n);
pathbuf[n] = '\0';
if (n < sizeof(pathbuf) - 1)
s = pathbuf;
} else {
else
s = xmalloc(n + 1);
strcpy(s, f);
}
memcpy(s, f, n);
s[n] = '\0';
t = lm_find(p, s);
if (s != pathbuf)
free(s);