From: Philip Withnall <withnall@endlessm.com>
Date: Fri, 10 Feb 2017 11:03:30 +0000 (+0000)
Subject: dbus-list: Add some missing OOM paths to an internal test
X-Git-Tag: dbus-1.11.10~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ce1ea4b78a4d5d355ff0255a68e14baba2c5a0e;p=thirdparty%2Fdbus.git

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

Coverity ID: 54715
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99724
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index df7c72ff2..8e713c007 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));