From 6438c4f36da162f72e0d53e8fff45cd6687b7f5c Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Fri, 27 Jan 2017 10:05:36 -0500 Subject: Limit parsing recursion levels in CPDF_StreamParser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We currently only limit the array recursion levels. This recursion level may also be reset when parsing. This is insufficient to protect against stack overflows. BUG=681920 Change-Id: I69bd0c912fb45c0e68b9b9fa961d43f0adc9bdd3 Reviewed-on: https://pdfium-review.googlesource.com/2434 Commit-Queue: Nicolás Peña Reviewed-by: Tom Sepez --- core/fpdfapi/page/cpdf_streamparser.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/fpdfapi/page/cpdf_streamparser.h') diff --git a/core/fpdfapi/page/cpdf_streamparser.h b/core/fpdfapi/page/cpdf_streamparser.h index dc3b7dcb40..fdc418c634 100644 --- a/core/fpdfapi/page/cpdf_streamparser.h +++ b/core/fpdfapi/page/cpdf_streamparser.h @@ -35,7 +35,8 @@ class CPDF_StreamParser { void SetPos(uint32_t pos) { m_Pos = pos; } std::unique_ptr GetObject() { return std::move(m_pLastObj); } std::unique_ptr ReadNextObject(bool bAllowNestedArray, - uint32_t dwInArrayLevel); + bool bInArray, + uint32_t dwRecursionLevel); std::unique_ptr ReadInlineStream( CPDF_Document* pDoc, std::unique_ptr pDict, -- cgit v1.2.3