commit 63c64460601d0cac046e37f2c98c85e0750d3f1f
author Lei Zhang <thestig@chromium.org> Wed Mar 13 23:32:59 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Mar 13 23:32:59 2019 +0000
tree 97d5e40a84955a1cfe637df7777eab92bd695d00
parent 545390d5fd8309c3a05d803865af8282cd34464a

Do not check for abbreviations in DecodeInlineStream().

The (only) caller already expanded all the abbreviations.

Change-Id: I169b589fa3c072731cee327f054b910bfda47b8b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/51831
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fpdfapi/page/cpdf_streamparser.cpp

diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp
index 18c539a..1cff97f 100644
--- a/core/fpdfapi/page/cpdf_streamparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamparser.cpp
@@ -71,34 +71,43 @@
                             const ByteString& decoder,
                             const CPDF_Dictionary* pParam,
                             uint32_t orig_size) {
+  // |decoder| should not be an abbreviation.
+  ASSERT(decoder != "A85");
+  ASSERT(decoder != "AHx");
+  ASSERT(decoder != "CCF");
+  ASSERT(decoder != "DCT");
+  ASSERT(decoder != "Fl");
+  ASSERT(decoder != "LZW");
+  ASSERT(decoder != "RL");
+
   std::unique_ptr<uint8_t, FxFreeDeleter> ignored_result;
   uint32_t ignored_size;
-  if (decoder == "FlateDecode" || decoder == "Fl") {
+  if (decoder == "FlateDecode") {
     return FlateOrLZWDecode(false, src_span, pParam, orig_size, &ignored_result,
                             &ignored_size);
   }
-  if (decoder == "LZWDecode" || decoder == "LZW") {
+  if (decoder == "LZWDecode") {
     return FlateOrLZWDecode(true, src_span, pParam, 0, &ignored_result,
                             &ignored_size);
   }
-  if (decoder == "DCTDecode" || decoder == "DCT") {
+  if (decoder == "DCTDecode") {
     std::unique_ptr<CCodec_ScanlineDecoder> pDecoder =
         CPDF_ModuleMgr::Get()->GetJpegModule()->CreateDecoder(
             src_span, width, height, 0,
             !pParam || pParam->GetIntegerFor("ColorTransform", 1));
     return DecodeAllScanlines(std::move(pDecoder));
   }
-  if (decoder == "CCITTFaxDecode" || decoder == "CCF") {
+  if (decoder == "CCITTFaxDecode") {
     std::unique_ptr<CCodec_ScanlineDecoder> pDecoder =
         CreateFaxDecoder(src_span, width, height, pParam);
     return DecodeAllScanlines(std::move(pDecoder));
   }
 
-  if (decoder == "ASCII85Decode" || decoder == "A85")
+  if (decoder == "ASCII85Decode")
     return A85Decode(src_span, &ignored_result, &ignored_size);
-  if (decoder == "ASCIIHexDecode" || decoder == "AHx")
+  if (decoder == "ASCIIHexDecode")
     return HexDecode(src_span, &ignored_result, &ignored_size);
-  if (decoder == "RunLengthDecode" || decoder == "RL")
+  if (decoder == "RunLengthDecode")
     return RunLengthDecode(src_span, &ignored_result, &ignored_size);
 
   return FX_INVALID_OFFSET;