virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es

Browse Source 
Originally committed as revision 13237 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Albert Astals Cid 2008-05-22 17:16:12 +00:00 committed by Baptiste Coudurier
parent ba9880c13a
commit 6f04eb1e8a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mov.c
View File

@ -1565,7 +1565,7 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
uint8_t *cmov_data; uint8_t *cmov_data;
uint8_t *moov_data; /* uncompressed data */ uint8_t *moov_data; /* uncompressed data */
long cmov_len, moov_len; long cmov_len, moov_len;
int ret; int ret = -1;
get_be32(pb); /* dcom atom */ get_be32(pb); /* dcom atom */
if (get_le32(pb) != MKTAG('d','c','o','m')) if (get_le32(pb) != MKTAG('d','c','o','m'))
@ -1590,9 +1590,9 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
} }
get_buffer(pb, cmov_data, cmov_len); get_buffer(pb, cmov_data, cmov_len);
if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK) if(uncompress (moov_data, (uLongf *) &moov_len, (const Bytef *)cmov_data, cmov_len) != Z_OK)
return -1; goto free_and_return;
if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0) if(init_put_byte(&ctx, moov_data, moov_len, 0, NULL, NULL, NULL, NULL) != 0)
return -1; goto free_and_return;
atom.type = MKTAG('m','o','o','v'); atom.type = MKTAG('m','o','o','v');
atom.offset = 0; atom.offset = 0;
atom.size = moov_len; atom.size = moov_len;
@ -1600,6 +1600,7 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
// { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); } // { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); }
#endif #endif
ret = mov_read_default(c, &ctx, atom); ret = mov_read_default(c, &ctx, atom);
free_and_return:
av_free(moov_data); av_free(moov_data);
av_free(cmov_data); av_free(cmov_data);
return ret; return ret;