commit 5a1e12b47b24cad267f1ca162aada83005d496e8
author Lei Zhang <thestig@chromium.org> Mon Apr 10 19:04:24 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Apr 10 19:04:24 2023 +0000
tree 42dfa476b5fb01f51365e7d9adb990930631777c
parent 850454b6edc7cbd5427de1c19d03e0dc9f63cb6b

Use NOTREACHED_NORETURN() in core/fxcodec

Switch from NOTREACHED() to NOTREACHED_NORETURN(). In some cases,
replace the NOTREACHED() with a CHECK().

Bug: pdfium:2008
Change-Id: I7517bcb13b519e1c2407d4ecbf786f116b882fe1
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/105952
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcodec/flate/flatemodule.cpp

diff --git a/core/fxcodec/flate/flatemodule.cpp b/core/fxcodec/flate/flatemodule.cpp
index 8bf99ac..8c397c5 100644
--- a/core/fxcodec/flate/flatemodule.cpp
+++ b/core/fxcodec/flate/flatemodule.cpp
@@ -762,9 +762,8 @@
       TIFF_PredictLine(m_Scanline.data(), m_PredictPitch, m_bpc, m_nComps,
                        m_OutputWidth);
       break;
-    default:
-      NOTREACHED();
-      break;
+    case PredictorType::kNone:
+      NOTREACHED_NORETURN();
   }
 }
 
@@ -790,9 +789,8 @@
         TIFF_PredictLine(m_PredictBuffer.data(), m_PredictPitch,
                          m_BitsPerComponent, m_Colors, m_Columns);
         break;
-      default:
-        NOTREACHED();
-        break;
+      case PredictorType::kNone:
+        NOTREACHED_NORETURN();
     }
     size_t read_bytes =
         m_PredictPitch > bytes_to_go ? bytes_to_go : m_PredictPitch;
@@ -866,9 +864,6 @@
       ret = TIFF_Predictor(Colors, BitsPerComponent, Columns, dest_buf,
                            dest_size);
       break;
-    default:
-      NOTREACHED();
-      break;
   }
   return ret ? offset : FX_INVALID_OFFSET;
 }

core/fxcodec/icc/icc_transform.cpp

diff --git a/core/fxcodec/icc/icc_transform.cpp b/core/fxcodec/icc/icc_transform.cpp
index ed91674..18f8a41 100644
--- a/core/fxcodec/icc/icc_transform.cpp
+++ b/core/fxcodec/icc/icc_transform.cpp
@@ -101,8 +101,7 @@
     case cmsSigGrayData:
     case cmsSigCmykData:
       // Check3Components() already filtered these types.
-      NOTREACHED();
-      break;
+      NOTREACHED_NORETURN();
     default:
       break;
   }

core/fxcodec/jpeg/jpegmodule.cpp

diff --git a/core/fxcodec/jpeg/jpegmodule.cpp b/core/fxcodec/jpeg/jpegmodule.cpp
index 5b10854..ad80c7e 100644
--- a/core/fxcodec/jpeg/jpegmodule.cpp
+++ b/core/fxcodec/jpeg/jpegmodule.cpp
@@ -23,7 +23,7 @@
 #include "core/fxge/dib/fx_dib.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/base/check.h"
-#include "third_party/base/notreached.h"
+#include "third_party/base/check_op.h"
 
 static pdfium::span<const uint8_t> JpegScanSOI(
     pdfium::span<const uint8_t> src_span) {
@@ -288,10 +288,7 @@
     jpeg_destroy_decompress(&m_Cinfo);
     return false;
   }
-  if (static_cast<int>(m_Cinfo.output_width) > m_OrigWidth) {
-    NOTREACHED();
-    return false;
-  }
+  CHECK_LE(static_cast<int>(m_Cinfo.output_width), m_OrigWidth);
   m_bStarted = true;
   return true;
 }

core/fxcodec/progressive_decoder.cpp

diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index c39ac77..a65e2bb 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -226,8 +226,7 @@
   switch (format) {
     case FXDIB_Format::k1bppMask:
     case FXDIB_Format::k1bppRgb:
-      NOTREACHED();
-      return false;
+      NOTREACHED_NORETURN();
     case FXDIB_Format::k8bppMask:
     case FXDIB_Format::k8bppRgb:
       *color_type = 0;
@@ -240,8 +239,7 @@
       *color_type = 6;
       break;
     default:
-      NOTREACHED();
-      return false;
+      NOTREACHED_NORETURN();
   }
   *gamma = kPngGamma;
   return true;
@@ -249,10 +247,7 @@
 
 bool ProgressiveDecoder::PngAskScanlineBuf(int line, uint8_t** pSrcBuf) {
   RetainPtr<CFX_DIBitmap> pDIBitmap = m_pDeviceBitmap;
-  if (!pDIBitmap) {
-    NOTREACHED();
-    return false;
-  }
+  CHECK(pDIBitmap);
   if (line < m_clipBox.top || line >= m_clipBox.bottom)
     return true;
 
@@ -277,8 +272,7 @@
         PixelWeight* pPixelWeights = m_WeightHorzOO.GetPixelWeight(src_col);
         if (pPixelWeights->m_SrcStart != pPixelWeights->m_SrcEnd)
           continue;
-        NOTREACHED();
-        return false;
+        NOTREACHED_NORETURN();
       }
       return true;
     case FXDIB_Format::k8bppMask:
@@ -1076,8 +1070,7 @@
   switch (pDeviceBitmap->GetFormat()) {
     case FXDIB_Format::k1bppMask:
     case FXDIB_Format::k1bppRgb:
-      NOTREACHED();
-      return;
+      NOTREACHED_NORETURN();
     case FXDIB_Format::k8bppMask:
     case FXDIB_Format::k8bppRgb:
       if (pDeviceBitmap->HasPalette())

core/fxcodec/tiff/tiff_decoder.cpp

diff --git a/core/fxcodec/tiff/tiff_decoder.cpp b/core/fxcodec/tiff/tiff_decoder.cpp
index 7f57439..518dd0b 100644
--- a/core/fxcodec/tiff/tiff_decoder.cpp
+++ b/core/fxcodec/tiff/tiff_decoder.cpp
@@ -132,8 +132,7 @@
 }
 
 tsize_t tiff_write(thandle_t context, tdata_t buf, tsize_t length) {
-  NOTREACHED();
-  return 0;
+  NOTREACHED_NORETURN();
 }
 
 toff_t tiff_seek(thandle_t context, toff_t offset, int whence) {