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>
This commit is contained in:
Michael Niedermayer 2014-08-21 16:33:03 +02:00
parent 949057c958
commit 1fa35e4352
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/h264_slice.c
View File

@ -1173,7 +1173,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
ret = ff_h264_alloc_tables(h); ret = ff_h264_alloc_tables(h);
if (ret < 0) { if (ret < 0) {
av_log(h->avctx, AV_LOG_ERROR, "Could not allocate memory\n"); av_log(h->avctx, AV_LOG_ERROR, "Could not allocate memory\n");
return ret; goto fail;
} }
if (nb_slices > H264_MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) { if (nb_slices > H264_MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
@ -1192,14 +1192,16 @@ static int h264_slice_header_init(H264Context *h, int reinit)
ret = ff_h264_context_init(h); ret = ff_h264_context_init(h);
if (ret < 0) { if (ret < 0) {
av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n"); av_log(h->avctx, AV_LOG_ERROR, "context_init() failed.\n");
return ret; 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) if (!c) {
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
}
c->avctx = h->avctx; c->avctx = h->avctx;
if (CONFIG_ERROR_RESILIENCE) { if (CONFIG_ERROR_RESILIENCE) {
c->mecc = h->mecc; c->mecc = h->mecc;
@ -1238,13 +1240,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 ((ret = ff_h264_context_init(h->thread_context[i])) < 0) { if ((ret = ff_h264_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 ret; goto fail;
} }
} }
h->context_initialized = 1; h->context_initialized = 1;
return 0; return 0;
fail:
ff_h264_free_tables(h, 0);
h->context_initialized = 0;
return ret;
} }
static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a) static enum AVPixelFormat non_j_pixfmt(enum AVPixelFormat a)