More restrictive checks, so DIALOG_IsAccelerator don't loop

endlessly.

More restrictive checks, so DIALOG_IsAccelerator don't loop
6f7797bc · Marcus Meissner · Alexandre Julliard · 2eb0a302 · 6f7797bc
Commit 6f7797bc authored Sep 03, 1999 by Marcus Meissner Committed by Alexandre Julliard Sep 03, 1999
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dialog.c windows/dialog.c +2 -2

No files found.
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -1183,7 +1183,7 @@ static BOOL DIALOG_IsAccelerator( HWND hwnd, HWND hwndDlg, WPARAM vKey )
 	    {
 	        hwndNext = GetWindow( hwndControl, GW_HWNDNEXT );
 	    }
-	    while (!hwndNext)
+	    while (!hwndNext && hwndControl)
 	    {
 		hwndControl = GetParent( hwndControl );
 		if (hwndControl == hwndDlg)
@@ -1201,7 +1201,7 @@ static BOOL DIALOG_IsAccelerator( HWND hwnd, HWND hwndDlg, WPARAM vKey )
 	    }
            hwndControl = hwndNext;
        }
-        while (hwndControl != hwnd);
+        while (hwndControl && (hwndControl != hwnd));
    }
    return RetVal;
 }