From 6b6b67ca192d490c226e8215d64c5c53a3bab453 Mon Sep 17 00:00:00 2001
From: oriolfreixa <ofreixad@gmail.com>
Date: Sat, 17 Jun 2023 19:14:19 +0200
Subject: [PATCH] progress

---
 modules/juce_core/text/juce_String.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp
index 3420ed19aa..bbde3806e6 100644
--- a/modules/juce_core/text/juce_String.cpp
+++ b/modules/juce_core/text/juce_String.cpp
@@ -243,6 +243,8 @@ String::~String() noexcept
 String::String (const String& other) noexcept   : text (other.text)
 {
     StringHolderUtils::retain (text);
+    size_t num = getNumBytesAsUTF8();
+    preallocateBytes(num);
 }
 
 void String::swapWith (String& other) noexcept
@@ -826,17 +828,17 @@ JUCE_API String JUCE_CALLTYPE operator+ (const wchar_t* s1, const String& s2) {
 JUCE_API String JUCE_CALLTYPE operator+ (char s1, const String& s2)           { return String::charToString ((juce_wchar) (uint8) s1) + s2; }
 JUCE_API String JUCE_CALLTYPE operator+ (wchar_t s1, const String& s2)        { return String::charToString (s1) + s2; }
 
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const String& s2)         { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const char* s2)           { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const wchar_t* s2)        { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, const std::string& s2)    { return s1 += s2.c_str(); }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const String& s2)         { String s(s1); return s += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const char* s2)           { String s(s1); return s += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const wchar_t* s2)        { String s(s1); return s += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, const std::string& s2)    { String s(s1); return s += s2.c_str(); }
 
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, char s2)                  { return s1 += s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, wchar_t s2)               { return s1 += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, char s2)                  { String s(s1); return s += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, wchar_t s2)               { String s(s1); return s += s2; }
 
 #if ! JUCE_NATIVE_WCHAR_IS_UTF32
 JUCE_API String JUCE_CALLTYPE operator+ (juce_wchar s1, const String& s2)     { return String::charToString (s1) + s2; }
-JUCE_API String JUCE_CALLTYPE operator+ (String s1, juce_wchar s2)            { return s1 += s2; }
+JUCE_API String JUCE_CALLTYPE operator+ (String s1, juce_wchar s2)            { String s(s1); return s += s2; }
 JUCE_API String& JUCE_CALLTYPE operator<< (String& s1, juce_wchar s2)         { return s1 += s2; }
 #endif