# HG changeset patch
# User jwe
# Date 1094664203 0
# Node ID ff29117ce225eaaf7b3f70a72d05d8c13fb50e8c
# Parent  c969a018c928737c42feb9a87785c161eff5e265
[project @ 2004-09-08 17:23:22 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-08  John W. Eaton  <jwe@octave.org>
+
+	* pt-arg-list.cc (convert_to_const_vector):
+	Unwind-protect index_position before modifying it.
+	Don't protect and set index_position unless stash_object is true.
+
 2004-09-08  David Bateman  <dbateman@free.fr>
 
 	* ov-fcn-inline.cc (octave_fcn_inline::save_ascii,
diff --git a/src/pt-arg-list.cc b/src/pt-arg-list.cc
--- a/src/pt-arg-list.cc
+++ b/src/pt-arg-list.cc
@@ -195,7 +195,12 @@
   int j = 0;
   for (int k = 0; k < len; k++)
     {
-      index_position = (len == 1) ? -1 : k;
+      if (stash_object)
+	{
+	  unwind_protect_int (index_position);
+
+	  index_position = (len == 1) ? -1 : k;
+	}
 
       tree_expression *elt = *p++;