From 1bcbe7b3849e6b9aae7c3eb633f7dfa85f4afc67 Mon Sep 17 00:00:00 2001 From: viest Date: Tue, 31 Dec 2019 20:03:56 +0800 Subject: [PATCH] Fix: free up stale sheets. --- kernel/excel.c | 4 ++++ package.xml | 24 ++++++++++++++++++++---- php_xlswriter.h | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/kernel/excel.c b/kernel/excel.c index d6683ce..d414a54 100644 --- a/kernel/excel.c +++ b/kernel/excel.c @@ -949,6 +949,10 @@ PHP_METHOD(vtiful_xls, openSheet) RETURN_NULL(); } + if (obj->read_ptr.sheet_t != NULL) { + xlsxioread_sheet_close(obj->read_ptr.sheet_t); + } + obj->read_ptr.sheet_t = sheet_open(obj->read_ptr.file_t, zs_sheet_name, zl_flag); } /* }}} */ diff --git a/package.xml b/package.xml index 59b7659..cfe0c3e 100644 --- a/package.xml +++ b/package.xml @@ -33,11 +33,11 @@ wjx@php.net yes - 2019-12-26 + 2019-12-31 - 1.3.3.1 - 1.3.3.1 + 1.3.3.2 + 1.3.3.2 stable @@ -45,7 +45,7 @@ BSD license -- FIX merge cells. +- FIX free up stale sheets. @@ -251,6 +251,22 @@ + + 2019-12-26 + + + 1.3.3.1 + 1.3.3.1 + + + stable + stable + + BSD license + + - FIX merge cells. + + 2019-12-23 diff --git a/php_xlswriter.h b/php_xlswriter.h index 869afda..cdf3a9e 100644 --- a/php_xlswriter.h +++ b/php_xlswriter.h @@ -18,7 +18,7 @@ extern zend_module_entry xlswriter_module_entry; #define phpext_xlswriter_ptr &xlswriter_module_entry -#define PHP_XLSWRITER_VERSION "1.3.3.1" +#define PHP_XLSWRITER_VERSION "1.3.3.2" #ifdef PHP_WIN32 # define PHP_VTIFUL_API __declspec(dllexport)