From: Stef Walter <stefw@collabora.co.uk>
Date: Thu, 26 May 2011 07:58:56 +0000 (+0200)
Subject: Return proper errors when NULL is passed to mutex functions.
X-Git-Tag: 0.1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c37d5dfaf0c2a5e70066fd1c9606b00329c3622a;p=p11-kit

Return proper errors when NULL is passed to mutex functions.
---

diff --git a/p11-kit/p11-kit-lib.c b/p11-kit/p11-kit-lib.c
index 59cdd19..abc58f8 100644
--- a/p11-kit/p11-kit-lib.c
+++ b/p11-kit/p11-kit-lib.c
@@ -197,6 +197,9 @@ create_mutex (CK_VOID_PTR_PTR mut)
 	pthread_mutex_t *pmutex;
 	int err;
 
+	if (mut == NULL)
+		return CKR_ARGUMENTS_BAD;
+
 	pmutex = malloc (sizeof (pthread_mutex_t));
 	if (!pmutex)
 		return CKR_HOST_MEMORY;
@@ -215,6 +218,9 @@ destroy_mutex (CK_VOID_PTR mut)
 	pthread_mutex_t *pmutex = mut;
 	int err;
 
+	if (mut == NULL)
+		return CKR_MUTEX_BAD;
+
 	err = pthread_mutex_destroy (pmutex);
 	if (err == EINVAL)
 		return CKR_MUTEX_BAD;
@@ -230,6 +236,9 @@ lock_mutex (CK_VOID_PTR mut)
 	pthread_mutex_t *pmutex = mut;
 	int err;
 
+	if (mut == NULL)
+		return CKR_MUTEX_BAD;
+
 	err = pthread_mutex_lock (pmutex);
 	if (err == EINVAL)
 		return CKR_MUTEX_BAD;
@@ -244,6 +253,9 @@ unlock_mutex (CK_VOID_PTR mut)
 	pthread_mutex_t *pmutex = mut;
 	int err;
 
+	if (mut == NULL)
+		return CKR_MUTEX_BAD;
+
 	err = pthread_mutex_unlock (pmutex);
 	if (err == EINVAL)
 		return CKR_MUTEX_BAD;