From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 29 Aug 2014 08:18:07 +0000 (+0200)
Subject: array: Adjust negative index before calling remove_head|tail()
X-Git-Tag: 5.2.1dr1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea50394bf1853627920d7f9028b3749172467424;p=thirdparty%2Fstrongswan.git

array: Adjust negative index before calling remove_head|tail()

For ARRAY_TAIL we most often want to call remove_tail() not remove_head().
---

diff --git a/src/libstrongswan/collections/array.c b/src/libstrongswan/collections/array.c
index 8d619116a7..61c696bc10 100644
--- a/src/libstrongswan/collections/array.c
+++ b/src/libstrongswan/collections/array.c
@@ -361,16 +361,16 @@ bool array_remove(array_t *array, int idx, void *data)
 	{
 		return FALSE;
 	}
+	if (idx < 0)
+	{
+		idx = array_count(array) - 1;
+	}
 	if (idx > array_count(array) / 2)
 	{
 		remove_tail(array, idx);
 	}
 	else
 	{
-		if (idx < 0)
-		{
-			idx = array_count(array) - 1;
-		}
 		remove_head(array, idx);
 	}
 	if (array->head + array->tail > ARRAY_MAX_UNUSED)