Commitf6c8007

authored and

committed

bpo-34770: Fix a possible null pointer dereference in pyshellext.cpp (GH-9497)

The GlobalLock() call in UpdateDropDescription() was not checked forfailure.https://bugs.python.org/issue34770

1 parentb60b468 commitf6c8007Copy full SHA for f6c8007

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix a possible null pointer dereference in pyshellext.cpp.`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,11 @@ class PyShellExt : public RuntimeClass<`
`172`	`172`	`return E_FAIL;`
`173`	`173`	`}`
`174`	`174`	`auto dd = (DROPDESCRIPTION*)GlobalLock(medium.hGlobal);`
	`175`	`+if (!dd) {`
	`176`	`+OutputDebugString(L"PyShellExt::UpdateDropDescription - failed to lock DROPDESCRIPTION hGlobal");`
	`177`	`+ReleaseStgMedium(&medium);`
	`178`	`+return E_FAIL;`
	`179`	`+ }`
`175`	`180`	`StringCchCopy(dd->szMessage,sizeof(dd->szMessage) /sizeof(dd->szMessage[0]), DRAG_MESSAGE);`
`176`	`181`	`StringCchCopy(dd->szInsert,sizeof(dd->szInsert) /sizeof(dd->szInsert[0]),PathFindFileNameW(target));`
`177`	`182`	`dd->type = DROPIMAGE_MOVE;`

Comments

(0)