Commit 0b2fc928 authored Mar 01, 2016 by FdaSilvaYY Committed by Rich Salz Mar 03, 2016

GH773: Possible leak on CRYPTO_THREAD_lock_new failure



Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Matt Caswell <matt@openssl.org>

parent e257b2c2

crypto/threads_pthread.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,8 +58,10 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
	if (lock == NULL)		if (lock == NULL)
	return NULL;		return NULL;

	if (pthread_rwlock_init(lock, NULL) != 0)		if (pthread_rwlock_init(lock, NULL) != 0) {
			OPENSSL_free(lock);
	return NULL;		return NULL;
			}

	return lock;		return lock;
	}		}

crypto/threads_win.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -59,8 +59,10 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
	return NULL;		return NULL;

	/* 0x400 is the spin count value suggested in the documentation */		/* 0x400 is the spin count value suggested in the documentation */
	if (!InitializeCriticalSectionAndSpinCount(lock, 0x400))		if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
			OPENSSL_free(lock);
	return NULL;		return NULL;
			}

	return lock;		return lock;
	}		}