archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BLI_dynstr_vappendf() was crashing with strings above 256 chars, this happens with some long reports.

Browse Source 
Problem was using va_list value more then once, fix by using va_copy().

Note, va_copy() is c99 spec but only alternative I can see is to turn BLI_dynstr_vappendf() into a macro which calls va_start/end inline.
This commit is contained in:
Campbell Barton
2011-01-12 05:49:33 +00:00
parent 63018144ba
commit e2e5361eb2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/intern/BLI_dynstr.c
View File

@@ -101,15 +101,21 @@ void BLI_dynstr_nappend(DynStr *ds, const char *cstr, int len) {
void BLI_dynstr_vappendf(DynStr *ds, const char *format, va_list args)
{
char *message, fixedmessage[256];
int len= 256, maxlen= 65536, retval;
int len= sizeof(fixedmessage);
const int maxlen= 65536;
int retval;
while(1) {
va_list args_cpy;
if(len == sizeof(fixedmessage))
message= fixedmessage;
else
message= MEM_callocN(sizeof(char)*(len+1), "BLI_dynstr_appendf");
retval= vsnprintf(message, len, format, args);
/* cant reuse the same args, so work on a copy */
va_copy(args_cpy, args);
retval= vsnprintf(message, len, format, args_cpy);
va_end(args_cpy);
if(retval == -1) {
/* -1 means not enough space, but on windows it may also mean