baab13
From b5c28f6c7ce86fc53048d5c51a4850a82f48f876 Mon Sep 17 00:00:00 2001
baab13
From: Jakub Filak <jfilak@redhat.com>
baab13
Date: Tue, 11 Aug 2015 10:01:53 +0200
baab13
Subject: [PATCH] cli: fix testing of DBus API return codes
baab13
baab13
The DBus wrapper functions uses ERR_PTR to report an error, so the
baab13
callers has to test the returned pointers for NULL and for ERR_PTR.
baab13
baab13
Related: rhbz#1224984
baab13
baab13
Signed-off-by: Jakub Filak <jfilak@redhat.com>
baab13
---
baab13
 src/cli/list.c   | 3 +++
baab13
 src/cli/status.c | 5 ++++-
baab13
 2 files changed, 7 insertions(+), 1 deletion(-)
baab13
baab13
diff --git a/src/cli/list.c b/src/cli/list.c
baab13
index c76e4fb..e688d2f 100644
baab13
--- a/src/cli/list.c
baab13
+++ b/src/cli/list.c
baab13
@@ -36,6 +36,9 @@ static problem_data_t *load_problem_data(const char *problem_id)
baab13
 
baab13
     /* First, check if there is a problem with the passed id */
baab13
     GList *problems = get_problems_over_dbus(g_cli_authenticate);
baab13
+    if (problems == ERR_PTR)
baab13
+        return NULL;
baab13
+
baab13
     GList *item = g_list_find_custom(problems, problem_id, (GCompareFunc)strcmp);
baab13
 
baab13
     /* (git requires at least 5 char hash prefix, we do the same) */
baab13
diff --git a/src/cli/status.c b/src/cli/status.c
baab13
index 0635289..3620cea 100644
baab13
--- a/src/cli/status.c
baab13
+++ b/src/cli/status.c
baab13
@@ -27,6 +27,9 @@ static unsigned int count_problem_dirs(unsigned long since)
baab13
     unsigned count = 0;
baab13
 
baab13
     GList *problems = get_problems_over_dbus(g_cli_authenticate);
baab13
+    if (problems == ERR_PTR)
baab13
+        return count;
baab13
+
baab13
     for (GList *iter = problems; iter != NULL; iter = g_list_next(iter))
baab13
     {
baab13
         const char *problem_id = (const char *)iter->data;
baab13
@@ -37,7 +40,7 @@ static unsigned int count_problem_dirs(unsigned long since)
baab13
         }
baab13
 
baab13
         char *time_str = load_text_over_dbus(problem_id, FILENAME_LAST_OCCURRENCE);
baab13
-        if (time_str == NULL)
baab13
+        if (time_str == ERR_PTR || time_str == NULL)
baab13
         {
baab13
             log_debug("Not counting problem %s: failed to get time element", problem_id);
baab13
             continue;
baab13
-- 
baab13
2.4.3
baab13