From 1181fb267bd8d5eeed5eb97b3cffa6b558447178 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 9 Feb 2004 02:23:37 +0000
Subject: [PATCH] don't seg when constants are involved in && or || expressions

---
 tools/qfcc/source/expr.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 6c2a09427..c026d6a0e 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -1065,6 +1065,14 @@ merge (ex_list_t *l1, ex_list_t *l2)
 {
 	ex_list_t  *m;
 
+	if (!l1 && !l2) {
+		error (0, "internal error");
+		abort ();
+	}
+	if (!l2)
+		return l1;
+	if (!l1)
+		return l2;
 	m = malloc ((size_t)&((ex_list_t *)0)->e[l1->size + l2->size]);
 	m->size = l1->size + l2->size;
 	memcpy (m->e, l1->e, l1->size * sizeof (expr_t *));