Fixed behaviour of Alloc..ThunkletCallback[Ex] for NULL target.

7b5fcc72 · Ulrich Weigand · Alexandre Julliard · 2bb2d9b0 · 7b5fcc72
Commit 7b5fcc72 authored Jun 05, 1999 by Ulrich Weigand Committed by Alexandre Julliard Jun 05, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

thunk.c if1632/thunk.c +4 -0

No files found.
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -1380,6 +1380,8 @@ FARPROC WINAPI AllocLSThunkletCallbackEx16( SEGPTR target,
                                            DWORD relay, HTASK16 task )
 {
    THUNKLET *thunk = (THUNKLET *)PTR_SEG_TO_LIN( target );
+    if ( !thunk ) return NULL;
+
    if (   IsSLThunklet16( thunk ) && thunk->relay == relay 
        && thunk->glue == (DWORD)ThunkletCallbackGlueSL )
        return (FARPROC)thunk->target;
@@ -1395,6 +1397,8 @@ SEGPTR WINAPI AllocSLThunkletCallbackEx16( FARPROC target,
                                         DWORD relay, HTASK16 task )
 {
    THUNKLET *thunk = (THUNKLET *)target;
+    if ( !thunk ) return 0;
+
    if (   IsLSThunklet( thunk ) && thunk->relay == relay 
        && thunk->glue == (DWORD)ThunkletCallbackGlueLS - (DWORD)&thunk->type )
        return (SEGPTR)thunk->target;