diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:45:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:46:10 +0200 |
commit | e1ec9c7fb6ba57f0ce5e6f51703b09b9d550406c (patch) | |
tree | ca4b02e4c6d1ebbe7799b703adb4e553e07c81eb /tools | |
parent | 6cfaa51acbf7f604ff94a3bc6e564855e7813b3a (diff) | |
parent | 30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d (diff) | |
download | ffmpeg-e1ec9c7fb6ba57f0ce5e6f51703b09b9d550406c.tar.gz |
Merge commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d'
* commit '30dfc1dad4285e7362ce3f596d7c5d5d9b7fb33d':
cws2fws: Close file handles on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/cws2fws.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/tools/cws2fws.c b/tools/cws2fws.c index d6cd2edd78..7046b69957 100644 --- a/tools/cws2fws.c +++ b/tools/cws2fws.c @@ -31,6 +31,7 @@ int main(int argc, char *argv[]) char buf_in[1024], buf_out[65536]; z_stream zstream; struct stat statbuf; + int ret = 1; if (argc < 3) { 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) { printf("Header error\n"); - close(fd_in); - close(fd_out); - return 1; + goto out; } if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S') { printf("Not a compressed flash file\n"); - return 1; + goto out; } if (fstat(fd_in, &statbuf) < 0) { @@ -76,7 +75,7 @@ int main(int argc, char *argv[]) buf_in[0] = 'F'; if (write(fd_out, &buf_in, 8) < 8) { perror("Error writing output file"); - return 1; + goto out; } zstream.zalloc = NULL; @@ -103,7 +102,7 @@ int main(int argc, char *argv[]) if (ret != Z_STREAM_END && ret != Z_OK) { printf("Error while decompressing: %d\n", ret); inflateEnd(&zstream); - return 1; + goto out; } 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) < zstream.total_out - last_out) { perror("Error writing output file"); - return 1; + inflateEnd(&zstream); + goto out; } i += len; @@ -134,12 +134,15 @@ int main(int argc, char *argv[]) if ( lseek(fd_out, 4, SEEK_SET) < 0 || write(fd_out, &buf_in, 4) < 4) { perror("Error writing output file"); - return 1; + inflateEnd(&zstream); + goto out; } } + ret = 0; inflateEnd(&zstream); +out: close(fd_in); close(fd_out); - return 0; + return ret; } |