Author: mjansen
Date: Sun Jun 11 11:08:32 2017
New Revision: 74998
URL:
http://svn.reactos.org/svn/reactos?rev=74998&view=rev
Log:
[COMCTL32_IMAGELIST] Prevent dereferencing a null pointer.
Modified:
trunk/rostests/winetests/comctl32/imagelist.c
Modified: trunk/rostests/winetests/comctl32/imagelist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel…
==============================================================================
--- trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] Sun Jun 11 11:08:32 2017
@@ -2046,9 +2046,9 @@
ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed &&
bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen &&
bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) ||
- broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed &&
+ (broken_expect && broken(bmi->bmiColors[i].rgbRed ==
broken_expect[i].rgbRed &&
bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen &&
- bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue),
+ bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue)),
"%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n",
depth, name, i,
bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen,
bmi->bmiColors[i].rgbBlue,
expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue);