diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-06-20 00:04:36 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-22 18:43:11 +0200 |
| commit | 73953df71a28e94d8959facba7906cf5975ca4ef (patch) | |
| tree | 2b9cb23701465e766ef67686b33bb1c13ad67699 | |
| parent | f83896abda1e78ebbbda0f184b682b4fabadc682 (diff) | |
| download | ffmpeg-73953df71a28e94d8959facba7906cf5975ca4ef.tar.gz | |
Replace av_malloc() and memset(0) by av_mallocz()
| -rw-r--r-- | libavformat/matroskadec.c | 4 | ||||
| -rw-r--r-- | libavformat/rmdec.c | 3 | ||||
| -rw-r--r-- | libavformat/utils.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e376baeac2..d5bc9230bb 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -746,11 +746,9 @@ 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 + FF_INPUT_BUFFER_PADDING_SIZE))) + if (!(bin->data = av_mallocz(length + FF_INPUT_BUFFER_PADDING_SIZE))) return AVERROR(ENOMEM); - memset(bin->data + length, 0, FF_INPUT_BUFFER_PADDING_SIZE); - bin->size = length; bin->pos = avio_tell(pb); if (avio_read(pb, bin->data, length) != length) { diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index eb0f3c5ff0..79a07566de 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -86,11 +86,10 @@ static int rm_read_extradata(AVIOContext *pb, AVCodecContext *avctx, unsigned si { if (size >= 1<<24) return -1; - avctx->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); + avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); if (!avctx->extradata) return AVERROR(ENOMEM); avctx->extradata_size = avio_read(pb, avctx->extradata, size); - memset(avctx->extradata + avctx->extradata_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); if (avctx->extradata_size != size) return AVERROR(EIO); return 0; diff --git a/libavformat/utils.c b/libavformat/utils.c index ab6c6bf0c9..133822b368 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2381,14 +2381,12 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) int i = st->parser->parser->split(st->codec, pkt->data, pkt->size); if (i > 0 && i < FF_MAX_EXTRADATA_SIZE) { st->codec->extradata_size = i; - st->codec->extradata = av_malloc(st->codec->extradata_size + - FF_INPUT_BUFFER_PADDING_SIZE); + st->codec->extradata = av_mallocz(st->codec->extradata_size + + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) return AVERROR(ENOMEM); memcpy(st->codec->extradata, pkt->data, st->codec->extradata_size); - memset(st->codec->extradata + i, 0, - FF_INPUT_BUFFER_PADDING_SIZE); } } |