diff options
author | Lei Zhang <thestig@chromium.org> | 2018-09-11 07:59:18 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-11 07:59:18 +0000 |
commit | bb06ae5ad0b6389490befc6831517ab383e94031 (patch) | |
tree | 97e9e2367db537f6a4f459481d77103973450b3c /core/fpdfapi/parser/fpdf_parser_decode.cpp | |
parent | c2f404f993f13d303f9e47d2f97aff727becac7d (diff) | |
download | pdfium-bb06ae5ad0b6389490befc6831517ab383e94031.tar.xz |
Make flate decode functions' buffer out parameter unique_ptrs.
Change-Id: Idb14846e87a8287dd911b0a2f7a32146e86c2af7
Reviewed-on: https://pdfium-review.googlesource.com/41853
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser/fpdf_parser_decode.cpp')
-rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index 9041666c07..eafb8ee8a3 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -320,7 +320,7 @@ uint32_t FlateOrLZWDecode(bool bLZW, pdfium::span<const uint8_t> src_span, const CPDF_Dictionary* pParams, uint32_t estimated_size, - uint8_t** dest_buf, + std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf, uint32_t* dest_size) { int predictor = 0; int Colors = 0; @@ -389,11 +389,15 @@ bool PDF_DataDecode(pdfium::span<const uint8_t> src_span, *pImageParams = pParam; return true; } + std::unique_ptr<uint8_t, FxFreeDeleter> result; offset = FlateOrLZWDecode(false, last_span, pParam, estimated_size, - &new_buf, &new_size); + &result, &new_size); + new_buf = result.release(); } else if (decoder == "LZWDecode" || decoder == "LZW") { + std::unique_ptr<uint8_t, FxFreeDeleter> result; offset = FlateOrLZWDecode(true, last_span, pParam, estimated_size, - &new_buf, &new_size); + &result, &new_size); + new_buf = result.release(); } else if (decoder == "ASCII85Decode" || decoder == "A85") { std::unique_ptr<uint8_t, FxFreeDeleter> result; offset = A85Decode(last_span, &result, &new_size); @@ -578,7 +582,7 @@ bool FlateEncode(pdfium::span<const uint8_t> src_span, } uint32_t FlateDecode(pdfium::span<const uint8_t> src_span, - uint8_t** dest_buf, + std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf, uint32_t* dest_size) { CCodec_ModuleMgr* pEncoders = CPDF_ModuleMgr::Get()->GetCodecModule(); return pEncoders->GetFlateModule()->FlateOrLZWDecode( |