From 345bee916ac5ad28dd269afc24c27fe234c4045b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 8 Aug 2018 11:00:55 +0100 Subject: [PATCH] Fix no-comp Commit 8839324 removed some NULL checks from the stack code. This caused a no-comp build to fail in the client and server fuzzers. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6893) --- fuzz/client.c | 4 ++-- fuzz/server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuzz/client.c b/fuzz/client.c index bc01f62231..a262209c0e 100644 --- a/fuzz/client.c +++ b/fuzz/client.c @@ -49,8 +49,8 @@ int FuzzerInitialize(int *argc, char ***argv) idx = SSL_get_ex_data_X509_STORE_CTX_idx(); FuzzerSetRand(); comp_methods = SSL_COMP_get_compression_methods(); - sk_SSL_COMP_sort(comp_methods); - + if (comp_methods != NULL) + sk_SSL_COMP_sort(comp_methods); return 1; } diff --git a/fuzz/server.c b/fuzz/server.c index 7f9f9fa020..db8c8b99ac 100644 --- a/fuzz/server.c +++ b/fuzz/server.c @@ -496,8 +496,8 @@ int FuzzerInitialize(int *argc, char ***argv) idx = SSL_get_ex_data_X509_STORE_CTX_idx(); FuzzerSetRand(); comp_methods = SSL_COMP_get_compression_methods(); - sk_SSL_COMP_sort(comp_methods); - + if (comp_methods != NULL) + sk_SSL_COMP_sort(comp_methods); return 1; } -- 2.40.0