mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid opened FILE handlers after exceptions in AseFormat member funtions.

Browse Source
This commit is contained in:
David Capello 2012-05-03 00:09:31 -03:00
parent ade6b0d333
commit 97154d5fbc
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/file/ase_format.cpp
View File

@ -142,15 +142,15 @@ bool AseFormat::onLoad(FileOp *fop)
int chunk_size;
int chunk_type;
int c, frame;
FILE *f;
f = fopen(fop->filename.c_str(), "rb");
FILE* f = fopen(fop->filename.c_str(), "rb");
if (!f)
return false;
UniquePtr<FILE, int(*)(FILE*)> fileHandleWrapper(f, fclose);
if (!ase_file_read_header(f, &header)) {
fop_error(fop, "Error reading header\n");
fclose(f);
return false;
}
@ -160,7 +160,6 @@ bool AseFormat::onLoad(FileOp *fop)
header.width, header.height, header.ncolors);
if (!sprite) {
fop_error(fop, "Error creating sprite with file spec\n");
fclose(f);
return false;
}
@ -285,11 +284,9 @@ bool AseFormat::onLoad(FileOp *fop)
if (ferror(f)) {
fop_error(fop, "Error reading file.\n");
fclose(f);
return false;
}
else {
fclose(f);
return true;
}
}
@ -306,6 +303,8 @@ bool AseFormat::onSave(FileOp *fop)
if (!f)
return false;
UniquePtr<FILE, int(*)(FILE*)> fileHandleWrapper(f, fclose);
/* prepare the header */
ase_file_prepare_header(f, &header, sprite);
@ -351,11 +350,9 @@ bool AseFormat::onSave(FileOp *fop)
if (ferror(f)) {
fop_error(fop, "Error writing file.\n");
fclose(f);
return false;
}
else {
fclose(f);
return true;
}
}