diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-02 20:35:10 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-02 20:35:10 +0200 |
| commit | 67002af32309be6f3a484b4f47f1a1551a57ee6e (patch) | |
| tree | db8966ee3e9d08d28a2bad5648b2c59e99b36bb9 | |
| parent | 1a15aba71d45a6ad38ee535611aa7eaf23de2e3e (diff) | |
| download | cpython-git-67002af32309be6f3a484b4f47f1a1551a57ee6e.tar.gz | |
Check error when calling PyUnicode_AppendAndDel()
| -rw-r--r-- | Modules/_ctypes/callproc.c | 4 | ||||
| -rw-r--r-- | Python/dynload_win.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 5a5ce31cbf..60d59c878a 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -944,9 +944,9 @@ void _ctypes_extend_error(PyObject *exc_class, char *fmt, ...) else { PyErr_Clear(); PyUnicode_AppendAndDel(&s, PyUnicode_FromString("???")); - if (s == NULL) - goto error; } + if (s == NULL) + goto error; PyErr_SetObject(exc_class, s); error: Py_XDECREF(tp); diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 932a637680..c620e58948 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c @@ -187,7 +187,7 @@ dl_funcptr _PyImport_GetDynLoadWindows(const char *shortname, HINSTANCE hDLL = NULL; unsigned int old_mode; ULONG_PTR cookie = 0; - + /* Don't display a message box when Python can't load a DLL */ old_mode = SetErrorMode(SEM_FAILCRITICALERRORS); @@ -248,8 +248,10 @@ dl_funcptr _PyImport_GetDynLoadWindows(const char *shortname, theInfo, theLength)); } - PyErr_SetObject(PyExc_ImportError, message); - Py_XDECREF(message); + if (message != NULL) { + PyErr_SetObject(PyExc_ImportError, message); + Py_DECREF(message); + } return NULL; } else { char buffer[256]; |