Add mysnprintf.c to Windows build, + squash compiler wngs in mysnprintf.c.

diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp
index ae193d51398f8ea91809bb12aea68e69f047f7a5..83e801627962213de85563b061a9362cf69cc978 100644 (file)
--- a/PCbuild/pythoncore.dsp
+++ b/PCbuild/pythoncore.dsp
@@ -1163,6 +1163,21 @@ SOURCE=..\Parser\myreadline.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\Python\mysnprintf.c\r
+\r
+!IF  "$(CFG)" == "pythoncore - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"\r
+\r
+!ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\Python\mystrtoul.c\r
 \r
 !IF  "$(CFG)" == "pythoncore - Win32 Release"\r

diff --git a/Python/mysnprintf.c b/Python/mysnprintf.c
index e6c3fcedc667844cdc2436b93a292f6f3f70166f..a373f4efe6d7516d38e1b7ad4f3713ccac3b5698 100644 (file)
--- 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;
     }