Fixed bug where pspp would crash if no startup files could be found.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b942336afb2474e5be15ee9558475b06b9e9099..6faf0afb6cb4dc4be167491efe4eb3ac79e1f83c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 11 15:13:58 WST 2003 John Darrington <john@darrington.wattle.id.au>
+
+        * output.c:  Fixed a bug where pspp would crash if it couldn't find
+       its startup files.
+
 Thu Dec 11 15:09:04 WST 2003 John Darrington <john@darrington.wattle.id.au>
 
        * frequencies.q: Fixed a bug where the program would crash if more that         one 'FREQUENCIES' command appeared in a file.

diff --git a/src/output.c b/src/output.c
index 8cf5bafa287ff7ef4bd75b8dee42c2b925224288..86e8534cedad1efcc659f7cc81346406a707887d 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -287,6 +287,8 @@ outp_read_devices (void)
   where.line_number = 0;
   err_push_file_locator (&where);
 
+  ds_init (NULL, &line, 128);
+
   if (init_fn == NULL)
     {
       msg (IE, _("Cannot find output initialization file.  Use `-vv' to view "
@@ -302,7 +304,6 @@ outp_read_devices (void)
       goto exit;
     }
 
-  ds_init (NULL, &line, 128);
   for (;;)
     {
       char *cp;