#4747: on Windows, starting a module with a non-ascii filename would print a useless "SyntaxError: None"

amauryfa · amauryfa · commit 374e220bcb1e · 2009-01-01T23:05:36.000Z
when the script contains a "# coding:" declaration.

The Python API expects char* to be utf-8 encoded. wcstombs should be avoided here.

Reviewed by Benjamin. Will backport to 3.0
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.1 alpha 0
 Core and Builtins
 -----------------
 
+- Issue #4747: When the terminal does not use utf-8, executing a script with
+  non-ascii characters in its name could fail with a "SyntaxError: None" error.
+
 - Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
   file with `bytes' filename on Windows.
 
diff --git a/Modules/main.c b/Modules/main.c
@@ -600,18 +600,21 @@ Py_Main(int argc, wchar_t **argv)
 		}
 
 		if (sts==-1) {
-			char cfilename[PATH_MAX];
+			PyObject *filenameObj = NULL;
 			char *p_cfilename = "<stdin>";
 			if (filename) {
-				size_t r = wcstombs(cfilename, filename, PATH_MAX);
-				p_cfilename = cfilename;
-				if (r == (size_t)-1 || r >= PATH_MAX)
+				filenameObj = PyUnicode_FromWideChar(
+					filename, wcslen(filename));
+				if (filenameObj != NULL)
+					p_cfilename = _PyUnicode_AsString(filenameObj);
+				else
 					p_cfilename = "<decoding error>";
 			}
 			sts = PyRun_AnyFileExFlags(
 				fp,
 				p_cfilename,
 				filename != NULL, &cf) != 0;
+			Py_XDECREF(filenameObj);
 		}
 		
 	}

Original file line number	Diff line number	Diff line change
`@@ -600,18 +600,21 @@ Py_Main(int argc, wchar_t **argv)`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`if (sts==-1) {`
`603`		`- char cfilename[PATH_MAX];`
	`603`	`+ PyObject *filenameObj = NULL;`
`604`	`604`	`char *p_cfilename = "<stdin>";`
`605`	`605`	`if (filename) {`
`606`		`- size_t r = wcstombs(cfilename, filename, PATH_MAX);`
`607`		`- p_cfilename = cfilename;`
`608`		`- if (r == (size_t)-1 \|\| r >= PATH_MAX)`
	`606`	`+ filenameObj = PyUnicode_FromWideChar(`
	`607`	`+ filename, wcslen(filename));`
	`608`	`+ if (filenameObj != NULL)`
	`609`	`+ p_cfilename = _PyUnicode_AsString(filenameObj);`
	`610`	`+ else`
`609`	`611`	`p_cfilename = "<decoding error>";`
`610`	`612`	`}`
`611`	`613`	`sts = PyRun_AnyFileExFlags(`
`612`	`614`	`fp,`
`613`	`615`	`p_cfilename,`
`614`	`616`	`filename != NULL, &cf) != 0;`
	`617`	`+ Py_XDECREF(filenameObj);`
`615`	`618`	`}`
`616`	`619`
`617`	`620`	`}`