diff options
Diffstat (limited to 'usr.bin/xargs/strnsubst.c')
| -rw-r--r-- | usr.bin/xargs/strnsubst.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c index 5ca2773fded7..b6668b7071b3 100644 --- a/usr.bin/xargs/strnsubst.c +++ b/usr.bin/xargs/strnsubst.c @@ -24,6 +24,8 @@ void strnsubst(char **, const char *, const char *, size_t); * maxsize bytes large. It does not free the string pointed to by str, it * is up to the calling program to be sure that the original contents of * str as well as the new contents are handled in an appropriate manner. + * If replstr is NULL, then that internally is changed to a nil-string, so + * that we can still pretend to do somewhat meaningful substitution. * No value is returned. */ void @@ -38,6 +40,9 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize) if (s2 == NULL) err(1, "calloc"); + if (replstr == NULL) + replstr = ""; + if (match == NULL || replstr == NULL || maxsize == strlen(s1)) { strlcpy(s2, s1, maxsize); goto done; |