From 31750f130d7da8dc20b0d27940f73d77bf3e775c Mon Sep 17 00:00:00 2001 From: Tim Kosse Date: Sat, 2 Oct 2010 12:57:57 +0000 Subject: [PATCH] Backport r65496: Fix infinite loop in wxDateTime::Format() when fields width was used. Closes #12451 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@65724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/datetime.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index e8b0764c66..aa597b5cd6 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -2664,9 +2664,10 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const default: // is it the format width? - fmt.Empty(); - while ( *p == _T('-') || *p == _T('+') || - *p == _T(' ') || wxIsdigit(*p) ) + for( fmt.clear(); + *p == _T('-') || *p == _T('+') || + *p == _T(' ') || wxIsdigit(*p); + ++p ) { fmt += *p; }