From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 8 Sep 2014 08:38:48 +0000 (+0200)
Subject: do not dereference find_data->p_list in pkcs11 callback
X-Git-Tag: gnutls_3_4_0~968
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ed63de195838fedee9ece728cc3bba47f2cf937;p=thirdparty%2Fgnutls.git

do not dereference find_data->p_list in pkcs11 callback
---

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 3be05b8979..a7c60296b7 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -2656,10 +2656,12 @@ find_objs_cb(struct pkcs11_session_info *sinfo,
 		}
 		gnutls_free(plist.key_ids);
 	}
-	for (i = 0; i < find_data->current; i++) {
-		gnutls_pkcs11_obj_deinit(find_data->p_list[i]);
+	if (find_data->p_list != NULL) {
+		for (i = 0; i < find_data->current; i++) {
+			gnutls_pkcs11_obj_deinit(find_data->p_list[i]);
+		}
+		gnutls_free(find_data->p_list);
 	}
-	gnutls_free(find_data->p_list);
 	find_data->p_list = NULL;
 	find_data->current = 0;