aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2000-05-11 15:55:10 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-05-11 15:55:10 -0400
commit48a259fc4375c8112bb44d3ccc7e9e59c5eeccdc (patch)
treea69eab05e9b23890502841a4dc3d559207da183e
parent32a4595e1f818c0c688b99bfc5186012a00e2578 (diff)
downloadgcc-48a259fc4375c8112bb44d3ccc7e9e59c5eeccdc.zip
gcc-48a259fc4375c8112bb44d3ccc7e9e59c5eeccdc.tar.gz
gcc-48a259fc4375c8112bb44d3ccc7e9e59c5eeccdc.tar.bz2
* fixinc/fixincl.c (run_compiles): Don't crash on null pz_machine.
From-SVN: r33860
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/fixinc/fixincl.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5ea286..44d5fff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-11 Jason Merrill <jason@casey.cygnus.com>
+
+ * fixinc/fixincl.c (run_compiles): Don't crash on null pz_machine.
+
2000-05-11 Zack Weinberg <zack@wolery.cumb.org>
* fixinc/fixfixes.c, fixinc/fixtests.c: Update commentary.
@@ -27,7 +31,7 @@ Thu May 11 22:28:05 2000 Denis Chertykov <denisc@overta.ru>
2000-05-11 Bruce Korb <bkorb@gnu.org>
- * fixinc/fixfixes.c(double_slash_fix): obsolete
+ * fixinc/fixfixes.c (double_slash_fix): obsolete
(else_endif_label_fix): obsolete
(format_fix): new, unused as yet
(main): obsolete
@@ -38,7 +42,7 @@ Thu May 11 22:28:05 2000 Denis Chertykov <denisc@overta.ru>
Added support for "make check".
* fixinc/check.diff: base diff file (needs work!!)
* fixinc/check.tpl: quiet the fixup output
- * fixinc/fixtests.c(main): obsolete
+ * fixinc/fixtests.c (main): obsolete
* fixinc/fixincl.sh: don't bother copying fixincl to ..
* fixinc/fixincl.tpl: provide for arguments to c_fix routines
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index 9c39735..2dc8d21 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -405,7 +405,7 @@ run_compiles ()
/* Allow machine name tests to be ignored (testing, mainly) */
- if ((*pz_machine == '\0') || (*pz_machine == '*'))
+ if (pz_machine && ((*pz_machine == '\0') || (*pz_machine == '*')))
pz_machine = (char*)NULL;
/* FOR every fixup, ... */