qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 09:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure dstring has space for terminating 0.

Browse source 
It seems (some versions of) windows vsnprintf don't count the terminating 0
when limiting the number of chars written to the buffer. Nor do they
guarantee the output string will be terminated.
This commit is contained in:
Bill Currie 2012-05-10 12:50:44 +09:00
parent 0036a5e113
commit e6c0512f31
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/util/dstring.c
View file

@ -320,7 +320,7 @@ _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
if (!dstr->truesize)
dstring_clearstr (dstr); // Make it a string
// Some vsnprintf implementations return -1 on truncation
while ((size = vsnprintf (dstr->str + offs, dstr->truesize - offs, fmt,
while ((size = vsnprintf (dstr->str + offs, dstr->truesize - offs - 1, fmt,
args)) == -1) {
dstr->size = (dstr->truesize & ~1023) + 1024;
dstring_adjust (dstr);
@ -328,15 +328,17 @@ _dvsprintf (dstring_t *dstr, int offs, const char *fmt, va_list args)
VA_COPY (args, tmp_args);
#endif
}
dstr->size = size + offs + 1;
dstr->size = size + offs + 2;
// "Proper" implementations return the required size
if (dstr->size > dstr->truesize) {
dstring_adjust (dstr);
#ifdef VA_LIST_IS_ARRAY
VA_COPY (args, tmp_args);
#endif
vsnprintf (dstr->str + offs, dstr->truesize - offs, fmt, args);
vsnprintf (dstr->str + offs, dstr->truesize - offs - 1, fmt, args);
}
dstr->size = size + offs + 1;
dstr->str[dstr->size - 1] = 0;
return size;
}