opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 05:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

pthread: add some malloc failure checks

Browse Source
This commit is contained in:
Justin Ruggles
2011-11-16 17:30:28 -05:00
parent 03f30c837b
commit a8fe9a7242
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/pthread.c
View File

@ -719,6 +719,11 @@ static int frame_thread_init(AVCodecContext *avctx)
p->parent = fctx; p->parent = fctx;
p->avctx = copy; p->avctx = copy;
if (!copy) {
err = AVERROR(ENOMEM);
goto error;
}
*copy = *src; *copy = *src;
copy->thread_opaque = p; copy->thread_opaque = p;
copy->pkt = &p->avpkt; copy->pkt = &p->avpkt;
@ -732,6 +737,10 @@ static int frame_thread_init(AVCodecContext *avctx)
update_context_from_thread(avctx, copy, 1); update_context_from_thread(avctx, copy, 1);
} else { } else {
copy->priv_data = av_malloc(codec->priv_data_size); copy->priv_data = av_malloc(codec->priv_data_size);
if (!copy->priv_data) {
err = AVERROR(ENOMEM);
goto error;
}
memcpy(copy->priv_data, src->priv_data, codec->priv_data_size); memcpy(copy->priv_data, src->priv_data, codec->priv_data_size);
copy->internal = av_malloc(sizeof(AVCodecInternal)); copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) { if (!copy->internal) {