dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-04 16:06:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dont' open output file until we're sure the input file is valid

Browse Source 
fixes http://code.google.com/p/webp/issues/detail?id=48

Change-Id: I9ce2e500623380ba71ae0e2c8faf80db4568ae50
This commit is contained in:
Pascal Massimino 2011-02-25 12:03:27 -08:00
parent d5bd54c712
commit 0744e8420e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/cwebp.c
View File

@ -719,6 +719,16 @@ int main(int argc, const char *argv[]) {
goto Error; goto Error;
} }
// Read the input
if (verbose)
StopwatchReadAndReset(&stop_watch);
if (!ReadPicture(in_file, &picture)) goto Error;
if (verbose) {
const double time = StopwatchReadAndReset(&stop_watch);
fprintf(stderr, "Time to read input: %.3fs\n", time);
}
// Open the output
if (out_file) { if (out_file) {
out = fopen(out_file, "wb"); out = fopen(out_file, "wb");
if (!out) { if (!out) {
@ -740,14 +750,9 @@ int main(int argc, const char *argv[]) {
} }
picture.stats = &stats; picture.stats = &stats;
// Compress
if (verbose) if (verbose)
StopwatchReadAndReset(&stop_watch); StopwatchReadAndReset(&stop_watch);
if (!ReadPicture(in_file, &picture)) goto Error;
if (verbose) {
const double time = StopwatchReadAndReset(&stop_watch);
fprintf(stderr, "Time to read input: %.3fs\n", time);
StopwatchReadAndReset(&stop_watch);
}
if (crop != 0 && !WebPPictureCrop(&picture, crop_x, crop_y, crop_w, crop_h)) if (crop != 0 && !WebPPictureCrop(&picture, crop_x, crop_y, crop_w, crop_h))
goto Error; goto Error;
if (picture.extra_info_type > 0) AllocExtraInfo(&picture); if (picture.extra_info_type > 0) AllocExtraInfo(&picture);
@ -756,6 +761,8 @@ int main(int argc, const char *argv[]) {
const double time = StopwatchReadAndReset(&stop_watch); const double time = StopwatchReadAndReset(&stop_watch);
fprintf(stderr, "Time to encode picture: %.3fs\n", time); fprintf(stderr, "Time to encode picture: %.3fs\n", time);
} }
// Write info
if (dump_file) DumpPicture(&picture, dump_file); if (dump_file) DumpPicture(&picture, dump_file);
if (!quiet) PrintExtraInfo(&picture, short_output); if (!quiet) PrintExtraInfo(&picture, short_output);