Fix segfault in openssl app called with no args.

[openssl.git] / fuzz / conf.c

diff --git a/fuzz/conf.c b/fuzz/conf.c
index d10d6c7f33cb574bb62b9574f6adf84610dc1a98..72e4b358fd86f79547afd8d1f2f45e4184cc6bb5 100644 (file)
--- a/fuzz/conf.c
+++ b/fuzz/conf.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html
@@ -13,18 +13,36 @@
  */
 
 #include <openssl/conf.h>
+#include <openssl/err.h>
 #include "fuzzer.h"
 
-int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
-    CONF *conf = NCONF_new(NULL);
-    BIO *in = BIO_new(BIO_s_mem());
+int FuzzerInitialize(int *argc, char ***argv)
+{
+    OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+    ERR_clear_error();
+    return 1;
+}
+
+int FuzzerTestOneInput(const uint8_t *buf, size_t len)
+{
+    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_dump_fp(conf, stdout);
     NCONF_free(conf);
     BIO_free(in);
+    ERR_clear_error();
 
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}