Bug fix for CCTK_ParameterWalk() which caused an infinite loop when called

from HTTPD.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3155 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 7 insertions, 4 deletions

diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 28e1529e..39cefde8 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -968,6 +968,13 @@ int CCTK_ParameterWalk (int first,
           /* save the last startpoint */
           prev_startpoint_all = prev_startpoint_thorn = startpoint;
 
+          /* advance to the next if this is an array parameter */
+          if (startpoint->props->array_size > 0)
+          {
+            startpoint = &startpoint->array[next_index++];
+          }
+
+          /* set the parameter's fullname if requested by the caller */
           if (pfullname)
           {
             prefix = startpoint->props->thorn;
@@ -976,10 +983,6 @@ int CCTK_ParameterWalk (int first,
               prefix = CCTK_ThornImplementation (prefix);
             }
 
-            if (startpoint->props->array_size > 0)
-            {
-              startpoint = &startpoint->array[next_index++];
-            }
             *pfullname = malloc (strlen (prefix) +
                                  strlen (startpoint->props->name) + 3);
             if(*pfullname)