# HG changeset patch
# User jwe
# Date 1115066028 0
# Node ID a892ee7ac114b481b68acd92325e7d8eb7ddcf63
# Parent  f9afe97d6d1444710b2561aee4ee1a1215fce09a
[project @ 2005-05-02 20:33:48 by jwe]

diff -r f9afe97d6d14 -r a892ee7ac114 src/ChangeLog
--- a/src/ChangeLog	Mon May 02 18:56:32 2005 +0000
+++ b/src/ChangeLog	Mon May 02 20:33:48 2005 +0000
@@ -1,5 +1,8 @@
 2005-05-02  John W. Eaton  <jwe@octave.org>
 
+	* error.cc (Flasterr): Don't access argv if an error occurs when
+	creating it.
+
 	* mkgendoc (main): Print header message.
 
 2005-05-02  Bill Denney  <denney@seas.upenn.edu>
diff -r f9afe97d6d14 -r a892ee7ac114 src/error.cc
--- a/src/error.cc	Mon May 02 18:56:32 2005 +0000
+++ b/src/error.cc	Mon May 02 20:33:48 2005 +0000
@@ -702,12 +702,18 @@
 
   int argc = args.length () + 1;
 
-  string_vector argv = args.make_argv ("lasterr");
+  if (argc == 1 || argc == 2)
+    {
+      string_vector argv = args.make_argv ("lasterr");
 
-  if (argc == 1)
-    retval(0) = Vlast_error_message;
-  else if (argc == 2)
-    Vlast_error_message = argv(1);
+      if (! error_state)
+	{
+	  if (argc == 1)
+	    retval(0) = Vlast_error_message;
+	  else
+	    Vlast_error_message = argv(1);
+	}
+    }
   else
     print_usage ("lasterr");