[FFmpeg-cvslog] vp56: release frames on error

[Luca Barbato]

ffmpeg | branch: release/0.5 | Luca Barbato <lu_zero at gentoo.org> | Fri Dec 14 09:55:04 2012 +0100| [4f8f4458a5a837bf58ae3b3662b0ec4278682612] | committer: Reinhard Tartler

vp56: release frames on error

Fixes CVE-2012-2783

CC: libav-stable at libav.org

(cherry picked from commit f33b5ba63eee96c9d1c7f0e568169cb0c3694238)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>
(cherry picked from commit 7fd7950174f9f2935fbf5bf1435fd0dc37be5c61)

Conflicts:

	libavcodec/vp56.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f8f4458a5a837bf58ae3b3662b0ec4278682612
---

 libavcodec/vp56.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index c09dbeb..2b70d2b 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -516,8 +516,14 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         s->modelp = &s->models[is_alpha];
 
         res = s->parse_header(s, buf, remaining_buf_size, &golden_frame);
-        if (!res)
-            return -1;
+        if (!res) {
+            int i;
+            for (i = 0; i < 4; i++) {
+                if (s->frames[i].data[0])
+                    avctx->release_buffer(avctx, &s->frames[i]);
+            }
+            return res;
+        }
 
         if (!is_alpha) {
             p->reference = 1;