From c7e4640df951e885a5552ee0ebc11e56e67fb003 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Fri, 7 Sep 2007 10:52:29 +0000
Subject: [PATCH] Bugzilla: 43324 stackoverflow

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@573537 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  3 ++
 .../tools/ant/taskdefs/MacroInstance.java     | 14 ++---
 src/tests/antunit/bugfixes/README.txt         |  2 +
 .../bugzilla-43324-stackoverflow-test.xml     | 51 +++++++++++++++++++
 4 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 src/tests/antunit/bugfixes/README.txt
 create mode 100644 src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml

diff --git a/WHATSNEW b/WHATSNEW
index 9b486d6bc..b5c0033d3 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -160,6 +160,9 @@ Fixed bugs:
 * FilterMapper could throw an NPE.
   Bugzilla 43292.
 
+* Regession nested macrodefs with elements could cause StackOverFlow.
+  Bugzilla 43324.
+
 Other changes:
 --------------
 * <script> now has basic support for JavaFX scripts
diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
index dbaaee466..3917101ca 100644
--- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
+++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
@@ -242,7 +242,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
         this.text = text;
     }
 
-    private UnknownElement copy(UnknownElement ue) {
+    private UnknownElement copy(UnknownElement ue, boolean nested) {
         UnknownElement ret = new UnknownElement(ue.getTag());
         ret.setNamespace(ue.getNamespace());
         ret.setProject(getProject());
@@ -281,8 +281,8 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
             }
             MacroDef.TemplateElement templateElement =
                 (MacroDef.TemplateElement) getNsElements().get(tag);
-            if (templateElement == null) {
-                UnknownElement child = copy(unknownElement);
+            if (templateElement == null || nested) {
+                UnknownElement child = copy(unknownElement, nested);
                 rc.addChild(child.getWrapper());
                 ret.addChild(child);
             } else if (templateElement.isImplicit()) {
@@ -293,7 +293,8 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
                 }
                 for (Iterator i = unknownElements.iterator();
                      i.hasNext();) {
-                    UnknownElement child = copy((UnknownElement) i.next());
+                    UnknownElement child
+                        = copy((UnknownElement) i.next(), true);
                     rc.addChild(child.getWrapper());
                     ret.addChild(child);
                 }
@@ -317,7 +318,8 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
                 if (list != null) {
                     for (Iterator i = list.iterator();
                          i.hasNext();) {
-                        UnknownElement child = copy((UnknownElement) i.next());
+                        UnknownElement child
+                            = copy((UnknownElement) i.next(), true);
                         rc.addChild(child.getWrapper());
                         ret.addChild(child);
                     }
@@ -386,7 +388,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain
         }
 
         // need to set the project on unknown element
-        UnknownElement c = copy(macroDef.getNestedTask());
+        UnknownElement c = copy(macroDef.getNestedTask(), false);
         c.init();
         try {
             c.perform();
diff --git a/src/tests/antunit/bugfixes/README.txt b/src/tests/antunit/bugfixes/README.txt
new file mode 100644
index 000000000..c2b5e5df2
--- /dev/null
+++ b/src/tests/antunit/bugfixes/README.txt
@@ -0,0 +1,2 @@
+This directory contains tests for the bugs
+that have been fixed.
diff --git a/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml b/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml
new file mode 100644
index 000000000..b37fd7d48
--- /dev/null
+++ b/src/tests/antunit/bugfixes/bugzilla-43324-stackoverflow-test.xml
@@ -0,0 +1,51 @@
+<project name="length-test" default="antunit"
+         xmlns:au="antlib:org.apache.ant.antunit">
+
+  <import file="../antunit-base.xml" />
+
+  <target name="testnested">
+    <macrodef name="root-macro">
+      <element name="sub-tasks" optional="false" />
+
+      <sequential>
+        <!-- do stuff -->
+        <sub-tasks />
+      </sequential>
+    </macrodef>
+
+    <macrodef name="used-macro-a">
+      <element name="a-sub-tasks" optional="false" implicit="true" />
+
+      <sequential>
+        <root-macro>
+          <sub-tasks>
+            <!-- do stuff -->
+            <a-sub-tasks />
+          </sub-tasks>
+        </root-macro>
+      </sequential>
+    </macrodef>
+
+    <macrodef name="used-macro-b">
+      <element name="b-sub-tasks" optional="false" implicit="true" />
+
+      <sequential>
+        <used-macro-a>
+          <root-macro>
+            <sub-tasks>
+              <!-- do stuff -->
+              <b-sub-tasks />
+            </sub-tasks>
+          </root-macro>
+        </used-macro-a>
+      </sequential>
+    </macrodef>
+
+    <used-macro-b>
+      <echo message="Test B" />
+    </used-macro-b>
+
+    <au:assertLogContains text="Test B"/>
+  </target>
+
+</project>