From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 10 Nov 2015 21:18:16 +0000 (+0100)
Subject: shell-test: Calling _dbus_string_init without checking return value (CID 60587).
X-Git-Tag: dbus-1.11.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b31f2fee96a4ca06a54e2bf17467f82f3120f70;p=thirdparty%2Fdbus.git

shell-test: Calling _dbus_string_init without checking return value (CID 60587).

Reported by Coverity: CID 60587: Unchecked return value (CHECKED_RETURN)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90021
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/test/shell-test.c b/test/shell-test.c
index 61280d683..6fa7a88b5 100644
--- a/test/shell-test.c
+++ b/test/shell-test.c
@@ -36,7 +36,13 @@ test_command_line_internal (dbus_bool_t should_work,
 
   original_argc = _dbus_list_get_length (&list);
   original_argv = dbus_new (char *, original_argc);
-  _dbus_string_init (&str);
+  if (!_dbus_string_init (&str))
+    {
+      _dbus_list_clear (&list);
+      dbus_free (original_argv);
+      return FALSE;
+    }
+
   for (i = 0, node = _dbus_list_get_first_link (&list); i < original_argc && node;
        i++, node = _dbus_list_get_next_link (&list, node))
     {
@@ -57,6 +63,7 @@ test_command_line_internal (dbus_bool_t should_work,
           should_work ? "" : " (as expected)",
           error.message ? error.message : "");
       dbus_free (original_argv);
+      _dbus_string_free (&str);
       return !should_work;
     }
   else