diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c12a963f0d2..eb50265a21d4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2000-11-24  Bernd Schmidt  <bernds@redhat.co.uk>
 
+	* fold-const.c (fold_range_test): Avoid crash if LHS or RHS is null.
+
 	* reload1.c (conflicts_with_override): New function.
 	(emit_input_reload_insns): Use it to tighten test for validity
 	of substituting into output of previous insn.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 9284a1943a97..aaff05f4d757 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3780,6 +3780,7 @@ fold_range_test (exp)
      short-circuited branch and the underlying object on both sides
      is the same, make a non-short-circuit operation.  */
   else if (BRANCH_COST >= 2
+	   && lhs != 0 && rhs != 0
 	   && (TREE_CODE (exp) == TRUTH_ANDIF_EXPR
 	       || TREE_CODE (exp) == TRUTH_ORIF_EXPR)
 	   && operand_equal_p (lhs, rhs, 0))