ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32/lcformat: Avoid back jumps on failure.

This commit is contained in:
Nikolay Sivov 2009-12-03 21:23:43 +03:00 committed by Alexandre Julliard
parent ba9ccc51e2
commit 1a2609189f
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/kernel32/lcformat.c
View File

@ -355,11 +355,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags,
/* Verify our arguments */ /* Verify our arguments */
if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags))) if ((cchOut && !lpStr) || !(node = NLS_GetFormats(lcid, dwFlags)))
{ goto invalid_parameter;
NLS_GetDateTimeFormatW_InvalidParameter:
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY)) if (dwFlags & ~(DATE_DATEVARSONLY|TIME_TIMEVARSONLY))
{ {
@ -367,15 +363,13 @@ NLS_GetDateTimeFormatW_InvalidParameter:
((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) || ((dwFlags & DATE_DATEVARSONLY && dwFlags & ~DATE_FORMAT_FLAGS) ||
(dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS))) (dwFlags & TIME_TIMEVARSONLY && dwFlags & ~TIME_FORMAT_FLAGS)))
{ {
NLS_GetDateTimeFormatW_InvalidFlags: goto invalid_flags;
SetLastError(ERROR_INVALID_FLAGS);
return 0;
} }
if (dwFlags & DATE_DATEVARSONLY) if (dwFlags & DATE_DATEVARSONLY)
{ {
if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING)) if ((dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) == (DATE_LTRREADING|DATE_RTLREADING))
goto NLS_GetDateTimeFormatW_InvalidFlags; goto invalid_flags;
else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING)) else if (dwFlags & (DATE_LTRREADING|DATE_RTLREADING))
FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n"); FIXME("Unsupported flags: DATE_LTRREADING/DATE_RTLREADING\n");
@ -387,10 +381,10 @@ NLS_GetDateTimeFormatW_InvalidFlags:
case DATE_LONGDATE: case DATE_LONGDATE:
case DATE_YEARMONTH: case DATE_YEARMONTH:
if (lpFormat) if (lpFormat)
goto NLS_GetDateTimeFormatW_InvalidFlags; goto invalid_flags;
break; break;
default: default:
goto NLS_GetDateTimeFormatW_InvalidFlags; goto invalid_flags;
} }
} }
} }
@ -429,7 +423,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
st.wDay = lpTime->wDay; st.wDay = lpTime->wDay;
if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp)) if (st.wDay > 31 || st.wMonth > 12 || !SystemTimeToFileTime(&st, &ftTmp))
goto NLS_GetDateTimeFormatW_InvalidParameter; goto invalid_parameter;
FileTimeToSystemTime(&ftTmp, &st); FileTimeToSystemTime(&ftTmp, &st);
lpTime = &st; lpTime = &st;
@ -439,7 +433,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
{ {
/* Verify the time */ /* Verify the time */
if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59) if (lpTime->wHour > 24 || lpTime->wMinute > 59 || lpTime->wSecond > 59)
goto NLS_GetDateTimeFormatW_InvalidParameter; goto invalid_parameter;
} }
} }
@ -464,7 +458,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
if (!cchOut) if (!cchOut)
cchWritten++; /* Count size only */ cchWritten++; /* Count size only */
else if (cchWritten >= cchOut) else if (cchWritten >= cchOut)
goto NLS_GetDateTimeFormatW_Overrun; goto overrun;
else if (!bSkipping) else if (!bSkipping)
{ {
lpStr[cchWritten] = *lpFormat; lpStr[cchWritten] = *lpFormat;
@ -624,7 +618,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
else else
{ {
memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR)); memcpy(lpStr + cchWritten, szAdd, (cchOut - cchWritten) * sizeof(WCHAR));
goto NLS_GetDateTimeFormatW_Overrun; goto overrun;
} }
} }
cchWritten += dwLen; cchWritten += dwLen;
@ -636,7 +630,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
if (!cchOut) if (!cchOut)
cchWritten++; /* Count size only */ cchWritten++; /* Count size only */
else if (cchWritten >= cchOut) else if (cchWritten >= cchOut)
goto NLS_GetDateTimeFormatW_Overrun; goto overrun;
else if (!bSkipping || *lpFormat == ' ') else if (!bSkipping || *lpFormat == ' ')
{ {
lpStr[cchWritten] = *lpFormat; lpStr[cchWritten] = *lpFormat;
@ -650,7 +644,7 @@ NLS_GetDateTimeFormatW_InvalidFlags:
if (cchOut) if (cchOut)
{ {
if (cchWritten >= cchOut) if (cchWritten >= cchOut)
goto NLS_GetDateTimeFormatW_Overrun; goto overrun;
else else
lpStr[cchWritten] = '\0'; lpStr[cchWritten] = '\0';
} }
@ -659,10 +653,18 @@ NLS_GetDateTimeFormatW_InvalidFlags:
TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr)); TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr));
return cchWritten; return cchWritten;
NLS_GetDateTimeFormatW_Overrun: overrun:
TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n"); TRACE("returning 0, (ERROR_INSUFFICIENT_BUFFER)\n");
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
return 0; return 0;
invalid_parameter:
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
invalid_flags:
SetLastError(ERROR_INVALID_FLAGS);
return 0;
} }
/****************************************************************************** /******************************************************************************