fix: Be flexible in zlib versions

- Support versions with major.minor version number only
- Support versions with more than one digit in the revision number

Author: qmfrederik

cve_bin_tool/checkers/zlib.py

@@ -26,9 +26,9 @@ class ZlibChecker(Checker):
     ]
     FILENAME_PATTERNS = [r"libz.so."]
     VERSION_PATTERNS = [
-        r"deflate ([01]+\.[0-9]+\.[0-9]+) ",
-        r"inflate ([01]+\.[0-9]+\.[0-9]+) ",
-        r"libz.so.([01]+\.[0-9]+\.[0-9]+)",  # patterns like this aren't ideal
+        r"deflate ([01]+\.[0-9]+(?:\.[0-9]+)?) ",
+        r"inflate ([01]+\.[0-9]+(?:\.[0-9]+)?) ",
+        r"libz.so.([01]+\.[0-9]+(?:\.[0-9]+)?)",  # patterns like this aren't ideal
     ]
     VENDOR_PRODUCT = [("gnu", "zlib"), ("zlib", "zlib")]
 

test/test_data/zlib.py

@@ -6,7 +6,21 @@
         "product": "zlib",
         "version": "1.2.2",
         "version_strings": ["deflate 1.2.2 Copyright 1995-2005 Jean-loup Gailly"],
-    }
+    },
+    {
+        "product": "zlib",
+        "version": "1.3",
+        "version_strings": [
+            "deflate 1.3 Copyright 1995-2023 Jean-loup Gailly and Mark Adler"
+        ],
+    },
+    {
+        "product": "zlib",
+        "version": "1.2.11",
+        "version_strings": [
+            "deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler"
+        ],
+    },
 ]
 package_test_data = [
     {
@@ -27,4 +41,10 @@
         "product": "zlib",
         "version": "1.2.8",
     },
+    {
+        "url": "https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/mingw64/",
+        "package_name": "mingw-w64-x86_64-zlib-1.3-1-any.pkg.tar.zst",
+        "product": "zlib",
+        "version": "1.3",
+    },
 ]