From: Michael Niedermayer <michael@niedermayer.cc>
Date: Mon, 13 Jul 2015 12:05:21 +0000 (+0200)
Subject: avcodec/sanm: Reset sizes in destroy_buffers()
X-Git-Tag: archive/raspbian/6%11.12-1_deb8u9+rpi1^2~58
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=23925250f02f3db48f26b35cbf3340a296f53964;p=libav.git

avcodec/sanm: Reset sizes in destroy_buffers()

avcodec/sanm: Reset sizes in destroy_buffers()

Fixes crash in 1288a2fe8e9ae6b00ca40e089d08ca65_signal_sigsegv_7ffff71426a7_354_accident.san with allocation limit 65536

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Gbp-Pq: Name CVE-2015-6822.patch
---

diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index 41c6551..c939fb2 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -406,6 +406,7 @@ static void destroy_buffers(SANMVideoContext *ctx)
     ctx->frm0_size =
     ctx->frm1_size =
     ctx->frm2_size = 0;
+    init_sizes(ctx, 0, 0);
 }
 
 static av_cold int init_buffers(SANMVideoContext *ctx)