Module: libav Branch: release/10 Commit: 964fef3f3ced60e67831549df223bc177e1537c9
Author: Luca Barbato <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Mon May 25 22:30:10 2015 +0200 h264: Make sure reinit failures mark the context as not initialized Bug-Id: CVE-2015-3417 CC: [email protected] (cherry picked from commit 3b69f245dbe6e2016659a45c4bfe284f6c5ac57e) Signed-off-by: Reinhard Tartler <[email protected]> Conflicts: libavcodec/h264_slice.c --- libavcodec/h264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 857a949..c327113 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3489,6 +3489,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) (h->width != h->avctx->coded_width || h->height != h->avctx->coded_height || needs_reinit)) { + h->context_initialized = 0; if (h != h0) { av_log(h->avctx, AV_LOG_ERROR, "changing width/height on " "slice %d\n", h0->current_slice + 1); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
