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

Check for iterator validity when parsing "%%" in wxDateTime::Format() too.

Browse Source 
This is similar to the previous commit and adds another missed check for the
iterator not being at the end of string.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-09 01:09:25 +00:00
parent 649148f93e
commit 1f29ecb357
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/datetimefmt.cpp
View File

@@ -1448,7 +1448,7 @@ wxDateTime::ParseFormat(const wxString& date,
break; break;
case wxT('%'): // a percent sign case wxT('%'): // a percent sign
if ( *input++ != wxT('%') ) if ( input == end || *input++ != wxT('%') )
{ {
// no match // no match
return false; return false;

1
tests/datetime/datetimetest.cpp
View File

@@ -831,6 +831,7 @@ void DateTimeTestCase::TestTimeFormat()
// test some degenerate cases // test some degenerate cases
CPPUNIT_ASSERT( !dt.ParseFormat("", "%z") ); CPPUNIT_ASSERT( !dt.ParseFormat("", "%z") );
CPPUNIT_ASSERT( !dt.ParseFormat("", "%%") );
// test compilation of some calls which should compile (and not result in // test compilation of some calls which should compile (and not result in
// ambiguity because of char*<->wxCStrData<->wxString conversions) // ambiguity because of char*<->wxCStrData<->wxString conversions)