From a7b98c407a89a5219a92d9fa34eefca040b114fb Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 26 Sep 2016 13:19:03 +0200 Subject: [PATCH] Core/String: Fix error when using COW on empty string Former-commit-id: 5d4bb54e4d7b9f68ef66ff8f099d9ea854d982b5 [formerly 8c7e15a2f6f5c1978a3e7b2c33f0ce038ca19dc7] [formerly 9b01d29473ca9d3d64333dd1aa79539a3b2dedb2 [formerly 9159fc04b30b7aef18d16ed1887ba637256a8ad8]] Former-commit-id: dcbc45c4fce819a44a47a02439a68276fae5b992 [formerly effba4f1df384c6bc7b87066fe94a93058302b0a] Former-commit-id: 357ad9fa46d773d6066b1b7cc945da663fe004f7 --- src/Nazara/Core/String.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp index 34ddd3dcf..5019f0885 100644 --- a/src/Nazara/Core/String.cpp +++ b/src/Nazara/Core/String.cpp @@ -4553,7 +4553,7 @@ namespace Nz String& String::operator=(String&& string) noexcept { - return Set(string); + return Set(std::move(string)); } /*! @@ -5852,7 +5852,7 @@ namespace Nz if (!m_sharedString.unique()) { auto newSharedString = std::make_shared(GetSize(), GetCapacity()); - if (!discardContent) + if (!discardContent && newSharedString->size > 0) std::memcpy(newSharedString->string.get(), GetConstBuffer(), GetSize()+1); m_sharedString = std::move(newSharedString);