Module: wine Branch: master Commit: b76dc21b8213ebbca210f535cb4ef4602cb90e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76dc21b8213ebbca210f535cb...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Aug 5 11:23:16 2009 +0200
ntdll: Ignore activation context entries that don't specify a path.
---
dlls/ntdll/loader.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index aa9395e..a3db3b2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1716,6 +1716,12 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) /* restart with larger buffer */ }
+ if (!info->lpAssemblyManifestPath || !info->lpAssemblyDirectoryName) + { + status = STATUS_SXS_KEY_NOT_FOUND; + goto done; + } + if ((p = strrchrW( info->lpAssemblyManifestPath, '\' ))) { DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR);