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

Fixed root_type leaking in from included files.

Browse Source 
Change-Id: I9378e375901f8a883eaeb2182955d690c358ed4b
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2017-08-14 09:22:12 -07:00
parent 76744a4345
commit dca33ddb75
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/idl_parser.cpp
View File

@@ -2216,6 +2216,9 @@ CheckedError Parser::DoParse(const char *source,
name.c_str())); name.c_str()));
// We generally do not want to output code for any included files: // We generally do not want to output code for any included files:
if (!opts.generate_all) MarkGenerated(); if (!opts.generate_all) MarkGenerated();
// Reset root type just in case the included file had one, and the
// parent doesn't.
root_struct_def_ = nullptr;
// This is the easiest way to continue this file after an include: // This is the easiest way to continue this file after an include:
// instead of saving and restoring all the state, we simply start the // instead of saving and restoring all the state, we simply start the
// file anew. This will cause it to encounter the same include // file anew. This will cause it to encounter the same include