From 48a259fc4375c8112bb44d3ccc7e9e59c5eeccdc Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 11 May 2000 15:55:10 -0400 Subject: [PATCH] * fixinc/fixincl.c (run_compiles): Don't crash on null pz_machine. From-SVN: r33860 --- gcc/ChangeLog | 8 ++++++-- gcc/fixinc/fixincl.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b5ea286b2ff..44d5fffc474 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2000-05-11 Jason Merrill + + * fixinc/fixincl.c (run_compiles): Don't crash on null pz_machine. + 2000-05-11 Zack Weinberg * fixinc/fixfixes.c, fixinc/fixtests.c: Update commentary. @@ -27,7 +31,7 @@ Thu May 11 22:28:05 2000 Denis Chertykov 2000-05-11 Bruce Korb - * 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 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 9c397358386..2dc8d21c8cf 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, ... */