repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.2~trusty
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
mmvideo.c
diff --git
a/ffmpeg/libavcodec/mmvideo.c
b/ffmpeg/libavcodec/mmvideo.c
index 9a7c10c3ab80d0579dd04398eafd62063c010535..8b04965d59a7ed2247fd31f5538377377837284c 100644
(file)
--- a/
ffmpeg/libavcodec/mmvideo.c
+++ b/
ffmpeg/libavcodec/mmvideo.c
@@
-61,6
+61,13
@@
static av_cold int mm_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_PAL8;
avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ if (!avctx->width || !avctx->height ||
+ (avctx->width & 1) || (avctx->height & 1)) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid video dimensions: %dx%d\n",
+ avctx->width, avctx->height);
+ return AVERROR(EINVAL);
+ }
+
s->frame = av_frame_alloc();
if (!s->frame)
return AVERROR(ENOMEM);
s->frame = av_frame_alloc();
if (!s->frame)
return AVERROR(ENOMEM);