MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closing NULL pointers is ok

develop
Myk Taylor 2020-08-15 23:37:21 -07:00
parent 4e331ce4ce
commit 7a7aff7745
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/xlsxreader.cpp
Unescape Escape View File

@ -24,9 +24,12 @@ xlsx_file_handle* open_xlsx_file(std::string filename) {
} }
void close_xlsx_file(xlsx_file_handle *file_handle) { void close_xlsx_file(xlsx_file_handle *file_handle) {
CHECK_NULL_POINTER(file_handle); if (!file_handle) {
CHECK_NULL_POINTER(file_handle->handle); return;
xlsxioread_close(file_handle->handle); }
if (file_handle->handle) {
xlsxioread_close(file_handle->handle);
}
delete(file_handle); delete(file_handle);
} }
@ -44,9 +47,12 @@ xlsx_sheet_handle* open_sheet(xlsx_file_handle *file_handle,
} }
void close_sheet(xlsx_sheet_handle *sheet_handle) { void close_sheet(xlsx_sheet_handle *sheet_handle) {
CHECK_NULL_POINTER(sheet_handle); if (!sheet_handle) {
CHECK_NULL_POINTER(sheet_handle->handle); return;
xlsxioread_sheet_close(sheet_handle->handle); }
if (sheet_handle->handle) {
xlsxioread_sheet_close(sheet_handle->handle);
}
delete(sheet_handle); delete(sheet_handle);
} }