[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  345bee916ac5ad28dd269afc24c27fe234c4045b (commit)
      from  1049ae985e58f87e433b6b00f08853914147adac (commit)


- Log -----------------------------------------------------------------
commit 345bee916ac5ad28dd269afc24c27fe234c4045b
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Aug 8 11:00:55 2018 +0100

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

-----------------------------------------------------------------------

Summary of changes:
 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 bc01f62..a262209 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 7f9f9fa..db8c8b9 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;
 }