diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2018-09-25 04:25:23 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-09-25 04:25:23 (GMT) |
| commit | f6c8007a29b95b3ea3ca687a9b4924769a696328 (patch) | |
| tree | 87076a61d0e9ca2d1a639e95aa7486586b3a8da9 | |
| parent | b60b4683f6c995e9205f68439023c80a0b628f39 (diff) | |
| download | cpython-f6c8007a29b95b3ea3ca687a9b4924769a696328.zip cpython-f6c8007a29b95b3ea3ca687a9b4924769a696328.tar.gz cpython-f6c8007a29b95b3ea3ca687a9b4924769a696328.tar.bz2 | |
bpo-34770: Fix a possible null pointer dereference in pyshellext.cpp (GH-9497)
The GlobalLock() call in UpdateDropDescription() was not checked for
failure.
https://bugs.python.org/issue34770
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2018-09-22-11-02-35.bpo-34770.4lEUOd.rst | 1 | ||||
| -rw-r--r-- | PC/pyshellext.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Windows/2018-09-22-11-02-35.bpo-34770.4lEUOd.rst b/Misc/NEWS.d/next/Windows/2018-09-22-11-02-35.bpo-34770.4lEUOd.rst new file mode 100644 index 0000000..5e4ba88 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-09-22-11-02-35.bpo-34770.4lEUOd.rst @@ -0,0 +1 @@ +Fix a possible null pointer dereference in pyshellext.cpp. diff --git a/PC/pyshellext.cpp b/PC/pyshellext.cpp index 04fe61e..0198802 100644 --- a/PC/pyshellext.cpp +++ b/PC/pyshellext.cpp @@ -172,6 +172,11 @@ private: return E_FAIL; } auto dd = (DROPDESCRIPTION*)GlobalLock(medium.hGlobal); + if (!dd) { + OutputDebugString(L"PyShellExt::UpdateDropDescription - failed to lock DROPDESCRIPTION hGlobal"); + ReleaseStgMedium(&medium); + return E_FAIL; + } StringCchCopy(dd->szMessage, sizeof(dd->szMessage) / sizeof(dd->szMessage[0]), DRAG_MESSAGE); StringCchCopy(dd->szInsert, sizeof(dd->szInsert) / sizeof(dd->szInsert[0]), PathFindFileNameW(target)); dd->type = DROPIMAGE_MOVE; |