Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 10:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INTL]

Browse source 
- 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

svn path=/trunk/; revision=74942
This commit is contained in:
Eric Kohl 2017-06-07 15:55:16 +00:00
parent fd32dd8623
commit 3e87295366
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

39
reactos/dll/cpl/intl/numbers.c
View file

@ -267,8 +267,7 @@ InitNegSignCB(HWND hwndDlg, PGLOBALDATA pGlobalData)
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 @@ InitNegNumFmtCB(HWND hwndDlg, PGLOBALDATA pGlobalData)
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 */
pszString2 = ReplaceSubStr(pszString1,
pGlobalData->szNumNegativeSign,
L"-");
if (pszString2 != NULL)
{
SendDlgItemMessageW(hwndDlg, IDC_NUMBERSNNUMFORMAT,
CB_ADDSTRING,
0,
(LPARAM)pszString2);
/* 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);
HeapFree(GetProcessHeap(), 0, pszString2);
}
HeapFree(GetProcessHeap(), 0, pszString1);
}
}