Protect CallWindowProcA/W from NULL pointers.

d9e79807 · Dmitry Timoshkov · Alexandre Julliard · f9100240 · d9e79807
Commit d9e79807 authored Aug 05, 2003 by Dmitry Timoshkov Committed by Alexandre Julliard Aug 05, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

winproc.c windows/winproc.c +10 -4

No files found.
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -2867,9 +2867,12 @@ LRESULT WINAPI CallWindowProcA(
    WPARAM wParam, /* [in] message dependent parameter */
    LPARAM lParam  /* [in] message dependent parameter */
 ) {
-    WINDOWPROC *proc = WINPROC_GetPtr( func );
+    WINDOWPROC *proc;
+
+    if (!func) return 0;

-    if (!proc) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
+    if (!(proc = WINPROC_GetPtr( func )))
+        return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );

 #if testing
    func = WINPROC_GetProc( (WNDPROC)proc, WIN_PROC_32A );
@@ -2903,9 +2906,12 @@ LRESULT WINAPI CallWindowProcA(
 LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg,
                                  WPARAM wParam, LPARAM lParam )
 {
-    WINDOWPROC *proc = WINPROC_GetPtr( func );
+    WINDOWPROC *proc;

-    if (!proc) return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
+    if (!func) return 0;
+
+    if (!(proc = WINPROC_GetPtr( (WNDPROC)func )))
+        return WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );

 #if testing
    func = WINPROC_GetProc( (WNDPROC)proc, WIN_PROC_32W );