Changeset 7109 for trunk/src

Timestamp:

Oct 18, 2001, 3:27:39 PM (24 years ago)

Author:

sandervl

Message:

Check for NULL handler in RtlRaiseException/RtlUnwind

File:

• trunk/src/kernel32/exceptions.cpp (modified) (3 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.55 2001-07-03 13:24:25 bird Exp $ */
+/* $Id: exceptions.cpp,v 1.56 2001-10-18 13:27:39 sandervl Exp $ */
 
 /*
@@ -348 +348 @@
 
         /* call handler */
-        rc = EXC_CallHandler(pRecord, pFrame, pContext, &dispatch, pFrame->Handler, EXC_RaiseHandler );
+        if(pFrame->Handler) {
+            rc = EXC_CallHandler(pRecord, pFrame, pContext, &dispatch, pFrame->Handler, EXC_RaiseHandler );
+        }
+        else {
+            dprintf(("pFrame->Handler is NULL!!!!!"));
+            rc = ExceptionContinueSearch;
+        }
 
         PrintWin32ExceptionChain(pFrame);
@@ -484 +490 @@
         /* Call handler */
         dprintf(("KERNEL32: RtlUnwind - calling exception handler %08X", frame->Handler));
-        rc = EXC_CallHandler(pRecord, frame, &context, &dispatch, frame->Handler, EXC_UnwindHandler );
+        if(frame->Handler) {
+            rc = EXC_CallHandler(pRecord, frame, &context, &dispatch, frame->Handler, EXC_UnwindHandler );
+        }
+        else {
+            dprintf(("pFrame->Handler is NULL!!!!!"));
+            rc = ExceptionContinueSearch;
+        }
         dprintf(("KERNEL32: RtlUnwind - handler returned %#x", rc));
         switch (rc)