[FFmpeg-cvslog] avformat/img2dec: fix logic error in GEM Raster file probe

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Jan 21 09:01:57 2022 +1100| [5903a4e32104ab343555b494991856fac5aa3aa2] | committer: Peter Ross

avformat/img2dec: fix logic error in GEM Raster file probe

Use correct logic to express limits of the planes and pattern_size fields.

Fix ticket# 9605

Signed-off-by: Peter Ross <pross at xvid.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5903a4e32104ab343555b494991856fac5aa3aa2
---

 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) &&