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/include | |
| 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/include')
| -rw-r--r-- | core/include/fxcrt/fx_string.h | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |