Commit c1da59fa authored by Baptiste Coudurier's avatar Baptiste Coudurier

return error if malloc failed, found by takis, fix issue 286

Originally committed as revision 11162 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9cf0419b
...@@ -964,7 +964,8 @@ static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -964,7 +964,8 @@ static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc->stts_count = entries; sc->stts_count = entries;
sc->stts_data = av_malloc(entries * sizeof(MOV_stts_t)); 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); dprintf(c->fc, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries);
sc->time_rate=0; sc->time_rate=0;
...@@ -1006,7 +1007,8 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) ...@@ -1006,7 +1007,8 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc->ctts_count = entries; sc->ctts_count = entries;
sc->ctts_data = av_malloc(entries * sizeof(MOV_stts_t)); 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); dprintf(c->fc, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
for(i=0; i<entries; i++) { for(i=0; i<entries; i++) {
......
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