[libcxx-commits] [PATCH] D146294: [libcxx] Fix crash in std::stringstream with payload >= INT_MAX

[Azat Khuzhin via Phabricator via libcxx-commits]

azat updated this revision to Diff 520263.
azat added a comment.

Fix default value for sizeof_void_p parameter


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D146294

Files:
  libcxx/include/sstream
  libcxx/test/configs/cmake-bridge.cfg.in
  libcxx/test/std/input.output/string.streams/stringstream.members/gcount.pass.cpp
  libcxx/utils/libcxx/test/params.py


Index: libcxx/utils/libcxx/test/params.py
===================================================================
--- libcxx/utils/libcxx/test/params.py
+++ libcxx/utils/libcxx/test/params.py
@@ -115,6 +115,15 @@
               AddCompileFlag('-fno-rtti')
             ]),
 
+  Parameter(name='sizeof_void_p', type=int,
+            default=False, # None means not a libcxx tests (libunwind or libcxxabi)
+            help="sizeof(void *)",
+            actions=lambda sizeof_void_p:
+            [] if sizeof_void_p is False else
+            [AddFeature('libcxx-64-bits')] if sizeof_void_p == 8 else
+            [AddFeature('libcxx-32-bits')]
+           ),
+
   Parameter(name='stdlib', choices=['llvm-libc++', 'apple-libc++', 'libstdc++', 'msvc'], type=str, default='llvm-libc++',
             help="""The C++ Standard Library implementation being tested.
 
Index: libcxx/test/std/input.output/string.streams/stringstream.members/gcount.pass.cpp
===================================================================
--- /dev/null
+++ libcxx/test/std/input.output/string.streams/stringstream.members/gcount.pass.cpp
@@ -0,0 +1,36 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: libcxx-32-bits
+
+// Test that tellp() does not break the stringstream after INT_MAX, due to use
+// of pbump() that accept int.
+
+#include <cassert>
+#include <climits>
+#include <sstream>
+#include <string>
+
+int main(int, char**) {
+  std::stringstream ss;
+  std::string payload(INT_MAX - 1, '\0');
+
+  ss.write(payload.data(), payload.size());
+  assert(ss.tellp() == INT_MAX - 1);
+
+  ss.write("a", 1);
+  assert(ss.tellp() == INT_MAX);
+
+  ss.write("b", 1);
+  assert(ss.tellp() == INT_MAX + 1ULL);
+  // it fails only after previous tellp() corrupts the internal field with int
+  // overflow
+  assert(ss.tellp() == INT_MAX + 1ULL);
+
+  return 0;
+}
Index: libcxx/test/configs/cmake-bridge.cfg.in
===================================================================
--- libcxx/test/configs/cmake-bridge.cfg.in
+++ libcxx/test/configs/cmake-bridge.cfg.in
@@ -1,5 +1,7 @@
 @AUTO_GEN_COMMENT@
 
+config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@
+
 @SERIALIZED_LIT_PARAMS@
 
 #
Index: libcxx/include/sstream
===================================================================
--- libcxx/include/sstream
+++ libcxx/include/sstream
@@ -620,7 +620,7 @@
     if (__wch & ios_base::out)
     {
         this->setp(this->pbase(), this->epptr());
-        this->pbump(__noff);
+        this->__pbump(__noff);
     }
     return pos_type(__noff);
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D146294.520263.patch
Type: text/x-patch
Size: 2874 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230508/7ee73cb6/attachment-0001.bin>