From 7b1e9c5a02c1640cce5f15d5f1ff4e8d3ac68542 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Mon, 21 Feb 2000 10:32:01 +0000
Subject: [PATCH] Avoid segfault on malformed %{!?FOO:} expansion (#9581).

CVS patchset: 3571
CVS date: 2000/02/21 10:32:01
---
 lib/macro.c   | 2 +-
 rpmio/macro.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/macro.c b/lib/macro.c
index 706198b..d87281c 100644
--- a/lib/macro.c
+++ b/lib/macro.c
@@ -1116,7 +1116,7 @@ expandMacro(MacroBuf *mb)
 		if (g && g < ge) {		/* Expand X in %{?f:X} */
 			rc = expandT(mb, g, gn);
 		} else
-		if (me->body && *me->body) {	/* Expand %{?f}/%{?f*} */
+		if (me && me->body && *me->body) { /* Expand %{?f}/%{?f*} */
 			rc = expandT(mb, me->body, strlen(me->body));
 		}
 		s = se;
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 706198b..d87281c 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -1116,7 +1116,7 @@ expandMacro(MacroBuf *mb)
 		if (g && g < ge) {		/* Expand X in %{?f:X} */
 			rc = expandT(mb, g, gn);
 		} else
-		if (me->body && *me->body) {	/* Expand %{?f}/%{?f*} */
+		if (me && me->body && *me->body) { /* Expand %{?f}/%{?f*} */
 			rc = expandT(mb, me->body, strlen(me->body));
 		}
 		s = se;
-- 
2.7.4