Handle hwnd and tbi when passing NULL

András Kovács andras at csevego.net
Sun Jun 28 15:55:02 CDT 2009


---
 dlls/user32/nonclient.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 708ed80..dc3721a 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -1628,6 +1628,18 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) {
 
     TRACE("(%p %p)\n", hwnd, tbi);
 
+    if (IsWindow(hwnd) == FALSE) {
+        TRACE("Invalid hwnd.\n");
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
+
+    if (!tbi) {
+        TRACE("tbi is NULL.\n");
+        SetLastError(ERROR_NOACCESS);
+        return FALSE;
+    }
+
     if(tbi->cbSize != sizeof(TITLEBARINFO)) {
         TRACE("Invalid TITLEBARINFO size: %d\n", tbi->cbSize);
         SetLastError(ERROR_INVALID_PARAMETER);
-- 
1.6.0.4


--=-J/o1lIKVwQ5LzuctpL1Q--




More information about the wine-patches mailing list