[ekohl] 74942: [INTL] - Fix a potential overflow and uninitialized variable in InitNegNumFmtCB(). - Get rid of the now useless string buffer szNewSample. Based on a patch by Victor Martinez Calvo. ...

Author: ekohl
Date: Wed Jun  7 15:55:16 2017
New Revision: 74942

URL: http://svn.reactos.org/svn/reactos?rev=74942&view=rev
Log:
[INTL]
- Fix a potential overflow and uninitialized variable in InitNegNumFmtCB().
- Get rid of the now useless string buffer szNewSample.
Based on a patch by Victor Martinez Calvo.
CORE-13384

Modified:
    trunk/reactos/dll/cpl/intl/numbers.c

Modified: trunk/reactos/dll/cpl/intl/numbers.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev=...
==============================================================================
--- trunk/reactos/dll/cpl/intl/numbers.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/intl/numbers.c	[iso-8859-1] Wed Jun  7 15:55:16 2017
@@ -267,8 +267,7 @@
 static VOID
 InitNegNumFmtCB(HWND hwndDlg, PGLOBALDATA pGlobalData)
 {
-    WCHAR szNewSample[MAX_SAMPLES_STR_SIZE];
-    PWSTR pszResultStr;
+    PWSTR pszString1, pszString2;
     INT nCBIndex;

/* Clear all box content */
@@ -281,26 +280,26 @@
     for (nCBIndex = 0; nCBIndex < MAX_NEG_NUMBERS_SAMPLES; nCBIndex++)
     {
         /* Replace standard separator to setted */
-        pszResultStr = ReplaceSubStr(lpNegNumFmtSamples[nCBIndex],
-                                     pGlobalData->szNumDecimalSep,
-                                     L",");
-        if (pszResultStr != NULL)
+        pszString1 = ReplaceSubStr(lpNegNumFmtSamples[nCBIndex],
+                                   pGlobalData->szNumDecimalSep,
+                                   L",");
+        if (pszString1 != NULL)
         {
-            wcscpy(szNewSample, pszResultStr);
-            HeapFree(GetProcessHeap(), 0, pszResultStr);
-        }
-
-        /* Replace standard negative sign to setted */
-        pszResultStr = ReplaceSubStr(szNewSample,
-                                     pGlobalData->szNumNegativeSign,
-                                     L"-");
-        if (pszResultStr != NULL)
-        {
-            SendDlgItemMessageW(hwndDlg, IDC_NUMBERSNNUMFORMAT,
-                                CB_ADDSTRING,
-                                0,
-                                (LPARAM)pszResultStr);
-            HeapFree(GetProcessHeap(), 0, pszResultStr);
+            /* Replace standard negative sign to setted */
+            pszString2 = ReplaceSubStr(pszString1,
+                                       pGlobalData->szNumNegativeSign,
+                                       L"-");
+            if (pszString2 != NULL)
+            {
+                SendDlgItemMessageW(hwndDlg, IDC_NUMBERSNNUMFORMAT,
+                                    CB_ADDSTRING,
+                                    0,
+                                    (LPARAM)pszString2);
+
+                HeapFree(GetProcessHeap(), 0, pszString2);
+            }
+
+            HeapFree(GetProcessHeap(), 0, pszString1);
         }
     }