[SCM] libav/experimental: return error if malloc failed, found by takis, fix issue 286
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:10:07 UTC 2013
The following commit has been merged in the experimental branch:
commit c1da59fa2d9ff701655d94fede63d0e645948a54
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Mon Dec 3 22:26:07 2007 +0000
return error if malloc failed, found by takis, fix issue 286
Originally committed as revision 11162 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1c2f322..6e6b834 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -964,7 +964,8 @@ static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc->stts_count = entries;
sc->stts_data = av_malloc(entries * sizeof(MOV_stts_t));
-
+ if (!sc->stts_data)
+ return -1;
dprintf(c->fc, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries);
sc->time_rate=0;
@@ -1006,7 +1007,8 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc->ctts_count = entries;
sc->ctts_data = av_malloc(entries * sizeof(MOV_stts_t));
-
+ if (!sc->ctts_data)
+ return -1;
dprintf(c->fc, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
for(i=0; i<entries; i++) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list