GetDeviceCaps: make sure the devCaps field is not NULL before

dereferencing it.

GetDeviceCaps: make sure the devCaps field is not NULL before
4f44845d · Francois Gouget · Alexandre Julliard · 40af1a87 · 4f44845d
Commit 4f44845d authored Apr 09, 2001 by Francois Gouget Committed by Alexandre Julliard Apr 09, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

dc.c objects/dc.c +5 -2

No files found.
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -841,9 +841,12 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap )
                  hdc,cap );
        if ((dc = DC_GetDCPtr( hdc )))
        {
-            ret = *(WORD *)(((char *)dc->devCaps) + cap);
+            if (dc->devCaps)
+            {
+                ret = *(WORD *)(((char *)dc->devCaps) + cap);
+                if ((cap == NUMCOLORS) && (ret == 0xffff)) ret = -1;
+            }
            GDI_ReleaseObj( hdc );
-            if ((cap == NUMCOLORS) && (ret == 0xffff)) ret = -1;
        }
        break;
    }