diff options
| author | Mark Hammond <mhammond@skippinet.com.au> | 2002-10-04 00:13:02 +0000 |
|---|---|---|
| committer | Mark Hammond <mhammond@skippinet.com.au> | 2002-10-04 00:13:02 +0000 |
| commit | 06d78ca3c4854c05395fa4c5e7fac9ca80c144c5 (patch) | |
| tree | 157e92e415f1ad5578b865a28b4822dc6dc00d7c /Python | |
| parent | caa776a4c7d2577b0f7c733c44bc1d18ed82b66d (diff) | |
| download | cpython-06d78ca3c4854c05395fa4c5e7fac9ca80c144c5.tar.gz | |
Fix [ 616716 ] Bug in PyErr_SetExcFromWindows
Ensure that even if FormatMessage fails we (a) don't crash, and (b) provide something useful.
Bugfix candidate.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/errors.c | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/Python/errors.c b/Python/errors.c index 9a2597b0ce..95c24a685e 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -269,6 +269,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject) #endif #ifdef MS_WINDOWS char *s_buf = NULL; + char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */ #endif #ifdef EINTR if (i == EINTR && PyErr_CheckSignals()) @@ -306,10 +307,18 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject) (LPTSTR) &s_buf, 0, /* size not used */ NULL); /* no args */ - s = s_buf; - /* remove trailing cr/lf and dots */ - while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) - s[--len] = '\0'; + if (len==0) { + /* Only ever seen this in out-of-mem + situations */ + sprintf(s_small_buf, "Windows Error 0x%X", i); + s = s_small_buf; + s_buf = NULL; + } else { + s = s_buf; + /* remove trailing cr/lf and dots */ + while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) + s[--len] = '\0'; + } } } #endif /* Unix/Windows */ @@ -366,6 +375,8 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject( { int len; char *s; + char *s_buf = NULL; /* Free via LocalFree */ + char s_small_buf[28]; /* Room for "Windows Error 0xFFFFFFFF" */ PyObject *v; DWORD err = (DWORD)ierr; if (err==0) err = GetLastError(); @@ -378,12 +389,20 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject( err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &s, + (LPTSTR) &s_buf, 0, /* size not used */ NULL); /* no args */ - /* remove trailing cr/lf and dots */ - while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) - s[--len] = '\0'; + if (len==0) { + /* Only seen this in out of mem situations */ + sprintf(s_small_buf, "Windows Error 0x%X", err); + s = s_small_buf; + s_buf = NULL; + } else { + s = s_buf; + /* remove trailing cr/lf and dots */ + while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.')) + s[--len] = '\0'; + } if (filenameObject != NULL) v = Py_BuildValue("(isO)", err, s, filenameObject); else @@ -392,7 +411,7 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilenameObject( PyErr_SetObject(exc, v); Py_DECREF(v); } - LocalFree(s); + LocalFree(s_buf); return NULL; } |