virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

libopusenc: prevent an out-of-bounds read by returning early

Browse Source 
CC: libav-stable@libav.org
Bug-Id: CID 1244188
This commit is contained in:
Vittorio Giovara 2014-11-11 13:26:55 +01:00
parent b09cf8afc5
commit 8dd0a2c5cf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libopusenc.c
View File

@ -163,10 +163,11 @@ static int av_cold libopus_encode_init(AVCodecContext *avctx)
/* FIXME: Opus can handle up to 255 channels. However, the mapping for /* FIXME: Opus can handle up to 255 channels. However, the mapping for
* anything greater than 8 is undefined. */ * anything greater than 8 is undefined. */
if (avctx->channels > 8) if (avctx->channels > 8) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_ERROR,
"Channel layout undefined for %d channels.\n", avctx->channels); "Channel layout undefined for %d channels.\n", avctx->channels);
return AVERROR_PATCHWELCOME;
}
if (!avctx->bit_rate) { if (!avctx->bit_rate) {
/* Sane default copied from opusenc */ /* Sane default copied from opusenc */
avctx->bit_rate = 64000 * opus->stream_count + avctx->bit_rate = 64000 * opus->stream_count +