diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-05-15 09:09:22 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-05-15 09:09:22 -0700 |
commit | 861a552af4aa7edb24c600e25a7bf388a1cdb364 (patch) | |
tree | 156c726317ac50e8876f86fc01bf8a5d3a968785 /core/src/fxcrt/fx_basic_bstring_unittest.cpp | |
parent | be6c8f29b92208f2806b8f70f0320b46500ddd94 (diff) | |
download | pdfium-861a552af4aa7edb24c600e25a7bf388a1cdb364.tar.xz |
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
Diffstat (limited to 'core/src/fxcrt/fx_basic_bstring_unittest.cpp')
-rw-r--r-- | core/src/fxcrt/fx_basic_bstring_unittest.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/src/fxcrt/fx_basic_bstring_unittest.cpp index 1f80207e96..bcdd33b8b8 100644 --- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_bstring_unittest.cpp @@ -288,6 +288,33 @@ TEST(fxcrt, ByteStringCNull) { EXPECT_NE(null_string, non_null_string); } +TEST(fxcrt, ByteStringConcatInPlace) { + CFX_ByteString fred; + fred.ConcatInPlace(4, "FRED"); + EXPECT_EQ("FRED", fred); + + fred.ConcatInPlace(2, "DY"); + EXPECT_EQ("FREDDY", fred); + + fred.Delete(3, 3); + EXPECT_EQ("FRE", fred); + + fred.ConcatInPlace(1, "D"); + EXPECT_EQ("FRED", fred); + + CFX_ByteString copy = fred; + fred.ConcatInPlace(2, "DY"); + EXPECT_EQ("FREDDY", fred); + EXPECT_EQ("FRED", copy); + + // Test invalid arguments. + copy = fred; + fred.ConcatInPlace(-6, "freddy"); + CFX_ByteString not_aliased("xxxxxx"); + EXPECT_EQ("FREDDY", fred); + EXPECT_EQ("xxxxxx", not_aliased); +} + TEST(fxcrt, ByteStringCNotNull) { CFX_ByteStringC string3("abc"); CFX_ByteStringC string6("abcdef"); |