Browse Source

ebml_read_binary: use fast_padded_malloc()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
commit
c63e76ba35
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavformat/matroskadec.c

+ 2
- 2
libavformat/matroskadec.c View File

@@ -762,8 +762,8 @@ static int ebml_read_ascii(AVIOContext *pb, int size, char **str)
*/
static int ebml_read_binary(AVIOContext *pb, int length, EbmlBin *bin)
{
av_free(bin->data);
if (!(bin->data = av_malloc(length)))
av_fast_padded_malloc(&bin->data, &bin->size, length);
if (!bin->data)
return AVERROR(ENOMEM);

bin->size = length;


Loading…
Cancel
Save