Fix Coverity 1498611 & 1498608: uninitialised read
authorPauli <pauli@openssl.org>
Wed, 16 Mar 2022 03:21:01 +0000 (14:21 +1100)
committerPauli <pauli@openssl.org>
Wed, 23 Mar 2022 00:07:18 +0000 (11:07 +1100)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17893)

(cherry picked from commit 09134f183f76539aa1294adfef10fcc694e90267)

ssl/ssl_lib.c

index 96a5822f302e1b969f44b36cbd3508dd2f569358..28304a700ded5119f028a8f39e84c7d680bf17f7 100644 (file)
@@ -2232,6 +2232,7 @@ int SSL_shutdown(SSL *s)
         if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) {
             struct ssl_async_args args;
 
+            memset(&args, 0, sizeof(args));
             args.s = s;
             args.type = OTHERFUNC;
             args.f.func_other = s->method->ssl_shutdown;
@@ -3914,6 +3915,7 @@ int SSL_do_handshake(SSL *s)
         if ((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) {
             struct ssl_async_args args;
 
+            memset(&args, 0, sizeof(args));
             args.s = s;
 
             ret = ssl_start_async_job(s, &args, ssl_do_handshake_intern);