From: Peter Ross <pross@xvid.org>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe
Date: Fri, 21 Jan 2022 09:14:05 +1100
Message-ID: <e778df7d98cd3d5413c8b2e94e5a0e67793abd2f.1642716811.git.pross@xvid.org> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1028 bytes --]
Use correct logic to express limits of the planes and pattern_size fields.
Fix ticket# 9605
Signed-off-by: Peter Ross <pross@xvid.org>
---
libavformat/img2dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 4d5ac51b53..2583ca2465 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -1115,8 +1115,8 @@ static int gem_probe(const AVProbeData *p)
int ret = 0;
if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 &&
AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 &&
- (AV_RB16(b + 4) > 0 || AV_RB16(b + 4) <= 8) &&
- (AV_RB16(b + 6) > 0 || AV_RB16(b + 6) <= 8) &&
+ (AV_RB16(b + 4) > 0 && AV_RB16(b + 4) <= 32) && /* planes */
+ (AV_RB16(b + 6) > 0 && AV_RB16(b + 6) <= 8) && /* pattern_size */
AV_RB16(b + 8) &&
AV_RB16(b + 10) &&
AV_RB16(b + 12) &&
--
2.34.1
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2022-01-20 22:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 22:14 Peter Ross [this message]
2022-01-25 7:26 ` [FFmpeg-devel] [PATCH] avformat/img2dec: increase probe score for fourcc variants Peter Ross
2022-02-02 7:52 ` Peter Ross
2022-02-02 7:52 ` [FFmpeg-devel] [PATCH] avformat/img2dec: fix logic error in GEM Raster file probe Peter Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e778df7d98cd3d5413c8b2e94e5a0e67793abd2f.1642716811.git.pross@xvid.org \
--to=pross@xvid.org \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git