highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use avcodec_check_dimensions instead of custom hack

Browse Source 
Originally committed as revision 3836 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roberto Togni
2005-01-15 00:07:38 +00:00
parent a9c3ff5b9e
commit 3048af8350
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/8bps.c
View File

@@ -160,8 +160,7 @@ static int decode_init(AVCodecContext *avctx)
c->pic.data[0] = NULL; c->pic.data[0] = NULL;
// FIXME: find a better way to prevent integer overflow if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
if (((unsigned int)avctx->width > 32000) || ((unsigned int)avctx->height > 32000)) {
av_log(avctx, AV_LOG_ERROR, "Bad image size (w = %d, h = %d).\n", avctx->width, avctx->height); av_log(avctx, AV_LOG_ERROR, "Bad image size (w = %d, h = %d).\n", avctx->width, avctx->height);
return 1; return 1;
} }

4
libavcodec/lcl.c
View File

@@ -640,9 +640,7 @@ static int decode_init(AVCodecContext *avctx)
return 1; return 1;
} }
// FIXME: find a better way to prevent integer overflow if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
if (((unsigned int)avctx->width > 32000) || ((unsigned int)avctx->height > 32000)) {
av_log(avctx, AV_LOG_ERROR, "Bad image size (w = %d, h = %d).\n", avctx->width, avctx->height);
return 1; return 1;
} }