Skip to content

F
ffmpeg
Commit 0898a6d4 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/ratecontrol: Check for av_malloc*() failures 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1bf747ae
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
libavcodec/ratecontrol.c
View file @ 0898a6d4
...@@ -175,6 +175,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s) ...@@ -175,6 +175,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
if (i <= 0 || i >= INT_MAX / sizeof(RateControlEntry)) if (i <= 0 || i >= INT_MAX / sizeof(RateControlEntry))
return -1; return -1;
rcc->entry = av_mallocz(i * sizeof(RateControlEntry)); rcc->entry = av_mallocz(i * sizeof(RateControlEntry));
if (!rcc->entry)
return AVERROR(ENOMEM);
rcc->num_entries = i; rcc->num_entries = i;
/* init all to skipped p frames /* init all to skipped p frames
...@@ -953,6 +955,11 @@ static int init_pass2(MpegEncContext *s) ...@@ -953,6 +955,11 @@ static int init_pass2(MpegEncContext *s)
qscale = av_malloc_array(rcc->num_entries, sizeof(double)); qscale = av_malloc_array(rcc->num_entries, sizeof(double));
blurred_qscale = av_malloc_array(rcc->num_entries, sizeof(double)); blurred_qscale = av_malloc_array(rcc->num_entries, sizeof(double));
if (!qscale || !blurred_qscale) {
av_free(qscale);
av_free(blurred_qscale);
return AVERROR(ENOMEM);
}
toobig = 0; toobig = 0;
for (step = 256 * 256; step > 0.0000001; step *= 0.5) { for (step = 256 * 256; step > 0.0000001; step *= 0.5) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment