Fix the CRT argument error handling for VisualStudio .NET 2005. Install a CRT error handler and disable the assertion for debug builds. This causes CRT to set errno to EINVAL.

This update fixes crash cases in the test suite where the default CRT error handler would cause process exit.

1 files changed, 8 insertions, 0 deletions

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 23de173962..2133273872 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -467,6 +467,14 @@ time_strftime(PyObject *self, PyObject *args)
 			return ret;
 		}
 		free(outbuf);
+#if defined _MSC_VER && _MSC_VER >= 1400
+		/* VisualStudio .NET 2005 does this properly */
+		if (buflen == 0 && errno == EINVAL) {
+			PyErr_SetString(PyExc_ValueError, "Invalid format string");
+			return 0;
+		}
+#endif
+		
 	}
 }