BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-03 04:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix confrom failure for nullptr dereference. (#7688)

Browse Source
This commit is contained in:
Derek Bailey
2022-12-01 20:21:48 -08:00
committed by GitHub
parent 3b2ced0131
commit 2eaf790638
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/idl_parser.cpp
View File

@@ -4239,8 +4239,13 @@ std::string Parser::ConformTo(const Parser &base) {
field_base = *fbit;
if (field.value.offset == field_base->value.offset) {
renamed_fields.insert(field_base);
if (!EqualByName(field.value.type, field_base->value.type))
return "field renamed to different type: " + qualified_field_name;
if (!EqualByName(field.value.type, field_base->value.type)) {
const auto qualified_field_base =
qualified_name + "." + field_base->name;
return "field renamed to different type: " +
qualified_field_name + " (renamed from " +
qualified_field_base + ")";
}
break;
}
}