ntop · IvanNardi · Jan 27, 2023 · Jan 24, 2023
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
@@ -18,7 +18,7 @@ jobs:
         uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
         with:
           oss-fuzz-project-name: 'ndpi'
-          fuzz-seconds: 1500
+          fuzz-seconds: 1600
           dry-run: false
           sanitizer: ${{ matrix.sanitizer }}
       - name: Check Crash (fails when a crash is detected)

diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@
 /fuzz/fuzz_alg_ses_des
 /fuzz/fuzz_config
 /fuzz/fuzz_community_id
+/fuzz/fuzz_serialization
 /fuzz/fuzz_ds_patricia
 /fuzz/fuzz_ds_libcache
 /fuzz/fuzz_ds_tree
@@ -70,6 +71,7 @@
 /fuzz/fuzz_quic_get_crypto_data_seed_corpus.zip
 /fuzz/fuzz_config_seed_corpus.zip
 /fuzz/fuzz_community_id_seed_corpus.zip
+/fuzz/fuzz_serialization_seed_corpus.zip
 /fuzz/fuzz_alg_ses_des_seed_corpus.zip
 /fuzz/fuzz_alg_bins_seed_corpus.zip
 /fuzz/fuzz_alg_hll_seed_corpus.zip

diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail fuzz_quic_get_crypto_data fuzz_config fuzz_community_id
+bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail fuzz_quic_get_crypto_data fuzz_config fuzz_community_id fuzz_serialization
 #Alghoritms
 bin_PROGRAMS += fuzz_alg_bins fuzz_alg_hll fuzz_alg_hw_rsi_outliers_da fuzz_alg_jitter fuzz_alg_ses_des
 #Data structures
