From 861a552af4aa7edb24c600e25a7bf388a1cdb364 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 15 May 2015 09:09:22 -0700 Subject: Merge to XFA: Fix potential UAF in ConcatInPlace. Original Review URL: https://codereview.chromium.org/1130763007 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1123333004 --- core/src/fxcrt/fx_basic_wstring_unittest.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'core/src/fxcrt/fx_basic_wstring_unittest.cpp') diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/src/fxcrt/fx_basic_wstring_unittest.cpp index 21b5ae54f6..847e5e8076 100644 --- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_wstring_unittest.cpp @@ -249,6 +249,33 @@ TEST(fxcrt, WideStringOperatorNE) { EXPECT_TRUE(c_string3 != wide_string); } +TEST(fxcrt, WideStringConcatInPlace) { + CFX_WideString fred; + fred.ConcatInPlace(4, L"FRED"); + EXPECT_EQ(L"FRED", fred); + + fred.ConcatInPlace(2, L"DY"); + EXPECT_EQ(L"FREDDY", fred); + + fred.Delete(3, 3); + EXPECT_EQ(L"FRE", fred); + + fred.ConcatInPlace(1, L"D"); + EXPECT_EQ(L"FRED", fred); + + CFX_WideString copy = fred; + fred.ConcatInPlace(2, L"DY"); + EXPECT_EQ(L"FREDDY", fred); + EXPECT_EQ(L"FRED", copy); + + // Test invalid arguments. + copy = fred; + fred.ConcatInPlace(-6, L"freddy"); + CFX_WideString not_aliased(L"xxxxxx"); + EXPECT_EQ(L"FREDDY", fred); + EXPECT_EQ(L"xxxxxx", not_aliased); +} + #define ByteStringLiteral(str) CFX_ByteString(FX_BSTRC(str)) TEST(fxcrt, WideStringUTF16LE_Encode) { -- cgit v1.2.3