BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 09:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Setting a field twice in a JSON object now gives error.

Browse Source 
Before, it would crash in FlatBufferBuilder.

Bug: 17357164
Change-Id: I6e6dbada5261745220345379eb53eb3eb113e8f8
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2014-09-03 14:48:37 -07:00
parent 15dc1a86cd
commit 57b614587c
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/idl_parser.cpp
View File

@@ -457,6 +457,10 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def) {
|| struct_def.fields.vec[fieldn] != field)) { || struct_def.fields.vec[fieldn] != field)) {
Error("struct field appearing out of order: " + name); Error("struct field appearing out of order: " + name);
} }
for (auto it = field_stack_.rbegin();
it != field_stack_.rbegin() + fieldn; ++it) {
if (it->second == field) Error("field already set: " + name);
}
Expect(':'); Expect(':');
Value val = field->value; Value val = field->value;
ParseAnyValue(val, field); ParseAnyValue(val, field);

1
tests/test.cpp
View File

@@ -490,6 +490,7 @@ void ErrorTest() {
TestError("union Z { X } struct X { Y:int; }", "only tables"); TestError("union Z { X } struct X { Y:int; }", "only tables");
TestError("table X { Y:[int]; YLength:int; }", "clash"); TestError("table X { Y:[int]; YLength:int; }", "clash");
TestError("table X { Y:string = 1; }", "scalar"); TestError("table X { Y:string = 1; }", "scalar");
TestError("table X { Y:byte; } root_type X; { Y:1, Y:2 }", "already set");
} }
// Additional parser testing not covered elsewhere. // Additional parser testing not covered elsewhere.