diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-11-21 01:01:41 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-11-21 01:01:41 (GMT) |
| commit | 333544764619b8e338b7485ea94b9be9b9e75a9d (patch) | |
| tree | da0738d3cce74dbc11379c145097277d0fd9ddb6 /PC | |
| parent | 53b33e767d9aa85f2bf3add5850499596f9d0558 (diff) | |
| download | cpython-333544764619b8e338b7485ea94b9be9b9e75a9d.zip cpython-333544764619b8e338b7485ea94b9be9b9e75a9d.tar.gz cpython-333544764619b8e338b7485ea94b9be9b9e75a9d.tar.bz2 | |
Check for PyUnicode_AS_UNICODE() failure
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/_subprocess.c | 14 | ||||
| -rw-r--r-- | PC/import_nt.c | 17 |
2 files changed, 27 insertions, 4 deletions
diff --git a/PC/_subprocess.c b/PC/_subprocess.c index f0ad559..ec93d25 100644 --- a/PC/_subprocess.c +++ b/PC/_subprocess.c @@ -417,6 +417,7 @@ sp_CreateProcess(PyObject* self, PyObject* args) PROCESS_INFORMATION pi; STARTUPINFOW si; PyObject* environment; + wchar_t *wenvironment; Py_UNICODE* application_name; Py_UNICODE* command_line; @@ -461,6 +462,17 @@ sp_CreateProcess(PyObject* self, PyObject* args) return NULL; } + if (environment) { + wenvironment = PyUnicode_AsUnicode(environment) + if (wenvironment == NULL) + { + Py_XDECREF(environment); + return NULL; + } + } + else + wenvironment = NULL; + Py_BEGIN_ALLOW_THREADS result = CreateProcessW(application_name, command_line, @@ -468,7 +480,7 @@ sp_CreateProcess(PyObject* self, PyObject* args) NULL, inherit_handles, creation_flags | CREATE_UNICODE_ENVIRONMENT, - environment ? PyUnicode_AS_UNICODE(environment) : NULL, + wenvironment, current_directory, &si, &pi); diff --git a/PC/import_nt.c b/PC/import_nt.c index 3b60718..dfbf054 100644 --- a/PC/import_nt.c +++ b/PC/import_nt.c @@ -35,6 +35,7 @@ _PyWin_FindRegisteredModule(PyObject *moduleName, wchar_t pathBuf[MAXPATHLEN+1]; int pathLen = MAXPATHLEN+1; PyObject *path, *moduleKey, *suffix; + wchar_t *wmoduleKey, *wsuffix; struct filedescr *fdp; HKEY keyBase; int modNameSize; @@ -52,17 +53,22 @@ _PyWin_FindRegisteredModule(PyObject *moduleName, PyWin_DLLVersionString, moduleName); if (moduleKey == NULL) return NULL; + wmoduleKey = PyUnicode_AsUnicode(moduleKey); + if (wmoduleKey == NULL) { + Py_DECREF(moduleKey); + return NULL; + } keyBase = HKEY_CURRENT_USER; modNameSize = pathLen; - regStat = RegQueryValueW(keyBase, PyUnicode_AS_UNICODE(moduleKey), + regStat = RegQueryValueW(keyBase, wmoduleKey, pathBuf, &modNameSize); if (regStat != ERROR_SUCCESS) { /* No user setting - lookup in machine settings */ keyBase = HKEY_LOCAL_MACHINE; /* be anal - failure may have reset size param */ modNameSize = pathLen; - regStat = RegQueryValueW(keyBase, PyUnicode_AS_UNICODE(moduleKey), + regStat = RegQueryValueW(keyBase, wmoduleKey, pathBuf, &modNameSize); if (regStat != ERROR_SUCCESS) { Py_DECREF(moduleKey); @@ -80,10 +86,15 @@ _PyWin_FindRegisteredModule(PyObject *moduleName, suffix = PyUnicode_FromString(fdp->suffix); if (suffix == NULL) return NULL; + wsuffix = PyUnicode_AsUnicode(suffix); + if (wsuffix == NULL) { + Py_DECREF(suffix); + return NULL; + } extLen = PyUnicode_GET_SIZE(suffix); if ((Py_ssize_t)modNameSize > extLen && _wcsnicmp(pathBuf + ((Py_ssize_t)modNameSize-extLen-1), - PyUnicode_AS_UNICODE(suffix), + wsuffix, extLen) == 0) { Py_DECREF(suffix); |