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

Fix segfault that could occur on "automount -LL".

Browse Source 
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
This commit is contained in:
Edward Tomasz Napierala 2019-04-10 16:09:06 +00:00
parent 9c0fe7f6b9
commit 1383afcb99
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,7 @@ expand_ampersand(char *string, const char *key)
* of characters before the '&'.
*/
before_len = i;
//assert(i + 1 < (int)strlen(string));
//assert(i < (int)strlen(string));
ret = asprintf(&expanded, "%.*s%s%s",
before_len, string, key, string + before_len + 1);
@ -380,6 +380,8 @@ expand_ampersand(char *string, const char *key)
*/
string = expanded;
i = before_len + strlen(key);
if (i == (int)strlen(string))
break;
backslashed = false;
//assert(i < (int)strlen(string));
}