Commit e9e9f79a authored by Moritz Barsnick's avatar Moritz Barsnick Committed by Michael Niedermayer

avformat/hashenc: fix incorrect use of av_mallocz_array()

Fixes CID 1453867, CID 1453866, CID 1453865.
Signed-off-by: 's avatarMoritz Barsnick <barsnick@gmx.net>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 648f5c93
...@@ -85,7 +85,7 @@ static int hash_init(struct AVFormatContext *s) ...@@ -85,7 +85,7 @@ static int hash_init(struct AVFormatContext *s)
int res; int res;
struct HashContext *c = s->priv_data; struct HashContext *c = s->priv_data;
c->per_stream = 0; 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) if (!c->hashes)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
res = av_hash_alloc(&c->hashes[0], c->hash_name); res = av_hash_alloc(&c->hashes[0], c->hash_name);
...@@ -102,7 +102,7 @@ static int streamhash_init(struct AVFormatContext *s) ...@@ -102,7 +102,7 @@ static int streamhash_init(struct AVFormatContext *s)
int res, i; int res, i;
struct HashContext *c = s->priv_data; struct HashContext *c = s->priv_data;
c->per_stream = 1; 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) if (!c->hashes)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
...@@ -270,7 +270,7 @@ static int framehash_init(struct AVFormatContext *s) ...@@ -270,7 +270,7 @@ static int framehash_init(struct AVFormatContext *s)
int res; int res;
struct HashContext *c = s->priv_data; struct HashContext *c = s->priv_data;
c->per_stream = 0; 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) if (!c->hashes)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
res = av_hash_alloc(&c->hashes[0], c->hash_name); res = av_hash_alloc(&c->hashes[0], c->hash_name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment