[FFmpeg-cvslog] avformat/hashenc: fix incorrect use of av_mallocz_array()

Moritz Barsnick git at videolan.org
Mon Sep 23 23:52:35 EEST 2019


ffmpeg | branch: master | Moritz Barsnick <barsnick at gmx.net> | Sun Sep 22 14:24:11 2019 +0200| [e9e9f79a1908899a315eed760e55b2c32ec1e55b] | committer: Michael Niedermayer

avformat/hashenc: fix incorrect use of av_mallocz_array()

Fixes CID 1453867, CID 1453866, CID 1453865.

Signed-off-by: Moritz Barsnick <barsnick at gmx.net>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/hashenc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
index 8e090731ae..34a8fd1f50 100644
--- a/libavformat/hashenc.c
+++ b/libavformat/hashenc.c
@@ -85,7 +85,7 @@ static int hash_init(struct AVFormatContext *s)
     int res;
     struct HashContext *c = s->priv_data;
     c->per_stream = 0;
-    c->hashes = av_mallocz_array(1, sizeof(c->hashes));
+    c->hashes = av_mallocz_array(1, sizeof(*c->hashes));
     if (!c->hashes)
         return AVERROR(ENOMEM);
     res = av_hash_alloc(&c->hashes[0], c->hash_name);
@@ -102,7 +102,7 @@ static int streamhash_init(struct AVFormatContext *s)
     int res, i;
     struct HashContext *c = s->priv_data;
     c->per_stream = 1;
-    c->hashes = av_mallocz_array(s->nb_streams, sizeof(c->hashes));
+    c->hashes = av_mallocz_array(s->nb_streams, sizeof(*c->hashes));
     if (!c->hashes)
         return AVERROR(ENOMEM);
     for (i = 0; i < s->nb_streams; i++) {
@@ -270,7 +270,7 @@ static int framehash_init(struct AVFormatContext *s)
     int res;
     struct HashContext *c = s->priv_data;
     c->per_stream = 0;
-    c->hashes = av_mallocz_array(1, sizeof(c->hashes));
+    c->hashes = av_mallocz_array(1, sizeof(*c->hashes));
     if (!c->hashes)
         return AVERROR(ENOMEM);
     res = av_hash_alloc(&c->hashes[0], c->hash_name);



More information about the ffmpeg-cvslog mailing list