[FFmpeg-cvslog] avcodec/wmalosslessdec: deallocate uninitialized frame on decode_tilehdr() failure

Michael Niedermayer git at videolan.org
Mon Jan 13 17:28:57 CET 2014


ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 11 01:59:20 2014 +0100| [cd753ee36b0f59123d9786c95cbc57c48bd59791] | committer: Michael Niedermayer

avcodec/wmalosslessdec: deallocate uninitialized frame on decode_tilehdr() failure

Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ae3856dcaf9c5ef339969c95a72bcaf7c4bba9ec)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/wmalosslessdec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 6386930..8487af9 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1040,6 +1040,7 @@ static int decode_frame(WmallDecodeCtx *s)
     /* decode tile information */
     if ((ret = decode_tilehdr(s))) {
         s->packet_loss = 1;
+        av_frame_unref(s->frame);
         return ret;
     }
 



More information about the ffmpeg-cvslog mailing list