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

libvpx: Fix mixed use of av_malloc() and av_reallocp()

Browse Source 
This buffer is resized when vpx_codec_get_cx_data() returns a
VPX_CODEC_STATS_PKT packet.

CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2015-03-08 21:08:16 +00:00
parent 8b86c2ed2e
commit 7244cefd6e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libvpxenc.c
View File

@ -291,7 +291,7 @@ static av_cold int vpx_init(AVCodecContext *avctx,
if (enccfg.g_pass == VPX_RC_FIRST_PASS) if (enccfg.g_pass == VPX_RC_FIRST_PASS)
enccfg.g_lag_in_frames = 0; enccfg.g_lag_in_frames = 0;
else if (enccfg.g_pass == VPX_RC_LAST_PASS) { else if (enccfg.g_pass == VPX_RC_LAST_PASS) {
int decode_size; int decode_size, ret;
if (!avctx->stats_in) { if (!avctx->stats_in) {
av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n"); av_log(avctx, AV_LOG_ERROR, "No stats file for second pass\n");
@ -299,12 +299,12 @@ static av_cold int vpx_init(AVCodecContext *avctx,
} }
ctx->twopass_stats.sz = strlen(avctx->stats_in) * 3 / 4; ctx->twopass_stats.sz = strlen(avctx->stats_in) * 3 / 4;
ctx->twopass_stats.buf = av_malloc(ctx->twopass_stats.sz); ret = av_reallocp(&ctx->twopass_stats.buf, ctx->twopass_stats.sz);
if (!ctx->twopass_stats.buf) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Stat buffer alloc (%zu bytes) failed\n", "Stat buffer alloc (%zu bytes) failed\n",
ctx->twopass_stats.sz); ctx->twopass_stats.sz);
return AVERROR(ENOMEM); return ret;
} }
decode_size = av_base64_decode(ctx->twopass_stats.buf, avctx->stats_in, decode_size = av_base64_decode(ctx->twopass_stats.buf, avctx->stats_in,
ctx->twopass_stats.sz); ctx->twopass_stats.sz);