BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-01 19:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: emit more reasonable error message when using incomplete type in struct (#7678)

Browse Source 
Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
sssooonnnggg
2022-11-29 12:59:53 +08:00
committed by GitHub
parent c3a01c7228
commit ad6054c600
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/flatbuffers/idl.h
View File

@@ -473,6 +473,10 @@ inline bool IsStruct(const Type &type) {
return type.base_type == BASE_TYPE_STRUCT && type.struct_def->fixed; return type.base_type == BASE_TYPE_STRUCT && type.struct_def->fixed;
} }
inline bool IsIncompleteStruct(const Type &type) {
return type.base_type == BASE_TYPE_STRUCT && type.struct_def->predecl;
}
inline bool IsTable(const Type &type) { inline bool IsTable(const Type &type) {
return type.base_type == BASE_TYPE_STRUCT && !type.struct_def->fixed; return type.base_type == BASE_TYPE_STRUCT && !type.struct_def->fixed;
} }

6
src/idl_parser.cpp
View File

@@ -918,6 +918,12 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
ECHECK(ParseType(type)); ECHECK(ParseType(type));
if (struct_def.fixed) { if (struct_def.fixed) {
if (IsIncompleteStruct(type) ||
(IsArray(type) && IsIncompleteStruct(type.VectorType()))) {
std::string type_name = IsArray(type) ? type.VectorType().struct_def->name : type.struct_def->name;
return Error(std::string("Incomplete type in struct is not allowed, type name: ") + type_name);
}
auto valid = IsScalar(type.base_type) || IsStruct(type); auto valid = IsScalar(type.base_type) || IsStruct(type);
if (!valid && IsArray(type)) { if (!valid && IsArray(type)) {
const auto &elem_type = type.VectorType(); const auto &elem_type = type.VectorType();