cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug [ 756485 ] wxDateTime::ParseTime fails with assertion when it shouldn't

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-09-23 17:01:15 +00:00
parent 987263fe19
commit 0308fd61a2
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/datetime.cpp
View File

@ -839,14 +839,29 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
{
tm tm;
InitTm(tm);
char buffer[64];
// @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
// and causes an assertion failed if the buffer is to small (which is good) - OR -
// if strftime does not return anything because the format string is invalid - OR -
// if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
// wxDateTime::ParseTime will try several different formats to parse the time.
// As a result, GetAmPmStrings might get called, even if the current locale
// does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
// assert, even though it is a perfectly legal use.
if ( am )
{
*am = CallStrftime(_T("%p"), &tm);
if (wxStrftime(buffer, sizeof buffer, _T("%p"), &tm) > 0)
*am = wxString(buffer);
else
*am = wxString();
}
if ( pm )
{
tm.tm_hour = 13;
*pm = CallStrftime(_T("%p"), &tm);
if (wxStrftime(buffer, sizeof buffer, _T("%p"), &tm) > 0)
*pm = wxString(buffer);
else
*pm = wxString();
}
}
@ -2865,6 +2880,8 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date,
wxString am, pm, token = GetAlphaToken(input);
GetAmPmStrings(&am, &pm);
if (am.IsEmpty() && pm.IsEmpty())
return (wxChar *)NULL; // no am/pm strings defined
if ( token.CmpNoCase(pm) == 0 )
{
isPM = TRUE;