diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0eef50673dc..5b058244ba11 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-24  James A. Morrison  <ja2morri@uwaterloo.ca>
+
+        * fixinc/fixinc.c (test_test): Initialize res.
+	(start_flexer): Initialize pz_cmd_save.
+
 2004-01-27  Zack Weinberg  <zack@codesourcery.com>
 
 	* doc/rtl.texi (Arithmetic): Rewrite entries for PLUS,
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 5b92c3ce097c..690184b8ad7a 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -647,6 +647,7 @@ fi";
   default:
     fprintf (stderr, "Script yielded bogus result of `%s':\n%s\n\n",
              pz_res, cmd_buf );
+    res = SKIP_FIX;
   }
 
   free ((void *) pz_res);
@@ -1027,7 +1028,10 @@ start_fixer (int read_fd, tFixDesc* p_fixd, char* pz_fix_file)
     return internal_fix (read_fd, p_fixd);
 
   if ((p_fixd->fd_flags & FD_SHELL_SCRIPT) == 0)
-    pz_cmd = (char*)NULL;
+    {
+      pz_cmd = NULL;
+      pz_cmd_save = NULL;
+    }
   else
     {
       tSCC z_cmd_fmt[] = "file='%s'\n%s";