From 30c3d976f12665d5d13971172aab062a97cb1bce Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Tue, 11 Oct 2011 10:14:06 +0200 Subject: mov: do not misreport empty stts Return -1 instead of ENOMEM if entries is 0. Fixes a av_malloc(0) crash in macosx. --- libavformat/mov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/mov.c b/libavformat/mov.c index 4f5bb0c59e..0e2ad1fe15 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1461,8 +1461,8 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_dlog(c->fc, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries); - if (entries >= UINT_MAX / sizeof(*sc->stts_data)) - return -1; + if (!entries || entries >= UINT_MAX / sizeof(*sc->stts_data)) + return AVERROR(EINVAL); sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data)); if (!sc->stts_data) -- cgit v1.2.1