[libcxx-commits] [PATCH] D145981: [libc++] Assert that lengths fit in difference_type

[David Benjamin via Phabricator via libcxx-commits]

davidben updated this revision to Diff 505690.
davidben added a comment.

Hopefully fix C++11 test failures.


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

https://reviews.llvm.org/D145981

Files:
  libcxx/include/string_view
  libcxx/test/libcxx/strings/string.view/assert.ctor.length.pass.cpp


Index: libcxx/test/libcxx/strings/string.view/assert.ctor.length.pass.cpp
===================================================================
--- /dev/null
+++ libcxx/test/libcxx/strings/string.view/assert.ctor.length.pass.cpp
@@ -0,0 +1,27 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// REQUIRES: has-unix-headers
+
+// UNSUPPORTED: c++03, c++11
+// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx{{10.9|10.10|10.11|10.12|10.13|10.14|10.15|11.0|12.0}}
+// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_ASSERTIONS=1
+
+// Construct a string_view from an invalid length
+// constexpr basic_string_view( const _CharT* s, size_type len )
+
+#include <string_view>
+
+#include "check_assertion.h"
+
+int main(int, char**) {
+  char c = 0;
+  TEST_LIBCPP_ASSERT_FAILURE(
+      std::string_view(&c, -1), "string_view::string_view(_CharT *, size_t): length does not fit in difference_type");
+  return 0;
+}
Index: libcxx/include/string_view
===================================================================
--- libcxx/include/string_view
+++ libcxx/include/string_view
@@ -305,6 +305,7 @@
         : __data_(__s), __size_(__len)
     {
 #if _LIBCPP_STD_VER >= 14
+    _LIBCPP_ASSERT(__len <= static_cast<size_type>(numeric_limits<difference_type>::max()), "string_view::string_view(_CharT *, size_t): length does not fit in difference_type");
     _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr");
 #endif
     }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D145981.505690.patch
Type: text/x-patch
Size: 1813 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230316/11461fb0/attachment.bin>