Add a FuzzerClean() function

This allows to free everything we allocated, so we can detect memory
leaks.

Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #2023

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 0644ed79e1328dc0ba20ed68fa84c721c5961844..f7b5571d4f7d2d3e21352232b2dc32332c38fe20 100644 (file)
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -222,3 +222,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/asn1parse.c b/fuzz/asn1parse.c
index 2fba1c44b6a4ccb6a0d8eb8a5a7935210aa2739e..edb4d023030273f199208a4645a4c832b38e0a11 100644 (file)
--- a/fuzz/asn1parse.c
+++ b/fuzz/asn1parse.c
@@ -33,3 +33,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     (void)ASN1_parse_dump(bio_out, buf, len, 0, 0);
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/bignum.c b/fuzz/bignum.c
index 9e110f65ef4d98265cb736037cd0fe1b6d6795bb..d6e8637a98dd4c6ced13d78509b30ef563a34729 100644 (file)
--- a/fuzz/bignum.c
+++ b/fuzz/bignum.c
@@ -94,3 +94,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/bndiv.c b/fuzz/bndiv.c
index 931987860797091079ca678fd7dd712d6051b234..eb17f29cab57aa12719581fdb26b503cdd9aff69 100644 (file)
--- a/fuzz/bndiv.c
+++ b/fuzz/bndiv.c
@@ -107,3 +107,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/cms.c b/fuzz/cms.c
index 71d8b6953c998c6d339b8d46c0ee5ecf3db13a91..c4477efa8fd00f1e92d717ddf3b8fcaa1652084c 100644 (file)
--- a/fuzz/cms.c
+++ b/fuzz/cms.c
@@ -36,3 +36,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     BIO_free(in);
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/conf.c b/fuzz/conf.c
index 49edb3eaa6937347ca99e70bb134aeaca7cc3763..27429c570f1285855fb571010ba72e352d088d7f 100644 (file)
--- a/fuzz/conf.c
+++ b/fuzz/conf.c
@@ -38,3 +38,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/crl.c b/fuzz/crl.c
index 51d184363ad2ecf1a22eda16ff56f20ea4fec2db..decf19e9d3e5912d565e58979ea4c63944cc87b3 100644 (file)
--- a/fuzz/crl.c
+++ b/fuzz/crl.c
@@ -35,3 +35,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     }
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/ct.c b/fuzz/ct.c
index 636b19510996ff53dba115a15eeb10e9797a1917..47b0fc3f78af3809740803f663515c8edc6644ea 100644 (file)
--- a/fuzz/ct.c
+++ b/fuzz/ct.c
@@ -40,3 +40,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     }
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}

diff --git a/fuzz/driver.c b/fuzz/driver.c
index d4b11cd6a477c91be8c5ed096cbeb7fbac6115ad..21bbb255afe51066f16af31dff214dee347bba28 100644 (file)
--- a/fuzz/driver.c
+++ b/fuzz/driver.c
@@ -40,6 +40,8 @@ int main(int argc, char** argv)
         FuzzerTestOneInput(buf, size);
         free(buf);
     }
+
+    FuzzerCleanup();
     return 0;
 }
 

diff --git a/fuzz/fuzzer.h b/fuzz/fuzzer.h
index 04d605d79a2fba34104b7f8324f87f0fdb125108..5f9efa4bf6b96b128f031d31dcfd47c658464a52 100644 (file)
--- a/fuzz/fuzzer.h
+++ b/fuzz/fuzzer.h
@@ -10,3 +10,4 @@
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len);
 int FuzzerInitialize(int *argc, char ***argv);
+void FuzzerCleanup(void);

diff --git a/fuzz/server.c b/fuzz/server.c
index 26ef4da1e64e4609708b4852d4915f12d10289f4..b8a3ac44e382a11b2d5fe88b1b1caaaa1087f5af 100644 (file)
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -250,3 +250,8 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     SSL_free(server);
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+    SSL_CTX_free(ctx);
+}

diff --git a/fuzz/test-corpus.c b/fuzz/test-corpus.c
index c553697d6c78aac43e0ae75af347aa1950c85505..9cef01f86d9afaa3591b0bb093613142a25013c5 100644 (file)
--- a/fuzz/test-corpus.c
+++ b/fuzz/test-corpus.c
@@ -42,5 +42,8 @@ int main(int argc, char **argv) {
         free(buf);
         fclose(f);
     }
+
+    FuzzerCleanup();
+
     return 0;
 }

diff --git a/fuzz/x509.c b/fuzz/x509.c
index 4c5b73258d53f604ea817c3d930e6f676636ad1f..78fef6c3ff00434626d6aa2dc2ab653e365e5c86 100644 (file)
--- a/fuzz/x509.c
+++ b/fuzz/x509.c
@@ -36,3 +36,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     }
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+}