[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  ea6199ea91ac59ae53686335e436d554cdacd2dc (commit)
      from  2b59d1beaad43d9cf8eb916a437db63bc8ce1d3a (commit)


- Log -----------------------------------------------------------------
commit ea6199ea91ac59ae53686335e436d554cdacd2dc
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Wed Nov 2 20:45:46 2016 +0100

    conf fuzzer: also check for an empty file
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    
    GH: #1828

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

Summary of changes:
 fuzz/conf.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/fuzz/conf.c b/fuzz/conf.c
index a76068d..30b13c8 100644
--- a/fuzz/conf.c
+++ b/fuzz/conf.c
@@ -20,10 +20,15 @@ int FuzzerInitialize(int *argc, char ***argv) {
 }
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
-    CONF *conf = NCONF_new(NULL);
-    BIO *in = BIO_new(BIO_s_mem());
+    CONF *conf;
+    BIO *in;
     long eline;
 
+    if (len == 0)
+        return 0;
+
+    conf = NCONF_new(NULL);
+    in = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(in, buf, len) == len);
     NCONF_load_bio(conf, in, &eline);
     NCONF_free(conf);