octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-02-02 11:58:25 +00:00
Code Issues Releases Wiki Activity

In QPDFParser::parse refactor handling of array_open and dict_open tokens

Browse Source
This commit is contained in:
m-holger 2023-10-27 17:55:09 +01:00
parent 90829228b8
commit d904eab84c
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libqpdf/QPDFParser.cc
View File

@ -227,20 +227,15 @@ QPDFParser::parse(bool& empty, bool content_stream)
if (stack.size() > 500) { if (stack.size() > 500) {
QTC::TC("qpdf", "QPDFParser too deep"); QTC::TC("qpdf", "QPDFParser too deep");
warn("ignoring excessively deeply nested data structure"); warn("ignoring excessively deeply nested data structure");
if (tooManyBadTokens()) { return {QPDF_Null::create()};
return {QPDF_Null::create()};
}
is_null = true;
state = st_top;
} else { } else {
state = st_start;
state_stack.push_back( state_stack.push_back(
(tokenizer.getType() == QPDFTokenizer::tt_array_open) ? st_array (tokenizer.getType() == QPDFTokenizer::tt_array_open) ? st_array
: st_dictionary); : st_dictionary);
b_contents = false; b_contents = false;
stack.emplace_back(input); stack.emplace_back(input);
continue;
} }
break;
case QPDFTokenizer::tt_bool: case QPDFTokenizer::tt_bool:
object = QPDF_Bool::create((tokenizer.getValue() == "true")); object = QPDF_Bool::create((tokenizer.getValue() == "true"));
@ -349,7 +344,7 @@ QPDFParser::parse(bool& empty, bool content_stream)
break; break;
} }
if (object == nullptr && !is_null && state != st_start) { if (object == nullptr && !is_null) {
throw std::logic_error("QPDFParser:parseInternal: unexpected uninitialized object"); throw std::logic_error("QPDFParser:parseInternal: unexpected uninitialized object");
} }
@ -369,9 +364,6 @@ QPDFParser::parse(bool& empty, bool content_stream)
case st_top: case st_top:
done = true; done = true;
break; break;
case st_start:
break;
} }
} }

2
libqpdf/qpdf/QPDFParser.hh
View File

@ -31,7 +31,7 @@ class QPDFParser
QPDFObjectHandle parse(bool& empty, bool content_stream); QPDFObjectHandle parse(bool& empty, bool content_stream);
private: private:
enum parser_state_e { st_top, st_start, st_dictionary, st_array }; enum parser_state_e { st_top, st_dictionary, st_array };
bool tooManyBadTokens(); bool tooManyBadTokens();
void warn(qpdf_offset_t offset, std::string const& msg) const; void warn(qpdf_offset_t offset, std::string const& msg) const;