octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 19:08:59 +00:00
Code Issues Releases Wiki Activity

Fix error caught by clang

Browse Source
This commit is contained in:
Jay Berkenbilt 2017-08-26 21:51:17 -04:00
parent dea704f0ab
commit 728dc9e6d8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/qpdf/QPDFObjectHandle.hh
View File

@ -652,6 +652,16 @@ class QPDFObjectHandle
QPDFObjectHandle(QPDF*, int objid, int generation);
QPDFObjectHandle(QPDFObject*);
enum parser_state_e
{
st_top,
st_start,
st_stop,
st_eof,
st_dictionary,
st_array
};
// Private object factory methods
static QPDFObjectHandle newIndirect(QPDF*, int objid, int generation);
static QPDFObjectHandle newStream(

7
libqpdf/QPDFObjectHandle.cc
View File

@ -965,8 +965,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input,
std::vector<std::vector<QPDFObjectHandle> > olist_stack;
olist_stack.push_back(std::vector<QPDFObjectHandle>());
enum state_e { st_top, st_start, st_stop, st_eof, st_dictionary, st_array };
std::vector<state_e> state_stack;
std::vector<parser_state_e> state_stack;
state_stack.push_back(st_top);
std::vector<qpdf_offset_t> offset_stack;
offset_stack.push_back(input->tell());
@ -974,7 +973,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input,
while (! done)
{
std::vector<QPDFObjectHandle>& olist = olist_stack.back();
state_e state = state_stack.back();
parser_state_e state = state_stack.back();
qpdf_offset_t offset = offset_stack.back();
object = QPDFObjectHandle();
@ -1193,7 +1192,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input,
"QPDFObjectHandle::parseInternal: st_stop encountered"
" with insufficient elements in stack");
}
state_e old_state = state_stack.back();
parser_state_e old_state = state_stack.back();
state_stack.pop_back();
if (old_state == st_array)
{