wrc: Don't crash when parsing COMBOBOX element without style.

Signed-off-by: Fabian Maurer <dark.shadow4@web.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wrc: Don't crash when parsing COMBOBOX element without style.
c0dfdbcf · Fabian Maurer · Alexandre Julliard · a9ac425a · c0dfdbcf
Commit c0dfdbcf authored Jul 20, 2018 by Fabian Maurer Committed by Alexandre Julliard Jul 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

parser.y tools/wrc/parser.y +1 -1

No files found.
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control
 		defaultstyle |= LBS_NOTIFY | WS_BORDER;
 		break;
 	case CT_COMBOBOX:
-                if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST)))
+                if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST)))
                    defaultstyle |= CBS_SIMPLE;
 		break;
 	case CT_STATIC: