From 570db9b60b64b91d875f1b838826a7b2e21079b4 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 29 Jul 2017 19:31:12 -0400
Subject: Catch more exceptions while resolving objects

---
 libqpdf/QPDF.cc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index a5f956b8..cfadaa3a 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -1542,6 +1542,7 @@ QPDF::resolve(int objid, int generation)
 	}
 
 	QPDFXRefEntry const& entry = this->xref_table[og];
+        bool success = false;
         try
         {
             switch (entry.getType())
@@ -1569,11 +1570,23 @@ QPDF::resolve(int objid, int generation)
                               QUtil::int_to_string(generation) +
                               " has unexpected xref entry type");
             }
+            success = true;
         }
         catch (QPDFExc& e)
         {
-            QTC::TC("qpdf", "QPDF resolve failure to null");
             warn(e);
+        }
+        catch (std::exception& e)
+        {
+            warn(QPDFExc(qpdf_e_damaged_pdf, this->file->getName(), "", 0,
+                         "object " +
+                         QUtil::int_to_string(objid) + "/" +
+                         QUtil::int_to_string(generation) +
+                         ": error reading object: " + e.what()));
+        }
+        if (! success)
+        {
+            QTC::TC("qpdf", "QPDF resolve failure to null");
             QPDFObjectHandle oh = QPDFObjectHandle::newNull();
             this->obj_cache[og] =
                 ObjCache(QPDFObjectHandle::ObjAccessor::getObject(oh), -1, -1);
-- 
cgit v1.2.3-54-g00ecf