commit 25a807bcb9509c6fccfbbd9d02119772ccb0f23e
author FdaSilvaYY <fdasilvayy@gmail.com> Sat Feb 13 19:29:34 2016 +0100
committer Rich Salz <rsalz@openssl.org> Thu Apr 28 14:37:41 2016 -0400
tree 66ebeec7f6213a64318b8f26fd064860832bf0e1
parent 8fdc99cb5dbf1a79b106cc635c82f59956e39108

Add checks on CRYPTO_new_ex_data return value

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/996)

ssl/ssl_sess.c

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index d5b7fe3..3b9a9f7 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -198,8 +198,11 @@
         return NULL;
     }
 
-    CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data);
-
+    if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data)) {
+        CRYPTO_THREAD_lock_free(ss->lock);
+        OPENSSL_free(ss);
+        return NULL;
+    }
     return ss;
 }