diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-05-13 17:39:56 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-05-13 17:39:56 +0100 |
| commit | 07e4924254cf52a1bad311a9231d0b0fb72ec763 (patch) | |
| tree | a45d21b0cb1edee9131d5158d5a60b91fc037dc5 /utils/utils.c | |
| parent | 4784273195dbf4a8efb6bd6480545e532b07a4fc (diff) | |
| download | netsurf-07e4924254cf52a1bad311a9231d0b0fb72ec763.tar.gz netsurf-07e4924254cf52a1bad311a9231d0b0fb72ec763.tar.bz2 | |
make vsnstrjoin correctly check for null arguments.
Diffstat (limited to 'utils/utils.c')
| -rw-r--r-- | utils/utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/utils/utils.c b/utils/utils.c index de0de0b72..953cc5cad 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -146,6 +146,10 @@ nserror vsnstrjoin(char **str, size_t *size, char sep, size_t nelm, va_list ap) */ for (elm_idx = 0; elm_idx < nelm; elm_idx++) { elm[elm_idx] = va_arg(ap, const char *); + /* check the argument is not NULL */ + if (elm[elm_idx] == NULL) { + return NSERROR_BAD_PARAMETER; + } elm_len[elm_idx] = strlen(elm[elm_idx]); fname_len += elm_len[elm_idx]; } |