Commit 098b98c889400aa33c81d71123418eecc4be2162
1 parent
8e697471
Tidy QPDF::read_xrefTable(qpdf_offset_t xref_offset)
Showing
1 changed file
with
4 additions
and
9 deletions
libqpdf/QPDF.cc
| @@ -910,7 +910,6 @@ QPDF::read_xrefTable(qpdf_offset_t xref_offset) | @@ -910,7 +910,6 @@ QPDF::read_xrefTable(qpdf_offset_t xref_offset) | ||
| 910 | qpdf_offset_t | 910 | qpdf_offset_t |
| 911 | QPDF::read_xrefStream(qpdf_offset_t xref_offset) | 911 | QPDF::read_xrefStream(qpdf_offset_t xref_offset) |
| 912 | { | 912 | { |
| 913 | - bool found = false; | ||
| 914 | if (!m->ignore_xref_streams) { | 913 | if (!m->ignore_xref_streams) { |
| 915 | QPDFObjGen x_og; | 914 | QPDFObjGen x_og; |
| 916 | QPDFObjectHandle xref_obj; | 915 | QPDFObjectHandle xref_obj; |
| @@ -922,17 +921,13 @@ QPDF::read_xrefStream(qpdf_offset_t xref_offset) | @@ -922,17 +921,13 @@ QPDF::read_xrefStream(qpdf_offset_t xref_offset) | ||
| 922 | } | 921 | } |
| 923 | if (xref_obj.isStreamOfType("/XRef")) { | 922 | if (xref_obj.isStreamOfType("/XRef")) { |
| 924 | QTC::TC("qpdf", "QPDF found xref stream"); | 923 | QTC::TC("qpdf", "QPDF found xref stream"); |
| 925 | - found = true; | ||
| 926 | - xref_offset = processXRefStream(xref_offset, xref_obj); | 924 | + return processXRefStream(xref_offset, xref_obj); |
| 927 | } | 925 | } |
| 928 | } | 926 | } |
| 929 | 927 | ||
| 930 | - if (!found) { | ||
| 931 | - QTC::TC("qpdf", "QPDF can't find xref"); | ||
| 932 | - throw damagedPDF("", xref_offset, "xref not found"); | ||
| 933 | - } | ||
| 934 | - | ||
| 935 | - return xref_offset; | 928 | + QTC::TC("qpdf", "QPDF can't find xref"); |
| 929 | + throw damagedPDF("", xref_offset, "xref not found"); | ||
| 930 | + return 0; // unreachable | ||
| 936 | } | 931 | } |
| 937 | 932 | ||
| 938 | qpdf_offset_t | 933 | qpdf_offset_t |