generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/h264_slice: More complete cleanup in h264_slice_header_init()

Browse Source 
Fixes null pointer dereference
Fixes Ticket3873

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1fa35e4352)

Conflicts:

	libavcodec/h264_slice.c
This commit is contained in:
Michael Niedermayer
2014-08-21 16:33:03 +02:00
parent b6ae28c2e9
commit 03c80a7400
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264.c
View File

@@ -3128,6 +3128,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
h->avctx->active_thread_type & FF_THREAD_SLICE) ? h->avctx->active_thread_type & FF_THREAD_SLICE) ?
h->avctx->thread_count : 1; h->avctx->thread_count : 1;
int i; int i;
int ret = AVERROR_INVALIDDATA;
h->avctx->sample_aspect_ratio = h->sps.sar; h->avctx->sample_aspect_ratio = h->sps.sar;
av_assert0(h->avctx->sample_aspect_ratio.den); av_assert0(h->avctx->sample_aspect_ratio.den);
@@ -3153,7 +3154,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
if (ff_h264_alloc_tables(h) < 0) { if (ff_h264_alloc_tables(h) < 0) {
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"Could not allocate memory for h264\n"); "Could not allocate memory for h264\n");
return AVERROR(ENOMEM); goto fail;
} }
if (nb_slices > MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) { if (nb_slices > MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
@@ -3171,12 +3172,16 @@ static int h264_slice_header_init(H264Context *h, int reinit)
if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) { if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) {
if (context_init(h) < 0) { if (context_init(h) < 0) {
av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n"); av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
return -1; goto fail;
} }
} else { } else {
for (i = 1; i < h->slice_context_count; i++) { for (i = 1; i < h->slice_context_count; i++) {
H264Context *c; H264Context *c;
c = h->thread_context[i] = av_mallocz(sizeof(H264Context)); c = h->thread_context[i] = av_mallocz(sizeof(H264Context));
if (!c) {
ret = AVERROR(ENOMEM);
goto fail;
}
c->avctx = h->avctx; c->avctx = h->avctx;
if (CONFIG_ERROR_RESILIENCE) { if (CONFIG_ERROR_RESILIENCE) {
c->dsp = h->dsp; c->dsp = h->dsp;
@@ -3215,13 +3220,17 @@ static int h264_slice_header_init(H264Context *h, int reinit)
for (i = 0; i < h->slice_context_count; i++) for (i = 0; i < h->slice_context_count; i++)
if (context_init(h->thread_context[i]) < 0) { if (context_init(h->thread_context[i]) < 0) {
av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n"); av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
return -1; goto fail;
} }
} }
h->context_initialized = 1; h->context_initialized = 1;
return 0; return 0;
fail:
free_tables(h, 0);
h->context_initialized = 0;
return ret;
} }
/** /**