Skip to content

Commit dc2dee6

Browse files
authored
fix: update ffmpeg checker (#5096)
Update ffmpeg pattern to catch version on two digits (e.g. version 4.4 released in 2021: https://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2) Signed-off-by: Fabrice Fontaine <[email protected]>
1 parent fa35800 commit dc2dee6

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

cve_bin_tool/checkers/ffmpeg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class FfmpegChecker(Checker):
2828
r"ffmpeg",
2929
]
3030
VERSION_PATTERNS = [
31-
r"%s version ([0-9]+\.[0-9]+\.[0-9]+)[a-zA-Z0-9 \(\)%~\-\r\n]*(?:avutil|FFmpeg)",
32-
r"FFmpeg version n?([0-9]+\.[0-9]+\.[0-9]+)",
31+
r"%s version ([0-9]+\.[0-9]+(\.[0-9]+)?)[a-zA-Z0-9 \(\)%~\-\r\n]*(?:avutil|FFmpeg)",
32+
r"FFmpeg version n?([0-9]+\.[0-9]+(\.[0-9]+)?)",
3333
]
3434
VENDOR_PRODUCT = [("ffmpeg", "ffmpeg")]

test/test_data/ffmpeg.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
"version": "4.3.1",
2828
"version_strings": ["FFmpeg version n4.3.1"],
2929
},
30+
{
31+
"product": "ffmpeg",
32+
"version": "4.4",
33+
"version_strings": ["FFmpeg version 4.4"],
34+
},
3035
]
3136
package_test_data = [
3237
{

0 commit comments

Comments
 (0)