| Message ID | e778df7d98cd3d5413c8b2e94e5a0e67793abd2f.1642716811.git.pross@xvid.org |
|---|---|
| State | Accepted |
| Commit | 5903a4e32104ab343555b494991856fac5aa3aa2 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/img2dec: fix logic error in GEM Raster file probe | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | fail | Make fate failed |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
On Fri, Jan 21, 2022 at 09:14:05AM +1100, Peter Ross wrote: > 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 will apply in a couple of days -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
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) &&
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(-)