locale_facets_nonio.tcc (time_get<>:: _M_extract_via_format): Tighten somewhat error checking.

2010-10-07  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/locale_facets_nonio.tcc (time_get<>::
	_M_extract_via_format): Tighten somewhat error checking.
	* testsuite/22_locale/time_get/get_time/char/6.cc: New.
	* testsuite/22_locale/time_get/get_time/wchar_t/6.cc: Likewise.

From-SVN: r165094

4 files changed, 152 insertions, 2 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 94586f6..7b4750c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/locale_facets_nonio.tcc (time_get<>::
+	_M_extract_via_format): Tighten somewhat error checking.
+	* testsuite/22_locale/time_get/get_time/char/6.cc: New.
+	* testsuite/22_locale/time_get/get_time/wchar_t/6.cc: Likewise.
+
 2010-10-07  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
 	PR libstdc++/45924
diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.tcc b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
index b5c77b9..039cce2 100644
--- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
@@ -633,7 +633,8 @@ _GLIBCXX_END_LDBL_NAMESPACE
       const size_t __len = char_traits<_CharT>::length(__format);
 
       ios_base::iostate __tmperr = ios_base::goodbit;
-      for (size_t __i = 0; __beg != __end && __i < __len && !__tmperr; ++__i)
+      size_t __i = 0;
+      for (; __beg != __end && __i < __len && !__tmperr; ++__i)
 	{
 	  if (__ctype.narrow(__format[__i], 0) == '%')
 	    {
@@ -827,7 +828,7 @@ _GLIBCXX_END_LDBL_NAMESPACE
 	    }
 	}
 
-      if (__tmperr)
+      if (__tmperr || __i != __len)
 	__err |= ios_base::failbit;
   
       return __beg;
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/6.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/6.cc
new file mode 100644
index 0000000..9ecd93f
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/6.cc
@@ -0,0 +1,71 @@
+// 2010-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 Free Software Foundation
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  typedef string::const_iterator iter_type;
+  typedef time_get<char, iter_type> time_get_type;
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  const ios_base::iostate eofbit = ios_base::eofbit;  
+  const ios_base::iostate failbit = ios_base::failbit;
+  ios_base::iostate err = goodbit;
+  const locale loc_c = locale::classic();
+
+  // Create "C" time objects
+  tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0);
+  tm tm1 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+  istringstream iss;
+  iss.imbue(locale(loc_c, new time_get_type));
+
+  // Iterator advanced, state, output.
+  const time_get_type& tg = use_facet<time_get_type>(iss.getloc());
+
+  const string str0 = "12";
+  tg.get_time(str0.begin(), str0.end(), iss, err, &tm0);
+  VERIFY( err == (failbit | eofbit) );
+  VERIFY( tm0.tm_sec == 0 );
+  VERIFY( tm0.tm_min == 0 );
+  // This is quite hard to guarantee now, revisit together with DR 461
+  // in the C++0x context.
+  // VERIFY( tm0.tm_hour == 0 );
+
+  const string str1 = "12:30 ";
+  err = goodbit;
+  iter_type end1 = tg.get_time(str1.begin(), str1.end(), iss, err, &tm1);
+  VERIFY( err == failbit );
+  VERIFY( *end1 == ' ' );
+  VERIFY( tm1.tm_sec == 0 );
+  // See above...
+  // VERIFY( tm1.tm_min == 0 );
+  // VERIFY( tm1.tm_hour == 0 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/6.cc
new file mode 100644
index 0000000..f544422
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/6.cc
@@ -0,0 +1,71 @@
+// 2010-10-07  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 Free Software Foundation
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  typedef wstring::const_iterator iter_type;
+  typedef time_get<wchar_t, iter_type> time_get_type;
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  const ios_base::iostate eofbit = ios_base::eofbit;  
+  const ios_base::iostate failbit = ios_base::failbit;
+  ios_base::iostate err = goodbit;
+  const locale loc_c = locale::classic();
+
+  // Create "C" time objects
+  tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0);
+  tm tm1 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+  wistringstream iss;
+  iss.imbue(locale(loc_c, new time_get_type));
+
+  // Iterator advanced, state, output.
+  const time_get_type& tg = use_facet<time_get_type>(iss.getloc());
+
+  const wstring str0 = L"12";
+  tg.get_time(str0.begin(), str0.end(), iss, err, &tm0);
+  VERIFY( err == (failbit | eofbit) );
+  VERIFY( tm0.tm_sec == 0 );
+  VERIFY( tm0.tm_min == 0 );
+  // This is quite hard to guarantee now, revisit together with DR 461
+  // in the C++0x context.
+  // VERIFY( tm0.tm_hour == 0 );
+
+  const wstring str1 = L"12:30 ";
+  err = goodbit;
+  iter_type end1 = tg.get_time(str1.begin(), str1.end(), iss, err, &tm1);
+  VERIFY( err == failbit );
+  VERIFY( *end1 == ' ' );
+  VERIFY( tm1.tm_sec == 0 );
+  // See above...
+  // VERIFY( tm1.tm_min == 0 );
+  // VERIFY( tm1.tm_hour == 0 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}