diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/89486cb52cbbeaab906be6525191cb775700f17b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/89486cb52cbbeaab906be6525191cb775700f17b
@@ -0,0 +1 @@
+	n--ßH
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8b35c45ae31647afd93a01801aa685b67bb16293 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8b35c45ae31647afd93a01801aa685b67bb16293
@@ -0,0 +1,3 @@
+!ŀ̀dict=li`.3َ̀dict=li`.3َ̀̀+=̀=
+=
+َ)َ)ǎ.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8b6191ff5f13ec218ddba10395535b7610c9e554 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8b6191ff5f13ec218ddba10395535b7610c9e554
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8c18c0388426b5c76e65cecdf43570549c4cd50f b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8c18c0388426b5c76e65cecdf43570549c4cd50f
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8cd17de92fa2a8624fc97539222c7cde091f1fe2 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8cd17de92fa2a8624fc97539222c7cde091f1fe2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8d1f40915949ded652742cce805c6b71643822a0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8d1f40915949ded652742cce805c6b71643822a0
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8e918de17c9a423facfd58d715fe6e9c8fbabd9d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8e918de17c9a423facfd58d715fe6e9c8fbabd9d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/8eca1c9470b0aaf44462b54fc7bf7aec5cdd61d3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/8eca1c9470b0aaf44462b54fc7bf7aec5cdd61d3
@@ -0,0 +1 @@
+125fIcE.xn‍--w.XN--w127f.xn--w125f.x.XN--1;XN--w063f.xn‍-N--w126f.xn‍--w'106f
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/90b319aafb7713a5e977a34e050ead85da9145e8 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/90b319aafb7713a5e977a34e050ead85da9145e8
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9120f0f734f9200a0bd42e0a9158b8f09cc820a4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9120f0f734f9200a0bd42e0a9158b8f09cc820a4
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/926e6e4feb996469e6084f89fb0456806052ab60 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/926e6e4feb996469e6084f89fb0456806052ab60
@@ -0,0 +1 @@
+XN---ßT.xn&--x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/92903bd1982efeeb362155ababe7029f49932d55 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/92903bd1982efeeb362155ababe7029f49932d55
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/92d1ff92e0b740fd34be42e554a29262777881b6 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/92d1ff92e0b740fd34be42e554a29262777881b6
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/949a53c84ef338879cfba284f95ffd73beb4a935 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/949a53c84ef338879cfba284f95ffd73beb4a935
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/949e5ba320abb7cbe3a65d543c9b1b6fa7d5311d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/949e5ba320abb7cbe3a65d543c9b1b6fa7d5311d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/95791c80d5a6569af484d4397ff97c25fd25318b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/95791c80d5a6569af484d4397ff97c25fd25318b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/95e61265f10f86e4f2bfb6d50b5e68124f7b9e30 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/95e61265f10f86e4f2bfb6d50b5e68124f7b9e30
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/96e35fa9d85281d6282b572537529f9955466b87 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/96e35fa9d85281d6282b572537529f9955466b87
@@ -0,0 +1 @@
+͵8͵..);)ٵ..)ݮٵ)ٵ..)ݮ..
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9754c613ae00f54f4191bacfa09cb6aa20ba962f b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9754c613ae00f54f4191bacfa09cb6aa20ba962f
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/97ebf231e7302015a2f933b25bc7655e91a1e740 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/97ebf231e7302015a2f933b25bc7655e91a1e740
@@ -0,0 +1 @@
+۲۰.xn--%)))).
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/980efbefdf1eee9a143407b9c8cb828f689641f1 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/980efbefdf1eee9a143407b9c8cb828f689641f1
@@ -0,0 +1 @@
+xn--.۲.۲.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/988a89cc9056577f8cc19f5582d5b30ba75ab948 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/988a89cc9056577f8cc19f5582d5b30ba75ab948
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/989a9c74fab9fc2485efe6ace030cf8b44e55d77 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/989a9c74fab9fc2485efe6ace030cf8b44e55d77
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/98ab94f12c9d879a3b733403d11526352e5c1e56 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/98ab94f12c9d879a3b733403d11526352e5c1e56
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/99bcdac4ecc76a65ec698c98462812c647fd70bc b/fuzz/libidn2_to_ascii_8z_fuzzer.in/99bcdac4ecc76a65ec698c98462812c647fd70bc
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9a8d2abb9028a467b4d0f48c569fdae8121ba762 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9a8d2abb9028a467b4d0f48c569fdae8121ba762
@@ -0,0 +1 @@
+-n١:
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9b49319fd190672d0198c8ee3fd2c327cf2328eb b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9b49319fd190672d0198c8ee3fd2c327cf2328eb
@@ -0,0 +1 @@
+Xxn%%%%%%-%%%%@%%%%%%%%%%XN--%%%%%%%%%%%%%%%%XN--%%%%%%%%%%%%%-ß
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9c2e25c17a34330e43cc49b0095688956761a112 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9c2e25c17a34330e43cc49b0095688956761a112
@@ -0,0 +1 @@
+--ß
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9c47c91dc723d47272686544e762caf6525bc1de b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9c47c91dc723d47272686544e762caf6525bc1de
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9c500015762b2a7b7c39a2a627dc269081c4e9cc b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9c500015762b2a7b7c39a2a627dc269081c4e9cc
@@ -0,0 +1 @@
+X-N-)-mYYß.xn--9999999rzr99XN-)--mYYß.xn--;9999rrrzrrrr9998r
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9cbdd0856811928e1c3a55ab7a03900b92862336 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9cbdd0856811928e1c3a55ab7a03900b92862336
@@ -0,0 +1 @@
+,xn6ß6
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9d01d55937cc137683bca1538cf8344d9d48d8d0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9d01d55937cc137683bca1538cf8344d9d48d8d0
@@ -0,0 +1 @@
+xn--n-MMMxn--MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMEMMMMMMMMMMMMMP,
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9d588f67d48a8c8d55094512ca41b08eec2a1fcd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9d588f67d48a8c8d55094512ca41b08eec2a1fcd
@@ -0,0 +1 @@
+;)()))))۰.)٦.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9de710bcc540e1b68361050da210b27514586072 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9de710bcc540e1b68361050da210b27514586072
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9e236c75a601917dcb4fe43250ea3baa72840432 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9e236c75a601917dcb4fe43250ea3baa72840432
@@ -0,0 +1 @@
+XN--.׳..׳.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/9e563879d7d06c4be0749b3621d064479a0d869f b/fuzz/libidn2_to_ascii_8z_fuzzer.in/9e563879d7d06c4be0749b3621d064479a0d869f
@@ -0,0 +1 @@
+?XN--??????????????????????????????????????????????????????????????????;.۷۷.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a17f2cbccffbdaa658e8c3d390671f726f3f204d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a17f2cbccffbdaa658e8c3d390671f726f3f204d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a2694a3f5679c6efe157542a763060f40b07a823 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a2694a3f5679c6efe157542a763060f40b07a823
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a30574c20feef783005705710b9529816e78b990 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a30574c20feef783005705710b9529816e78b990
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a361ab759108fbc341532d29c6d2bf840d210dc5 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a361ab759108fbc341532d29c6d2bf840d210dc5
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a44ec22c6d0902677d09bbab820cae0362678192 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a44ec22c6d0902677d09bbab820cae0362678192
@@ -0,0 +1 @@
+‍)XN--)Z;^Z6ZX;-xZxn--ZZZZZXr~r~
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a4b37bced1c5eb0a34a0032c794fdfb29610c278 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a4b37bced1c5eb0a34a0032c794fdfb29610c278
@@ -0,0 +1 @@
+.XN--;ގَ,
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a56e5c4b3352011f45873a28a80643646da163a4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a56e5c4b3352011f45873a28a80643646da163a4
@@ -0,0 +1 @@
+)ٵ.ٵݮ..)ٵ)...)ݮ۵..))ٵ..)ݮ..)ٵ)...)ݮٵ..))ٵ..)ݮ.۵.ٵݮ..)ٵ)...)ݮٵ..).)۵.ٵݮ..)ٵ)...)ݮٵ..))ٵ..)ݮ..)ٵ)...)ݮٵ..))ٵ..)
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a6a0d1276c0e29fb4fad4e9bf0ab1df3b156bd89 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a6a0d1276c0e29fb4fad4e9bf0ab1df3b156bd89
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a6bad4c496fe07ba2917681e0c8da2b12bff58f2 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a6bad4c496fe07ba2917681e0c8da2b12bff58f2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a83d251c86cdc4747c3a43a687a88401bcdd772b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a83d251c86cdc4747c3a43a687a88401bcdd772b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a86caf2511ea4a21baddb65379913664ed970e11 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a86caf2511ea4a21baddb65379913664ed970e11
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a884eae179950bdaeb6ac6fc614aa6f11f30e0ca b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a884eae179950bdaeb6ac6fc614aa6f11f30e0ca
@@ -0,0 +1 @@
+)))))XN--)٦.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a8c3e15bff7117824b80ad2a17869b31a2ae534d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a8c3e15bff7117824b80ad2a17869b31a2ae534d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/a9b880e415aa4d96a35cd16e8682c23d532bd727 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/a9b880e415aa4d96a35cd16e8682c23d532bd727
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/aaaae06dc1ad7bce3fc6e967ef71339b23852788 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/aaaae06dc1ad7bce3fc6e967ef71339b23852788
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/aaf4fcd396f24ff583930699de51b3e3a5b34164 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/aaf4fcd396f24ff583930699de51b3e3a5b34164
@@ -0,0 +1 @@
+XN--xn--ßT.xn----
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/aaf94d2f43a5d18b8fd43eb325f105d2b159e467 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/aaf94d2f43a5d18b8fd43eb325f105d2b159e467
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ab5cbdd45f468b9b3d741718fbb7e0766d6ffeb6 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ab5cbdd45f468b9b3d741718fbb7e0766d6ffeb6
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/abb93fdd64e39f80a9ad02a35d83863e794ec095 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/abb93fdd64e39f80a9ad02a35d83863e794ec095
@@ -0,0 +1 @@
+xn--XN--ß5
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ac6c64fea1a91db4931e44d0b274504536bcbb0d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ac6c64fea1a91db4931e44d0b274504536bcbb0d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/acd5eb610857fd80cd8186228dd64832b9093ecb b/fuzz/libidn2_to_ascii_8z_fuzzer.in/acd5eb610857fd80cd8186228dd64832b9093ecb
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/acf98491580dd8f396d64d98aa931ae6d1039398 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/acf98491580dd8f396d64d98aa931ae6d1039398
@@ -0,0 +1 @@
+!ͧ=‍
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ad27d0ffa3c2d17234502e5b3f32324d599283e0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ad27d0ffa3c2d17234502e5b3f32324d599283e0
@@ -0,0 +1 @@
+ݐ‌ݐ!‌x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/adad5e3fb264a3be5eb8e72918f27cb64aebdb26 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/adad5e3fb264a3be5eb8e72918f27cb64aebdb26
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ade8f42b7029f1fc65a6f0fd6f04041364d79063 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ade8f42b7029f1fc65a6f0fd6f04041364d79063
@@ -0,0 +1 @@
+                                                  XN--NXkNß
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ae77dfbf35d6d422c4c504171f9873e26735c538 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ae77dfbf35d6d422c4c504171f9873e26735c538
@@ -0,0 +1,2 @@
+!XN--ŀ=
+=J
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b065728a87b751f85227266f06de4e31ab0bb4e3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b065728a87b751f85227266f06de4e31ab0bb4e3
@@ -0,0 +1 @@
+.xn--0099000a099000a999a9000a09,xN--ß-99999a90000
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b07ce534080ebc912b21491f2b392a8f3e5d3a92 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b07ce534080ebc912b21491f2b392a8f3e5d3a92
@@ -0,0 +1 @@
+"xn-ݐ ݐ-,¨‌x,
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b0e4630fb47b4fbf02a13c9bb60f4d6eafe7e095 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b0e4630fb47b4fbf02a13c9bb60f4d6eafe7e095
@@ -0,0 +1 @@
+!XN--.ٮ2.ٮ2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b12f874c12b890ddcd07437fc740fd71ecd96ab1 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b12f874c12b890ddcd07437fc740fd71ecd96ab1
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b1b98122dfaa20776ea42766b41c1d1b2e8e2534 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b1b98122dfaa20776ea42766b41c1d1b2e8e2534
@@ -0,0 +1 @@
+xn--ßhxn---0000F-9999F
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b1e03fdb0419dde9498d3a130e3c27e066283ddb b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b1e03fdb0419dde9498d3a130e3c27e066283ddb
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b1fc4e216c883706a67564aa5a00637b000c67a7 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b1fc4e216c883706a67564aa5a00637b000c67a7
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b27d176333bae1885a8b4c58468bc6fab1c7f1b8 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b27d176333bae1885a8b4c58468bc6fab1c7f1b8
@@ -0,0 +1,3 @@
+!ŀ̀dict=li`.3َ̀̀2
+=
+َ)َ)ǎ.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b334fdc36ee60c014dd2e43a356721b73c74ca3d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b334fdc36ee60c014dd2e43a356721b73c74ca3d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b4818de2a226d0c8931cfe584024b3c0d1997f2b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b4818de2a226d0c8931cfe584024b3c0d1997f2b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b72d56a9035aa78c551a5d7ce50ade3616f66713 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b72d56a9035aa78c551a5d7ce50ade3616f66713
@@ -0,0 +1 @@
+ßß.xn--A19541r.xn--Aßu&.x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b7a23164679ada883c443a3a4cfc7bcec0961ccf b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b7a23164679ada883c443a3a4cfc7bcec0961ccf
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b7df67c6e1c30f302d7ceaf3b8a321e1c2f029d1 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b7df67c6e1c30f302d7ceaf3b8a321e1c2f029d1
@@ -0,0 +1 @@
+.Х.3.َ.Х.3.ََ)َََ)َ)Х.3.ََ)َ).3.َ.Х.3.ََ)َXN--)Х.3.ََ)َ)ََ.َ)ََ.)Х.)Х.3.ََ)َ)ََ.َ.Х.3.ََ)َ)Х.3.ََ)َ)ََ.3.َ.Х.3.ََ)َ)Х.3.ََ)َ)ََ.َ)ََ.)Х.3ََ.َ)ََ.)Х.3.ََ)َ).َ)ََ.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b80765839e768e1b395e4ec3bd0e17df96bd9edc b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b80765839e768e1b395e4ec3bd0e17df96bd9edc
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b83a72b7b0f075348e40d289470b854c43c0ded4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b83a72b7b0f075348e40d289470b854c43c0ded4
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b8f22ee8cd193387ed90f08953ef99e65ad6b49b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b8f22ee8cd193387ed90f08953ef99e65ad6b49b
@@ -0,0 +1 @@
+۰۰.۰)))))))۰.|n--)٦ۦ.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/b9163f852345533f40bf93a8a663605726e120a4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/b9163f852345533f40bf93a8a663605726e120a4
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ba272accd00905807784ffd6e05e7a2a338793dd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ba272accd00905807784ffd6e05e7a2a338793dd
@@ -0,0 +1 @@
+ﵿ⵿「x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/badf7ac188cec175273a9bd7f67797225e0fa53c b/fuzz/libidn2_to_ascii_8z_fuzzer.in/badf7ac188cec175273a9bd7f67797225e0fa53c
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/baf200ac6dd30f9a119138cfd5073f9261ba00cd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/baf200ac6dd30f9a119138cfd5073f9261ba00cd
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bb6f5a321b9d3109122ba4ee421c2e455d40e758 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bb6f5a321b9d3109122ba4ee421c2e455d40e758
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bc3042733d8af8ae029237f054c116259396917d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bc3042733d8af8ae029237f054c116259396917d
@@ -0,0 +1 @@
+9⵿‍⵿‍9⵿‍⵿‍9⵿‍9⵿‍⵿‍9⵿‍⵿‍9⵿‍⵿‍9⵿‍⵿‍9⵿‍9⵿‍⵿‍9⵿‍⵿‍0⵿‍9⵿‍9⵿‍⵿‍9⵿‍9⵿‍⵿‍⵿‍9⵿‍⵿‍9⵿‍9⿀(ⵍ⵿‍⵿‍
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bcb4e2aa2016377c5c2144adfdd83b0283531ad9 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bcb4e2aa2016377c5c2144adfdd83b0283531ad9
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bd07396c67d9bb18785082e74d359e846bddada8 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bd07396c67d9bb18785082e74d359e846bddada8
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bd175decdd7b41753df2691edec8c68fd8bd70e5 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bd175decdd7b41753df2691edec8c68fd8bd70e5
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bd89d8c0d4ce1cf5af7cb49abac6b56b73bf54cd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bd89d8c0d4ce1cf5af7cb49abac6b56b73bf54cd
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/be11ee5f2288a094bbc2bb65d009ec9c4f04fbed b/fuzz/libidn2_to_ascii_8z_fuzzer.in/be11ee5f2288a094bbc2bb65d009ec9c4f04fbed
@@ -0,0 +1 @@
+XN--..٣w
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/be33036f16b4daa6e9dc626d2ed0db252af78a74 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/be33036f16b4daa6e9dc626d2ed0db252af78a74
@@ -0,0 +1 @@
+XN--467$dflllllllll;lllllllllllllllll01‌\3X
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bec8316db94912e8cc0fdc345ded0f2e3f067290 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bec8316db94912e8cc0fdc345ded0f2e3f067290
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/bf1bbf052734b574cf38eb58ec882fe772694178 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/bf1bbf052734b574cf38eb58ec882fe772694178
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c01197d342355205ed223d38a4ab8a93affbb9e3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c01197d342355205ed223d38a4ab8a93affbb9e3
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c0831e08d2dbb4264940a0c6d04fb2d2457e4a72 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c0831e08d2dbb4264940a0c6d04fb2d2457e4a72
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c0e08bf448b28a42ecdcbc6e0d033d7de02c0f73 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c0e08bf448b28a42ecdcbc6e0d033d7de02c0f73
@@ -0,0 +1 @@
+‌xn--ﷺn--ﷺ
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c1a7861fce84be10532b195f449da9b7e8f87a4c b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c1a7861fce84be10532b195f449da9b7e8f87a4c
@@ -0,0 +1 @@
+ݐ‌ݐ‌mm--'ٮ.XN-X-m٥..ݮ.3ِ.)ٮ*.!ǎِ).ݮ.3ِ.)ٮ*.ǎِ).ݮ.3ِ.)ٮ*.!ǎِ)ٮ*.ǎِ).ݮ.3ِ.)ǎِ)&ݮ.3ِ.)֮Xmm--'ٮ.XN-X-m.ݮ.3ِ0.)ٮ*.!ǎِ).ݮ.3ِ0.)ٮ*.!ǎِ).ݮ.3ِ.)ٮ*.ǎِ).ݮ.3ِ.)ٮ*.!ǎِ)
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c2bcda9a7558fdb0aaacdcb7525b4f2098f151a8 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c2bcda9a7558fdb0aaacdcb7525b4f2098f151a8
@@ -0,0 +1 @@
+XN---ßT.XN---(
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c2e4d6a588934c8372dc2fb8994be1e4ddd4ff1b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c2e4d6a588934c8372dc2fb8994be1e4ddd4ff1b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c3049f4cedff187a63b1014b18d891a9d434a3b5 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c3049f4cedff187a63b1014b18d891a9d434a3b5
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c322b23cd26de537ffec78303c3f2b73167b6dcf b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c322b23cd26de537ffec78303c3f2b73167b6dcf
@@ -0,0 +1 @@
+)XN--･ݮ
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c379b8aa73aa52aa8a0e50879427f358cf31ce50 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c379b8aa73aa52aa8a0e50879427f358cf31ce50
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c3ad5b352a1799bb6fcf2b15e71ce0bf58afd770 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c3ad5b352a1799bb6fcf2b15e71ce0bf58afd770
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c3ff5211ea50980a6f57ba15722334ee36f8c0ee b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c3ff5211ea50980a6f57ba15722334ee36f8c0ee
@@ -0,0 +1 @@
+)͵3.)N--ݮٵ..))ٵ).͵3.)N
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c441d8fb4976bacce104721007d7277cdc708bc4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c441d8fb4976bacce104721007d7277cdc708bc4
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c44c6a87120f53d3751253ddc385ed4a0487435b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c44c6a87120f53d3751253ddc385ed4a0487435b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4ba25a45b96606c96360a851faae5a74c6f1a58 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4ba25a45b96606c96360a851faae5a74c6f1a58
@@ -0,0 +1 @@
+nX--٠
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4bd1da3481dde584814a6177b76072323fb4354 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4bd1da3481dde584814a6177b76072323fb4354
@@ -0,0 +1 @@
+XN--8Y9^9YY
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4df6364c9c2ee35d54ba3eae52ae38598631df0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4df6364c9c2ee35d54ba3eae52ae38598631df0
@@ -0,0 +1 @@
+))-٢.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4fa98531d857532727dccb220fc73977e16d2e0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c4fa98531d857532727dccb220fc73977e16d2e0
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c6b71a9eb6d80d3c5060c5568ae6a343c34a7d95 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c6b71a9eb6d80d3c5060c5568ae6a343c34a7d95
@@ -0,0 +1 @@
+XN--‌.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c7ee5e6b663e4a1c1424c231b9201d3d7b773d99 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c7ee5e6b663e4a1c1424c231b9201d3d7b773d99
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c88a30984b35a59ce17753e74b76018a9e27f801 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c88a30984b35a59ce17753e74b76018a9e27f801
@@ -0,0 +1 @@
+;ٮ2.ٮ2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c88d643cf084200eb6b37849c6fd1ae15fd00b6d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c88d643cf084200eb6b37849c6fd1ae15fd00b6d
@@ -0,0 +1 @@
+‍9XN--)Z;^Z6ZX;-xZxn--ZZZZZXr~r~
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c9222b5719a2870319765a2c0b57eea5e86e9cb1 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c9222b5719a2870319765a2c0b57eea5e86e9cb1
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/c99211f81f7a0107871babf041d39667d54fad1c b/fuzz/libidn2_to_ascii_8z_fuzzer.in/c99211f81f7a0107871babf041d39667d54fad1c
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ca1be488cdf9dc060a2eeb60722022eb2764f416 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ca1be488cdf9dc060a2eeb60722022eb2764f416
@@ -0,0 +1 @@
+!xn--XN--xn--w(wvvxn--w(wvXN---ßT.xn&v--vxN
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ca581882c57d980deb1fed9d7a929617c320c3a9 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ca581882c57d980deb1fed9d7a929617c320c3a9
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ca6f179a49aad3184b61836fb3dc6322f392f842 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ca6f179a49aad3184b61836fb3dc6322f392f842
@@ -0,0 +1 @@
+‌x:--ﷺﷺ-
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/cb42f246d48e9d0db0f386f4dcf8747851361283 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/cb42f246d48e9d0db0f386f4dcf8747851361283
@@ -0,0 +1 @@
+΅΅΅΅΅΅΅΅-.υ΅΅΅΅΅xn΅΅΅΅΅΅΅΅΅΅΅t-΅΅-΅2t΅΅΅΅΅΅΅-t΅΅.X
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/cbacf12f08c8d10e0c79dbff31aba570ea7cd912 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/cbacf12f08c8d10e0c79dbff31aba570ea7cd912
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/cc58bb95396dbd938e3b31ccef226af0b4ed2f79 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/cc58bb95396dbd938e3b31ccef226af0b4ed2f79
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/cd25c9d9c99a20df8c30d10cb555fbf6a760f53a b/fuzz/libidn2_to_ascii_8z_fuzzer.in/cd25c9d9c99a20df8c30d10cb555fbf6a760f53a
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d16ab21b3ce0fed185ccfe9ea6d62ebdeb066d95 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d16ab21b3ce0fed185ccfe9ea6d62ebdeb066d95
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d26b75b881429419479f0debf421ae672c253920 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d26b75b881429419479f0debf421ae672c253920
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d50cd418bb2b3b7fc21bfbd5130a55630ec93272 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d50cd418bb2b3b7fc21bfbd5130a55630ec93272
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d5605d4f0e81de25a84b07326067d9a3ebb00d87 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d5605d4f0e81de25a84b07326067d9a3ebb00d87
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d5833ec74df9fdcb1581e059b3417214808e4e5a b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d5833ec74df9fdcb1581e059b3417214808e4e5a
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d623f3f12a749b450d3711545a9587e6a373d010 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d623f3f12a749b450d3711545a9587e6a373d010
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d676c64e8c93623986ff3dee408dde56a525c8ab b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d676c64e8c93623986ff3dee408dde56a525c8ab
@@ -0,0 +1 @@
+‍)XN--)Z;^Z[ZZZZZXr~r~
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d6d35f142af3e3139ac843469d5e96d07762e119 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d6d35f142af3e3139ac843469d5e96d07762e119
@@ -0,0 +1 @@
+.۴۴.....۴۴۴....۴۴۴.۶۴۴....۴۴.۴.۴۴۴۴.XN--:.۴.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d722dd8cbfafc2e782816a6b04b35c9f11e276b3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d722dd8cbfafc2e782816a6b04b35c9f11e276b3
@@ -0,0 +1 @@
+XN---ßT.xn---x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/d753d33a9149eac38d4c079bc8157e6f463d6eed b/fuzz/libidn2_to_ascii_8z_fuzzer.in/d753d33a9149eac38d4c079bc8157e6f463d6eed
@@ -0,0 +1 @@
+XN--IN\g.XN--N-Nß
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/db1bf156c3df5247d98a02431d34acbf584c43bd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/db1bf156c3df5247d98a02431d34acbf584c43bd
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/db240bc4ac9af4a1fa07c4727ea93252c2a0318f b/fuzz/libidn2_to_ascii_8z_fuzzer.in/db240bc4ac9af4a1fa07c4727ea93252c2a0318f
@@ -0,0 +1 @@
+ς‌̀
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/db6867b01433631fb8832383097a04666bb94fa9 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/db6867b01433631fb8832383097a04666bb94fa9
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/dc05dedcd227918a399ae9dba9b735e0d1f4ecdd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/dc05dedcd227918a399ae9dba9b735e0d1f4ecdd
@@ -0,0 +1 @@
+xn(--9RDJ0C9RJ99H
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/dc25680fc98bb85c95fdfc994da7818ac598cc77 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/dc25680fc98bb85c95fdfc994da7818ac598cc77
@@ -0,0 +1 @@
+xn---ßT.xn---}-
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/dd3e5423ac402150c3137705c7818b98b670d6ab b/fuzz/libidn2_to_ascii_8z_fuzzer.in/dd3e5423ac402150c3137705c7818b98b670d6ab
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ddb7d26c0f2ec7c7fa7ac9da043d0539b4f4985c b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ddb7d26c0f2ec7c7fa7ac9da043d0539b4f4985c
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/de4bf522f8dcc1a28c6d7851732b936d391cc702 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/de4bf522f8dcc1a28c6d7851732b936d391cc702
@@ -0,0 +1 @@
+xn--.٤٤
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/df4c6d84c6c787af9d15d509adee3d883a8ba0f2 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/df4c6d84c6c787af9d15d509adee3d883a8ba0f2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/dfadc23c27e934c970f4af110f71fa44f52defde b/fuzz/libidn2_to_ascii_8z_fuzzer.in/dfadc23c27e934c970f4af110f71fa44f52defde
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e03b825842152094a606f1fe8f34dfad126cc3fe b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e03b825842152094a606f1fe8f34dfad126cc3fe
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e138ae070d2d33faf247db964b3bf6706e87f574 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e138ae070d2d33faf247db964b3bf6706e87f574
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e19bcdfdffbb4ca6c3d09a18e67784c5d760d575 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e19bcdfdffbb4ca6c3d09a18e67784c5d760d575
@@ -0,0 +1 @@
+)ٮ.XXXjobsXXXXXXXXXXXN--XXXXXXXXXXXXXXXXXXXXN--XXXXXXXXXXXXXXXx-‌XXX:XXXXXXXX
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e1a2f76987b130cf3f36b88b490fc437e4f749c2 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e1a2f76987b130cf3f36b88b490fc437e4f749c2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e1dce9564d7d123e14caffa00e934759c1dc9862 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e1dce9564d7d123e14caffa00e934759c1dc9862
@@ -0,0 +1 @@
+..XN---m..
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e29496124abf7af336ec37f595a473258d50ef7b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e29496124abf7af336ec37f595a473258d50ef7b
@@ -0,0 +1 @@
+!--۷.
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e2b902230d418f97484530ce8ecda6d237f4cc57 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e2b902230d418f97484530ce8ecda6d237f4cc57
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e2e6abbf84f482923e5cd54257191c656aea4bbd b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e2e6abbf84f482923e5cd54257191c656aea4bbd
@@ -0,0 +1 @@
+xn--.١:
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e5752644440e75375c0e8e9e08c92860ed3e38e2 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e5752644440e75375c0e8e9e08c92860ed3e38e2
@@ -0,0 +1 @@
+,xN--ßccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc-
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e5818a93bbb4b31208a3cf3701f7519ba588f1b6 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e5818a93bbb4b31208a3cf3701f7519ba588f1b6
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e5aeff1acd0973ff204eb856434b04b19371bef1 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e5aeff1acd0973ff204eb856434b04b19371bef1
@@ -0,0 +1 @@
+XN--ß-*-
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e62b24eccdd54255318c4aa64c1847ed1b7d4ee0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e62b24eccdd54255318c4aa64c1847ed1b7d4ee0
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e67c2d912297a2149e06692b9d319733a9f84650 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e67c2d912297a2149e06692b9d319733a9f84650
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e7349119e5ab8448524310e6045a10e7dd1fee08 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e7349119e5ab8448524310e6045a10e7dd1fee08
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e763c5b0c397c9efeeabaf84209ce955ba64e928 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e763c5b0c397c9efeeabaf84209ce955ba64e928
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e76d869674c01ac8818f5d7526af5a0f9ab10011 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e76d869674c01ac8818f5d7526af5a0f9ab10011
@@ -0,0 +1 @@
+5r.xn--A19542r.xn--Aßu&&.xn--A195XN--x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e7cfa7b220123d41f869045ccec88785ef1ed7e4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e7cfa7b220123d41f869045ccec88785ef1ed7e4
@@ -0,0 +1 @@
+ß--㎯
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e7fc09464f5f3385c3327ea24f7d79465dd12da3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e7fc09464f5f3385c3327ea24f7d79465dd12da3
@@ -0,0 +1 @@
+XN/‍
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/e94ee42e502c5d51f76dffa6bf25113ad0edde9d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/e94ee42e502c5d51f76dffa6bf25113ad0edde9d
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ea6511f8c2f5783a3fbc257fc6a4ced729982120 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ea6511f8c2f5783a3fbc257fc6a4ced729982120
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/eb3a22733ab223267256cb4c4b876fdadb000d7b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/eb3a22733ab223267256cb4c4b876fdadb000d7b
@@ -0,0 +1 @@
+X*‌.xn--1111XN--11111
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/eb734424a41de446502be38b90db6bf0a4a9aee4 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/eb734424a41de446502be38b90db6bf0a4a9aee4
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ec77bdf2ba2607c1c5fc1834a57b8095d6c278b3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ec77bdf2ba2607c1c5fc1834a57b8095d6c278b3
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ec893854ed8d9ce75a161cafd942fbc6713247e7 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ec893854ed8d9ce75a161cafd942fbc6713247e7
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ed636bc4c07f1e1e73e9e475ab0f34ba6574140e b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ed636bc4c07f1e1e73e9e475ab0f34ba6574140e
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ed6edffcacdb8503f79f7d23c002d0931728fda8 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ed6edffcacdb8503f79f7d23c002d0931728fda8
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/eda3014383aecdf6e129e7a2fb8937a2e7d4f658 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/eda3014383aecdf6e129e7a2fb8937a2e7d4f658
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/edbff0651982b71ce594834d6183f43f720489fa b/fuzz/libidn2_to_ascii_8z_fuzzer.in/edbff0651982b71ce594834d6183f43f720489fa
@@ -0,0 +1 @@
+xn--.١١
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/efbf6ed21d2e5d49ef9c83c6755e0e0b9c552e6b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/efbf6ed21d2e5d49ef9c83c6755e0e0b9c552e6b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f058e85566f100fb67a03e947c627354381fe7ae b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f058e85566f100fb67a03e947c627354381fe7ae
@@ -0,0 +1 @@
+125f.x.XN--w126f.xn--w125f.x.XN--w!26f.f.xn--w125f.x.XN--w!26f.xn--w126f.Vn.XN--w126f.xn‍--w'126f
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f160cc6ffa4e0069ff1f0df2bb184df7897f7c31 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f160cc6ffa4e0069ff1f0df2bb184df7897f7c31
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f2125d72cb44e4a521ab653b40a5036b16d8f25e b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f2125d72cb44e4a521ab653b40a5036b16d8f25e
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f2334bd984b51a86a099a6bf6fdee23196c30ca0 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f2334bd984b51a86a099a6bf6fdee23196c30ca0
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f301d84e91d820cb3af5e09cc5c013a24b208bae b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f301d84e91d820cb3af5e09cc5c013a24b208bae
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f3a37e3d31353b8f638457a73396351d22b5a57c b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f3a37e3d31353b8f638457a73396351d22b5a57c
@@ -0,0 +1 @@
+.٨..ݮ.3ِ.)ٮ*.!ǎِ).ݮ.3ِ.)ٮ*.ǎِ).ݮ.3ِ.)ٮ*.!ǎِ)ٮ*.ǎِ).ݮ.6ِ*)ǎِ).ݮ.3ِ.)ٮ*ٮ*.ǎِ)ǎ,ǎ)ٮ*.ǎِ)ǎ,).ݮ.3ِ.)ٮ*.ǎِ)ǎ).ݮ.6ِ.)ٮ*.ǎِ).ݮ.3ِ.)ٮ*.!ǎِ)ٮ*.ǎِ).ݮ.3ِ.)ǎِ).ݮ.3ِ.)ٮ*ٮ*.ǎِ)ǎ,ǎ,ٮ*.!ǎِ).ݮ.3ِ.)ٮ*.ǎِ)ǎ,).ݮ.3,ǎ,
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f3afa38acdc39fde0d31493a80b0d28b288f13c9 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f3afa38acdc39fde0d31493a80b0d28b288f13c9
@@ -0,0 +1 @@
+‍)XN--)X;^XN--ZZXr~r~
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f3b9bb0aca2a6f6f604afb8874c09f21141814d2 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f3b9bb0aca2a6f6f604afb8874c09f21141814d2
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f45f05218ff4503cd0e16305d6210d61400cca94 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f45f05218ff4503cd0e16305d6210d61400cca94
@@ -0,0 +1 @@
+'۸.۸.۲n.XN--
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f534fac2dcb9190d094f7fa753870520e588a671 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f534fac2dcb9190d094f7fa753870520e588a671
@@ -0,0 +1 @@
+ݐ:‌ݐ!‌x
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f5fa8de170997473fbf0470d135270d3dc546767 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f5fa8de170997473fbf0470d135270d3dc546767
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f60fccc8a37b029a095a77a008ab0af6bf6f772b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f60fccc8a37b029a095a77a008ab0af6bf6f772b
@@ -0,0 +1 @@
+)xn--..)xn-۶n-۶۶۶۶۶۶wxn--www.۶۶-۶n۷۶۶۶wwwx)n-۶۵..))ٵ..)ݮ...wwwww
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f684cf9ff456e9f9be52ddcb2601aa11667eb49b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f684cf9ff456e9f9be52ddcb2601aa11667eb49b
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f699cf1a96b566428ebe652998efc74b0f9240fa b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f699cf1a96b566428ebe652998efc74b0f9240fa
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f6e3d5c48c77bcfa03f1f3e9cc7a336dbbb8ee24 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f6e3d5c48c77bcfa03f1f3e9cc7a336dbbb8ee24
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f6f55c118dd54d752d89bc828615014db7b6f0cb b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f6f55c118dd54d752d89bc828615014db7b6f0cb
@@ -0,0 +1 @@
+XN--..ѣ-)-!٣٣w
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f7268d45d22c1722a4b47f7beb46c8d529a60beb b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f7268d45d22c1722a4b47f7beb46c8d529a60beb
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f778fcaca8d990eff071fcea0d80a71916d60558 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f778fcaca8d990eff071fcea0d80a71916d60558
@@ -0,0 +1 @@
+)ٵ.ٵݮ..)ٵ)...)ݮٵ..))ٵ..)ݮ...)ݮٵ..))ٵ..)ݮ..)۵.ٵݮ..)ٵ)...)ݮٵ..))ٵ..)ݮ..)ٵ)...)ݮٵ..))ٵ..)
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f884ce27a1cf82dec1e7c374f2953585815de056 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f884ce27a1cf82dec1e7c374f2953585815de056
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/f95cc4c94f11634188bdb1bc0f48c970c8515cd8 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/f95cc4c94f11634188bdb1bc0f48c970c8515cd8
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fa994e672698d76fe2baa2eaf6d25987aeaf5638 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fa994e672698d76fe2baa2eaf6d25987aeaf5638
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fab104a875a324c17a608a6b9f131553aca85571 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fab104a875a324c17a608a6b9f131553aca85571
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fbb2e70f6b4dae5ff17f834d6b0cf44c851fd59d b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fbb2e70f6b4dae5ff17f834d6b0cf44c851fd59d
@@ -0,0 +1 @@
+)ݮ.)･ݮ
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fbb9ea375c23c1c95296c1d169fa083aa6369ab5 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fbb9ea375c23c1c95296c1d169fa083aa6369ab5
@@ -0,0 +1 @@
+XN---‷‌x)‷‌--‗‷-‷‷XN---
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fbfb4c08be686910b78d6d4579e9640f30786385 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fbfb4c08be686910b78d6d4579e9640f30786385
@@ -0,0 +1 @@
+n-x-ßh.xn--999'h.xn-F
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fc11710734b2b74b8c280fcf02f8984fa64199c6 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fc11710734b2b74b8c280fcf02f8984fa64199c6
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fc743af059196cc94d0e5032d320b3efcfe82ac5 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fc743af059196cc94d0e5032d320b3efcfe82ac5
@@ -0,0 +1 @@
+xnT.xn----ßT.xn---}-
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fd1159847b1001d26006e6677b5f8d2b5e7cc628 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fd1159847b1001d26006e6677b5f8d2b5e7cc628
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fd9766f892c4e2c36ac9275a7da6cb255030c365 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fd9766f892c4e2c36ac9275a7da6cb255030c365
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fe725ecb7e993c7707a3ff3862825e37768d982e b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fe725ecb7e993c7707a3ff3862825e37768d982e
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/fea6c59f054219d35f854a4e2f45ad5fc2d67412 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/fea6c59f054219d35f854a4e2f45ad5fc2d67412
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/feb8dda8fca6981e231ec792a3d84e060ddf71c3 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/feb8dda8fca6981e231ec792a3d84e060ddf71c3
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff22ca800145be135c9d701ab2add0bb7329f33f b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff22ca800145be135c9d701ab2add0bb7329f33f
@@ -0,0 +1 @@
+xn--ß--xx-.xn#-n-MMMxn--MMMMMMMMMMMMMMMMMMP,XN--
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff5c73978d16ebcc6bedecb3955f7dca0e36154b b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff5c73978d16ebcc6bedecb3955f7dca0e36154b
@@ -0,0 +1 @@
+!XN--.ٮ2.!XN
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff9ca32a5736fc31da79f9f2880f5519d36c67e7 b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff9ca32a5736fc31da79f9f2880f5519d36c67e7
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff9f34ba8c46565e67d10f676e688642410c930e b/fuzz/libidn2_to_ascii_8z_fuzzer.in/ff9f34ba8c46565e67d10f676e688642410c930e
diff --git a/fuzz/libidn2_to_ascii_8z_fuzzer.repro/clusterfuzz-testcase-5644466457673728 b/fuzz/libidn2_to_ascii_8z_fuzzer.repro/clusterfuzz-testcase-5644466457673728
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.c
@@ -32,10 +32,13 @@
 #include "idn2.h"
 #include "fuzzer.h"
 
+#pragma GCC optimize ("O0")
+
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
 	char *domain;
 	char *out;
+	const char *x = "";
 
 	if (size > 1024)
 		return 0;
@@ -47,8 +50,61 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 	memcpy(domain, data, size);
 	domain[size] = 0;
 
+	if (size == 0) {
+		x = idn2_check_version(NULL);
+
+		for (int err = -500; err <= 0; err++) {
+			if (idn2_strerror_name(err))
+				x = NULL;
+			if (idn2_strerror(err))
+				x = NULL;
+		}
+
+		/*** test NULL input/output combinations ***/
+
+		if (idn2_to_unicode_lzlz(NULL, &out, 0) == IDN2_OK)
+			idn2_free(out);
+		idn2_to_unicode_lzlz(NULL, NULL, 0);
+		idn2_to_unicode_lzlz(domain, NULL, 0);
+
+		{
+			uint32_t *in32 = (uint32_t *) malloc(4);
+			uint32_t *out32;
+			in32[0] = 0;
+			if (idn2_to_unicode_4z4z(NULL, &out32, 0) == IDN2_OK)
+				idn2_free(out32);
+			idn2_to_unicode_4z4z(NULL, NULL, 0);
+			idn2_to_unicode_4z4z(in32, NULL, 0);
+			free(in32);
+		}
+
+		{
+			uint32_t *out32;
+			if (idn2_to_unicode_8z4z(NULL, &out32, 0) == IDN2_OK)
+				idn2_free(out32);
+			idn2_to_unicode_8z4z(NULL, NULL, 0);
+			idn2_to_unicode_8z4z(domain, NULL, 0);
+		}
+
+		{
+			uint32_t *u32 = (uint32_t *) malloc(0);
+			size_t u32len = 0;
+			idn2_to_unicode_44i(NULL, 1, u32, &u32len, 0);
+			u32len = 0;
+			idn2_to_unicode_44i(NULL, 0, NULL, &u32len, 0);
+			free(u32);
+		}
+	}
+
+	// let's fuzz gnulib's strverscmp()
+	if (idn2_check_version(domain))
+		x = NULL;
+
+	if (x)
+		free(malloc(1)); // prevent compiler from optimizing out idn2_check_version()
+
 	// internally calls idn2_to_unicode_8zlz(), idn2_to_unicode_8z8z(), idn2_to_unicode_8z4z()
-	if (idn2_to_unicode_lzlz(domain, &out, 0) == IDNA_SUCCESS)
+	if (idn2_to_unicode_lzlz(domain, &out, 0) == IDN2_OK)
 		idn2_free(out);
 
 	if ((size & 3) == 0) {

diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/0d03f830fbe02c560508b1d581a02c58d111ef07 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/0d03f830fbe02c560508b1d581a02c58d111ef07
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/0ddf39ef2efa6902e21661d2597e91b8253a931f b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/0ddf39ef2efa6902e21661d2597e91b8253a931f
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/0fb65517cb33874dc751cb4f9fea13dab0c957b6 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/0fb65517cb33874dc751cb4f9fea13dab0c957b6
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/164cd8345463a32df320f8559591599405de79d4 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/164cd8345463a32df320f8559591599405de79d4
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/17057c222a010c0b3ca4d871c4f680d9e03ccc6f b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/17057c222a010c0b3ca4d871c4f680d9e03ccc6f
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/1bf67e8191d68eb9188757d263310a5de3760670 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/1bf67e8191d68eb9188757d263310a5de3760670
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/221c5b8f8ce01af9aeca0b1da1548d3dcb377af3 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/221c5b8f8ce01af9aeca0b1da1548d3dcb377af3
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/2b3a4dbaab815e7b74428d6b2d69cc8b4a452b3c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/2b3a4dbaab815e7b74428d6b2d69cc8b4a452b3c
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/2b6ae412a542939c77b53c222ab61b8118450c5d b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/2b6ae412a542939c77b53c222ab61b8118450c5d
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/2f43fb37ab346ac2368fac371b825af926dc6f3e b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/2f43fb37ab346ac2368fac371b825af926dc6f3e
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/330e3572c8876a10be5ffa5400a538e871218096 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/330e3572c8876a10be5ffa5400a538e871218096
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3555a720c27e51260d9210738690d51d835da833 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3555a720c27e51260d9210738690d51d835da833
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/37ff761320a90974609165e0235e55054c618a5b b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/37ff761320a90974609165e0235e55054c618a5b
@@ -0,0 +1 @@
+YYYY3YYYY'Y.'*YYYYYYYYYY.'*YYYYYYYYYY.(YY(YYYYYYYY.YYYY3YYYYY.(YY(Y'YYYY+Y.'*YYYYYYYYYY.(YY(YMYYYYYY.(YY(YYYYYYYY.YYYY3YYYYY).'YYY#YYYY'Y.'*YYYYYYYYYY.(YY(Y'YYYY+Y.'*YYYYYYYYYY.(YY(YYYYYYYY.4YMMMMMMMMYY
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/39fa0a16d79d90780b9daae0c6358c7488452d95 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/39fa0a16d79d90780b9daae0c6358c7488452d95
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3b9496bedbafdf53a544d38bdc770972f834620c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3b9496bedbafdf53a544d38bdc770972f834620c
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3cab51594eac95643199465a403c0955960b0c10 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3cab51594eac95643199465a403c0955960b0c10
@@ -0,0 +1,2 @@
+
+....((
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3f1e09c8a77d1ff1922b64eecc2b15be73ef1d67 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3f1e09c8a77d1ff1922b64eecc2b15be73ef1d67
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3f6a5dfddd26f511f898767daf42fc8e4bd51515 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/3f6a5dfddd26f511f898767daf42fc8e4bd51515
@@ -0,0 +1,3 @@
+
+.((
+.((
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/426f261103fd52bbfe9f8a38c9c9f316d89f99c5 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/426f261103fd52bbfe9f8a38c9c9f316d89f99c5
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/42f3520831c1c21f8d6f6c635b61cc284d0413b5 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/42f3520831c1c21f8d6f6c635b61cc284d0413b5
@@ -0,0 +1,2 @@
+
+.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/4dc55222752f483d2359beca314fe0f2051e025f b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/4dc55222752f483d2359beca314fe0f2051e025f
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/597ea4c2f16baf8c4cb96a29fae1d757129c9dfd b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/597ea4c2f16baf8c4cb96a29fae1d757129c9dfd
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/5e34e3d616fe9e3e526f46da54e058721e9f51c5 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/5e34e3d616fe9e3e526f46da54e058721e9f51c5
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/5f0f9bc3c8532695824b223fe46b07cb4c8db9c0 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/5f0f9bc3c8532695824b223fe46b07cb4c8db9c0
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/601b9129c8efdd994c4814e6db26cf6159f6c5ee b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/601b9129c8efdd994c4814e6db26cf6159f6c5ee
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/62cf4def116c3cba55ab5e8e465895aced43b585 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/62cf4def116c3cba55ab5e8e465895aced43b585
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/6513497bd0b5018de12b8c6d679959d18a406c1c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/6513497bd0b5018de12b8c6d679959d18a406c1c
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/67627f90c268c94ddecca42ef0060785f417bf6e b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/67627f90c268c94ddecca42ef0060785f417bf6e
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/689c0f1e3460779de1680301738058956b3115d0 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/689c0f1e3460779de1680301738058956b3115d0
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/6f7ea60c73b6576e5648c32589427c91e4188a74 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/6f7ea60c73b6576e5648c32589427c91e4188a74
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/6ff2aacfab867b342c8963bc50905297fbc3adf5 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/6ff2aacfab867b342c8963bc50905297fbc3adf5
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/721fc607a4c30c7221e201d6a1d1c8cd77042943 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/721fc607a4c30c7221e201d6a1d1c8cd77042943
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/73d8b08e24c7593f36e543471bc9eb8cd79771d2 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/73d8b08e24c7593f36e543471bc9eb8cd79771d2
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/75940d514d3d472925fe6c8f35f0859cc7bc7f93 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/75940d514d3d472925fe6c8f35f0859cc7bc7f93
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/7c020a2bca0bf258b71546d8888abe6126dfaeec b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/7c020a2bca0bf258b71546d8888abe6126dfaeec
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/80c4a4fcd5157be4c3263595d04688e7d95d7afb b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/80c4a4fcd5157be4c3263595d04688e7d95d7afb
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/85fc17ca296fb43ebe0cfdabace57a56bdef248c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/85fc17ca296fb43ebe0cfdabace57a56bdef248c
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/8645f8436fbe228a1d24b75129e9de115add40b9 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/8645f8436fbe228a1d24b75129e9de115add40b9
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/89f0205bef9f0e3ef556ebce1319731fcf5259d3 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/89f0205bef9f0e3ef556ebce1319731fcf5259d3
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/8a2d767f80f7cdc7eab515b6ba20a3b20d5884b2 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/8a2d767f80f7cdc7eab515b6ba20a3b20d5884b2
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/8bd3d238d248aff675c5237f37f69c5099c86fd5 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/8bd3d238d248aff675c5237f37f69c5099c86fd5
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/912da4d660cfc25f12836becd98190ff796a44a5 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/912da4d660cfc25f12836becd98190ff796a44a5
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/957b6305187fbf8a874f7816599ca450a9271be1 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/957b6305187fbf8a874f7816599ca450a9271be1
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9616b0fbe673cb25b95b4352260451f6d917e6e4 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9616b0fbe673cb25b95b4352260451f6d917e6e4
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9a21b50cf7c68821865675136ab7363caa46db1f b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9a21b50cf7c68821865675136ab7363caa46db1f
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9a5386eeb77150712ceaeccb4cd1d166fe3e0f91 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9a5386eeb77150712ceaeccb4cd1d166fe3e0f91
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9d9d7918f035af39fedec0f5560713242e7ba80f b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/9d9d7918f035af39fedec0f5560713242e7ba80f
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/a16881364a5217ef3ce3323658dde4d145895c10 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/a16881364a5217ef3ce3323658dde4d145895c10
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/a946208d4c63b846593354cb76d61475be23548e b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/a946208d4c63b846593354cb76d61475be23548e
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/ab93246531f75cb4a93a559a294f1ffb0b75562f b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/ab93246531f75cb4a93a559a294f1ffb0b75562f
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/ad5d18aa307948bb6b558d05101769307747d73c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/ad5d18aa307948bb6b558d05101769307747d73c
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/af6e3e57af3dd2ce0517b03346733292990b2f18 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/af6e3e57af3dd2ce0517b03346733292990b2f18
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/afac2484f7d2d4ab75f73fccfa1ae58565733d8e b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/afac2484f7d2d4ab75f73fccfa1ae58565733d8e
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b1ec45b13c4a39a06c79f82b2cf9e586895bc5eb b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b1ec45b13c4a39a06c79f82b2cf9e586895bc5eb
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b37fa8cedbe4b1ff1741464f3ed026afcf1673d3 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b37fa8cedbe4b1ff1741464f3ed026afcf1673d3
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b4d0831391215e2f4af261e5bb65df22bd99e6d3 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b4d0831391215e2f4af261e5bb65df22bd99e6d3
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b7b929f711ebe97629c90eabf41f7ffdb80735ee b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/b7b929f711ebe97629c90eabf41f7ffdb80735ee
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/c18350f1f10f4f977f251b19de56415e4f803334 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/c18350f1f10f4f977f251b19de56415e4f803334
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/c1eb0be60ea0037a4a18fcdc5aee0c4060626ead b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/c1eb0be60ea0037a4a18fcdc5aee0c4060626ead
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/c5698e233ebbaba53b821b00c78207d0811b945e b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/c5698e233ebbaba53b821b00c78207d0811b945e
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/cd31221a265c15bdd7a5f809a0657bfd482bbfa1 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/cd31221a265c15bdd7a5f809a0657bfd482bbfa1
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/cfd9aa564c8b8d835b4a49d1c571334a50769dbf b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/cfd9aa564c8b8d835b4a49d1c571334a50769dbf
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/da2a482986155ec30aa043bad6de8ab05af7182e b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/da2a482986155ec30aa043bad6de8ab05af7182e
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/dd13f979ec6dcee12cd1e0b46e888beb18c9407c b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/dd13f979ec6dcee12cd1e0b46e888beb18c9407c
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/dd96c629e17246a12c1b64b76195ddba609d63ef b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/dd96c629e17246a12c1b64b76195ddba609d63ef
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/de96c825b31198897f0ac4e8773a20af1b164952 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/de96c825b31198897f0ac4e8773a20af1b164952
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/e602f37976b16e45ef981bf3c5d5dfc10ab4d68d b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/e602f37976b16e45ef981bf3c5d5dfc10ab4d68d
@@ -0,0 +1,34 @@
+
+.((
+(
+
+.(
+.((
+.(
+.8(
+.(.((((((((
+.(
+.((
+.(
+.8(
+.(
+.((
+.(
+.8(
+
+(
+
+.(
+.((
+.(
+.8(
+.(.((((((((
+.(
+.((
+.(
+.8(
+.(
+.((
+.(
+.8(
+.(.(((((.(.(((((
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/ee040c300ee99230777a428ca1d49a5e84de9a07 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/ee040c300ee99230777a428ca1d49a5e84de9a07
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/eea3981de3a6226ca6c231dbd0d44eb84a003b81 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/eea3981de3a6226ca6c231dbd0d44eb84a003b81
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f189d802e42c7330c10ca4bdbfc868da27e8df73 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f189d802e42c7330c10ca4bdbfc868da27e8df73
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f1a60d0ce9e3fd9958a98ede451064126a42f0fc b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f1a60d0ce9e3fd9958a98ede451064126a42f0fc
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f6554b2898165f33c58e124651947401a2d342d0 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f6554b2898165f33c58e124651947401a2d342d0
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f690305390cd3ca66285af29dafa973648c53f84 b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/f690305390cd3ca66285af29dafa973648c53f84
diff --git a/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/zero b/fuzz/libidn2_to_unicode_8z8z_fuzzer.in/zero
diff --git a/fuzz/main.c b/fuzz/main.c
@@ -43,13 +43,18 @@ static void test_all_from(const char *dirname)
 {
 	DIR *dirp;
 	struct dirent *dp;
+	char fname[1024];
+	int len;
 
 	if ((dirp = opendir(dirname))) {
 		while ((dp = readdir(dirp))) {
 			if (*dp->d_name == '.') continue;
 
-			char fname[strlen(dirname) + strlen(dp->d_name) + 2];
-			snprintf(fname, sizeof(fname), "%s/%s", dirname, dp->d_name);
+			len = snprintf(fname, sizeof(fname), "%s/%s", dirname, dp->d_name);
+			if (len < 0 || len >= (int) sizeof(fname)) {
+				fprintf(stderr, "File name truncation: %s/%s\n", dirname, dp->d_name);
+				continue;
+			}
 
 			int fd;
 			if ((fd = open(fname, O_RDONLY)) == -1) {
@@ -81,24 +86,31 @@ static void test_all_from(const char *dirname)
 
 int main(int argc, char **argv)
 {
+	int len;
+
 	/* if VALGRIND testing is enabled, we have to call ourselves with valgrind checking */
 	if (argc == 1) {
 		const char *valgrind = getenv("TESTS_VALGRIND");
 
 		if (valgrind && *valgrind) {
-			size_t cmdsize = strlen(valgrind) + strlen(argv[0]) + 32;
-			char *cmd = alloca(cmdsize);
+			char cmd[1024]; /* avoid alloca / VLA / heap allocation */
+
+			len = snprintf(cmd, sizeof(cmd), "TESTS_VALGRIND="" %s %s", valgrind, argv[0]);
+			if (len < 0 || len >= (int) sizeof(cmd))
+				return 1; /* failure on command truncation */
 
-			snprintf(cmd, cmdsize, "TESTS_VALGRIND="" %s %s", valgrind, argv[0]);
 			return system(cmd) != 0;
 		}
 	}
 
 	const char *target = strrchr(argv[0], '/');
 	target = target ? target + 1 : argv[0];
 
-	char corporadir[sizeof(SRCDIR) + 1 + strlen(target) + 8];
-	snprintf(corporadir, sizeof(corporadir), SRCDIR "/%s.in", target);
+	char corporadir[1024]; /* avoid alloca / VLA / heap allocation */
+
+	len = snprintf(corporadir, sizeof(corporadir), SRCDIR "/%s.in", target);
+	if (len < 0 || len >= (int) sizeof(corporadir))
+		return 1; /* failure on file name truncation */
 
 	test_all_from(corporadir);
 

diff --git a/fuzz/run-clang.sh b/fuzz/run-clang.sh
@@ -40,7 +40,7 @@ workers=$(($(nproc) - 1))
 jobs=$workers
 
 clang-6.0 \
- $CFLAGS -Og -g -I../include -I.. \
+ $CFLAGS -Og -g -I../lib -I.. \
  ${fuzzer}.c -o ${fuzzer} \
  -Wl,-Bstatic ../lib/.libs/libidn2.a -lFuzzer \
  -lunistring \

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -101,5 +101,5 @@ $(NFCQC):
 if HAVE_LD_VERSION_SCRIPT
 libidn2_la_LDFLAGS += -Wl,--version-script=$(srcdir)/idn2.map
 else
-libidn2_la_LDFLAGS += -export-symbols-regex '^idn2_.*|_idn2_punycode_..code'
+libidn2_la_LDFLAGS += -export-symbols-regex '^idn2_.*'
 endif
diff --git a/lib/bidi.h b/lib/bidi.h
@@ -26,6 +26,13 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LIBIDN2_BIDI_H
+#define LIBIDN2_BIDI_H
+
 #include <stdint.h>
+#include "idn2.h"
+
+int G_GNUC_IDN2_ATTRIBUTE_PURE
+	_idn2_bidi (const uint32_t * label, size_t llen);
 
-int _idn2_bidi (const uint32_t * label, size_t llen) _GL_ATTRIBUTE_PURE;
+#endif /* LIBIDN2_BIDI_H */
diff --git a/lib/context.c b/lib/context.c
@@ -29,11 +29,8 @@
 #include <config.h>
 
 #include "idn2.h"
-
 #include "tables.h"
-
 #include <unictype.h>		/* uc_combining_class, UC_CCC_VR */
-
 #include "context.h"
 
 int
@@ -115,6 +112,17 @@ _idn2_contextj_rule (const uint32_t * label, size_t llen, size_t pos)
   return IDN2_CONTEXTJ_NO_RULE;
 }
 
+static const char *
+_uc_script_name (ucs4_t uc)
+{
+  const uc_script_t *ucs = uc_script(uc);
+
+  if (!ucs)
+    return "";
+
+  return ucs->name;
+}
+
 int
 _idn2_contexto_rule (const uint32_t * label, size_t llen, size_t pos)
 {
@@ -140,7 +148,7 @@ _idn2_contexto_rule (const uint32_t * label, size_t llen, size_t pos)
       /* GREEK LOWER NUMERAL SIGN (KERAIA) */
       if (pos == llen - 1)
 	return IDN2_CONTEXTO;
-      if (strcmp (uc_script (label[pos + 1])->name, "Greek") == 0)
+      if (strcmp (_uc_script_name (label[pos + 1]), "Greek") == 0)
 	return IDN2_OK;
       return IDN2_CONTEXTO;
       break;
@@ -151,7 +159,7 @@ _idn2_contexto_rule (const uint32_t * label, size_t llen, size_t pos)
       /* HEBREW PUNCTUATION GERSHAYIM */
       if (pos == 0)
 	return IDN2_CONTEXTO;
-      if (strcmp (uc_script (label[pos - 1])->name, "Hebrew") == 0)
+      if (strcmp (_uc_script_name (label[pos - 1]), "Hebrew") == 0)
 	return IDN2_OK;
       return IDN2_CONTEXTO;
       break;
@@ -202,9 +210,9 @@ _idn2_contexto_rule (const uint32_t * label, size_t llen, size_t pos)
 	bool script_ok = false;
 
 	for (i = 0; !script_ok && i < llen; i++)
-	  if (strcmp (uc_script (label[i])->name, "Hiragana") == 0
-	      || strcmp (uc_script (label[i])->name, "Katakana") == 0
-	      || strcmp (uc_script (label[i])->name, "Han") == 0)
+	  if (strcmp (_uc_script_name (label[i]), "Hiragana") == 0
+	      || strcmp (_uc_script_name (label[i]), "Katakana") == 0
+	      || strcmp (_uc_script_name (label[i]), "Han") == 0)
 	    script_ok = true;
 
 	if (script_ok)

diff --git a/lib/context.h b/lib/context.h
@@ -26,11 +26,20 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LIBIDN2_CONTEXT_H
+#define LIBIDN2_CONTEXT_H
+
 #include <stdint.h>
 #include <stdbool.h>
+#include "idn2.h"
+
+int G_GNUC_IDN2_ATTRIBUTE_PURE
+	_idn2_contextj_rule (const uint32_t * label, size_t llen, size_t pos);
 
-int _idn2_contextj_rule (const uint32_t * label, size_t llen, size_t pos) _GL_ATTRIBUTE_PURE;
+int G_GNUC_IDN2_ATTRIBUTE_PURE
+	_idn2_contexto_rule (const uint32_t * label, size_t llen, size_t pos);
 
-int _idn2_contexto_rule (const uint32_t * label, size_t llen, size_t pos) _GL_ATTRIBUTE_PURE;
+bool G_GNUC_IDN2_ATTRIBUTE_CONST
+	_idn2_contexto_with_rule (uint32_t cp);
 
-bool _idn2_contexto_with_rule (uint32_t cp) _GL_ATTRIBUTE_CONST;
+#endif /* LIBIDN2_CONTEXT_H */
diff --git a/lib/data.h b/lib/data.h
@@ -26,6 +26,9 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LIBIDN2_DATA_H
+#define LIBIDN2_DATA_H
+
 #include <stdint.h>
 #include <sys/types.h>
 
@@ -43,3 +46,5 @@ struct idna_table
 
 extern const struct idna_table idna_table[];
 extern const size_t idna_table_size;
+
+#endif /* LIBIDN2_DATA_H */
diff --git a/lib/error.c b/lib/error.c
@@ -46,114 +46,39 @@
 const char *
 idn2_strerror (int rc)
 {
-  const char *p;
-
   bindtextdomain (PACKAGE, LOCALEDIR);
 
   switch (rc)
     {
-    case IDN2_OK:
-      p = _("success");
-      break;
-
-    case IDN2_MALLOC:
-      p = _("out of memory");
-      break;
-
-    case IDN2_NO_CODESET:
-      p = _("could not determine locale encoding format");
-      break;
-
-    case IDN2_ICONV_FAIL:
-      p = _("could not convert string to UTF-8");
-      break;
-
-    case IDN2_ENCODING_ERROR:
-      p = _("string encoding error");
-      break;
-
-    case IDN2_NFC:
-      p = _("string could not be NFC normalized");
-      break;
-
-    case IDN2_PUNYCODE_BAD_INPUT:
-      p = _("string contains invalid punycode data");
-      break;
-
-    case IDN2_PUNYCODE_BIG_OUTPUT:
-      p = _("punycode encoded data will be too large");
-      break;
-
-    case IDN2_PUNYCODE_OVERFLOW:
-      p = _("punycode conversion resulted in overflow");
-      break;
-
-    case IDN2_TOO_BIG_DOMAIN:
-      p = _("domain name longer than 255 characters");
-      break;
-
-    case IDN2_TOO_BIG_LABEL:
-      p = _("domain label longer than 63 characters");
-      break;
-
-    case IDN2_INVALID_ALABEL:
-      p = _("input A-label is not valid");
-      break;
-
-    case IDN2_UALABEL_MISMATCH:
-      p = _("input A-label and U-label does not match");
-      break;
-
-    case IDN2_NOT_NFC:
-      p = _("string is not in Unicode NFC format");
-      break;
-
-    case IDN2_2HYPHEN:
-      p = _("string contains forbidden two hyphens pattern");
-      break;
-
-    case IDN2_HYPHEN_STARTEND:
-      p = _("string start/ends with forbidden hyphen");
-      break;
-
-    case IDN2_LEADING_COMBINING:
-      p = _("string contains a forbidden leading combining character");
-      break;
-
-    case IDN2_DISALLOWED:
-      p = _("string contains a disallowed character");
-      break;
-
-    case IDN2_CONTEXTJ:
-      p = _("string contains a forbidden context-j character");
-      break;
-
-    case IDN2_CONTEXTJ_NO_RULE:
-      p = _("string contains a context-j character with null rule");
-      break;
-
-    case IDN2_CONTEXTO:
-      p = _("string contains a forbidden context-o character");
-      break;
-
-    case IDN2_CONTEXTO_NO_RULE:
-      p = _("string contains a context-o character with null rule");
-      break;
-
-    case IDN2_UNASSIGNED:
-      p = _("string contains unassigned code point");
-      break;
-
-    case IDN2_BIDI:
-      p = _("string has forbidden bi-directional properties");
-      break;
-
-    default:
-      p = _("Unknown error");
-      break;
+    case IDN2_OK: return _("success");
+    case IDN2_MALLOC: return _("out of memory");
+    case IDN2_NO_CODESET: return _("could not determine locale encoding format");
+    case IDN2_ICONV_FAIL: return _("could not convert string to UTF-8");
+    case IDN2_ENCODING_ERROR: return _("string encoding error");
+    case IDN2_NFC: return _("string could not be NFC normalized");
+    case IDN2_PUNYCODE_BAD_INPUT: return _("string contains invalid punycode data");
+    case IDN2_PUNYCODE_BIG_OUTPUT: return _("punycode encoded data will be too large");
+    case IDN2_PUNYCODE_OVERFLOW: return _("punycode conversion resulted in overflow");
+    case IDN2_TOO_BIG_DOMAIN: return _("domain name longer than 255 characters");
+    case IDN2_TOO_BIG_LABEL: return _("domain label longer than 63 characters");
+    case IDN2_INVALID_ALABEL: return _("input A-label is not valid");
+    case IDN2_UALABEL_MISMATCH: return _("input A-label and U-label does not match");
+    case IDN2_NOT_NFC: return _("string is not in Unicode NFC format");
+    case IDN2_2HYPHEN: return _("string contains forbidden two hyphens pattern");
+    case IDN2_HYPHEN_STARTEND: return _("string start/ends with forbidden hyphen");
+    case IDN2_LEADING_COMBINING: return _("string contains a forbidden leading combining character");
+    case IDN2_DISALLOWED: return _("string contains a disallowed character");
+    case IDN2_CONTEXTJ: return _("string contains a forbidden context-j character");
+    case IDN2_CONTEXTJ_NO_RULE: return _("string contains a context-j character with null rule");
+    case IDN2_CONTEXTO: return _("string contains a forbidden context-o character");
+    case IDN2_CONTEXTO_NO_RULE: return _("string contains a context-o character with null rule");
+    case IDN2_UNASSIGNED: return _("string contains unassigned code point");
+    case IDN2_BIDI: return _("string has forbidden bi-directional properties");
+    case IDN2_DOT_IN_LABEL: return _("domain label has forbidden dot (TR46)");
+    case IDN2_INVALID_TRANSITIONAL: return _("domain label has character forbidden in transitional mode (TR46)");
+    case IDN2_INVALID_NONTRANSITIONAL: return _("domain label has character forbidden in non-transitional mode (TR46)");
+    default: return _("Unknown error");
     }
-
-  return p;
 }
 
 #define ERR2STR(name) #name
@@ -174,126 +99,36 @@ idn2_strerror (int rc)
 const char *
 idn2_strerror_name (int rc)
 {
-  const char *p;
-
   switch (rc)
     {
-    case IDN2_OK:
-      p = ERR2STR (IDN2_OK);
-      break;
-
-    case IDN2_MALLOC:
-      p = ERR2STR (IDN2_MALLOC);
-      break;
-
-    case IDN2_NO_CODESET:
-      p = ERR2STR (IDN2_NO_NODESET);
-      break;
-
-    case IDN2_ICONV_FAIL:
-      p = ERR2STR (IDN2_ICONV_FAIL);
-      break;
-
-    case IDN2_ENCODING_ERROR:
-      p = ERR2STR (IDN2_ENCODING_ERROR);
-      break;
-
-    case IDN2_NFC:
-      p = ERR2STR (IDN2_NFC);
-      break;
-
-    case IDN2_PUNYCODE_BAD_INPUT:
-      p = ERR2STR (IDN2_PUNYCODE_BAD_INPUT);
-      break;
-
-    case IDN2_PUNYCODE_BIG_OUTPUT:
-      p = ERR2STR (IDN2_PUNYCODE_BIG_OUTPUT);
-      break;
-
-    case IDN2_PUNYCODE_OVERFLOW:
-      p = ERR2STR (IDN2_PUNYCODE_OVERFLOW);
-      break;
-
-    case IDN2_TOO_BIG_DOMAIN:
-      p = ERR2STR (IDN2_TOO_BIG_DOMAIN);
-      break;
-
-    case IDN2_TOO_BIG_LABEL:
-      p = ERR2STR (IDN2_TOO_BIG_LABEL);
-      break;
-
-    case IDN2_INVALID_ALABEL:
-      p = ERR2STR (IDN2_INVALID_ALABEL);
-      break;
-
-    case IDN2_UALABEL_MISMATCH:
-      p = ERR2STR (IDN2_UALABEL_MISMATCH);
-      break;
-
-    case IDN2_INVALID_FLAGS:
-      p = ERR2STR (IDN2_INVALID_FLAGS);
-      break;
-
-    case IDN2_NOT_NFC:
-      p = ERR2STR (IDN2_NOT_NFC);
-      break;
-
-  case IDN2_2HYPHEN:
-      p = ERR2STR (IDN2_2HYPHEN);
-      break;
-
-    case IDN2_HYPHEN_STARTEND:
-      p = ERR2STR (IDN2_HYPHEN_STARTEND);
-      break;
-
-    case IDN2_LEADING_COMBINING:
-      p = ERR2STR (IDN2_LEADING_COMBINING);
-      break;
-
-    case IDN2_DISALLOWED:
-      p = ERR2STR (IDN2_DISALLOWED);
-      break;
-
-    case IDN2_CONTEXTJ:
-      p = ERR2STR (IDN2_CONTEXTJ);
-      break;
-
-    case IDN2_CONTEXTJ_NO_RULE:
-      p = ERR2STR (IDN2_CONTEXTJ_NO_RULE);
-      break;
-
-    case IDN2_CONTEXTO:
-      p = ERR2STR (IDN2_CONTEXTO);
-      break;
-
-    case IDN2_CONTEXTO_NO_RULE:
-      p = ERR2STR (IDN2_CONTEXTO_NO_RULE);
-      break;
-
-    case IDN2_UNASSIGNED:
-      p = ERR2STR (IDN2_UNASSIGNED);
-      break;
-
-    case IDN2_BIDI:
-      p = ERR2STR (IDN2_BIDI);
-      break;
-
-    case IDN2_DOT_IN_LABEL:
-      p = ERR2STR (IDN2_DOT_IN_LABEL);
-      break;
-
-    case IDN2_INVALID_TRANSITIONAL:
-      p = ERR2STR (IDN2_INVALID_TRANSITIONAL);
-      break;
-
-    case IDN2_INVALID_NONTRANSITIONAL:
-      p = ERR2STR (IDN2_INVALID_NONTRANSITIONAL);
-      break;
-
-    default:
-      p = "IDN2_UNKNOWN";
-      break;
+    case IDN2_OK: return ERR2STR (IDN2_OK);
+    case IDN2_MALLOC: return ERR2STR (IDN2_MALLOC);
+    case IDN2_NO_CODESET:  return ERR2STR (IDN2_NO_NODESET);
+    case IDN2_ICONV_FAIL:  return  ERR2STR (IDN2_ICONV_FAIL);
+    case IDN2_ENCODING_ERROR: return ERR2STR (IDN2_ENCODING_ERROR);
+    case IDN2_NFC: return ERR2STR (IDN2_NFC);
+    case IDN2_PUNYCODE_BAD_INPUT: return ERR2STR (IDN2_PUNYCODE_BAD_INPUT);
+    case IDN2_PUNYCODE_BIG_OUTPUT: return ERR2STR (IDN2_PUNYCODE_BIG_OUTPUT);
+    case IDN2_PUNYCODE_OVERFLOW: return ERR2STR (IDN2_PUNYCODE_OVERFLOW);
+    case IDN2_TOO_BIG_DOMAIN: return ERR2STR (IDN2_TOO_BIG_DOMAIN);
+    case IDN2_TOO_BIG_LABEL: return ERR2STR (IDN2_TOO_BIG_LABEL);
+    case IDN2_INVALID_ALABEL: return ERR2STR (IDN2_INVALID_ALABEL);
+    case IDN2_UALABEL_MISMATCH: return ERR2STR (IDN2_UALABEL_MISMATCH);
+    case IDN2_INVALID_FLAGS: return ERR2STR (IDN2_INVALID_FLAGS);
+    case IDN2_NOT_NFC: return ERR2STR (IDN2_NOT_NFC);
+    case IDN2_2HYPHEN: return ERR2STR (IDN2_2HYPHEN);
+    case IDN2_HYPHEN_STARTEND: return ERR2STR (IDN2_HYPHEN_STARTEND);
+    case IDN2_LEADING_COMBINING: return ERR2STR (IDN2_LEADING_COMBINING);
+    case IDN2_DISALLOWED: return ERR2STR (IDN2_DISALLOWED);
+    case IDN2_CONTEXTJ: return ERR2STR (IDN2_CONTEXTJ);
+    case IDN2_CONTEXTJ_NO_RULE: return ERR2STR (IDN2_CONTEXTJ_NO_RULE);
+    case IDN2_CONTEXTO: return ERR2STR (IDN2_CONTEXTO);
+    case IDN2_CONTEXTO_NO_RULE: return ERR2STR (IDN2_CONTEXTO_NO_RULE);
+    case IDN2_UNASSIGNED: return ERR2STR (IDN2_UNASSIGNED);
+    case IDN2_BIDI: return ERR2STR (IDN2_BIDI);
+    case IDN2_DOT_IN_LABEL: return ERR2STR (IDN2_DOT_IN_LABEL);
+    case IDN2_INVALID_TRANSITIONAL: return ERR2STR (IDN2_INVALID_TRANSITIONAL);
+    case IDN2_INVALID_NONTRANSITIONAL: return ERR2STR (IDN2_INVALID_NONTRANSITIONAL);
+    default: return "IDN2_UNKNOWN";
     }
-
-  return p;
 }
diff --git a/lib/idn2.h.in b/lib/idn2.h.in
@@ -26,10 +26,11 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _IDN2_H
-#define _IDN2_H
+#ifndef IDN2_H
+#define IDN2_H
 
 /* *INDENT-OFF* */
+/* see https://www.gnu.org/software/gnulib/manual/html_node/Exported-Symbols-of-Shared-Libraries.html */
 #ifndef _IDN2_API
 # if defined IDN2_BUILDING && defined HAVE_VISIBILITY && HAVE_VISIBILITY
 #  define _IDN2_API __attribute__((__visibility__("default")))
@@ -51,39 +52,66 @@ extern "C"
 {
 #endif
 
+/**
+ * GCC_VERSION_AT_LEAST
+ *
+ * Pre-processor symbol to check the gcc version.
+ */
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define GCC_VERSION_AT_LEAST(major, minor) ((__GNUC__ > (major)) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
+#else
+# define GCC_VERSION_AT_LEAST(major, minor) 0
+#endif
+
+/* the following G_GNUC_ prefixes are for gtk-doc to recognize the attributes */
+
 /**
  * G_GNUC_IDN2_ATTRIBUTE_PURE
  *
  * Function attribute: Function is a pure function.
  */
+#if GCC_VERSION_AT_LEAST(2,96)
+#	define G_GNUC_IDN2_ATTRIBUTE_PURE __attribute__ ((pure))
+#else
+#	define G_GNUC_IDN2_ATTRIBUTE_PURE
+#endif
 
 /**
  * G_GNUC_IDN2_ATTRIBUTE_CONST
  *
  * Function attribute: Function is a const function.
  */
+#if GCC_VERSION_AT_LEAST(2,5)
+# define G_GNUC_IDN2_ATTRIBUTE_CONST __attribute__ ((const))
+#else
+# define G_GNUC_IDN2_ATTRIBUTE_CONST
+#endif
+
+/**
+ * G_GNUC_DEPRECATED
+ *
+ * Function attribute: Function is deprecated.
+ */
+#if GCC_VERSION_AT_LEAST(3,1)
+# define G_GNUC_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+# define G_GNUC_DEPRECATED __declspec(deprecated)
+#else
+# define G_GNUC_DEPRECATED /* empty */
+#endif
 
 /**
  * G_GNUC_UNUSED
  *
  * Parameter attribute: Parameter is not used.
  */
-
-/* the following G_GNUC_ prefix is for gtk-doc to recognize the attributes */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _IDN2_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# define _IDN2_ATTRIBUTE_CONST __attribute__ ((__const__))
-# define G_GNUC_IDN2_ATTRIBUTE_PURE __attribute__ ((__pure__))
-# define G_GNUC_IDN2_ATTRIBUTE_CONST __attribute__ ((__const__))
+#if GCC_VERSION_AT_LEAST(2,95)
 # define G_GNUC_UNUSED __attribute__ ((__unused__))
 #else
-# define _IDN2_ATTRIBUTE_PURE /* empty */
-# define _IDN2_ATTRIBUTE_CONST /* empty */
-# define G_GNUC_IDN2_ATTRIBUTE_PURE /* empty */
-# define G_GNUC_IDN2_ATTRIBUTE_CONST /* empty */
 # define G_GNUC_UNUSED /* empty */
 #endif
 
+
 /**
  * IDN2_VERSION
  *
@@ -263,8 +291,10 @@ extern "C"
 
 /* Auxiliary functions. */
 
-  extern _IDN2_API int
+  extern _IDN2_API G_GNUC_DEPRECATED int
     idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char * output, int flags);
+  extern _IDN2_API int
+    idn2_to_ascii_4i2 (const uint32_t * input, size_t inlen, char ** output, int flags);
   extern _IDN2_API int
     idn2_to_ascii_4z (const uint32_t * input, char ** output, int flags);
   extern _IDN2_API int
@@ -273,7 +303,7 @@ extern "C"
     idn2_to_ascii_lz (const char * input, char ** output, int flags);
 
   extern _IDN2_API int
-    idn2_to_unicode_8z4z (const char * input, uint32_t ** output, int flags G_GNUC_UNUSED);
+    idn2_to_unicode_8z4z (const char * input, uint32_t ** output, G_GNUC_UNUSED int flags);
   extern _IDN2_API int
     idn2_to_unicode_4z4z (const uint32_t * input, uint32_t ** output, int flags);
   extern _IDN2_API int
@@ -285,13 +315,13 @@ extern "C"
   extern _IDN2_API int
     idn2_to_unicode_lzlz (const char * input, char ** output, int flags);
 
-  extern _IDN2_API const char *
-    idn2_strerror (int rc) G_GNUC_IDN2_ATTRIBUTE_CONST;
-  extern _IDN2_API const char *
-    idn2_strerror_name (int rc) G_GNUC_IDN2_ATTRIBUTE_CONST;
+  extern _IDN2_API G_GNUC_IDN2_ATTRIBUTE_CONST const char *
+    idn2_strerror (int rc);
+  extern _IDN2_API G_GNUC_IDN2_ATTRIBUTE_CONST const char *
+    idn2_strerror_name (int rc);
 
-  extern _IDN2_API const char *
-    idn2_check_version (const char *req_version) G_GNUC_IDN2_ATTRIBUTE_PURE;
+  extern _IDN2_API G_GNUC_IDN2_ATTRIBUTE_PURE const char *
+    idn2_check_version (const char *req_version);
 
   extern _IDN2_API void
     idn2_free (void *ptr);
@@ -346,4 +376,4 @@ extern "C"
 }
 #endif
 
-#endif				/* _IDN2_H */
+#endif				/* IDN2_H */
diff --git a/lib/idn2.map b/lib/idn2.map
@@ -27,10 +27,10 @@ IDN2_0.0.0 {
     idn2_decode_ul;
     idn2_register_ul;
 
-	 idn2_to_ascii_4i;
-	 idn2_to_ascii_4z;
-	 idn2_to_ascii_8z;
-	 idn2_to_ascii_lz;
+    idn2_to_ascii_4i;
+    idn2_to_ascii_4z;
+    idn2_to_ascii_8z;
+    idn2_to_ascii_lz;
 
     idn2_to_unicode_8z4z;
     idn2_to_unicode_4z4z;
@@ -42,10 +42,11 @@ IDN2_0.0.0 {
     idn2_strerror;
     idn2_strerror_name;
 
-    # Internal self-test use only.
-    _idn2_punycode_encode;
-    _idn2_punycode_decode;
-
   local:
     *;
 };
+
+IDN2_2.1.0 {
+  global:
+    idn2_to_ascii_4i2;
+} IDN2_0.0.0;
diff --git a/lib/idna.c b/lib/idna.c
@@ -28,11 +28,10 @@
 
 #include <config.h>
 
-#include "idn2.h"
-
 #include <stdlib.h>		/* free */
 #include <errno.h>		/* errno */
 
+#include "idn2.h"
 #include "bidi.h"
 #include "tables.h"
 #include "context.h"
@@ -45,17 +44,14 @@
 
 #include "idna.h"
 
-static int
-_isNFC (uint32_t * label, size_t len) _GL_ATTRIBUTE_PURE;
-
 /*
  * NFC Quick Check from
  * http://unicode.org/reports/tr15/#Detecting_Normalization_Forms
  *
  * They say, this is much faster than 'brute force' normalization.
  * Strings are very likely already in NFC form.
  */
-static int
+G_GNUC_IDN2_ATTRIBUTE_PURE static int
 _isNFC (uint32_t * label, size_t len)
 {
   int lastCanonicalClass = 0;

diff --git a/lib/idna.h b/lib/idna.h
@@ -26,8 +26,12 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LIBIDN2_IDNA_H
+#define LIBIDN2_IDNA_H
+
 #include <stdint.h>
 #include <stdbool.h>
+#include "idn2.h"
 
 enum
 {
@@ -53,9 +57,14 @@ enum
   TEST_ALLOW_STD3_DISALLOWED = 0x4000,
 };
 
-extern int _idn2_u8_to_u32_nfc (const uint8_t * src, size_t srclen,
-				uint32_t ** out, size_t * outlen, int nfc);
+extern int
+	_idn2_u8_to_u32_nfc (const uint8_t * src, size_t srclen,
+		uint32_t ** out, size_t * outlen, int nfc);
+
+extern G_GNUC_IDN2_ATTRIBUTE_PURE bool
+	_idn2_ascii_p (const uint8_t * src, size_t srclen);
 
-extern bool _idn2_ascii_p (const uint8_t * src, size_t srclen) _GL_ATTRIBUTE_PURE;
+extern int
+	_idn2_label_test (int what, const uint32_t * label, size_t llen);
 
-extern int _idn2_label_test (int what, const uint32_t * label, size_t llen);
+#endif /* LIBIDN2_IDNA_H */
diff --git a/lib/lookup.c b/lib/lookup.c
@@ -209,6 +209,14 @@ _tr46 (const uint8_t * domain_u8, uint8_t ** out, int flags)
         }
     }
 
+  /* Exit early if result is too long.
+   * This avoids excessive CPU usage in punycode encoding, which is O(N^2). */
+  if (len2 >= IDN2_DOMAIN_MAX_LENGTH)
+    {
+      free (domain_u32);
+      return IDN2_TOO_BIG_DOMAIN;
+    }
+
   uint32_t *tmp = (uint32_t *) malloc ((len2 + 1) * sizeof (uint32_t));
   if (!tmp)
     {
@@ -547,9 +555,11 @@ idn2_lookup_ul (const char * src, char ** lookupname, int flags)
  * idn2_to_ascii_4i:
  * @input: zero terminated input Unicode (UCS-4) string.
  * @inlen: number of elements in @input.
- * @output: pointer to newly allocated zero-terminated output string.
+ * @output: output zero terminated string that must have room for at least 63 characters plus the terminating zero.
  * @flags: optional #idn2_flags to modify behaviour.
  *
+ * THIS FUNCTION HAS BEEN DEPRECATED DUE TO A DESIGN FLAW. USE idn2_to_ascii_4i2() INSTEAD !
+ *
  * The ToASCII operation takes a sequence of Unicode code points that make
  * up one domain label and transforms it into a sequence of code points in
  * the ASCII range (0..7F). If ToASCII succeeds, the original sequence and
@@ -579,6 +589,69 @@ idn2_lookup_ul (const char * src, char ** lookupname, int flags)
  **/
 int
 idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char * output, int flags)
+{
+  char *out;
+  int rc;
+
+  if (!input)
+    {
+      if (output)
+	*output = 0;
+      return IDN2_OK;
+    }
+
+  rc = idn2_to_ascii_4i2 (input, inlen, &out, flags);
+  if (rc == IDN2_OK)
+  {
+	  size_t len = strlen(out);
+
+	  if (len > 63)
+		  rc = IDN2_TOO_BIG_DOMAIN;
+	  else if (output)
+		  memcpy (output, out, len);
+
+	  free (out);
+  }
+
+  return rc;
+}
+
+/**
+ * idn2_to_ascii_4i:
+ * @input: zero terminated input Unicode (UCS-4) string.
+ * @inlen: number of elements in @input.
+ * @output: pointer to newly allocated zero-terminated output string.
+ * @flags: optional #idn2_flags to modify behaviour.
+ *
+ * The ToASCII operation takes a sequence of Unicode code points that make
+ * up one domain label and transforms it into a sequence of code points in
+ * the ASCII range (0..7F). If ToASCII succeeds, the original sequence and
+ * the resulting sequence are equivalent labels.
+ *
+ * It is important to note that the ToASCII operation can fail.
+ * ToASCII fails if any step of it fails. If any step of the
+ * ToASCII operation fails on any label in a domain name, that domain
+ * name MUST NOT be used as an internationalized domain name.
+ * The method for dealing with this failure is application-specific.
+ *
+ * The inputs to ToASCII are a sequence of code points.
+ *
+ * ToASCII never alters a sequence of code points that are all in the ASCII
+ * range to begin with (although it could fail). Applying the ToASCII operation multiple
+ * effect as applying it just once.
+ *
+ * The default behavior of this function (when flags are zero) is to apply
+ * the IDNA2008 rules without the TR46 amendments. As the TR46
+ * non-transitional processing is nowadays ubiquitous, when unsure, it is
+ * recommended to call this function with the %IDN2_NONTRANSITIONAL
+ * and the %IDN2_NFC_INPUT flags for compatibility with other software.
+ *
+ * Return value: Returns %IDN2_OK on success, or error code.
+ *
+ * Since: 2.1.1
+ **/
+int
+idn2_to_ascii_4i2 (const uint32_t * input, size_t inlen, char ** output, int flags)
 {
   uint32_t *input_u32;
   uint8_t *input_u8, *output_u8;
@@ -588,7 +661,7 @@ idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char * output, int flags
   if (!input)
     {
       if (output)
-	*output = 0;
+	*output = NULL;
       return IDN2_OK;
     }
 
@@ -613,15 +686,12 @@ idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char * output, int flags
 
   if (rc == IDN2_OK)
     {
-      /* wow, this is ugly, but libidn manpage states:
-       * char * out  output zero terminated string that must have room for at
-       * least 63 characters plus the terminating zero.
-       */
       if (output)
-	strcpy (output, (const char *) output_u8);
+	*output = (char *) output_u8;
+		else
+	free (output_u8);
     }
 
-  free(output_u8);
   return rc;
 }
 

diff --git a/lib/puny_encode.c b/lib/puny_encode.c
@@ -68,6 +68,7 @@
 #define punycode_success IDN2_OK
 #define punycode_overflow IDN2_PUNYCODE_OVERFLOW
 #define punycode_big_output IDN2_PUNYCODE_BIG_OUTPUT
+#define punycode_bad_input IDN2_PUNYCODE_BAD_INPUT
 #define punycode_encode _idn2_punycode_encode
 
 /**********************************************************/
@@ -158,8 +159,8 @@ int punycode_encode(
       if (max_out - out < 2) return punycode_big_output;
       output[out++] = (char) input[j];
     }
-    /* else if (input[j] < n) return punycode_bad_input; */
-    /* (not needed for Punycode with unsigned code points) */
+    else if (input[j] > 0x10FFFF || (input[j] >= 0xD800 && input[j] <= 0xDBFF))
+      return punycode_bad_input;
   }
 
   h = b = (punycode_uint) out;

diff --git a/lib/punycode.h b/lib/punycode.h
@@ -26,6 +26,9 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LIBIDN2_PUNYCODE_H
+#define LIBIDN2_PUNYCODE_H
+
 #include <stddef.h>
 #include <stdint.h>
 
@@ -39,3 +42,5 @@ _idn2_punycode_decode (size_t input_length,
 		       const char input[],
 		       size_t * output_length,
 		       uint32_t output[]);
+
+#endif /* LIBIDN2_PUNYCODE_H */
diff --git a/lib/tables.h b/lib/tables.h
@@ -26,9 +26,19 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdint.h>
+#ifndef LIBIDN2_TABLES_H
+#define LIBIDN2_TABLES_H
 
-int _idn2_disallowed_p (uint32_t cp) _GL_ATTRIBUTE_CONST;
-int _idn2_contextj_p (uint32_t cp) _GL_ATTRIBUTE_CONST;
-int _idn2_contexto_p (uint32_t cp) _GL_ATTRIBUTE_CONST;
-int _idn2_unassigned_p (uint32_t cp) _GL_ATTRIBUTE_CONST;
+#include <stdint.h>
+#include "idn2.h"
+
+int G_GNUC_IDN2_ATTRIBUTE_CONST
+	_idn2_disallowed_p (uint32_t cp);
+int G_GNUC_IDN2_ATTRIBUTE_CONST
+	_idn2_contextj_p (uint32_t cp);
+int G_GNUC_IDN2_ATTRIBUTE_CONST
+	_idn2_contexto_p (uint32_t cp);
+int G_GNUC_IDN2_ATTRIBUTE_CONST
+	_idn2_unassigned_p (uint32_t cp);
+
+#endif /* LIBIDN2_TABLES_H */
diff --git a/lib/tr46map.c b/lib/tr46map.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>		/* bsearch */
 #include <string.h>		/* memset */
 
+#include "tr46map.h"
 #include "tr46map_data.c"
 
 #define countof(a) (sizeof(a)/sizeof(*(a)))
@@ -136,7 +137,7 @@ map_is (const IDNAMap * map, unsigned flags)
   return (idna_flags[map->flag_index] & flags) == flags;
 }
 
-static int
+static int G_GNUC_IDN2_ATTRIBUTE_PURE
 _compare_nfcqc_map (uint32_t * c, NFCQCMap * m2)
 {
   if (*c < m2->cp1)
		@@ -0,0 +1 @@
		125fIcE.xn‍--w.XN--w127f.xn--w125f.x.XN--1;XN--w063f.xn‍-N--w126f.xn‍--w'106f
		@@ -0,0 +1 @@
		Xxn%%%%%%-%%%%@%%%%%%%%%%XN--%%%%%%%%%%%%%%%%XN--%%%%%%%%%%%%%-ß
		@@ -0,0 +1 @@
		X-N-)-mYYß.xn--9999999rzr99XN-)--mYYß.xn--;9999rrrzrrrr9998r
		@@ -0,0 +1 @@
		xn--n-MMMxn--MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMEMMMMMMMMMMMMMP,
		@@ -0,0 +1 @@
		?XN--??????????????????????????????????????????????????????????????????;.۷۷.
		@@ -0,0 +1 @@
		)ٵ.ٵݮ..)ٵ)...)ݮ۵..))ٵ..)ݮ..)ٵ)...)ݮٵ..))ٵ..)ݮ.۵.ٵݮ..)ٵ)...)ݮٵ..).)۵.ٵݮ..)ٵ)...)ݮٵ..))ٵ..)ݮ..)ٵ)...)ݮٵ..))ٵ..)
		@@ -0,0 +1 @@
		.xn--0099000a099000a999a9000a09,xN--ß-99999a90000
		@@ -0,0 +1 @@
		.Х.3.َ.Х.3.ََ)َََ)َ)Х.3.ََ)َ).3.َ.Х.3.ََ)َXN--)Х.3.ََ)َ)ََ.َ)ََ.)Х.)Х.3.ََ)َ)ََ.َ.Х.3.ََ)َ)Х.3.ََ)َ)ََ.3.َ.Х.3.ََ)َ)Х.3.ََ)َ)ََ.َ)ََ.)Х.3ََ.َ)ََ.)Х.3.ََ)َ).َ)ََ.
		@@ -0,0 +1 @@
		9⵿‍⵿‍9⵿‍⵿‍9⵿‍9⵿‍⵿‍9⵿‍⵿‍9⵿‍⵿‍9⵿‍⵿‍9⵿‍9⵿‍⵿‍9⵿‍⵿‍0⵿‍9⵿‍9⵿‍⵿‍9⵿‍9⵿‍⵿‍⵿‍9⵿‍⵿‍9⵿‍9⿀(ⵍ⵿‍⵿‍
		@@ -0,0 +1 @@
		ݐ‌ݐ‌mm--'ٮ.XN-X-m٥..ݮ.3ِ.)ٮ.!ǎِ).ݮ.3ِ.)ٮ.ǎِ).ݮ.3ِ.)ٮ.!ǎِ)ٮ.ǎِ).ݮ.3ِ.)ǎِ)&ݮ.3ِ.)֮Xmm--'ٮ.XN-X-m.ݮ.3ِ0.)ٮ.!ǎِ).ݮ.3ِ0.)ٮ.!ǎِ).ݮ.3ِ.)ٮ.ǎِ).ݮ.3ِ.)ٮ.!ǎِ)