From aa6111fc93c1cb5950e45ee3c8354e1e517b9524 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Tue, 31 Jul 2001 22:10:29 +0000 Subject: Add mysnprintf.c to Windows build, + squash compiler wngs in mysnprintf.c. --- PCbuild/pythoncore.dsp | 15 +++++++++++++++ Python/mysnprintf.c | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp index ae193d5..83e8016 100644 --- a/PCbuild/pythoncore.dsp +++ b/PCbuild/pythoncore.dsp @@ -1163,6 +1163,21 @@ SOURCE=..\Parser\myreadline.c # End Source File # Begin Source File +SOURCE=..\Python\mysnprintf.c + +!IF "$(CFG)" == "pythoncore - Win32 Release" + +!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" + +!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug" + +!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Release" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\Python\mystrtoul.c !IF "$(CFG)" == "pythoncore - Win32 Release" diff --git a/Python/mysnprintf.c b/Python/mysnprintf.c index e6c3fce..a373f4e 100644 --- a/Python/mysnprintf.c +++ b/Python/mysnprintf.c @@ -37,9 +37,10 @@ int myvsnprintf(char *str, size_t size, const char *format, va_list va) return len; } len++; - if (len > size + 512) + assert(len >= 0); + if ((size_t)len > size + 512) Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf"); - if (len > size) { + if ((size_t)len > size) { PyMem_Free(buffer); return len - 1; } -- cgit v0.12