commit 07c64fda15f68d227b4f1caee7e24b1581b6e3bf
author Lei Zhang <thestig@chromium.org> Fri Sep 15 17:04:11 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 15 17:04:11 2023 +0000
tree 96485e3dced5bcfeff6cc614988c6d1cb9362e8f
parent c186235a1418c77478c128777950aca50389e74f

Remove some NOTREACHED() usage in core/fpdfapi/parser directory

Switch to NOTREACHED_NORETURN().

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

core/fpdfapi/parser/cpdf_object_avail_unittest.cpp

diff --git a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
index 97eb3d6..a51ec9d 100644
--- a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
@@ -97,8 +97,7 @@
   using CPDF_ObjectAvail::CPDF_ObjectAvail;
   ~CPDF_ObjectAvailFailOnExclude() override = default;
   bool ExcludeObject(const CPDF_Object* object) const override {
-    NOTREACHED();
-    return false;
+    NOTREACHED_NORETURN();
   }
 };
 

core/fpdfapi/parser/cpdf_security_handler.cpp

diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp
index 5f2883d..badb1b5 100644
--- a/core/fpdfapi/parser/cpdf_security_handler.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler.cpp
@@ -535,8 +535,7 @@
     case kUtf8toLatin1:
       return WideString::FromUTF8(password).ToLatin1();
     default:
-      NOTREACHED();
-      return ByteString(password);
+      NOTREACHED_NORETURN();
   }
 }
 

core/fpdfapi/parser/cpdf_seekablemultistream.cpp

diff --git a/core/fpdfapi/parser/cpdf_seekablemultistream.cpp b/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
index bad6d97..1f721aa 100644
--- a/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
+++ b/core/fpdfapi/parser/cpdf_seekablemultistream.cpp
@@ -61,8 +61,7 @@
 }
 
 size_t CPDF_SeekableMultiStream::ReadBlock(pdfium::span<uint8_t> buffer) {
-  NOTREACHED();
-  return 0;
+  NOTREACHED_NORETURN();
 }
 
 FX_FILESIZE CPDF_SeekableMultiStream::GetPosition() {
@@ -74,13 +73,11 @@
 }
 
 bool CPDF_SeekableMultiStream::Flush() {
-  NOTREACHED();
-  return false;
+  NOTREACHED_NORETURN();
 }
 
 bool CPDF_SeekableMultiStream::WriteBlockAtOffset(
     pdfium::span<const uint8_t> buffer,
     FX_FILESIZE offset) {
-  NOTREACHED();
-  return false;
+  NOTREACHED_NORETURN();
 }