@@ -86,6 +86,21 @@ fuzz_community_id_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
     $(fuzz_community_id_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
 
+fuzz_serialization_SOURCES = fuzz_serialization.cpp fuzz_common_code.c
+fuzz_serialization_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+fuzz_serialization_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+fuzz_serialization_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_serialization_LDFLAGS = $(LIBS)
+if HAS_FUZZLDFLAGS
+fuzz_serialization_CXXFLAGS += $(LIB_FUZZING_ENGINE)
+fuzz_serialization_CFLAGS += $(LIB_FUZZING_ENGINE)
+fuzz_serialization_LDFLAGS += $(LIB_FUZZING_ENGINE)
+endif
+# force usage of CXX for linker
+fuzz_serialization_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+    $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
+    $(fuzz_serialization_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
+
 fuzz_alg_bins_SOURCES = fuzz_alg_bins.cpp fuzz_common_code.c
 fuzz_alg_bins_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 fuzz_alg_bins_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS) -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
@@ -242,6 +257,11 @@ files_corpus_fuzz_config :=  $(wildcard corpus/fuzz_config/*)
 fuzz_config_seed_corpus.zip: $(files_corpus_fuzz_config)
 	zip -j fuzz_config_seed_corpus.zip $(files_corpus_fuzz_config)
 
+files_corpus_fuzz_serialization :=  $(wildcard corpus/fuzz_serialization/*)
+
+fuzz_serialization_seed_corpus.zip: $(files_corpus_fuzz_serialization)
+	zip -j fuzz_serialization_seed_corpus.zip $(files_corpus_fuzz_serialization)
+
 files_corpus_fuzz_community_id :=  $(wildcard corpus/fuzz_community_id/*)
 
 fuzz_community_id_seed_corpus.zip: $(files_corpus_fuzz_community_id)
@@ -292,7 +312,7 @@ files_corpus_fuzz_ds_tree :=  $(wildcard corpus/fuzz_ds_tree/*)
 fuzz_ds_tree_seed_corpus.zip: $(files_corpus_fuzz_ds_tree)
 	zip -j fuzz_ds_tree_seed_corpus.zip $(files_corpus_fuzz_ds_tree)
 
-corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_config_seed_corpus.zip fuzz_ds_patricia_seed_corpus.zip fuzz_ds_ahocorasick_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_ds_tree_seed_corpus.zip
+corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_config_seed_corpus.zip fuzz_ds_patricia_seed_corpus.zip fuzz_ds_ahocorasick_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_hw_rsi_outliers_da_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_ds_tree_seed_corpus.zip fuzz_serialization_seed_corpus.zip
 
 #Create dictionaries exactly as expected by oss-fuzz.
 #This way, if we need to change/update/add something,
@@ -311,6 +331,7 @@ distdir:
 		-o -name '*.dict' \
 		-o -path './corpus/fuzz_quic_get_crypto_data/*' \
 		-o -path './corpus/fuzz_config/*' \
+		-o -path './corpus/fuzz_serialization/*' \
 		-o -path './corpus/fuzz_community_id/*' \
 		-o -path './corpus/fuzz_alg_ses_des/*' \
 		-o -path './corpus/fuzz_alg_bins/*' \

diff --git a/fuzz/corpus/fuzz_serialization/0067200701e9b0b5ec3db13f387a75e9e82202b0 b/fuzz/corpus/fuzz_serialization/0067200701e9b0b5ec3db13f387a75e9e82202b0
diff --git a/fuzz/corpus/fuzz_serialization/00ba573f9435b38d7205d995bbfe1813add81ab3 b/fuzz/corpus/fuzz_serialization/00ba573f9435b38d7205d995bbfe1813add81ab3
diff --git a/fuzz/corpus/fuzz_serialization/0228f43998915b3c03c642cadacb0fc9f34ad80f b/fuzz/corpus/fuzz_serialization/0228f43998915b3c03c642cadacb0fc9f34ad80f
@@ -0,0 +1 @@
+R�0-
diff --git a/fuzz/corpus/fuzz_serialization/03e684ba5d7a6306ddfb1dd15f40f2c4a1a074ee b/fuzz/corpus/fuzz_serialization/03e684ba5d7a6306ddfb1dd15f40f2c4a1a074ee
diff --git a/fuzz/corpus/fuzz_serialization/07d9e6281c5355f19da85e221fc562ec2d877e3b b/fuzz/corpus/fuzz_serialization/07d9e6281c5355f19da85e221fc562ec2d877e3b
diff --git a/fuzz/corpus/fuzz_serialization/07dda5cbda20802250efce051169313efcc19c91 b/fuzz/corpus/fuzz_serialization/07dda5cbda20802250efce051169313efcc19c91
diff --git a/fuzz/corpus/fuzz_serialization/0826de64028c8e890d2c9f95ee0ac3180ad45431 b/fuzz/corpus/fuzz_serialization/0826de64028c8e890d2c9f95ee0ac3180ad45431
diff --git a/fuzz/corpus/fuzz_serialization/09251a8df7e23a0e332eb0beee7afdec7e48fc7d b/fuzz/corpus/fuzz_serialization/09251a8df7e23a0e332eb0beee7afdec7e48fc7d
diff --git a/fuzz/corpus/fuzz_serialization/0cf7de690bf6e03f2843688fef7e5fa6f8f5b50a b/fuzz/corpus/fuzz_serialization/0cf7de690bf6e03f2843688fef7e5fa6f8f5b50a
@@ -0,0 +1 @@
+�0�{Шp(�'}��F
diff --git a/fuzz/corpus/fuzz_serialization/0f6e2d10bdff7d0f0f6ce142c9fa4d2a22d39fdb b/fuzz/corpus/fuzz_serialization/0f6e2d10bdff7d0f0f6ce142c9fa4d2a22d39fdb
@@ -0,0 +1 @@
+�����
diff --git a/fuzz/corpus/fuzz_serialization/1019a3c07fe32d6fab2e673671f557717d4997d7 b/fuzz/corpus/fuzz_serialization/1019a3c07fe32d6fab2e673671f557717d4997d7
diff --git a/fuzz/corpus/fuzz_serialization/102b9366042c4c2ada3408c1808bc8cae19199e6 b/fuzz/corpus/fuzz_serialization/102b9366042c4c2ada3408c1808bc8cae19199e6
diff --git a/fuzz/corpus/fuzz_serialization/111bf62468546c168ac3da1052ec3bf12c51d927 b/fuzz/corpus/fuzz_serialization/111bf62468546c168ac3da1052ec3bf12c51d927
diff --git a/fuzz/corpus/fuzz_serialization/123959e688316f1156b5fd63115e66990691dab8 b/fuzz/corpus/fuzz_serialization/123959e688316f1156b5fd63115e66990691dab8
diff --git a/fuzz/corpus/fuzz_serialization/1599e9fa41ec68c80230491902786bee889f5bcb b/fuzz/corpus/fuzz_serialization/1599e9fa41ec68c80230491902786bee889f5bcb
@@ -0,0 +1 @@
+�
diff --git a/fuzz/corpus/fuzz_serialization/1799f48cfbb2ab6b1110385ff98bb8c46313cdec b/fuzz/corpus/fuzz_serialization/1799f48cfbb2ab6b1110385ff98bb8c46313cdec
diff --git a/fuzz/corpus/fuzz_serialization/1835e91fe48390e58af954a32fd7c76f31bd9589 b/fuzz/corpus/fuzz_serialization/1835e91fe48390e58af954a32fd7c76f31bd9589
diff --git a/fuzz/corpus/fuzz_serialization/1a8f29ec0d35809a410d5491f71238139e481538 b/fuzz/corpus/fuzz_serialization/1a8f29ec0d35809a410d5491f71238139e481538
diff --git a/fuzz/corpus/fuzz_serialization/1af6e9701b53c33f27e958848e077cc8663f2d49 b/fuzz/corpus/fuzz_serialization/1af6e9701b53c33f27e958848e077cc8663f2d49
diff --git a/fuzz/corpus/fuzz_serialization/1b9853e05cb525c5e3f95cc351e6af1d93169e21 b/fuzz/corpus/fuzz_serialization/1b9853e05cb525c5e3f95cc351e6af1d93169e21
diff --git a/fuzz/corpus/fuzz_serialization/1c1f0a2fb6bce1b4efad57e900e1dea1884b31b5 b/fuzz/corpus/fuzz_serialization/1c1f0a2fb6bce1b4efad57e900e1dea1884b31b5
diff --git a/fuzz/corpus/fuzz_serialization/1d25ea7808bdc1960f4fa0b1265d348157676d34 b/fuzz/corpus/fuzz_serialization/1d25ea7808bdc1960f4fa0b1265d348157676d34
@@ -0,0 +1 @@
+�K!i�@`�1�� �GH we<��7@�|����:v�/�&m�}�9������p%����
diff --git a/fuzz/corpus/fuzz_serialization/212f0b6f4f250553420c4b462b6adfbca29667e7 b/fuzz/corpus/fuzz_serialization/212f0b6f4f250553420c4b462b6adfbca29667e7
@@ -0,0 +1 @@
+�0���
diff --git a/fuzz/corpus/fuzz_serialization/22180792385106ce0b6ce830e1ff76f431a01c9d b/fuzz/corpus/fuzz_serialization/22180792385106ce0b6ce830e1ff76f431a01c9d
diff --git a/fuzz/corpus/fuzz_serialization/23d2435c588ac50944b11976815bf162f433e0ab b/fuzz/corpus/fuzz_serialization/23d2435c588ac50944b11976815bf162f433e0ab
diff --git a/fuzz/corpus/fuzz_serialization/25885772862548d55ad11ac6b1913a2b7a9f2513 b/fuzz/corpus/fuzz_serialization/25885772862548d55ad11ac6b1913a2b7a9f2513
diff --git a/fuzz/corpus/fuzz_serialization/2c16853a4cc039ea91f734590db769824ae54318 b/fuzz/corpus/fuzz_serialization/2c16853a4cc039ea91f734590db769824ae54318
diff --git a/fuzz/corpus/fuzz_serialization/2f10304d880a3bceb43f89514ff7661474d818f9 b/fuzz/corpus/fuzz_serialization/2f10304d880a3bceb43f89514ff7661474d818f9
@@ -0,0 +1,3 @@
+�
+�}pp�}
+�_��a���]C%�
diff --git a/fuzz/corpus/fuzz_serialization/30fba8556db34f5d467c0d677fe176564b377748 b/fuzz/corpus/fuzz_serialization/30fba8556db34f5d467c0d677fe176564b377748
diff --git a/fuzz/corpus/fuzz_serialization/33a78cbd4539e3757769bb950283c7f8a340f20d b/fuzz/corpus/fuzz_serialization/33a78cbd4539e3757769bb950283c7f8a340f20d
diff --git a/fuzz/corpus/fuzz_serialization/36a23d77f4380edecd3ba002c371f2e9ebfe4fc2 b/fuzz/corpus/fuzz_serialization/36a23d77f4380edecd3ba002c371f2e9ebfe4fc2
diff --git a/fuzz/corpus/fuzz_serialization/38eba3bacca0984d08666561e863d816fae7bd79 b/fuzz/corpus/fuzz_serialization/38eba3bacca0984d08666561e863d816fae7bd79
diff --git a/fuzz/corpus/fuzz_serialization/39a7293fe98a37dbd3bb56eafebff914df2e0835 b/fuzz/corpus/fuzz_serialization/39a7293fe98a37dbd3bb56eafebff914df2e0835
diff --git a/fuzz/corpus/fuzz_serialization/3a474dedd7c902caa19c0aea83735fe5805b5ae5 b/fuzz/corpus/fuzz_serialization/3a474dedd7c902caa19c0aea83735fe5805b5ae5
diff --git a/fuzz/corpus/fuzz_serialization/3c49269686ee0c250a2d977a86d965727418ebe0 b/fuzz/corpus/fuzz_serialization/3c49269686ee0c250a2d977a86d965727418ebe0
diff --git a/fuzz/corpus/fuzz_serialization/3ccc20957ca1de354f0911587f3f6a89bf639bbe b/fuzz/corpus/fuzz_serialization/3ccc20957ca1de354f0911587f3f6a89bf639bbe
@@ -0,0 +1 @@
+0�{�uLLLLLOLLLLLLL���
diff --git a/fuzz/corpus/fuzz_serialization/3eec95f5cdf41fd6200a215e24d60f3bede4fa18 b/fuzz/corpus/fuzz_serialization/3eec95f5cdf41fd6200a215e24d60f3bede4fa18
diff --git a/fuzz/corpus/fuzz_serialization/44613cadc2a119c0445d8aca742ddaa6e9d14f15 b/fuzz/corpus/fuzz_serialization/44613cadc2a119c0445d8aca742ddaa6e9d14f15
@@ -0,0 +1 @@
+}���D����a�Ӹt�ا�P���04
diff --git a/fuzz/corpus/fuzz_serialization/44c16af83b7bfe485630ec7417a8a93dd6a4f344 b/fuzz/corpus/fuzz_serialization/44c16af83b7bfe485630ec7417a8a93dd6a4f344
diff --git a/fuzz/corpus/fuzz_serialization/4599f42df4bd96e578ca04c9f530bce55f85c593 b/fuzz/corpus/fuzz_serialization/4599f42df4bd96e578ca04c9f530bce55f85c593
@@ -0,0 +1 @@
+�c�
diff --git a/fuzz/corpus/fuzz_serialization/46220eb9c32d8f39af7842340be4410bbc6b0acf b/fuzz/corpus/fuzz_serialization/46220eb9c32d8f39af7842340be4410bbc6b0acf
@@ -0,0 +1 @@
+��a���D���	������=�;0izZXٙ�6��_���>�h�{|4��^iW�������a���]D�C%�

diff --git a/fuzz/corpus/fuzz_serialization/47102208d3296068fd9d922e8794d5614bf673b4 b/fuzz/corpus/fuzz_serialization/47102208d3296068fd9d922e8794d5614bf673b4
@@ -0,0 +1 @@
+���
diff --git a/fuzz/corpus/fuzz_serialization/485ffdac621c7a2fe64c49a9d43218c4297b0291 b/fuzz/corpus/fuzz_serialization/485ffdac621c7a2fe64c49a9d43218c4297b0291
diff --git a/fuzz/corpus/fuzz_serialization/4a3ac753e86aee22a1fba2144d452def73f5d445 b/fuzz/corpus/fuzz_serialization/4a3ac753e86aee22a1fba2144d452def73f5d445
diff --git a/fuzz/corpus/fuzz_serialization/4a4cc4a8eea5e60045f94339f31c6a70a6fd0b68 b/fuzz/corpus/fuzz_serialization/4a4cc4a8eea5e60045f94339f31c6a70a6fd0b68
diff --git a/fuzz/corpus/fuzz_serialization/4c9b56fa31b381b7fb82fa698c6f3a756af8cc3c b/fuzz/corpus/fuzz_serialization/4c9b56fa31b381b7fb82fa698c6f3a756af8cc3c
diff --git a/fuzz/corpus/fuzz_serialization/4d4eb9538c5dcf8eb485e7b1d25e476926375abb b/fuzz/corpus/fuzz_serialization/4d4eb9538c5dcf8eb485e7b1d25e476926375abb
diff --git a/fuzz/corpus/fuzz_serialization/4e39c82f78d2c2109122e62d29a7e6b244d4e466 b/fuzz/corpus/fuzz_serialization/4e39c82f78d2c2109122e62d29a7e6b244d4e466
diff --git a/fuzz/corpus/fuzz_serialization/4f13e492e5330e2b0ac7cfd33bdb6f68e51da838 b/fuzz/corpus/fuzz_serialization/4f13e492e5330e2b0ac7cfd33bdb6f68e51da838
@@ -0,0 +1 @@
+}�����D�u6�R�����].��z��
diff --git a/fuzz/corpus/fuzz_serialization/50f7bf3ec485cf36e17c682136cf193664a54ec6 b/fuzz/corpus/fuzz_serialization/50f7bf3ec485cf36e17c682136cf193664a54ec6
diff --git a/fuzz/corpus/fuzz_serialization/524d8a5744ca12baee06ac2d445758e0839e6cae b/fuzz/corpus/fuzz_serialization/524d8a5744ca12baee06ac2d445758e0839e6cae
@@ -0,0 +1 @@
+�
diff --git a/fuzz/corpus/fuzz_serialization/531faf1813c549e0360c85b7eb48e8027d4cedca b/fuzz/corpus/fuzz_serialization/531faf1813c549e0360c85b7eb48e8027d4cedca
diff --git a/fuzz/corpus/fuzz_serialization/54a1f0e11a61f82bfc474938c0d9109e263d918c b/fuzz/corpus/fuzz_serialization/54a1f0e11a61f82bfc474938c0d9109e263d918c
diff --git a/fuzz/corpus/fuzz_serialization/5528584ddeb60c8e7ea81d4c0bc4227734eeb393 b/fuzz/corpus/fuzz_serialization/5528584ddeb60c8e7ea81d4c0bc4227734eeb393
diff --git a/fuzz/corpus/fuzz_serialization/55ccac63fbaaefbb92a099f0b7a53dee3d3066b3 b/fuzz/corpus/fuzz_serialization/55ccac63fbaaefbb92a099f0b7a53dee3d3066b3
diff --git a/fuzz/corpus/fuzz_serialization/5654db3776d1ca71a669fca63266a558e0fd9de5 b/fuzz/corpus/fuzz_serialization/5654db3776d1ca71a669fca63266a558e0fd9de5
diff --git a/fuzz/corpus/fuzz_serialization/592504fa45d5574c992ce453dbce57c85cd8c7d5 b/fuzz/corpus/fuzz_serialization/592504fa45d5574c992ce453dbce57c85cd8c7d5
@@ -0,0 +1 @@
+�0+;;�I5j�@;x��m�
diff --git a/fuzz/corpus/fuzz_serialization/592d762aa688783a742e8f8a17dde6fef0e6b5d6 b/fuzz/corpus/fuzz_serialization/592d762aa688783a742e8f8a17dde6fef0e6b5d6
diff --git a/fuzz/corpus/fuzz_serialization/596704a7ad7f8f8707f5b78d18e15d341dc39d81 b/fuzz/corpus/fuzz_serialization/596704a7ad7f8f8707f5b78d18e15d341dc39d81
@@ -0,0 +1,2 @@
+�
+]C%�
diff --git a/fuzz/corpus/fuzz_serialization/5ad5bc1d2fd6dcceea9fa2f0ad47687af9d4b363 b/fuzz/corpus/fuzz_serialization/5ad5bc1d2fd6dcceea9fa2f0ad47687af9d4b363
diff --git a/fuzz/corpus/fuzz_serialization/5e90850401034e03214848e68ac58a16eb4500ce b/fuzz/corpus/fuzz_serialization/5e90850401034e03214848e68ac58a16eb4500ce
diff --git a/fuzz/corpus/fuzz_serialization/62691b118afe47b94cb40c796bdef339d0d988d8 b/fuzz/corpus/fuzz_serialization/62691b118afe47b94cb40c796bdef339d0d988d8
diff --git a/fuzz/corpus/fuzz_serialization/63d993bb60fffd7db971b2cd6a4705bc8b1a48b1 b/fuzz/corpus/fuzz_serialization/63d993bb60fffd7db971b2cd6a4705bc8b1a48b1
diff --git a/fuzz/corpus/fuzz_serialization/65b3da6770c4f54774165c7d38dbe3798014aed1 b/fuzz/corpus/fuzz_serialization/65b3da6770c4f54774165c7d38dbe3798014aed1
@@ -0,0 +1 @@
+;�e}�"�0�{�u�xn�݋c�����^�P*
diff --git a/fuzz/corpus/fuzz_serialization/65f4e4a70975970600b24ab9bad2fd4566811401 b/fuzz/corpus/fuzz_serialization/65f4e4a70975970600b24ab9bad2fd4566811401
diff --git a/fuzz/corpus/fuzz_serialization/67da0bbde8a646154e47bf2aa07a6c8d9dbc1b3d b/fuzz/corpus/fuzz_serialization/67da0bbde8a646154e47bf2aa07a6c8d9dbc1b3d
diff --git a/fuzz/corpus/fuzz_serialization/680d6e5c33be1f40552f8490c4b48092dc60b48d b/fuzz/corpus/fuzz_serialization/680d6e5c33be1f40552f8490c4b48092dc60b48d
@@ -0,0 +1 @@
+�f�+
diff --git a/fuzz/corpus/fuzz_serialization/689feb67d67a14b517b465a04f53405737559a1f b/fuzz/corpus/fuzz_serialization/689feb67d67a14b517b465a04f53405737559a1f
@@ -0,0 +1 @@
+*˙
diff --git a/fuzz/corpus/fuzz_serialization/69ac32bf48028d8ae9178d8033d97c203a581975 b/fuzz/corpus/fuzz_serialization/69ac32bf48028d8ae9178d8033d97c203a581975
diff --git a/fuzz/corpus/fuzz_serialization/6a366c1317147c81f22beb5d30508ba99f9cfc1a b/fuzz/corpus/fuzz_serialization/6a366c1317147c81f22beb5d30508ba99f9cfc1a
diff --git a/fuzz/corpus/fuzz_serialization/6ee5029e3f543c4b4c0aaf35ed145faf7d0e801b b/fuzz/corpus/fuzz_serialization/6ee5029e3f543c4b4c0aaf35ed145faf7d0e801b
diff --git a/fuzz/corpus/fuzz_serialization/6fcd960ca2930b6937c917eecb9260a0aa09c84a b/fuzz/corpus/fuzz_serialization/6fcd960ca2930b6937c917eecb9260a0aa09c84a
diff --git a/fuzz/corpus/fuzz_serialization/73a3ced41d5b17c23f7dc9bc9f14fa4d54bcbcf6 b/fuzz/corpus/fuzz_serialization/73a3ced41d5b17c23f7dc9bc9f14fa4d54bcbcf6
diff --git a/fuzz/corpus/fuzz_serialization/76a328c4bdcf451f29c126bf8afdb2fe7959f6de b/fuzz/corpus/fuzz_serialization/76a328c4bdcf451f29c126bf8afdb2fe7959f6de
diff --git a/fuzz/corpus/fuzz_serialization/79ef2ee1dbd00cc89471b5a14e9e5d1ddf72433c b/fuzz/corpus/fuzz_serialization/79ef2ee1dbd00cc89471b5a14e9e5d1ddf72433c
diff --git a/fuzz/corpus/fuzz_serialization/7f41b5802c84844391268f34b64754a448042ac7 b/fuzz/corpus/fuzz_serialization/7f41b5802c84844391268f34b64754a448042ac7
diff --git a/fuzz/corpus/fuzz_serialization/80904ef56b525af4d82b26c38ee9ed84fbe0e8aa b/fuzz/corpus/fuzz_serialization/80904ef56b525af4d82b26c38ee9ed84fbe0e8aa
diff --git a/fuzz/corpus/fuzz_serialization/80a2f44ca0165122312c549c2d3041e22ec72bb2 b/fuzz/corpus/fuzz_serialization/80a2f44ca0165122312c549c2d3041e22ec72bb2
@@ -0,0 +1 @@
+0�LLLLLL���
diff --git a/fuzz/corpus/fuzz_serialization/83631c962f6eb3da79b4ac7c8c7074b8d6227679 b/fuzz/corpus/fuzz_serialization/83631c962f6eb3da79b4ac7c8c7074b8d6227679
@@ -0,0 +1 @@
+��!9��dD�D��]�4�}�
diff --git a/fuzz/corpus/fuzz_serialization/8441252d77c0917fc6c320cfbf39750f4199ece0 b/fuzz/corpus/fuzz_serialization/8441252d77c0917fc6c320cfbf39750f4199ece0
diff --git a/fuzz/corpus/fuzz_serialization/858e8a25126145e8652b1c7b343ed9ff1f6c553f b/fuzz/corpus/fuzz_serialization/858e8a25126145e8652b1c7b343ed9ff1f6c553f
diff --git a/fuzz/corpus/fuzz_serialization/8a5c1ec4919c4969acb7773394d0a6be0db6b095 b/fuzz/corpus/fuzz_serialization/8a5c1ec4919c4969acb7773394d0a6be0db6b095
@@ -0,0 +1 @@
+m�
diff --git a/fuzz/corpus/fuzz_serialization/8b00d59cd338662b7c1dedbe6e59a79cf0c6c68f b/fuzz/corpus/fuzz_serialization/8b00d59cd338662b7c1dedbe6e59a79cf0c6c68f
@@ -0,0 +1 @@
+�]C%�
diff --git a/fuzz/corpus/fuzz_serialization/8f34b6450307981b6781762ac91d95be712b356e b/fuzz/corpus/fuzz_serialization/8f34b6450307981b6781762ac91d95be712b356e
diff --git a/fuzz/corpus/fuzz_serialization/9081ee6e4c227d5358b1f1ddc5c0cbe028bd8dda b/fuzz/corpus/fuzz_serialization/9081ee6e4c227d5358b1f1ddc5c0cbe028bd8dda
@@ -0,0 +1 @@
+0��
diff --git a/fuzz/corpus/fuzz_serialization/9170a32e0626ef41739a17e35b953834eb1c5615 b/fuzz/corpus/fuzz_serialization/9170a32e0626ef41739a17e35b953834eb1c5615
diff --git a/fuzz/corpus/fuzz_serialization/92bc0af3e1560941650609e3838e9f2a8368ae05 b/fuzz/corpus/fuzz_serialization/92bc0af3e1560941650609e3838e9f2a8368ae05
@@ -0,0 +1,2 @@
+�
+����]C%�
diff --git a/fuzz/corpus/fuzz_serialization/9405f4e8857cfd57af09922f2288c7a3ecb3ae37 b/fuzz/corpus/fuzz_serialization/9405f4e8857cfd57af09922f2288c7a3ecb3ae37
diff --git a/fuzz/corpus/fuzz_serialization/954f87b690e4197ce18370cc095e38f19d46079e b/fuzz/corpus/fuzz_serialization/954f87b690e4197ce18370cc095e38f19d46079e
diff --git a/fuzz/corpus/fuzz_serialization/95c8e1e713d2ae5295f770d12f179f1f3a1ccd50 b/fuzz/corpus/fuzz_serialization/95c8e1e713d2ae5295f770d12f179f1f3a1ccd50
@@ -0,0 +1 @@
+����
diff --git a/fuzz/corpus/fuzz_serialization/9b232d55db40c0c0f37d1a1e32900ccc8cf6fa3c b/fuzz/corpus/fuzz_serialization/9b232d55db40c0c0f37d1a1e32900ccc8cf6fa3c
diff --git a/fuzz/corpus/fuzz_serialization/9bc313bbd93a1b7255982a0b530216f895f1e7e9 b/fuzz/corpus/fuzz_serialization/9bc313bbd93a1b7255982a0b530216f895f1e7e9
diff --git a/fuzz/corpus/fuzz_serialization/a5129c501ad4d923bab9f5a6bd2c5285c29a3b3b b/fuzz/corpus/fuzz_serialization/a5129c501ad4d923bab9f5a6bd2c5285c29a3b3b
diff --git a/fuzz/corpus/fuzz_serialization/a5e860ac13a20ab2f18783407f78bb905a0963eb b/fuzz/corpus/fuzz_serialization/a5e860ac13a20ab2f18783407f78bb905a0963eb
diff --git a/fuzz/corpus/fuzz_serialization/a6fe820db6653fb5927c1a6bd8f51312efa25066 b/fuzz/corpus/fuzz_serialization/a6fe820db6653fb5927c1a6bd8f51312efa25066
diff --git a/fuzz/corpus/fuzz_serialization/a86035f1a172b4fb88a7a69a7067fd47e2e27879 b/fuzz/corpus/fuzz_serialization/a86035f1a172b4fb88a7a69a7067fd47e2e27879
diff --git a/fuzz/corpus/fuzz_serialization/ac2592e04c8ccbd9fce8ee3e3b24936bacbea892 b/fuzz/corpus/fuzz_serialization/ac2592e04c8ccbd9fce8ee3e3b24936bacbea892
diff --git a/fuzz/corpus/fuzz_serialization/af28dd714ec6294a073e197f8dd7d71bcb6f1e2c b/fuzz/corpus/fuzz_serialization/af28dd714ec6294a073e197f8dd7d71bcb6f1e2c
@@ -0,0 +1 @@
++�f�+
diff --git a/fuzz/corpus/fuzz_serialization/b0c497a1362aaf4a88c748cd0cb7d7e9f42335a9 b/fuzz/corpus/fuzz_serialization/b0c497a1362aaf4a88c748cd0cb7d7e9f42335a9
diff --git a/fuzz/corpus/fuzz_serialization/b5bef5ad04216ad1f791e597955d8d8186d62708 b/fuzz/corpus/fuzz_serialization/b5bef5ad04216ad1f791e597955d8d8186d62708
diff --git a/fuzz/corpus/fuzz_serialization/b5e0d763f52cbcff1901a681e4c20e2779199010 b/fuzz/corpus/fuzz_serialization/b5e0d763f52cbcff1901a681e4c20e2779199010
@@ -0,0 +1 @@
+s�M��4V
diff --git a/fuzz/corpus/fuzz_serialization/b8519b2ff0c0594b3efb263a8fbab2c95f47cb4f b/fuzz/corpus/fuzz_serialization/b8519b2ff0c0594b3efb263a8fbab2c95f47cb4f
diff --git a/fuzz/corpus/fuzz_serialization/b95f6fb075e53d512a044a2360f433369b040e2a b/fuzz/corpus/fuzz_serialization/b95f6fb075e53d512a044a2360f433369b040e2a
diff --git a/fuzz/corpus/fuzz_serialization/ba89b5c3dcd4dfc793072a98906602abe615d3df b/fuzz/corpus/fuzz_serialization/ba89b5c3dcd4dfc793072a98906602abe615d3df
diff --git a/fuzz/corpus/fuzz_serialization/bbde76499882a6ff1e92ed9e5450b9d1b403250d b/fuzz/corpus/fuzz_serialization/bbde76499882a6ff1e92ed9e5450b9d1b403250d
diff --git a/fuzz/corpus/fuzz_serialization/bcb4b1979366bc14e35ecceef03f26a476f91538 b/fuzz/corpus/fuzz_serialization/bcb4b1979366bc14e35ecceef03f26a476f91538
diff --git a/fuzz/corpus/fuzz_serialization/beca236cd931cf5352ec7b89411909a4b44c9138 b/fuzz/corpus/fuzz_serialization/beca236cd931cf5352ec7b89411909a4b44c9138
diff --git a/fuzz/corpus/fuzz_serialization/c1cebe31fadd74fc77b17ce6c0e44ef289444c6d b/fuzz/corpus/fuzz_serialization/c1cebe31fadd74fc77b17ce6c0e44ef289444c6d
@@ -0,0 +1 @@
+0�OL�������
diff --git a/fuzz/corpus/fuzz_serialization/c340e8e3f8b1bff333981c8d463daddd5ff4e855 b/fuzz/corpus/fuzz_serialization/c340e8e3f8b1bff333981c8d463daddd5ff4e855
diff --git a/fuzz/corpus/fuzz_serialization/c68eef36f0848d2dc34d212d294f37ce490d3258 b/fuzz/corpus/fuzz_serialization/c68eef36f0848d2dc34d212d294f37ce490d3258
diff --git a/fuzz/corpus/fuzz_serialization/c69ca63f0353737b22874f88f5a67dafc1bf7d44 b/fuzz/corpus/fuzz_serialization/c69ca63f0353737b22874f88f5a67dafc1bf7d44
diff --git a/fuzz/corpus/fuzz_serialization/ce6b603fce80719da46c97eb1b95bbd0ad777070 b/fuzz/corpus/fuzz_serialization/ce6b603fce80719da46c97eb1b95bbd0ad777070
diff --git a/fuzz/corpus/fuzz_serialization/ce8fbfa93be2bb9182b40186316e43da0dbc55d8 b/fuzz/corpus/fuzz_serialization/ce8fbfa93be2bb9182b40186316e43da0dbc55d8
diff --git a/fuzz/corpus/fuzz_serialization/d0476e429d72246b03d172241b0d201c7f012be8 b/fuzz/corpus/fuzz_serialization/d0476e429d72246b03d172241b0d201c7f012be8
@@ -0,0 +1 @@
+��
diff --git a/fuzz/corpus/fuzz_serialization/d1f6790b8477c7e41e3dc072c24b4b80aafc6739 b/fuzz/corpus/fuzz_serialization/d1f6790b8477c7e41e3dc072c24b4b80aafc6739
@@ -0,0 +1 @@
+C��
diff --git a/fuzz/corpus/fuzz_serialization/d56083163211e89f5cfa50e8ae80d1a11d03c250 b/fuzz/corpus/fuzz_serialization/d56083163211e89f5cfa50e8ae80d1a11d03c250
diff --git a/fuzz/corpus/fuzz_serialization/d8db49096b062b619719f6308c8d2b9cf043c7c2 b/fuzz/corpus/fuzz_serialization/d8db49096b062b619719f6308c8d2b9cf043c7c2
@@ -0,0 +1 @@
+Eg�
diff --git a/fuzz/corpus/fuzz_serialization/d8dcf7b34858f2f7e7d8e50337bd68bc4b4f4fb0 b/fuzz/corpus/fuzz_serialization/d8dcf7b34858f2f7e7d8e50337bd68bc4b4f4fb0
diff --git a/fuzz/corpus/fuzz_serialization/d9bf92f929213b053f6e37ef4e18c9533d0d42ff b/fuzz/corpus/fuzz_serialization/d9bf92f929213b053f6e37ef4e18c9533d0d42ff
@@ -0,0 +1 @@
+�o��
diff --git a/fuzz/corpus/fuzz_serialization/dae54cc5b98acbe40db9a826182e66c06dc6872b b/fuzz/corpus/fuzz_serialization/dae54cc5b98acbe40db9a826182e66c06dc6872b
@@ -0,0 +1 @@
+�LLL���

diff --git a/fuzz/corpus/fuzz_serialization/db178237414743cf16da250d10ffd0ae98bd127f b/fuzz/corpus/fuzz_serialization/db178237414743cf16da250d10ffd0ae98bd127f
@@ -0,0 +1 @@
+�r0;5��o�
diff --git a/fuzz/corpus/fuzz_serialization/dbb873b6c49161fb72609a09c79b1b4ef461e3f7 b/fuzz/corpus/fuzz_serialization/dbb873b6c49161fb72609a09c79b1b4ef461e3f7
diff --git a/fuzz/corpus/fuzz_serialization/dbee5c3fa40e7883ee26d33234ed6364cb7b3da6 b/fuzz/corpus/fuzz_serialization/dbee5c3fa40e7883ee26d33234ed6364cb7b3da6
diff --git a/fuzz/corpus/fuzz_serialization/dd735e0d38c3775492fc9d0346516eb675c47428 b/fuzz/corpus/fuzz_serialization/dd735e0d38c3775492fc9d0346516eb675c47428
diff --git a/fuzz/corpus/fuzz_serialization/ddb98f7964ea51bb468c9fa93af5f11bfc072627 b/fuzz/corpus/fuzz_serialization/ddb98f7964ea51bb468c9fa93af5f11bfc072627
diff --git a/fuzz/corpus/fuzz_serialization/e3c1912a734aa51cc75fb7e67db525f34ac1e43e b/fuzz/corpus/fuzz_serialization/e3c1912a734aa51cc75fb7e67db525f34ac1e43e
@@ -0,0 +1 @@
+{�f���
diff --git a/fuzz/corpus/fuzz_serialization/e76108ff6580c8809875c5051c8a3df9ce8fc85a b/fuzz/corpus/fuzz_serialization/e76108ff6580c8809875c5051c8a3df9ce8fc85a
diff --git a/fuzz/corpus/fuzz_serialization/ebd0b9c4978407a17b7331e0562dc9ad31b29204 b/fuzz/corpus/fuzz_serialization/ebd0b9c4978407a17b7331e0562dc9ad31b29204
@@ -0,0 +1 @@
+Y�
diff --git a/fuzz/corpus/fuzz_serialization/f0ab531075130e5e92df690fa7311dafed5b43bc b/fuzz/corpus/fuzz_serialization/f0ab531075130e5e92df690fa7311dafed5b43bc
diff --git a/fuzz/corpus/fuzz_serialization/f0b7597e0a424ca259bbd593ebf179789dbc0c09 b/fuzz/corpus/fuzz_serialization/f0b7597e0a424ca259bbd593ebf179789dbc0c09
diff --git a/fuzz/corpus/fuzz_serialization/f573e80e11c969b592809f357dc72eb3caf356dd b/fuzz/corpus/fuzz_serialization/f573e80e11c969b592809f357dc72eb3caf356dd
@@ -0,0 +1 @@
+��
diff --git a/fuzz/corpus/fuzz_serialization/f69a22307982dab12f462040e386daba86052e2c b/fuzz/corpus/fuzz_serialization/f69a22307982dab12f462040e386daba86052e2c
diff --git a/fuzz/corpus/fuzz_serialization/f82023faffb3b3e67d5d587caa6b53ab10f27fb6 b/fuzz/corpus/fuzz_serialization/f82023faffb3b3e67d5d587caa6b53ab10f27fb6
diff --git a/fuzz/corpus/fuzz_serialization/fa30ba2c9565dcccb091ade5dbab902e0cf0c3b4 b/fuzz/corpus/fuzz_serialization/fa30ba2c9565dcccb091ade5dbab902e0cf0c3b4
diff --git a/fuzz/corpus/fuzz_serialization/fab44564f0279bbfeddbbdfe97a92b882d7a3e9c b/fuzz/corpus/fuzz_serialization/fab44564f0279bbfeddbbdfe97a92b882d7a3e9c
@@ -0,0 +1 @@
+}���D����a���P���04
diff --git a/fuzz/corpus/fuzz_serialization/fafe20628a68c12b150c9af37e24c36f74672288 b/fuzz/corpus/fuzz_serialization/fafe20628a68c12b150c9af37e24c36f74672288
@@ -0,0 +1 @@
+� 
diff --git a/fuzz/corpus/fuzz_serialization/fed40fead812cb12d7906402be2efb5a39ff84c6 b/fuzz/corpus/fuzz_serialization/fed40fead812cb12d7906402be2efb5a39ff84c6
diff --git a/fuzz/fuzz_serialization.cpp b/fuzz/fuzz_serialization.cpp
@@ -0,0 +1,139 @@
+#include "ndpi_api.h"
+#include "fuzz_common_code.h"
+
+#include <stdint.h>
+#include <stdio.h>
+#include <assert.h>
+#include "fuzzer/FuzzedDataProvider.h"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  FuzzedDataProvider fuzzed_data(data, size);
+  u_int16_t i, num_iteration;
+  ndpi_serializer serializer, serializer_cloned, deserializer;
+  ndpi_serialization_format fmt;
+  int rc;
+  std::vector<char>d;
+  char kbuf[32];
+  u_int32_t buffer_len;
+
+  /* To allow memory allocation failures */
+  fuzz_set_alloc_callbacks_and_seed(size);
+
+  fmt = static_cast<ndpi_serialization_format>(fuzzed_data.ConsumeIntegralInRange(1, 3));
+
+  if (fuzzed_data.ConsumeBool())
+    rc = ndpi_init_serializer(&serializer, fmt);
+  else
+    rc = ndpi_init_serializer_ll(&serializer, fmt, fuzzed_data.ConsumeIntegralInRange(0, 64));
+
+  if (rc != 0)
+    return 0;
+
+  if (fmt == ndpi_serialization_format_csv)
+    ndpi_serializer_set_csv_separator(&serializer, ',');
+
+  num_iteration = fuzzed_data.ConsumeIntegralInRange(0, 16);
+  for (i = 0; i < num_iteration; i++) {
+    memset(kbuf, '\0', sizeof(kbuf)); /* It is also used as binary key */
+    snprintf(kbuf, sizeof(kbuf), "Key %d", i);
+
+    ndpi_serialize_uint32_uint32(&serializer, i, fuzzed_data.ConsumeIntegral<u_int32_t>());
+    ndpi_serialize_uint32_int32(&serializer, i, fuzzed_data.ConsumeIntegral<int32_t>());
+    ndpi_serialize_uint32_uint64(&serializer, i, fuzzed_data.ConsumeIntegral<u_int64_t>());
+    ndpi_serialize_uint32_int64(&serializer, i, fuzzed_data.ConsumeIntegral<int64_t>());
+    ndpi_serialize_uint32_float(&serializer, i, fuzzed_data.ConsumeFloatingPoint<float>(), "%f");
+    if (fmt != ndpi_serialization_format_tlv)
+      ndpi_serialize_uint32_double(&serializer, i, fuzzed_data.ConsumeFloatingPoint<double>(), "%lf");
+    d = fuzzed_data.ConsumeBytes<char>(16);
+    ndpi_serialize_uint32_binary(&serializer, i, d.data(), d.size());
+    ndpi_serialize_uint32_string(&serializer, i, fuzzed_data.ConsumeBytesAsString(8).c_str());
+    ndpi_serialize_uint32_boolean(&serializer, i, fuzzed_data.ConsumeIntegral<int8_t>());
+
+    ndpi_serialize_string_uint32(&serializer, kbuf, fuzzed_data.ConsumeIntegral<u_int32_t>());
+    ndpi_serialize_string_int32(&serializer, kbuf, fuzzed_data.ConsumeIntegral<int32_t>());
+    ndpi_serialize_string_uint64(&serializer, kbuf, fuzzed_data.ConsumeIntegral<u_int64_t>());
+    ndpi_serialize_string_int64(&serializer, kbuf, fuzzed_data.ConsumeIntegral<int64_t>());
+    ndpi_serialize_string_float(&serializer, kbuf, fuzzed_data.ConsumeFloatingPoint<float>(), "%f");
+    if (fmt != ndpi_serialization_format_tlv)
+      ndpi_serialize_string_double(&serializer, kbuf, fuzzed_data.ConsumeFloatingPoint<double>(), "%lf");
+    ndpi_serialize_string_string(&serializer, kbuf, fuzzed_data.ConsumeBytesAsString(8).c_str());
+    ndpi_serialize_string_boolean(&serializer, kbuf, fuzzed_data.ConsumeIntegral<int8_t>());
+
+    ndpi_serialize_binary_uint32(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<u_int32_t>());
+    ndpi_serialize_binary_int32(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<int32_t>());
+    ndpi_serialize_binary_uint64(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<u_int64_t>());
+    ndpi_serialize_binary_int64(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<int64_t>());
+    ndpi_serialize_binary_float(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeFloatingPoint<float>(), "%f");
+    if (fmt != ndpi_serialization_format_tlv)
+      ndpi_serialize_binary_double(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeFloatingPoint<double>(), "%lf");
+    ndpi_serialize_binary_boolean(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<int8_t>());
+    d = fuzzed_data.ConsumeBytes<char>(16);
+    ndpi_serialize_binary_binary(&serializer, kbuf, sizeof(kbuf), d.data(), d.size());
+
+    if ((i & 0x3) == 0x3)
+      ndpi_serialize_end_of_record(&serializer);
+  }
+
+  ndpi_serializer_create_snapshot(&serializer);
+
+  if (fuzzed_data.ConsumeBool()) {
+    ndpi_serialize_start_of_block(&serializer, "Block");
+    memset(kbuf, '\0', sizeof(kbuf)); /* It is also used as binary key */
+    snprintf(kbuf, sizeof(kbuf), "K-Ignored");
+    ndpi_serialize_uint32_uint32(&serializer, i, fuzzed_data.ConsumeIntegral<u_int32_t>());
+    ndpi_serialize_string_string(&serializer, kbuf, fuzzed_data.ConsumeBytesAsString(8).c_str());
+    ndpi_serialize_string_float(&serializer, kbuf, fuzzed_data.ConsumeFloatingPoint<float>(), "%f");
+    ndpi_serialize_binary_boolean(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<int8_t>());
+    ndpi_serialize_end_of_block(&serializer);
+  }
+
+  if (fuzzed_data.ConsumeBool()) {
+    ndpi_serialize_start_of_block_uint32(&serializer, 0);
+    memset(kbuf, '\0', sizeof(kbuf)); /* It is also used as binary key */
+    snprintf(kbuf, sizeof(kbuf), "K32-Ignored");
+    ndpi_serialize_uint32_uint32(&serializer, i, fuzzed_data.ConsumeIntegral<u_int32_t>());
+    ndpi_serialize_string_string(&serializer, kbuf, fuzzed_data.ConsumeBytesAsString(8).c_str());
+    ndpi_serialize_string_float(&serializer, kbuf, fuzzed_data.ConsumeFloatingPoint<float>(), "%f");
+    ndpi_serialize_binary_boolean(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<int8_t>());
+    ndpi_serialize_end_of_block(&serializer);
+  }
+
+  if (fuzzed_data.ConsumeBool())
+    ndpi_serializer_rollback_snapshot(&serializer);
+
+  if (fmt == ndpi_serialization_format_json) {
+
+    ndpi_serialize_start_of_list(&serializer, "List");
+
+    num_iteration = fuzzed_data.ConsumeIntegralInRange(0, 8);
+    for (i = 0; i < num_iteration; i++) {
+      memset(kbuf, '\0', sizeof(kbuf)); /* It is also used as binary key */
+      snprintf(kbuf, sizeof(kbuf), "Ignored");
+      ndpi_serialize_uint32_uint32(&serializer, i, fuzzed_data.ConsumeIntegral<u_int32_t>());
+      ndpi_serialize_string_string(&serializer, kbuf, fuzzed_data.ConsumeBytesAsString(8).c_str());
+      ndpi_serialize_string_float(&serializer, kbuf, fuzzed_data.ConsumeFloatingPoint<float>(), "%f");
+      ndpi_serialize_binary_boolean(&serializer, kbuf, sizeof(kbuf), fuzzed_data.ConsumeIntegral<int8_t>());
+    }
+
+    ndpi_serialize_end_of_list(&serializer);
+    ndpi_serialize_string_string(&serializer, "Last", "Ok");
+  } else if (fmt == ndpi_serialization_format_csv) {
+    ndpi_serializer_get_header(&serializer, &buffer_len);
+    ndpi_serializer_get_buffer(&serializer, &buffer_len);
+  } else {
+    /* Conversion from tlv to json */
+    rc = ndpi_init_deserializer(&deserializer, &serializer);
+    if (rc == 0) {
+      rc = ndpi_init_serializer_ll(&serializer_cloned, ndpi_serialization_format_json, fuzzed_data.ConsumeIntegralInRange(0, 2048));
+      if (rc == 0) {
+        ndpi_deserialize_clone_all(&deserializer, &serializer_cloned);
+        ndpi_serializer_get_buffer(&serializer_cloned, &buffer_len);
+        ndpi_term_serializer(&serializer_cloned);
+      }
+    }
+  }
+
+  ndpi_term_serializer(&serializer);
+
+  return 0;
+}
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h
@@ -1248,6 +1248,16 @@ extern "C" {
    */
   int ndpi_serialize_uint32_float(ndpi_serializer *serializer, u_int32_t key, float value, const char *format /* e.f. "%.2f" */);
 
+  /**
+   * Serialize a 32-bit unsigned int key and a double value
+   * @param serializer The serializer handle
+   * @param key The field name or ID
+   * @param value The field value
+   * @param format The float value format
+   * @return 0 on success, a negative number otherwise
+   */
+  int ndpi_serialize_uint32_double(ndpi_serializer *serializer, u_int32_t key, double value, const char *format /* e.f. "%.2f" */);
+
   /**
    * Serialize a 32-bit unsigned int key and a double value
    * @param serializer The serializer handle
@@ -1276,6 +1286,16 @@ extern "C" {
    */
   int ndpi_serialize_uint32_boolean(ndpi_serializer *serializer, u_int32_t key, u_int8_t value);
 
+  /**
+   * Serialize a 32-bit unsigned int and an unterminated string value
+   * @param serializer The serializer handle
+   * @param key The field name or ID
+   * @param value The field value
+   * @param vlen The value length
+   * @return 0 on success, a negative number otherwise
+   */
+  int ndpi_serialize_uint32_binary(ndpi_serializer *serializer, u_int32_t key, const char *_value, u_int16_t vlen);
+
   /**
    * Serialize an unterminated string key and a 32-bit signed int value
    * @param serializer The serializer handle
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		�K!i�@`�1�� GH we<��7@�\|��:v�/�&m�}�9��p%��
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		��a��D�� =�;0izZXٙ�6��_��>�h�{\|4��^iW��a��]D�C%�
Expand Down