c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue where zipfile isn't close when there is a file add error.

Browse Source 
Issue #310
This commit is contained in:
John McNamara 2020-09-24 14:32:04 +01:00
parent 38b8903228
commit dfbc07c973
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/xlsxwriter/common.h
View File

@ -251,6 +251,12 @@ enum lxw_custom_property_types {
if (error) \
return error;
#define RETURN_AND_ZIPCLOSE_ON_ERROR(error) \
if (error) { \
zipClose(self->zipfile, NULL); \
return error; \
}
#define LXW_WARN(message) \
fprintf(stderr, "[WARNING]: " message "\n")

62
src/packager.c
View File

@ -158,9 +158,8 @@ _write_workbook_file(lxw_packager *self)
lxw_workbook_assemble_xml_file(workbook);
err = _add_file_to_zip(self, workbook->file, "xl/workbook.xml");
RETURN_ON_ERROR(err);
fclose(workbook->file);
RETURN_ON_ERROR(err);
return LXW_NO_ERROR;
}
@ -197,9 +196,8 @@ _write_worksheet_files(lxw_packager *self)
lxw_worksheet_assemble_xml_file(worksheet);
err = _add_file_to_zip(self, worksheet->file, sheetname);
RETURN_ON_ERROR(err);
fclose(worksheet->file);
RETURN_ON_ERROR(err);
}
return LXW_NO_ERROR;
@ -234,9 +232,8 @@ _write_chartsheet_files(lxw_packager *self)
lxw_chartsheet_assemble_xml_file(chartsheet);
err = _add_file_to_zip(self, chartsheet->file, sheetname);
RETURN_ON_ERROR(err);
fclose(chartsheet->file);
RETURN_ON_ERROR(err);
}
return LXW_NO_ERROR;
@ -356,9 +353,8 @@ _write_chart_files(lxw_packager *self)
lxw_chart_assemble_xml_file(chart);
err = _add_file_to_zip(self, chart->file, sheetname);
RETURN_ON_ERROR(err);
fclose(chart->file);
RETURN_ON_ERROR(err);
}
return LXW_NO_ERROR;
@ -412,10 +408,10 @@ _write_drawing_files(lxw_packager *self)
return LXW_ERROR_CREATING_TMPFILE;
lxw_drawing_assemble_xml_file(drawing);
err = _add_file_to_zip(self, drawing->file, filename);
RETURN_ON_ERROR(err);
err = _add_file_to_zip(self, drawing->file, filename);
fclose(drawing->file);
RETURN_ON_ERROR(err);
}
}
@ -549,7 +545,6 @@ _write_vml_files(lxw_packager *self)
RETURN_ON_ERROR(err);
}
}
return LXW_NO_ERROR;
@ -627,9 +622,8 @@ _write_shared_strings_file(lxw_packager *self)
lxw_sst_assemble_xml_file(sst);
err = _add_file_to_zip(self, sst->file, "xl/sharedStrings.xml");
RETURN_ON_ERROR(err);
fclose(sst->file);
RETURN_ON_ERROR(err);
return LXW_NO_ERROR;
}
@ -1451,67 +1445,67 @@ lxw_create_package(lxw_packager *self)
int8_t zip_error;
error = _write_content_types_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_root_rels_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_workbook_rels_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_worksheet_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_chartsheet_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_workbook_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_chart_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_drawing_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_vml_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_comment_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_shared_strings_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_custom_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_theme_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_styles_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_worksheet_rels_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_chartsheet_rels_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_drawing_rels_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_image_files(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _add_vba_project(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_core_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
error = _write_app_file(self);
RETURN_ON_ERROR(error);
RETURN_AND_ZIPCLOSE_ON_ERROR(error);
zip_error = zipClose(self->zipfile, NULL);
if (zip_error) {