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

Handle maxsize==0 in such a way that we don't modify the string.

Browse Source
This commit is contained in:
Juli Mallett 2005-12-30 23:22:50 +00:00
parent d028250086
commit 38e62c6999
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153917
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/xargs/strnsubst.c
View File

@ -36,6 +36,18 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize)
s1 = *str;
if (s1 == NULL)
return;
/*
* If maxsize is 0 then set it to to the length of s1, because we have
* to duplicate s1. XXX we maybe should double-check whether the match
* appears in s1. If it doesn't, then we also have to set the length
* to the length of s1, to avoid modifying the argument. It may make
* sense to check if maxsize is <= strlen(s1), because in that case we
* want to return the unmodified string, too.
*/
if (maxsize == 0) {
match = NULL;
maxsize = strlen(s1) + 1;
}
s2 = calloc(maxsize, 1);
if (s2 == NULL)
err(1, "calloc");