[libcxx-commits] [PATCH] D124175: [libcxx] Reject month 0 in get_date/__get_month

[David Spickett via Phabricator via libcxx-commits]

DavidSpickett updated this revision to Diff 424432.
DavidSpickett added a comment.

- Added defines for the iterator checks to support libstdc++. (MSVC STL has these disabled already: https://github.com/microsoft/STL/blob/main/tests/libcxx/expected_results.txt#L372 I do know what it does though so I could add that if needed?)
- Fix off by one in upper month limit test, should be 13 not 12.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D124175/new/

https://reviews.llvm.org/D124175

Files:
  libcxx/include/locale
  libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp


Index: libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
===================================================================
--- libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
+++ libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_date.pass.cpp
@@ -103,5 +103,59 @@
         assert(err == std::ios_base::eofbit);
     }
 
+    // Months must be > 0 and <= 12.
+    {
+        const my_facet f(LOCALE_en_US_UTF_8, 1);
+        const char in[] = "00/21/2022";
+        err = std::ios_base::goodbit;
+        t = std::tm();
+        I i = f.get_date(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t);
+#if _LIBCPP_VERSION
+          // libc++ points to the '/' after the month.
+          assert(base(i) == in+2);
+#else
+          // libstdc++ points to the second character.
+          assert(base(i) == in+1);
+#endif
+        // tm is not modified.
+        assert(t.tm_mon == 0);
+        assert(t.tm_mday == 0);
+        assert(t.tm_year == 0);
+        assert(err == std::ios_base::failbit);
+    }
+    {
+        const my_facet f(LOCALE_en_US_UTF_8, 1);
+        const char in[] = "13/21/2022";
+        err = std::ios_base::goodbit;
+        t = std::tm();
+        I i = f.get_date(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t);
+#if _LIBCPP_VERSION
+          // libc++ points to the '/' after the month.
+          assert(base(i) == in+2);
+#else
+          // libstdc++ points to the second character.
+          assert(base(i) == in+1);
+#endif
+        assert(base(i) == in+2);
+        assert(t.tm_mon == 0);
+        assert(t.tm_mday == 0);
+        assert(t.tm_year == 0);
+        assert(err == std::ios_base::failbit);
+    }
+
+    // Leading zero is allowed.
+    {
+        const my_facet f(LOCALE_en_US_UTF_8, 1);
+        const char in[] = "03/21/2022";
+        err = std::ios_base::goodbit;
+        t = std::tm();
+        I i = f.get_date(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t);
+        assert(base(i) == in+sizeof(in)/sizeof(in[0])-1);
+        assert(t.tm_mon == 2);
+        assert(t.tm_mday == 21);
+        assert(t.tm_year == 122);
+        assert(err == std::ios_base::eofbit);
+    }
+
   return 0;
 }
Index: libcxx/include/locale
===================================================================
--- libcxx/include/locale
+++ libcxx/include/locale
@@ -1925,7 +1925,7 @@
                                               const ctype<char_type>& __ct) const
 {
     int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2) - 1;
-    if (!(__err & ios_base::failbit) && __t <= 11)
+    if (!(__err & ios_base::failbit) && 0 <= __t && __t <= 11)
         __m = __t;
     else
         __err |= ios_base::failbit;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D124175.424432.patch
Type: text/x-patch
Size: 2819 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220422/82395c36/attachment-0001.bin>