From 7c694a4632dc3b11e26d66a44e598a211913d02a Mon Sep 17 00:00:00 2001 From: Artem Strygin Date: Wed, 11 Jul 2018 16:25:14 +0000 Subject: Fix crash and memory leak. Do not return size within CPDF_StreamAcc in case when read data failed. Also free buffers in this case. Bug: chromium:860210 Change-Id: Ifb2a061d7c8427409b68c33f213c5c55343fb946 Reviewed-on: https://pdfium-review.googlesource.com/37310 Reviewed-by: Henrique Nakashima Commit-Queue: Art Snake --- core/fpdfapi/parser/cpdf_stream_acc_unittest.cpp | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 core/fpdfapi/parser/cpdf_stream_acc_unittest.cpp (limited to 'core/fpdfapi/parser/cpdf_stream_acc_unittest.cpp') diff --git a/core/fpdfapi/parser/cpdf_stream_acc_unittest.cpp b/core/fpdfapi/parser/cpdf_stream_acc_unittest.cpp new file mode 100644 index 0000000000..dcebf0b3a7 --- /dev/null +++ b/core/fpdfapi/parser/cpdf_stream_acc_unittest.cpp @@ -0,0 +1,38 @@ +// Copyright 2018 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "core/fpdfapi/parser/cpdf_stream_acc.h" + +#include "core/fpdfapi/parser/cpdf_stream.h" + +#include "core/fxcrt/cfx_memorystream.h" +#include "core/fxcrt/fx_stream.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace { + +class InvalidStream : public IFX_SeekableReadStream { + public: + InvalidStream() = default; + ~InvalidStream() override = default; + + // IFX_SeekableReadStream overrides: + bool ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) override { + // Read failure. + return false; + } + + FX_FILESIZE GetSize() override { return 1024; } +}; + +} // namespace + +TEST(CPDF_StreamAccTest, ReadRawDataFailed) { + CPDF_Stream stream; + stream.InitStreamFromFile(pdfium::MakeRetain(), nullptr); + auto stream_acc = pdfium::MakeRetain(&stream); + stream_acc->LoadAllDataRaw(); + EXPECT_EQ(0u, stream_acc->GetSize()); + EXPECT_FALSE(stream_acc->GetData()); +} -- cgit v1.2.3