Skip to content

W
wine-winehq
Commit 56c0bb8b authored by Juergen Schmied's avatar Juergen Schmied Committed by Alexandre Julliard
Browse files
Options

Fixed crash due to invalid GDI_Obj.

parent a904e16f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
graphics/x11drv/palette.c
View file @ 56c0bb8b
...@@ -660,6 +660,9 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color ) ...@@ -660,6 +660,9 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
unsigned char spec_type = color >> 24; unsigned char spec_type = color >> 24;
PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC ); PALETTEOBJ* palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hPal, PALETTE_MAGIC );
/* palPtr can be NULL when DC is being destroyed */
if( !palPtr ) return 0;
if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED ) if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED )
{ {
/* there is no colormap limitation; we are going to have to compute /* there is no colormap limitation; we are going to have to compute
...@@ -724,10 +727,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color ) ...@@ -724,10 +727,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
else else
{ {
/* palPtr can be NULL when DC is being destroyed */ if( !palPtr->mapping )
if( !palPtr ) return 0;
else if( !palPtr->mapping )
WARN("Palette %04x is not realized\n", dc->w.hPalette); WARN("Palette %04x is not realized\n", dc->w.hPalette);
switch(spec_type) /* we have to peruse DC and system palette */ switch(spec_type) /* we have to peruse DC and system palette */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment