Nikolay Sivov : winecfg: Fix a crash on empty size field in Desktop Integration.

Alexandre Julliard julliard at wine.codeweavers.com
Sat Dec 12 10:41:43 CST 2015


Module: wine
Branch: master
Commit: a11b8ded1dc86f04ef07265def0c0d5e95326b36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a11b8ded1dc86f04ef07265def0c0d5e95326b36

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Dec 11 16:44:14 2015 +0300

winecfg: Fix a crash on empty size field in Desktop Integration.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/winecfg/theme.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c
index 52e64eb..8db457f 100644
--- a/programs/winecfg/theme.c
+++ b/programs/winecfg/theme.c
@@ -1214,8 +1214,17 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                             int index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETCURSEL, 0, 0);
 
                             index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0);
-                            metrics[index].size = atoi(text);
-                            HeapFree(GetProcessHeap(), 0, text);
+
+                            if (text)
+                            {
+                                metrics[index].size = atoi(text);
+                                HeapFree(GetProcessHeap(), 0, text);
+                            }
+                            else
+                            {
+                                /* for empty string set to minimum value */
+                                SendDlgItemMessageW(hDlg, IDC_SYSPARAM_SIZE_UD, UDM_GETRANGE32, (WPARAM)&metrics[index].size, 0);
+                            }
 
                             SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0);
                             break;




More information about the wine-cvs mailing list