From 5d88111a142b3c37e92bdd36699a04fd054d27f4 Mon Sep 17 00:00:00 2001
From: Xavi Hernandez <xhernandez@redhat.com>
Date: Wed, 22 May 2019 17:46:19 +0200
Subject: Fix some "Null pointer dereference" coverity issues

This patch fixes the following CID's:

  * 1124829
  * 1274075
  * 1274083
  * 1274128
  * 1274135
  * 1274141
  * 1274143
  * 1274197
  * 1274205
  * 1274210
  * 1274211
  * 1288801
  * 1398629

Change-Id: Ia7c86cfab3245b20777ffa296e1a59748040f558
Updates: bz#789278
Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
---
 cli/src/cli-cmd-system.c | 2 +-
 cli/src/cli-xml-output.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cli/src')

diff --git a/cli/src/cli-cmd-system.c b/cli/src/cli-cmd-system.c
index 8cd15424572..cb3a9ea7484 100644
--- a/cli/src/cli-cmd-system.c
+++ b/cli/src/cli-cmd-system.c
@@ -446,7 +446,7 @@ cli_cmd_sys_exec_cbk(struct cli_state *state, struct cli_cmd_word *word,
     dict_t *dict = NULL;
     cli_local_t *local = NULL;
 
-    if (wordcount < 3) {
+    if ((wordcount < 3) || (words[2] == NULL)) {
         cli_usage_out(word->pattern);
         goto out;
     }
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
index ce5c9cd6cc2..3accd9ce4bf 100644
--- a/cli/src/cli-xml-output.c
+++ b/cli/src/cli-xml-output.c
@@ -64,7 +64,7 @@ cli_begin_xml_output(xmlTextWriterPtr *writer, xmlDocPtr *doc)
     int ret = -1;
 
     *writer = xmlNewTextWriterDoc(doc, 0);
-    if (writer == NULL) {
+    if (*writer == NULL) {
         ret = -1;
         goto out;
     }
-- 
cgit