diff --git a/fuzz/cms.c b/fuzz/cms.c
index c4477efa8fd00f1e92d717ddf3b8fcaa1652084c..b57a6de96a63112cce7bc63e257771a437fb6594 100644
--- a/fuzz/cms.c
+++ b/fuzz/cms.c
@@ -23,17 +23,25 @@ int FuzzerInitialize(int *argc, char ***argv)
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 {
-    CMS_ContentInfo *i;
+    CMS_ContentInfo *cms;
     BIO *in;
-    if (!len) {
+
+    if (len == 0)
         return 0;
-    }
 
     in = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(in, buf, len) == len);
-    i = d2i_CMS_bio(in, NULL);
-    CMS_ContentInfo_free(i);
+    cms = d2i_CMS_bio(in, NULL);
+    if (cms != NULL) {
+        BIO *out = BIO_new(BIO_s_null());
+
+        i2d_CMS_bio(out, cms);
+        BIO_free(out);
+        CMS_ContentInfo_free(cms);
+    }
+
     BIO_free(in);
+
     return 0;
 }