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

Properly terminate the result string for intermediate results, to

Browse Source 
allow the final strcpy() to start at the intended place.

Reported and tested by:	pgj
Pointy hat to:	kib
MFC after:	3 days
This commit is contained in:
Konstantin Belousov 2013-04-29 21:12:25 +00:00
parent 5c6fe3a917
commit 3c9cb0c6c9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libexec/rtld-elf/rtld.c
View File

@ -784,7 +784,7 @@ origin_subst_one(char *real, const char *kw, const char *subst,
/* /*
* Now, execute the substitution loop. * Now, execute the substitution loop.
*/ */
for (p = real, resp = res;;) { for (p = real, resp = res, *resp = '\0';;) {
p1 = strstr(p, kw); p1 = strstr(p, kw);
if (p1 != NULL) { if (p1 != NULL) {
/* Copy the prefix before keyword. */ /* Copy the prefix before keyword. */
@ -793,6 +793,7 @@ origin_subst_one(char *real, const char *kw, const char *subst,
/* Keyword replacement. */ /* Keyword replacement. */
memcpy(resp, subst, subst_len); memcpy(resp, subst, subst_len);
resp += subst_len; resp += subst_len;
*resp = '\0';
p = p1 + kw_len; p = p1 + kw_len;
} else } else
break; break;