From d4b10a2041c0b148d2f29f88c28fd82ef6277c7d Mon Sep 17 00:00:00 2001
From: m-holger <m.holger@qpdf.org>
Date: Sat, 6 Dec 2025 11:48:42 +0000
Subject: [PATCH] Minor code tweaks: Replace `throw std::runtime_error` with `util::no_ci_rt_error_if` for improved error handling in `QPDFWriter::writeLinearized` and adjust argv parsing in `objects.cc`tests.

---
 libqpdf/QPDFWriter.cc | 13 +++++++------
 libtests/objects.cc   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index 8649e29..0a9c8bc 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -2859,16 +2859,17 @@ impl::Writer::writeLinearized()
     }
     next_objid = part6_first_obj;
     enqueuePart(part6);
-    if (next_objid != after_part6) {
-        throw std::runtime_error("error encountered after writing part 6 of linearized data");
-    }
+    util::no_ci_rt_error_if(
+        next_objid != after_part6, "error encountered after writing part 6 of linearized data" //
+    );
     next_objid = second_half_first_obj;
     enqueuePart(part7);
     enqueuePart(part8);
     enqueuePart(part9);
-    if (next_objid != after_second_half) {
-        throw std::runtime_error("error encountered after writing part 9 of cfg.linearized_ data");
-    }
+    util::no_ci_rt_error_if(
+        next_objid != after_second_half,
+        "error encountered after writing part 9 of linearized data" //
+    );
 
     qpdf_offset_t hint_length = 0;
     std::string hint_buffer;
diff --git a/libtests/objects.cc b/libtests/objects.cc
index a52aae8..5ab8098 100644
--- a/libtests/objects.cc
+++ b/libtests/objects.cc
@@ -356,7 +356,7 @@ main(int argc, char* argv[])
     try {
         int n = QUtil::string_to_int(argv[1]);
         char const* filename1 = argv[2];
-        char const* arg2 = argv[3];
+        char const* arg2 = (argc >= 4) ? argv[3] : "";
         runtest(n, filename1, arg2);
     } catch (std::exception& e) {
         std::cerr << e.what() << '\n';
--
libgit2 0.21.4