From 2336df7e4243b0d4f8e4c1372bb7c838850cce5c Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Sat, 1 Feb 2025 16:37:36 +0100 Subject: [PATCH] fix: Support FFmpeg versions with 'n' prefix --- cve_bin_tool/checkers/ffmpeg.py | 2 +- test/test_data/ffmpeg.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cve_bin_tool/checkers/ffmpeg.py b/cve_bin_tool/checkers/ffmpeg.py index ea4bfac3c8..b3fc52553f 100644 --- 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 index 9300de70e6..fdd4fe87a1 100644 --- 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 = [ {