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 bc01f622317e638e03166dd5aacf7b2f0e1ab308..a262209c0e28100e32f4f95cdee4998546a34abe 100644 (file)
--- 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 7f9f9fa02081d4423efaa53d806b03047138b682..db8c8b99acfc05ac5ed48736d7bd100183d55bc9 100644 (file)
--- 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;
 }