Attachment 129474 Details for Bug 99724 – dbus-list: Add some missing OOM paths to an internal test

[patch] dbus-list: Add some missing OOM paths to an internal test

dbus-list-Add-some-missing-OOM-paths-to-an-interna.patch (text/plain), 4.80 KB, created by Philip Withnall on 2017-02-10 11:09:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Withnall

Created: 2017-02-10 11:09:39 UTC

Size: 4.80 KB

patch

obsolete

>From 488c7c3ef37308e285d4cf065dd9dd9ccd11a28c Mon Sep 17 00:00:00 2001
>From: Philip Withnall <withnall@endlessm.com>
>Date: Fri, 10 Feb 2017 11:03:30 +0000
>Subject: [PATCH] dbus-list: Add some missing OOM paths to an internal test
>
>Coverity ID: 54715
>
>Signed-off-by: Philip Withnall <withnall@endlessm.com>
>
>https://bugs.freedesktop.org/show_bug.cgi?id=99724
>---
> dbus/dbus-list.c | 53 +++++++++++++++++++++++++++++++++++------------------
> 1 file changed, 35 insertions(+), 18 deletions(-)
>
>diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
>index df7c72f..8e713c0 100644
>--- a/dbus/dbus-list.c
>+++ b/dbus/dbus-list.c
>@@ -991,8 +991,10 @@ _dbus_list_test (void)
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
>     }
> 
>@@ -1034,8 +1036,10 @@ _dbus_list_test (void)
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
>     }
> 
>@@ -1080,12 +1084,14 @@ _dbus_list_test (void)
>   _dbus_assert (list2 == NULL);
>   
>   /* Test iteration */
>-  
>+
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
> 
>       verify_list (&list1);
>@@ -1142,8 +1148,10 @@ _dbus_list_test (void)
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
>     }
> 
>@@ -1174,8 +1182,10 @@ _dbus_list_test (void)
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
>     }
> 
>@@ -1214,8 +1224,10 @@ _dbus_list_test (void)
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
>     }
> 
>@@ -1263,8 +1275,10 @@ _dbus_list_test (void)
>   i = 0;
>   while (i < 10)
>     {
>-      _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i));
>-      _dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i));
>+      if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for append");
>+      if (!_dbus_list_prepend (&list2, _DBUS_INT_TO_POINTER (i)))
>+        _dbus_assert_not_reached ("could not allocate for prepend");
>       ++i;
>     }
> 
>@@ -1331,9 +1345,12 @@ _dbus_list_test (void)
>   _dbus_list_clear (&list1);
> 
>   /* using remove_last */
>-  _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (2));
>-  _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (1));
>-  _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (3));
>+  if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (2)))
>+    _dbus_assert_not_reached ("could not allocate for append");
>+  if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (1)))
>+    _dbus_assert_not_reached ("could not allocate for append");
>+  if (!_dbus_list_append (&list1, _DBUS_INT_TO_POINTER (3)))
>+    _dbus_assert_not_reached ("could not allocate for append");
> 
>   _dbus_list_remove_last (&list1, _DBUS_INT_TO_POINTER (2));
>   
>-- 
>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.