summaryrefslogtreecommitdiff
path: root/core/fxcrt/cfx_widestring.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-04-07 16:35:13 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-04-07 23:56:10 +0000
commit746c28772e01675096800d8853aae33f94ed3d55 (patch)
tree2ce47901d8028f4e73db474ed6a4a36768463f14 /core/fxcrt/cfx_widestring.cpp
parentc4a2b7518949df00651aa3513c93079f1968441e (diff)
downloadpdfium-746c28772e01675096800d8853aae33f94ed3d55.tar.xz
Create initializer-list ctor for strings.
Also use safe arithmetic for two-arg ctor. Change-Id: I5d541d9b2d5fe5b939f4cc8c22cf034f5cb01176 Reviewed-on: https://pdfium-review.googlesource.com/3955 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_widestring.cpp')
-rw-r--r--core/fxcrt/cfx_widestring.cpp25
1 files changed, 24 insertions, 1 deletions
diff --git a/core/fxcrt/cfx_widestring.cpp b/core/fxcrt/cfx_widestring.cpp
index eb6bc66e73..c9a89fe112 100644
--- a/core/fxcrt/cfx_widestring.cpp
+++ b/core/fxcrt/cfx_widestring.cpp
@@ -14,6 +14,7 @@
#include "core/fxcrt/cfx_string_pool_template.h"
#include "core/fxcrt/fx_basic.h"
#include "core/fxcrt/fx_ext.h"
+#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/numerics/safe_math.h"
#include "third_party/base/stl_util.h"
@@ -296,7 +297,10 @@ CFX_WideString::CFX_WideString(const CFX_WideStringC& stringSrc) {
CFX_WideString::CFX_WideString(const CFX_WideStringC& str1,
const CFX_WideStringC& str2) {
- int nNewLen = str1.GetLength() + str2.GetLength();
+ FX_SAFE_STRSIZE nSafeLen = str1.GetLength();
+ nSafeLen += str2.GetLength();
+
+ FX_STRSIZE nNewLen = nSafeLen.ValueOrDie();
if (nNewLen == 0)
return;
@@ -305,6 +309,25 @@ CFX_WideString::CFX_WideString(const CFX_WideStringC& str1,
m_pData->CopyContentsAt(str1.GetLength(), str2.c_str(), str2.GetLength());
}
+CFX_WideString::CFX_WideString(
+ const std::initializer_list<CFX_WideStringC>& list) {
+ FX_SAFE_STRSIZE nSafeLen = 0;
+ for (const auto& item : list)
+ nSafeLen += item.GetLength();
+
+ FX_STRSIZE nNewLen = nSafeLen.ValueOrDie();
+ if (nNewLen == 0)
+ return;
+
+ m_pData.Reset(StringData::Create(nNewLen));
+
+ FX_STRSIZE nOffset = 0;
+ for (const auto& item : list) {
+ m_pData->CopyContentsAt(nOffset, item.c_str(), item.GetLength());
+ nOffset += item.GetLength();
+ }
+}
+
CFX_WideString::~CFX_WideString() {}
const CFX_WideString& CFX_WideString::operator=(const wchar_t* pStr) {