From 0004f29bf6ee3c6060a272c79f14993e92e053c7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Mar 2017 13:51:46 -0700 Subject: Refcount all CFX_DIBSources (and subclasses) all the time. There are currently several ownership models for these objects, including ad-hoc logic for sharing and deletion, and the now-redundant CFX_DIBitmapRef externally-counted handle to the DIBs. Replace them all with the internal refcount scheme. Change-Id: I2db399dfc19219eda384f94cc989353b78ce2872 Reviewed-on: https://pdfium-review.googlesource.com/3166 Reviewed-by: dsinclair Commit-Queue: dsinclair --- testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc | 2 +- testing/libfuzzer/pdf_jpx_fuzzer.cc | 3 +-- testing/libfuzzer/xfa_codec_fuzzer.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'testing/libfuzzer') diff --git a/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc b/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc index 1db39751db..162a0bf772 100644 --- a/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc +++ b/testing/libfuzzer/pdf_codec_jbig2_fuzzer.cc @@ -25,7 +25,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { size -= kParameterSize; data += kParameterSize; - std::unique_ptr bitmap(new CFX_DIBitmap); + auto bitmap = pdfium::MakeRetain(); if (!bitmap->Create(width, height, FXDIB_1bppRgb)) return 0; diff --git a/testing/libfuzzer/pdf_jpx_fuzzer.cc b/testing/libfuzzer/pdf_jpx_fuzzer.cc index bea7ba2dbe..92ba210be3 100644 --- a/testing/libfuzzer/pdf_jpx_fuzzer.cc +++ b/testing/libfuzzer/pdf_jpx_fuzzer.cc @@ -37,8 +37,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { width = (width * components + 2) / 3; format = FXDIB_Rgb; } - - std::unique_ptr bitmap(new CFX_DIBitmap); + auto bitmap = pdfium::MakeRetain(); if (!bitmap->Create(width, height, format)) return 0; diff --git a/testing/libfuzzer/xfa_codec_fuzzer.h b/testing/libfuzzer/xfa_codec_fuzzer.h index 9a8b23e368..85cedec9a1 100644 --- a/testing/libfuzzer/xfa_codec_fuzzer.h +++ b/testing/libfuzzer/xfa_codec_fuzzer.h @@ -32,7 +32,7 @@ class XFACodecFuzzer { if (status != FXCODEC_STATUS_FRAME_READY) return 0; - std::unique_ptr bitmap(new CFX_DIBitmap); + auto bitmap = pdfium::MakeRetain(); bitmap->Create(decoder->GetWidth(), decoder->GetHeight(), FXDIB_Argb); int32_t frames; @@ -40,7 +40,7 @@ class XFACodecFuzzer { frames == 0) return 0; - status = decoder->StartDecode(bitmap.get(), 0, 0, bitmap->GetWidth(), + status = decoder->StartDecode(bitmap, 0, 0, bitmap->GetWidth(), bitmap->GetHeight()); while (status == FXCODEC_STATUS_DECODE_TOBECONTINUE) status = decoder->ContinueDecode(); -- cgit v1.2.3