From 30f2ff16bf30ccaa66bb7e144873fc29b4bcbdc2 Mon Sep 17 00:00:00 2001 From: Chris Palmer Date: Tue, 8 Jul 2014 13:27:00 -0700 Subject: Fix integer overflow in fx_basic_[bw]string.cpp. BUG=382601 R=jun_fang@foxitsoftware.com Review URL: https://codereview.chromium.org/336003004 --- core/include/fxcrt/fx_string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/include') diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 08fb83cfd7..7e02101def 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -340,7 +340,7 @@ public: protected: struct CFX_StringData* m_pData; - void AllocCopy(CFX_ByteString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex, FX_STRSIZE nExtraLen) const; + void AllocCopy(CFX_ByteString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex) const; void AssignCopy(FX_STRSIZE nSrcLen, FX_LPCSTR lpszSrcData); void ConcatCopy(FX_STRSIZE nSrc1Len, FX_LPCSTR lpszSrc1Data, FX_STRSIZE nSrc2Len, FX_LPCSTR lpszSrc2Data); void ConcatInPlace(FX_STRSIZE nSrcLen, FX_LPCSTR lpszSrcData); @@ -756,7 +756,7 @@ protected: void ConcatInPlace(FX_STRSIZE nSrcLen, FX_LPCWSTR lpszSrcData); void ConcatCopy(FX_STRSIZE nSrc1Len, FX_LPCWSTR lpszSrc1Data, FX_STRSIZE nSrc2Len, FX_LPCWSTR lpszSrc2Data); void AssignCopy(FX_STRSIZE nSrcLen, FX_LPCWSTR lpszSrcData); - void AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex, FX_STRSIZE nExtraLen) const; + void AllocCopy(CFX_WideString& dest, FX_STRSIZE nCopyLen, FX_STRSIZE nCopyIndex) const; }; inline CFX_WideStringC::CFX_WideStringC(const CFX_WideString& src) { -- cgit v1.2.3