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

Improve separated_concat() to properly handle the case of concatenating

Browse Source 
"/" and "/foo".

MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2015-03-09 13:00:59 +00:00
parent 8822ff21ce
commit 622e1a5d99
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/autofs/common.c
View File

@ -136,8 +136,14 @@ separated_concat(const char *s1, const char *s2, char separator)
assert(s1 != NULL);
assert(s2 != NULL);
if (s1[0] == '\0' || s2[0] == '\0' ||
s1[strlen(s1) - 1] == separator || s2[0] == separator) {
/*
* If s2 starts with separator - skip it; otherwise concatenating
* "/" and "/foo" would end up returning "//foo".
*/
if (s2[0] == separator)
s2++;
if (s1[0] == '\0' || s2[0] == '\0' || s1[strlen(s1) - 1] == separator) {
ret = asprintf(&result, "%s%s", s1, s2);
} else {
ret = asprintf(&result, "%s%c%s", s1, separator, s2);