diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-06-16 00:07:57 +0100 |
---|---|---|
committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2013-07-23 23:59:31 +0100 |
commit | 9fe360bf2be5c959fb21835955ef550098ccbbf0 (patch) | |
tree | a3e1108114bb17c04d69e8a7bf1e14fdd755c363 /hw/xwin/winmultiwindowicons.c | |
parent | 71b5f56302bbd8be62f63f0dd62cbcd33aab3ac5 (diff) |
hw/xwin: Avoid a null dereference if CreateDIBSection() fails in NetWMToWinIconAlpha()
Avoid a null dereference of DIB_pixels if CreateDIBSection() fails in
NetWMToWinIconAlpha()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw/xwin/winmultiwindowicons.c')
-rw-r--r-- | hw/xwin/winmultiwindowicons.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index bcc5688df..0531ad6c7 100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -257,6 +257,10 @@ NetWMToWinIconAlpha(uint32_t * icon) DIB_RGB_COLORS, (void **) &DIB_pixels, NULL, 0); ReleaseDC(NULL, hdc); + + if (!ii.hbmColor) + return NULL; + ii.hbmMask = CreateBitmap(width, height, 1, 1, NULL); memcpy(DIB_pixels, pixels, height * width * 4); |