From: Tim Peters <tim.peters@gmail.com>
Date: Mon, 27 Feb 2006 23:29:46 +0000 (+0000)
Subject: PyErr_ProgramText():  Grrrrrr.
X-Git-Tag: v2.5a0~502
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7444f47b21ac75cd6e4bb06b615b39cd7876fa2;p=thirdparty%2FPython%2Fcpython.git

PyErr_ProgramText():  Grrrrrr.

In a Windows debug build, trying to open a file using
an empty string as the name causes assertion death
inside MS's C runtime code.  We probably need to worm
around that in many places.  I'm worming around it here
to stop the new test_with.py from assert-dying in the
Windows debug build (it calls compile() with an empty
string for "the file name", which indirectly leads to
C-level code in Python trying to fopen("", "r")).
---

diff --git a/Python/errors.c b/Python/errors.c
index ace63ffd8115..cbcc6facaf58 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -738,7 +738,7 @@ PyErr_ProgramText(const char *filename, int lineno)
 	int i;
 	char linebuf[1000];
 
-	if (filename == NULL || lineno <= 0)
+	if (filename == NULL || *filename == '\0' || lineno <= 0)
 		return NULL;
 	fp = fopen(filename, "r" PY_STDIOTEXTMODE);
 	if (fp == NULL)