Skip to content
Snippets Groups Projects
Commit 8460db48 authored by deuce's avatar deuce
Browse files

Actually, given the commit message for 1.44, this may be what was intended.

parent 21ceb49e
No related branches found
No related tags found
No related merge requests found
......@@ -343,15 +343,14 @@ char* DLLCALL strListCombine(str_list_t list, char* buf, size_t maxlen, const ch
if(maxlen<1)
return(NULL);
if(list==NULL)
return buf;
if(buf==NULL)
if((buf=(char*)malloc(maxlen))==NULL)
return(NULL);
memset(buf, 0, maxlen);
*buf=0;
if(list==NULL)
return buf;
end=buf+maxlen;
for(i=0, ptr=buf; list[i]!=NULL && buf<end; i++)
ptr += safe_snprintf(ptr, end-ptr, "%s%s", i ? delimit:"", list[i]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment