diff options
| author | Philip Withnall <withnall@endlessm.com> | 2017-02-09 09:55:06 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2017-02-13 16:04:18 +0000 |
| commit | c5a5c4047d7c10972c2e9d42cdcd29cd33b3d70e (patch) | |
| tree | 9959a19f829f8de770cb15f140b915812ecef5f8 /test | |
| parent | cee80c92b624efa73ac4a41ce9f46643f1934ab2 (diff) | |
| download | dbus-c5a5c4047d7c10972c2e9d42cdcd29cd33b3d70e.tar.gz | |
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>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99724
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'test')
| -rw-r--r-- | test/shell-test.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/test/shell-test.c b/test/shell-test.c index 6fa7a88b..07585abb 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); |