diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-12-03 22:26:07 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-12-03 22:26:07 +0000 |
| commit | c1da59fa2d9ff701655d94fede63d0e645948a54 (patch) | |
| tree | 10f0533dd25bab52efb9cfe30b1ebe48bc5d9063 /libavformat/mov.c | |
| parent | 9cf0419bb1a2cf929dcf458d435ae3c3bfb5d3ab (diff) | |
| download | ffmpeg-c1da59fa2d9ff701655d94fede63d0e645948a54.tar.gz | |
return error if malloc failed, found by takis, fix issue 286
Originally committed as revision 11162 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 1c2f3226ea..6e6b8346b4 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++) { |