diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-02 18:35:10 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-02 18:35:10 (GMT) |
| commit | 67002af32309be6f3a484b4f47f1a1551a57ee6e (patch) | |
| tree | db8966ee3e9d08d28a2bad5648b2c59e99b36bb9 /Python | |
| parent | 1a15aba71d45a6ad38ee535611aa7eaf23de2e3e (diff) | |
| download | cpython-67002af32309be6f3a484b4f47f1a1551a57ee6e.zip cpython-67002af32309be6f3a484b4f47f1a1551a57ee6e.tar.gz cpython-67002af32309be6f3a484b4f47f1a1551a57ee6e.tar.bz2 | |
Check error when calling PyUnicode_AppendAndDel()
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/dynload_win.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Python/dynload_win.c b/Python/dynload_win.c index 932a637..c620e58 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]; |