traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

When the number of bytes written to the malloc'ed buffer is larger 

than the argument string size, copy as many bytes as will fit
(including a terminating '\0'), rather than not copying anything.
This to make it satisfy the C99 spec.
This commit is contained in:
Guido van Rossum 2001-12-01 16:00:10 +00:00
parent 82285dad8e
commit 64be0b4aa5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Python/mysnprintf.c
View File

@ -40,11 +40,11 @@ int myvsnprintf(char *str, size_t size, const char *format, va_list va)
assert(len >= 0); assert(len >= 0);
if ((size_t)len > size + 512) if ((size_t)len > size + 512)
Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf"); Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf");
if ((size_t)len > size) { if ((size_t)len > size)
PyMem_Free(buffer); buffer[size-1] = '\0';
return len - 1; else
} size = len;
memcpy(str, buffer, len); memcpy(str, buffer, size);
PyMem_Free(buffer); PyMem_Free(buffer);
return len - 1; return len - 1;
} }