Mercurial > cpython-lru_cache-weakref
view Python/mysnprintf.c @ 20723:6ac45244c41e legacy-trunk
vgetargskeywords()
+ Squash another potential buffer overrun.
+ Simplify the keyword-arg loop by decrementing the count of keywords
remaining instead of incrementing Yet Another Variable; also break
out early if the number of keyword args remaining hits 0.
Since I hit the function's closing curly brace with this patch, that's
enough of this for now <wink>.
| author | Tim Peters <tim.peters@gmail.com> |
|---|---|
| date | Sat, 27 Oct 2001 07:25:06 +0000 |
| parents | 2bc648932d44 |
| children | 6b6a9cae256e |
line wrap: on
line source
#include "Python.h" /* snprintf() emulation for platforms which don't have it (yet). Return value The number of characters printed (not including the trailing `\0' used to end output to strings) or a negative number in case of an error. PyOS_snprintf and PyOS_vsnprintf do not write more than size bytes (including the trailing '\0'). If the output would have been truncated, they return the number of characters (excluding the trailing '\0') which would have been written to the final string if enough space had been available. This is inline with the C99 standard. */ #include <ctype.h> #ifndef HAVE_SNPRINTF static int myvsnprintf(char *str, size_t size, const char *format, va_list va) { char *buffer = PyMem_Malloc(size + 512); int len; if (buffer == NULL) return -1; len = vsprintf(buffer, format, va); if (len < 0) { PyMem_Free(buffer); return len; } len++; assert(len >= 0); if ((size_t)len > size + 512) Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf"); if ((size_t)len > size) { PyMem_Free(buffer); return len - 1; } memcpy(str, buffer, len); PyMem_Free(buffer); return len - 1; } int PyOS_snprintf(char *str, size_t size, const char *format, ...) { int rc; va_list va; va_start(va, format); rc = myvsnprintf(str, size, format, va); va_end(va); return rc; } int PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) { return myvsnprintf(str, size, format, va); } #else /* Make sure that a C API is included in the lib */ #ifdef PyOS_snprintf # undef PyOS_snprintf #endif int PyOS_snprintf(char *str, size_t size, const char *format, ...) { int rc; va_list va; va_start(va, format); rc = vsnprintf(str, size, format, va); va_end(va); return rc; } #ifdef PyOS_vsnprintf # undef PyOS_vsnprintf #endif int PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) { return vsnprintf(str, size, format, va); } #endif
