fix: Support FFmpeg versions with 'n' prefix

qmfrederik · qmfrederik · commit 874eff62a136 · 2025-02-12T19:16:43.000+01:00
diff --git a/cve_bin_tool/checkers/ffmpeg.py b/cve_bin_tool/checkers/ffmpeg.py
@@ -23,6 +23,6 @@ class FfmpegChecker(Checker):
     FILENAME_PATTERNS = [r"ffmpeg"]
     VERSION_PATTERNS = [
         r"%s version ([0-9]+\.[0-9]+\.[0-9]+)[a-zA-Z0-9 \(\)%~\-\r\n]*(?:avutil|FFmpeg)",
-        r"FFmpeg version ([0-9]+\.[0-9]+\.[0-9]+)",
+        r"FFmpeg version n?([0-9]+\.[0-9]+\.[0-9]+)",
     ]
     VENDOR_PRODUCT = [("ffmpeg", "ffmpeg")]
diff --git a/test/test_data/ffmpeg.py b/test/test_data/ffmpeg.py
@@ -22,6 +22,11 @@
         "version": "3.4.9",
         "version_strings": ["FFmpeg version 3.4.9"],
     },
+    {
+        "product": "ffmpeg",
+        "version": "4.3.1",
+        "version_strings": ["FFmpeg version n4.3.1"],
+    },
 ]
 package_test_data = [
     {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ class FfmpegChecker(Checker):`
`23`	`23`	`FILENAME_PATTERNS = [r"ffmpeg"]`
`24`	`24`	`VERSION_PATTERNS = [`
`25`	`25`	`r"%s version ([0-9]+\.[0-9]+\.[0-9]+)[a-zA-Z0-9 \(\)%~\-\r\n]*(?:avutil\|FFmpeg)",`
`26`		`- r"FFmpeg version ([0-9]+\.[0-9]+\.[0-9]+)",`
	`26`	`+ r"FFmpeg version n?([0-9]+\.[0-9]+\.[0-9]+)",`
`27`	`27`	`]`
`28`	`28`	`VENDOR_PRODUCT = [("ffmpeg", "ffmpeg")]`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,11 @@`
`22`	`22`	`"version": "3.4.9",`
`23`	`23`	`"version_strings": ["FFmpeg version 3.4.9"],`
`24`	`24`	`},`
	`25`	`+ {`
	`26`	`+ "product": "ffmpeg",`
	`27`	`+ "version": "4.3.1",`
	`28`	`+ "version_strings": ["FFmpeg version n4.3.1"],`
	`29`	`+ },`
`25`	`30`	`]`
`26`	`31`	`package_test_data = [`
`27`	`32`	`{`