virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d'

Browse Source 
* commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d':
  cws2fws: Close file handles on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-12 22:45:53 +02:00
parent 6cfaa51acb 30dfc1dad4
commit e1ec9c7fb6
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/cws2fws.c
View File

@@ -31,6 +31,7 @@ int main(int argc, char *argv[])
char buf_in[1024], buf_out[65536]; char buf_in[1024], buf_out[65536];
z_stream zstream; z_stream zstream;
struct stat statbuf; struct stat statbuf;
int ret = 1;
if (argc < 3) { if (argc < 3) {
printf("Usage: %s <infile.swf> <outfile.swf>\n", argv[0]); printf("Usage: %s <infile.swf> <outfile.swf>\n", argv[0]);
@@ -52,14 +53,12 @@ int main(int argc, char *argv[])
if (read(fd_in, &buf_in, 8) != 8) { if (read(fd_in, &buf_in, 8) != 8) {
printf("Header error\n"); printf("Header error\n");
close(fd_in); goto out;
close(fd_out);
return 1;
} }
if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S') { if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S') {
printf("Not a compressed flash file\n"); printf("Not a compressed flash file\n");
return 1; goto out;
} }
if (fstat(fd_in, &statbuf) < 0) { if (fstat(fd_in, &statbuf) < 0) {
@@ -76,7 +75,7 @@ int main(int argc, char *argv[])
buf_in[0] = 'F'; buf_in[0] = 'F';
if (write(fd_out, &buf_in, 8) < 8) { if (write(fd_out, &buf_in, 8) < 8) {
perror("Error writing output file"); perror("Error writing output file");
return 1; goto out;
} }
zstream.zalloc = NULL; zstream.zalloc = NULL;
@@ -103,7 +102,7 @@ int main(int argc, char *argv[])
if (ret != Z_STREAM_END && ret != Z_OK) { if (ret != Z_STREAM_END && ret != Z_OK) {
printf("Error while decompressing: %d\n", ret); printf("Error while decompressing: %d\n", ret);
inflateEnd(&zstream); inflateEnd(&zstream);
return 1; goto out;
} }
dbgprintf("a_in: %d t_in: %lu a_out: %d t_out: %lu -- %lu out\n", dbgprintf("a_in: %d t_in: %lu a_out: %d t_out: %lu -- %lu out\n",
@@ -113,7 +112,8 @@ int main(int argc, char *argv[])
if (write(fd_out, &buf_out, zstream.total_out - last_out) < if (write(fd_out, &buf_out, zstream.total_out - last_out) <
zstream.total_out - last_out) { zstream.total_out - last_out) {
perror("Error writing output file"); perror("Error writing output file");
return 1; inflateEnd(&zstream);
goto out;
} }
i += len; i += len;
@@ -134,12 +134,15 @@ int main(int argc, char *argv[])
if ( lseek(fd_out, 4, SEEK_SET) < 0 if ( lseek(fd_out, 4, SEEK_SET) < 0
|| write(fd_out, &buf_in, 4) < 4) { || write(fd_out, &buf_in, 4) < 4) {
perror("Error writing output file"); perror("Error writing output file");
return 1; inflateEnd(&zstream);
goto out;
} }
} }
ret = 0;
inflateEnd(&zstream); inflateEnd(&zstream);
out:
close(fd_in); close(fd_in);
close(fd_out); close(fd_out);
return 0; return ret;
} }