virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

g722enc: validate AVCodecContext.trellis

Browse Source
This commit is contained in:
Justin Ruggles
2012-01-06 16:01:07 -05:00
parent 77c5b66cbe
commit cf1a259ad6
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/g722enc.c
View File

@@ -36,6 +36,11 @@
problems, so we limit it to a reasonable value */ problems, so we limit it to a reasonable value */
#define MAX_FRAME_SIZE 32768 #define MAX_FRAME_SIZE 32768
/* We clip the value of avctx->trellis to prevent data type overflows and
undefined behavior. Using larger values is insanely slow anyway. */
#define MIN_TRELLIS 0
#define MAX_TRELLIS 16
static av_cold int g722_encode_init(AVCodecContext * avctx) static av_cold int g722_encode_init(AVCodecContext * avctx)
{ {
G722Context *c = avctx->priv_data; G722Context *c = avctx->priv_data;
@@ -83,6 +88,17 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
avctx->frame_size = 320; avctx->frame_size = 320;
} }
if (avctx->trellis) {
/* validate trellis */
if (avctx->trellis < MIN_TRELLIS || avctx->trellis > MAX_TRELLIS) {
int new_trellis = av_clip(avctx->trellis, MIN_TRELLIS, MAX_TRELLIS);
av_log(avctx, AV_LOG_WARNING, "Requested trellis value is not "
"allowed. Using %d instead of %d\n", new_trellis,
avctx->trellis);
avctx->trellis = new_trellis;
}
}
return 0; return 0;
} }