Commit 198a00bc authored by Alexandre Julliard's avatar Alexandre Julliard

ntdll: Add an exception handler around check_actctx to catch bad handles.

parent dba8ad57
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include "winternl.h" #include "winternl.h"
#include "ntdll_misc.h" #include "ntdll_misc.h"
#include "wine/exception.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
...@@ -568,16 +569,18 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai ) ...@@ -568,16 +569,18 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai )
static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) static ACTIVATION_CONTEXT *check_actctx( HANDLE h )
{ {
ACTIVATION_CONTEXT *actctx = h; ACTIVATION_CONTEXT *ret = NULL, *actctx = h;
if (!h || h == INVALID_HANDLE_VALUE) return NULL; if (!h || h == INVALID_HANDLE_VALUE) return NULL;
switch (actctx->magic) __TRY
{ {
case ACTCTX_MAGIC: if (actctx->magic == ACTCTX_MAGIC) ret = actctx;
return actctx;
default:
return NULL;
} }
__EXCEPT_PAGE_FAULT
{
}
__ENDTRY
return ret;
} }
static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) static inline void actctx_addref( ACTIVATION_CONTEXT *actctx )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment