Let ssl_get_prev_session reliably work in multi-threaded settings.

[openssl.git] / ssl / s3_srvr.c

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 9d2debf00d7777bd1edfbe5fb36c3e4f3ad12f10..e003d88357461aa7c9a0b661b9af3a215430d80a 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -557,7 +557,9 @@ static int ssl3_get_client_hello(SSL *s)
                        { /* previous session */
                        s->hit=1;
                        }
                        { /* previous session */
                        s->hit=1;
                        }

-               else
+               else if (i == -1)
+                       goto err;
+               else /* i == 0 */

                        {
                        if (!ssl_get_new_session(s,1))
                                goto err;
                        {
                        if (!ssl_get_new_session(s,1))
                                goto err;