Attachment 129428 Details for Bug 99724 – test: Add some OOM paths to the shell-test

[patch] test: Add some OOM paths to the shell-test

test-Add-some-OOM-paths-to-the-shell-test.patch (text/plain), 1.84 KB, created by Philip Withnall on 2017-02-09 10:14:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Withnall

Created: 2017-02-09 10:14:16 UTC

Size: 1.84 KB

patch

obsolete

>From 79392ce3934193ea14acac96ba0abd806c71db2f Mon Sep 17 00:00:00 2001
>From: Philip Withnall <withnall@endlessm.com>
>Date: Thu, 9 Feb 2017 09:55:06 +0000
>Subject: [PATCH] test: Add some OOM paths to the shell-test
>
>I am increasingly of the opinion that this is a gigantic waste of time.
>But at least Coverity will be happy.
>
>Coverity IDs: 60585, 60586
>
>Signed-off-by: Philip Withnall <withnall@endlessm.com>
>
>https://bugs.freedesktop.org/show_bug.cgi?id=99724
>---
> test/shell-test.c | 21 ++++++++++++++++-----
> 1 file changed, 16 insertions(+), 5 deletions(-)
>
>diff --git a/test/shell-test.c b/test/shell-test.c
>index 6fa7a88..07585ab 100644
>--- a/test/shell-test.c
>+++ b/test/shell-test.c
>@@ -25,13 +25,19 @@ test_command_line_internal (dbus_bool_t should_work,
>   DBusList *list = NULL, *node;
>   DBusError error;
> 
>-  _dbus_list_append (&list, (char *)arg1);
>+  if (!_dbus_list_append (&list, (char *)arg1))
>+    return FALSE;
>+
>   do
>     {
>       tmp = va_arg (var_args, char *);
>       if (!tmp)
>         break;
>-      _dbus_list_append (&list, tmp);
>+      if (!_dbus_list_append (&list, tmp))
>+        {
>+          _dbus_list_clear (&list);
>+          return FALSE;
>+        }
>     } while (tmp);
> 
>   original_argc = _dbus_list_get_length (&list);
>@@ -47,9 +53,14 @@ test_command_line_internal (dbus_bool_t should_work,
>        i++, node = _dbus_list_get_next_link (&list, node))
>     {
>       original_argv[i] = node->data;
>-      if (i > 0)
>-        _dbus_string_append_byte (&str, ' ');
>-      _dbus_string_append (&str, original_argv[i]);
>+      if ((i > 0 && !_dbus_string_append_byte (&str, ' ')) ||
>+          !_dbus_string_append (&str, original_argv[i]))
>+        {
>+          _dbus_list_clear (&list);
>+          dbus_free (original_argv);
>+          _dbus_string_free (&str);
>+          return FALSE;
>+        }
>     }
>   
>   _dbus_list_clear (&list);
>-- 
>2.9.3

Actions: View | Splinter Review

Attachments on bug 99724: 129427 | 129428 | 129429 | 129430 | 129474 | 129475

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.