Prevent infinitely recursive macros (bug #20126)

We simply use the system already in place for file inclusions, and bump the limit up to 100 to appease compulsive macro users.
wesnoth · Jun 23, 2014 · 6529bbc · 6529bbc
1 parent acb02f5
commit 6529bbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog b/changelog
@@ -73,6 +73,7 @@ Version 1.11.15+dev:
    * Fix bug in Random Recruit Micro AI: the AI can now handle custom castle
      terrain independent of its terrain code
    * Fix bug in Return Guardian Micro AI when there is no path to the return hex
+   * Fix bug #20126: Recursive preprocessor includes cause infinite loop
 
 Version 1.11.15:
  * Graphics:

diff --git a/src/serialization/preprocessor.cpp b/src/serialization/preprocessor.cpp
@@ -1053,7 +1053,7 @@ bool preprocessor_data::get_chunk()
 				pop_token();
 				put(v.str());
 			}
-			else if ((macro = target_.defines_->find(symbol)) != target_.defines_->end())
+			else if (target_.depth_ < 100 && (macro = target_.defines_->find(symbol)) != target_.defines_->end())
 			{
 				preproc_define const &val = macro->second;
 				size_t nb_arg = strings_.size() - token.stack_pos - 1;