Avoid segfault on malformed %{!?FOO:} expansion (#9581).

CVS patchset: 3571
CVS date: 2000/02/21 10:32:01

diff --git a/lib/macro.c b/lib/macro.c
index 706198b..d87281c 100644 (file)
--- 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 (file)
--- 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;