You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
avcodec/evc_frame_merge_bsf: check for av_memdup() failure
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@@ -61,6 +61,7 @@ static void evc_frame_merge_flush(AVBSFContext *bsf)
|
||||
EVCFMergeContext *ctx = bsf->priv_data;
|
||||
|
||||
av_packet_unref(ctx->in);
|
||||
ctx->au_buffer.data_size = 0;
|
||||
}
|
||||
|
||||
static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
||||
@@ -117,9 +118,13 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
||||
|
||||
if (au_end_found) {
|
||||
uint8_t *data = av_memdup(ctx->au_buffer.data, ctx->au_buffer.data_size);
|
||||
err = av_packet_from_data(out, data, ctx->au_buffer.data_size);
|
||||
size_t data_size = ctx->au_buffer.data_size;
|
||||
|
||||
ctx->au_buffer.data_size = 0;
|
||||
if (!data)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
err = av_packet_from_data(out, data, data_size);
|
||||
} else
|
||||
err = AVERROR(EAGAIN);
|
||||
|
||||
|
Reference in New Issue
Block a user