From 07e4924254cf52a1bad311a9231d0b0fb72ec763 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 13 May 2014 17:39:56 +0100 Subject: make vsnstrjoin correctly check for null arguments. --- utils/utils.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'utils') 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]; } -- cgit v1.2.3