mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-07-02 05:56:46 +08:00
avformat/mov: add more sanity checks when reading clap boxes
If the apperture window is bigger than the canvas, then the clap box is invalid and there's no point calculating cropping values. Fixes: libavformat/mov.c:1295:14: runtime error: -256 is outside the range of representable values of type 'unsigned long' Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@ -1277,6 +1277,11 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||
err = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
if ((av_cmp_q((AVRational) { width, 1 }, aperture_width) < 0) ||
|
||||
(av_cmp_q((AVRational) { height, 1 }, aperture_height) < 0)) {
|
||||
err = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
av_log(c->fc, AV_LOG_TRACE, "clap: apertureWidth %d/%d, apertureHeight %d/%d "
|
||||
"horizOff %d/%d vertOff %d/%d\n",
|
||||
aperture_width.num, aperture_width.den, aperture_height.num, aperture_height.den,
|
||||
|
Reference in New Issue
Block a user