From 361caf938f18fc9604c3b55b2106d71d9dc30a08 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Mon, 10 Jun 2024 14:45:28 +0200
Subject: [PATCH] Utils: Fix small string

Change-Id: I94b9cd4c282bf57254b52172658135237d4073bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/libs/utils/smallstring.h       | 6 ++++--
 src/libs/utils/smallstringlayout.h | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h
index bf74f93482a..2f19e35103e 100644
--- a/src/libs/utils/smallstring.h
+++ b/src/libs/utils/smallstring.h
@@ -464,9 +464,11 @@ public:
 
             reserve(optimalCapacity(newSize));
 
-            std::memcpy(data() + oldSize, temporaryArray, newAppendedStringSize);
+            auto begin = data();
 
-            newEnd = data() + newSize;
+            std::memcpy(begin + oldSize, temporaryArray, newAppendedStringSize);
+
+            newEnd = begin + newSize;
         }
         setSize(newEnd - data());
     }
diff --git a/src/libs/utils/smallstringlayout.h b/src/libs/utils/smallstringlayout.h
index 9271002803f..572661e925c 100644
--- a/src/libs/utils/smallstringlayout.h
+++ b/src/libs/utils/smallstringlayout.h
@@ -281,7 +281,7 @@ struct alignas(16) StringDataLayout<MaximumShortStringDataAreaSize,
 
     constexpr void reset() noexcept
     {
-        pointer = nullptr;
+        pointer = buffer;
         size_ = 0;
         capacity_ = MaximumShortStringDataAreaSize;
     }