wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-07 16:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep the created pointer rather than an uninitialized json_value

Browse Source 
clang-tidy reported the json_value unions declared in the string, array,
and object constructors of to_json.hpp as uninitialized
(cppcoreguidelines-pro-type-member-init). Assign the created pointer to
the member directly once the old value is destroyed.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-09-26 10:07:22 +02:00
1 parent 8a26f2dc8f
commit e9c84befa1
2 files changed
+12 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/conversions/to_json.hpp
+6 -9
View File
@@ -91,11 +91,10 @@ struct external_constructor<value_t::string>
int > = 0 > int > = 0 >
static void construct(BasicJsonType& j, const CompatibleStringType& str) static void construct(BasicJsonType& j, const CompatibleStringType& str)
{ {
typename BasicJsonType::json_value value; auto* created = j.template create<typename BasicJsonType::string_t>(str);
value.string = j.template create<typename BasicJsonType::string_t>(str);
j.m_data.m_value.destroy(j.m_data.m_type); j.m_data.m_value.destroy(j.m_data.m_type);
j.m_data.m_type = value_t::string; j.m_data.m_type = value_t::string;
j.m_data.m_value = value; j.m_data.m_value.string = created;
j.assert_invariant(); j.assert_invariant();
} }
}; };
@@ -199,11 +198,10 @@ struct external_constructor<value_t::array>
using std::begin; using std::begin;
using std::end; using std::end;
typename BasicJsonType::json_value value; auto* created = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
j.m_data.m_value.destroy(j.m_data.m_type); j.m_data.m_value.destroy(j.m_data.m_type);
j.m_data.m_type = value_t::array; j.m_data.m_type = value_t::array;
j.m_data.m_value = value; j.m_data.m_value.array = created;
j.set_parents(); j.set_parents();
j.assert_invariant(); j.assert_invariant();
} }
@@ -293,11 +291,10 @@ struct external_constructor<value_t::object>
using std::begin; using std::begin;
using std::end; using std::end;
typename BasicJsonType::json_value value; auto* created = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
j.m_data.m_value.destroy(j.m_data.m_type); j.m_data.m_value.destroy(j.m_data.m_type);
j.m_data.m_type = value_t::object; j.m_data.m_type = value_t::object;
j.m_data.m_value = value; j.m_data.m_value.object = created;
j.set_parents(); j.set_parents();
j.assert_invariant(); j.assert_invariant();
} }
single_include/nlohmann/json.hpp
+6 -9
View File
@@ -6620,11 +6620,10 @@ struct external_constructor<value_t::string>
int > = 0 > int > = 0 >
static void construct(BasicJsonType& j, const CompatibleStringType& str) static void construct(BasicJsonType& j, const CompatibleStringType& str)
{ {
typename BasicJsonType::json_value value; auto* created = j.template create<typename BasicJsonType::string_t>(str);
value.string = j.template create<typename BasicJsonType::string_t>(str);
j.m_data.m_value.destroy(j.m_data.m_type); j.m_data.m_value.destroy(j.m_data.m_type);
j.m_data.m_type = value_t::string; j.m_data.m_type = value_t::string;
j.m_data.m_value = value; j.m_data.m_value.string = created;
j.assert_invariant(); j.assert_invariant();
} }
}; };
@@ -6728,11 +6727,10 @@ struct external_constructor<value_t::array>
using std::begin; using std::begin;
using std::end; using std::end;
typename BasicJsonType::json_value value; auto* created = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
j.m_data.m_value.destroy(j.m_data.m_type); j.m_data.m_value.destroy(j.m_data.m_type);
j.m_data.m_type = value_t::array; j.m_data.m_type = value_t::array;
j.m_data.m_value = value; j.m_data.m_value.array = created;
j.set_parents(); j.set_parents();
j.assert_invariant(); j.assert_invariant();
} }
@@ -6822,11 +6820,10 @@ struct external_constructor<value_t::object>
using std::begin; using std::begin;
using std::end; using std::end;
typename BasicJsonType::json_value value; auto* created = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
j.m_data.m_value.destroy(j.m_data.m_type); j.m_data.m_value.destroy(j.m_data.m_type);
j.m_data.m_type = value_t::object; j.m_data.m_type = value_t::object;
j.m_data.m_value = value; j.m_data.m_value.object = created;
j.set_parents(); j.set_parents();
j.assert_invariant(); j.assert_invariant();
} }