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

Fixed file_identifier/extension leaking from included file.

Browse Source 
Change-Id: I470143411e4ce6322e018a27bcc9cd40c15d9bf1
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2017-08-14 10:41:39 -07:00
parent d76113100a
commit 432e7582c6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/idl_parser.cpp
View File

@@ -2216,9 +2216,11 @@ 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 // Reset these just in case the included file had them, and the
// parent doesn't. // parent doesn't.
root_struct_def_ = nullptr; root_struct_def_ = nullptr;
file_identifier_.clear();
file_extension_.clear();
// 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