From: Matt Caswell <matt@openssl.org>
Date: Wed, 8 Aug 2018 10:00:55 +0000 (+0100)
Subject: Fix no-comp
X-Git-Tag: OpenSSL_1_1_1-pre9~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=345bee916ac5ad28dd269afc24c27fe234c4045b;p=oweals%2Fopenssl.git

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 <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6893)
---

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;
 }