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/include/fxcrt/fx_string.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/include/fxcrt/fx_string.h') diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index a7b9a23e25..3614cbe0ee 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -389,6 +389,7 @@ protected: void AllocBeforeWrite(FX_STRSIZE nLen); StringData* m_pData; + friend class fxcrt_ByteStringConcatInPlace_Test; }; inline CFX_ByteStringC::CFX_ByteStringC(const CFX_ByteString& src) { @@ -815,6 +816,7 @@ protected: void AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex) const; StringData* m_pData; + friend class fxcrt_WideStringConcatInPlace_Test; }; inline CFX_WideStringC::CFX_WideStringC(const CFX_WideString& src) { -- cgit v1.2.3