Remove const_cast<> from CFX_LZWDecompressor::Decode() caller. Because the argument to Decode() can be const. Part of the ongoing war against const_cast<>. Change-Id: I3a8402277dbfc4fd80b1dd60225de57b732713f8 Reviewed-on: https://pdfium-review.googlesource.com/39832 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.cpp b/core/fxcodec/gif/cfx_lzwdecompressor.cpp index d4fd43d..a23106b 100644 --- a/core/fxcodec/gif/cfx_lzwdecompressor.cpp +++ b/core/fxcodec/gif/cfx_lzwdecompressor.cpp
@@ -42,7 +42,7 @@ CFX_LZWDecompressor::~CFX_LZWDecompressor() {} -CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(uint8_t* src_buf, +CFX_GifDecodeStatus CFX_LZWDecompressor::Decode(const uint8_t* src_buf, uint32_t src_size, uint8_t* dest_buf, uint32_t* dest_size) {
diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.h b/core/fxcodec/gif/cfx_lzwdecompressor.h index 808f50a..f4df065 100644 --- a/core/fxcodec/gif/cfx_lzwdecompressor.h +++ b/core/fxcodec/gif/cfx_lzwdecompressor.h
@@ -24,7 +24,7 @@ uint8_t code_exp); ~CFX_LZWDecompressor(); - CFX_GifDecodeStatus Decode(uint8_t* src_buf, + CFX_GifDecodeStatus Decode(const uint8_t* src_buf, uint32_t src_size, uint8_t* dest_buf, uint32_t* dest_size); @@ -35,7 +35,6 @@ } std::vector<uint8_t>* DecompressedForTest() { return &decompressed_; } - size_t* DecompressedNextForTest() { return &decompressed_next_; } private: @@ -55,7 +54,7 @@ std::vector<uint8_t> decompressed_; size_t decompressed_next_; uint16_t code_old_; - uint8_t* next_in_; + const uint8_t* next_in_; uint32_t avail_in_; uint8_t bits_left_; uint32_t code_store_;
diff --git a/testing/fuzzers/pdf_lzw_fuzzer.cc b/testing/fuzzers/pdf_lzw_fuzzer.cc index 7e10d2a..e4d993e 100644 --- a/testing/fuzzers/pdf_lzw_fuzzer.cc +++ b/testing/fuzzers/pdf_lzw_fuzzer.cc
@@ -28,9 +28,9 @@ // the initial data. uint32_t dest_size = static_cast<uint32_t>(dest_buf.size()); if (CFX_GifDecodeStatus::InsufficientDestSize != - decompressor->Decode(const_cast<uint8_t*>(src_buf), src_size, - dest_buf.data(), &dest_size)) + decompressor->Decode(src_buf, src_size, dest_buf.data(), &dest_size)) { return; + } } }