Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

#3705: Fix crash when given a non-ascii value on the command line for the "-c" and "-m" parameters

Browse source 
Second part, for Windows.

Reviewed by Antoine Pitrou
This commit is contained in:
Amaury Forgeot d'Arc 2008-09-09 07:04:36 +00:00
parent f7bfcfbb68
commit 14b785192b
4 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/import.c
View file

@ -2804,6 +2804,7 @@ call_find_module(char *name, PyObject *path)
{
extern int fclose(FILE *);
PyObject *fob, *ret;
PyObject *pathobj;
struct filedescr *fdp;
char pathname[MAXPATHLEN+1];
FILE *fp = NULL;
@ -2847,9 +2848,9 @@ call_find_module(char *name, PyObject *path)
fob = Py_None;
Py_INCREF(fob);
}
ret = Py_BuildValue("Os(ssi)",
fob, pathname, fdp->suffix, fdp->mode, fdp->type);
Py_DECREF(fob);
pathobj = PyUnicode_DecodeFSDefault(pathname);
ret = Py_BuildValue("NN(ssi)",
fob, pathobj, fdp->suffix, fdp->mode, fdp->type);
PyMem_FREE(found_encoding);
return ret;
@ -2860,7 +2861,9 @@ imp_find_module(PyObject *self, PyObject *args)
{
char *name;
PyObject *path = NULL;
if (!PyArg_ParseTuple(args, "s|O:find_module", &name, &path))
if (!PyArg_ParseTuple(args, "es|O:find_module",
Py_FileSystemDefaultEncoding, &name,
&path))
return NULL;
return call_find_module(name, path);
}