commit 25ae3af575507a9952629eeb5d8da7d432f0ef14
author Tom Sepez <tsepez@chromium.org> Mon Dec 03 19:40:14 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Dec 03 19:40:14 2018 +0000
tree 89e3749d2b6d25b9dfa776e8c2e67bdbc2ae4487
parent 0cfefd1a1e982dc461ec363dc659d5c1b8fc9edf

Avoid malloc/copy in CFX_WideTextBuf::operator<<(const ByteStringView&)

Follow-up to fix the TODO from the earlier, simpler CL.
Use reinterpret_cast<> as appropriate.

Change-Id: Id4da65b7ba0585be1e13a9f9bdccdb13e5dc10e7
Reviewed-on: https://pdfium-review.googlesource.com/c/46330
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxcrt/cfx_widetextbuf.cpp

diff --git a/core/fxcrt/cfx_widetextbuf.cpp b/core/fxcrt/cfx_widetextbuf.cpp
index 13208d1..3d7da32 100644
--- a/core/fxcrt/cfx_widetextbuf.cpp
+++ b/core/fxcrt/cfx_widetextbuf.cpp
@@ -12,14 +12,16 @@
 
 void CFX_WideTextBuf::AppendChar(wchar_t ch) {
   ExpandBuf(sizeof(wchar_t));
-  *(wchar_t*)(m_pBuffer.get() + m_DataSize) = ch;
+  *reinterpret_cast<wchar_t*>(m_pBuffer.get() + m_DataSize) = ch;
   m_DataSize += sizeof(wchar_t);
 }
 
 CFX_WideTextBuf& CFX_WideTextBuf::operator<<(const ByteStringView& ascii) {
-  // TODO(tsepez): avoid a malloc/copy here.
-  WideString temp = WideString::FromASCII(ascii);
-  AppendBlock(temp.c_str(), temp.GetLength() * sizeof(wchar_t));
+  ExpandBuf(ascii.GetLength() * sizeof(wchar_t));
+  for (uint8_t ch : ascii) {
+    *reinterpret_cast<wchar_t*>(m_pBuffer.get() + m_DataSize) = ch;
+    m_DataSize += sizeof(wchar_t);
+  }
   return *this;
 }
 
@@ -38,7 +40,7 @@
   FXSYS_itoa(i, buf, 10);
   size_t len = strlen(buf);
   ExpandBuf(len * sizeof(wchar_t));
-  wchar_t* str = (wchar_t*)(m_pBuffer.get() + m_DataSize);
+  wchar_t* str = reinterpret_cast<wchar_t*>(m_pBuffer.get() + m_DataSize);
   for (size_t j = 0; j < len; j++) {
     *str++ = buf[j];
   }
@@ -50,7 +52,7 @@
   char buf[32];
   size_t len = FX_ftoa((float)f, buf);
   ExpandBuf(len * sizeof(wchar_t));
-  wchar_t* str = (wchar_t*)(m_pBuffer.get() + m_DataSize);
+  wchar_t* str = reinterpret_cast<wchar_t*>(m_pBuffer.get() + m_DataSize);
   for (size_t i = 0; i < len; i++) {
     *str++ = buf[i];
   }