Simplify NewCopy a bit; avoid direct use of memcpy

Change-Id: I197978604d0dfa997c95b907715ce891211621f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130380
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index eec7010117d8..856fce560065 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -1001,18 +1001,17 @@ auto* NewCopy                                              ( IMPL_RTL_STRINGDATA
                                                              IMPL_RTL_STRINGDATA* pStr,
                                                              sal_Int32 nCount )
 {
-    assert(nCount >= 0);
-    IMPL_RTL_STRINGDATA*    pData = Alloc<IMPL_RTL_STRINGDATA>( pStr->length );
-    OSL_ASSERT(pData != nullptr);
-
-    auto* pDest   = pData->buffer;
-    auto* pSrc    = pStr->buffer;
+    assert(ppThis);
+    assert(pStr);
+    assert(nCount >= 0 && nCount <= pStr->length);
+    *ppThis = Alloc<IMPL_RTL_STRINGDATA>( pStr->length );
+    OSL_ASSERT(*ppThis != nullptr);
 
-    memcpy( pDest, pSrc, nCount * sizeof(*pSrc) );
+    auto* pDest   = (*ppThis)->buffer;
 
-    *ppThis = pData;
+    Copy(pDest, pStr->buffer, nCount);
 
-    RTL_LOG_STRING_NEW( pData );
+    RTL_LOG_STRING_NEW( *ppThis );
     return pDest + nCount;
 }