[FFmpeg-cvslog] avidec: use actually read size instead of requested size

[Anton Khirnov]

ffmpeg | branch: release/0.5 | Anton Khirnov <anton at khirnov.net> | Fri Sep 28 15:42:29 2012 +0200| [d1729c3715af6901788058be46e8a73372e434bf] | committer: Reinhard Tartler

avidec: use actually read size instead of requested size

Fixes CVE-2012-2788
(cherry picked from commit 0af49a63c7f87876486ab09482d5b26b95abce60)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

 libavformat/avidec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 78e5051..74edebf 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -780,7 +780,7 @@ resync:
             else
                 ast->frame_offset++;
         }
-        ast->remaining -= size;
+        ast->remaining -= err;
         if(!ast->remaining){
             avi->stream_index= -1;
             ast->packet_size= 0;