Nikolay Sivov : comctl32/toolbar: Don't add NULL imagelist entries.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: dfda3173b3951781fa197c625d34bbe861d220b2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dfda3173b3951781fa197c625d...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Wed May 31 05:56:38 2017 +0300

comctl32/toolbar: Don't add NULL imagelist entries.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit ece34a1319f47cb7cd242c0f95d57cd1d35ae8f4)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/comctl32/toolbar.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 784745c..92ab856 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -6903,6 +6903,10 @@ static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIS
     /* Check if the entry already exists */
     c = TOOLBAR_GetImageListEntry(*pies, *cies, id);
 
+    /* Don't add new entry for NULL imagelist */
+    if (!c && !himl)
+        return NULL;
+
     /* If this is a new entry we must create it and insert into the array */
     if (!c)
     {