Always check for rdToken() return codes in expression parsing

(cherry picked from commit 968c53cd3de01e16e8be3da800c8cd0d8e25fcbe)

1 files changed, 6 insertions, 4 deletions

diff --git a/rpmio/expression.c b/rpmio/expression.c
index ad0199df5..e70ebb6bd 100644
--- a/rpmio/expression.c
+++ b/rpmio/expression.c
@@ -714,7 +714,7 @@ int rpmExprBool(const char *expr)
 {
   struct _parseState state;
   int result = -1;
-  Value v;
+  Value v = NULL;
 
   DEBUG(printf("parseExprBoolean(?, '%s')\n", expr));
 
@@ -722,7 +722,8 @@ int rpmExprBool(const char *expr)
   state.p = state.str = xstrdup(expr);
   state.nextToken = 0;
   state.tokenValue = NULL;
-  (void) rdToken(&state);
+  if (rdToken(&state))
+    goto exit;
 
   /* Parse the expression. */
   v = doLogical(&state);
@@ -758,7 +759,7 @@ char *rpmExprStr(const char *expr)
 {
   struct _parseState state;
   char *result = NULL;
-  Value v;
+  Value v = NULL;
 
   DEBUG(printf("parseExprString(?, '%s')\n", expr));
 
@@ -766,7 +767,8 @@ char *rpmExprStr(const char *expr)
   state.p = state.str = xstrdup(expr);
   state.nextToken = 0;
   state.tokenValue = NULL;
-  (void) rdToken(&state);
+  if (rdToken(&state))
+    goto exit;
 
   /* Parse the expression. */
   v = doLogical(&state);