octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-06-05 03:40:53 +00:00
Code Issues Releases Wiki Activity

Change JSON_dictionary and JSON_array to store JSON objects rather than std::shared_ptr<JSON_value>

Browse Source 
Recognise that JSON objects are effectively shared pointers to JSON_value.
This commit is contained in:
m-holger 2023-02-05 18:39:30 +00:00
parent b4c36d9b73
commit a4f3dddb79
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qpdf/JSON.hh
View File

@ -54,6 +54,8 @@ class JSON
{
public:
static int constexpr LATEST = 2;
QPDF_DLL
JSON() = default;
QPDF_DLL
@ -369,7 +371,7 @@ class JSON
}
virtual ~JSON_dictionary() = default;
virtual void write(Pipeline*, size_t depth) const;
std::map<std::string, std::shared_ptr<JSON_value>> members;
std::map<std::string, JSON> members;
std::set<std::string> parsed_keys;
};
struct JSON_array: public JSON_value
@ -380,7 +382,7 @@ class JSON
}
virtual ~JSON_array() = default;
virtual void write(Pipeline*, size_t depth) const;
std::vector<std::shared_ptr<JSON_value>> elements;
std::vector<JSON> elements;
};
struct JSON_string: public JSON_value
{

22
libqpdf/JSON.cc
View File

@ -322,9 +322,9 @@ JSON::addArrayElement(JSON const& val)
throw std::runtime_error("JSON::addArrayElement called on non-array");
}
if (val.m->value.get()) {
arr->elements.push_back(val.m->value);
arr->elements.push_back(val);
} else {
arr->elements.push_back(std::make_shared<JSON_null>());
arr->elements.push_back(makeNull());
}
return arr->elements.back();
}
@ -504,11 +504,11 @@ JSON::checkSchemaInternal(
}
if (sch_dict && (!pattern_key.empty())) {
auto pattern_schema = sch_dict->members[pattern_key].get();
auto pattern_schema = sch_dict->members[pattern_key].m->value.get();
for (auto const& iter: this_dict->members) {
std::string const& key = iter.first;
checkSchemaInternal(
this_dict->members[key].get(),
this_dict->members[key].m->value.get(),
pattern_schema,
flags,
errors,
@ -519,8 +519,8 @@ JSON::checkSchemaInternal(
std::string const& key = iter.first;
if (this_dict->members.count(key)) {
checkSchemaInternal(
this_dict->members[key].get(),
iter.second.get(),
this_dict->members[key].m->value.get(),
iter.second.m->value.get(),
flags,
errors,
prefix + "." + key);
@ -557,8 +557,8 @@ JSON::checkSchemaInternal(
int i = 0;
for (auto const& element: this_arr->elements) {
checkSchemaInternal(
element.get(),
sch_arr->elements.at(0).get(),
element.m->value.get(),
sch_arr->elements.at(0).m->value.get(),
flags,
errors,
prefix + "." + std::to_string(i));
@ -568,7 +568,7 @@ JSON::checkSchemaInternal(
QTC::TC("libtests", "JSON schema array for single item");
checkSchemaInternal(
this_v,
sch_arr->elements.at(0).get(),
sch_arr->elements.at(0).m->value.get(),
flags,
errors,
prefix);
@ -587,8 +587,8 @@ JSON::checkSchemaInternal(
size_t i = 0;
for (auto const& element: this_arr->elements) {
checkSchemaInternal(
element.get(),
sch_arr->elements.at(i).get(),
element.m->value.get(),
sch_arr->elements.at(i).m->value.get(),
flags,
errors,
prefix + "." + std::to_string(i));