From: Stef Walter <stef@thewalter.net>
Date: Fri, 8 Aug 2014 15:40:57 +0000 (+0200)
Subject: trust: Double check that index bucket is valid before access
X-Git-Tag: 0.21.2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9df354fffbbfa42aac796235cf446c63ad2eef8;p=p11-kit

trust: Double check that index bucket is valid before access
---

diff --git a/trust/index.c b/trust/index.c
index 9a193c5..f4b6b4b 100644
--- a/trust/index.c
+++ b/trust/index.c
@@ -264,9 +264,9 @@ bucket_insert (index_bucket *bucket,
 		alloc = alloc ? alloc * 2 : 1;
 		return_if_fail (alloc != 0);
 		bucket->elem = realloc (bucket->elem, alloc * sizeof (CK_OBJECT_HANDLE));
-		return_if_fail (bucket->elem != NULL);
 	}
 
+	return_if_fail (bucket->elem != NULL);
 	memmove (bucket->elem + at + 1, bucket->elem + at,
 	         (bucket->num - at) * sizeof (CK_OBJECT_HANDLE));
 	bucket->elem[at] = handle;
@@ -284,9 +284,9 @@ bucket_push (index_bucket *bucket,
 		alloc = alloc ? alloc * 2 : 1;
 		return_val_if_fail (alloc != 0, false);
 		bucket->elem = realloc (bucket->elem, alloc * sizeof (CK_OBJECT_HANDLE));
-		return_val_if_fail (bucket->elem != NULL, false);
 	}
 
+	return_val_if_fail (bucket->elem != NULL, false);
 	bucket->elem[bucket->num++] = handle;
 	return true;
 }