[FFmpeg-cvslog] avformat/xwma: Use ff_alloc_extradata()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  1 18:17:20 2015 +0200| [b9fbd034bfd4b323d57bc2ac888301c93fcfd4ca] | committer: Michael Niedermayer

avformat/xwma: Use ff_alloc_extradata()

This prevents the fields from potentially becoming inconsistent in case of errors

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

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

 libavformat/xwma.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 075a85a..a1f2dc2 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -104,11 +104,10 @@ static int xwma_read_header(AVFormatContext *s)
             avpriv_request_sample(s, "Unexpected extradata (%d bytes)",
                                   st->codec->extradata_size);
         } else {
-            st->codec->extradata_size = 6;
-            st->codec->extradata      = av_mallocz(6 + FF_INPUT_BUFFER_PADDING_SIZE);
-            if (!st->codec->extradata)
+            if (ff_alloc_extradata(st->codec, 6))
                 return AVERROR(ENOMEM);
 
+            memset(st->codec->extradata, 0, st->codec->extradata_size);
             /* setup extradata with our experimentally obtained value */
             st->codec->extradata[4] = 31;
         }