From: Ben Pfaff <blp@gnu.org>
Date: Thu, 19 Feb 2004 05:33:11 +0000 (+0000)
Subject: Prevent procedure() from being called recursively.
X-Git-Tag: v0.4.0~345
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dbb3e53b531febbf118b31d66a0fbd687ff16fa;p=pspp-builds.git

Prevent procedure() from being called recursively.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c180a6d..4f4f3eda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 18 21:32:44 2004  Ben Pfaff  <blp@gnu.org>
+
+	* vfm.c: (procedure) Add check to prevent recursive call.
+
 Wed Feb 18 21:48:54 WST 2004 John Darrington <john@darrington.wattle.id.au>
 
 	* Moved the declarations relating to values to their own header file
diff --git a/src/vfm.c b/src/vfm.c
index e9c7d204..fb8c5feb 100644
--- a/src/vfm.c
+++ b/src/vfm.c
@@ -126,9 +126,13 @@ procedure (void (*beginfunc) (void *),
 	   void (*endfunc) (void *),
            void *aux)
 {
+  static int recursive_call;
+
   struct write_case_data procedure_write_data;
   struct write_case_data split_file_data;
 
+  assert (++recursive_call == 1);
+
   if (dict_get_split_cnt (default_dict) == 0) 
     {
       /* Normally we just use the data passed by the user. */
@@ -156,6 +160,8 @@ procedure (void (*beginfunc) (void *),
   open_active_file ();
   vfm_source->read (procedure_write_case, &procedure_write_data);
   close_active_file (&procedure_write_data);
+
+  assert (--recursive_call == 0);
 }
 
 /* Active file processing support.  Subtly different semantics from