From d73ca3efa74bbb620a1e74deb5eec6f3d10203d5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 10 Nov 2015 23:12:36 +0000 Subject: [PATCH] Remove an NULL ptr deref in an error path The |passwd| variable in the code can be NULL if it goes to the err label. Therefore we cannot call strlen on it without first checking that it is non NULL. Reviewed-by: Kurt Roeckx --- ssl/tls_srp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c index 91b88cd11f..64a3f23df7 100644 --- a/ssl/tls_srp.c +++ b/ssl/tls_srp.c @@ -393,7 +393,8 @@ int srp_generate_client_master_secret(SSL *s) err: BN_clear_free(K); BN_clear_free(x); - OPENSSL_clear_free(passwd, strlen(passwd)); + if (passwd != NULL) + OPENSSL_clear_free(passwd, strlen(passwd)); BN_clear_free(u); return ret; } -- 2.25.1