[FFmpeg-cvslog] avcodec/vp3: Clear context on reinitialization failure
ffmpeg | branch: release/2.6 | Michael Niedermayer | Sat Nov 28 00:23:54 2015 +0100| [67b29888f4dc03a45dd060fbb785481ac91b0219] | committer: Michael Niedermayer avcodec/vp3: Clear context on reinitialization failure Fixes null pointer dereference Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 6105b7219a90438deae71b0dc5a034c71ee30fc0) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67b29888f4dc03a45dd060fbb785481ac91b0219 --- libavcodec/vp3.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index b728bbc..a0845e4 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2014,17 +2014,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vp3: Clear context on reinitialization failure
ffmpeg | branch: release/2.7 | Michael Niedermayer | Sat Nov 28 00:23:54 2015 +0100| [c1d29678f1ca993e201b32b8e4af3f9846c5db32] | committer: Michael Niedermayer avcodec/vp3: Clear context on reinitialization failure Fixes null pointer dereference Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 6105b7219a90438deae71b0dc5a034c71ee30fc0) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1d29678f1ca993e201b32b8e4af3f9846c5db32 --- libavcodec/vp3.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 2c8a8fe..26c2ea7 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2014,17 +2014,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vp3: Clear context on reinitialization failure
ffmpeg | branch: release/2.4 | Michael Niedermayer | Sat Nov 28 00:23:54 2015 +0100| [af3e5bdd0d3277bc555cc8026c169d46e1d08ef2] | committer: Michael Niedermayer avcodec/vp3: Clear context on reinitialization failure Fixes null pointer dereference Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 6105b7219a90438deae71b0dc5a034c71ee30fc0) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af3e5bdd0d3277bc555cc8026c169d46e1d08ef2 --- libavcodec/vp3.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 4a72d0d..c9bc859 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2010,17 +2010,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vp3: Clear context on reinitialization failure
ffmpeg | branch: release/2.8 | Michael Niedermayer | Sat Nov 28 00:23:54 2015 +0100| [d32c9723a626701a5a508db7ceba9e8b8a774921] | committer: Michael Niedermayer avcodec/vp3: Clear context on reinitialization failure Fixes null pointer dereference Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 6105b7219a90438deae71b0dc5a034c71ee30fc0) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d32c9723a626701a5a508db7ceba9e8b8a774921 --- libavcodec/vp3.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 09e6f75..59cd725 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2016,17 +2016,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vp3: Clear context on reinitialization failure
ffmpeg | branch: release/2.5 | Michael Niedermayer | Sat Nov 28 00:23:54 2015 +0100| [2b9e849c37124ce571c8697a10b6b6124c4c2840] | committer: Michael Niedermayer avcodec/vp3: Clear context on reinitialization failure Fixes null pointer dereference Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 6105b7219a90438deae71b0dc5a034c71ee30fc0) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b9e849c37124ce571c8697a10b6b6124c4c2840 --- libavcodec/vp3.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 8aca83a..7df406c 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2010,17 +2010,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vp3: Clear context on reinitialization failure
ffmpeg | branch: master | Michael Niedermayer | Sat Nov 28 00:23:54 2015 +0100| [6105b7219a90438deae71b0dc5a034c71ee30fc0] | committer: Michael Niedermayer avcodec/vp3: Clear context on reinitialization failure Fixes null pointer dereference Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6105b7219a90438deae71b0dc5a034c71ee30fc0 --- libavcodec/vp3.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 1e55474..28f0569 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2018,17 +2018,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); +if (ret >= 0) +ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); -} else -ret = vp3_decode_init(avctx); +} return ret; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog