Merge pull request #222 from viest/dev

Fix: free up stale sheets.
viest · Dec 31, 2019 · 77a1d16 · 77a1d16
2 parents d5f632c + 1bcbe7b
commit 77a1d16
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git 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
@@ -33,19 +33,19 @@
   <email>wjx@php.net</email>
   <active>yes</active>
  </lead>
- <date>2019-12-26</date>
+ <date>2019-12-31</date>
  <time>22:00:00</time>
  <version>
-  <release>1.3.3.1</release>
-  <api>1.3.3.1</api>
+  <release>1.3.3.2</release>
+  <api>1.3.3.2</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
  <notes>
-- FIX merge cells.
+- FIX free up stale sheets.
  </notes>
  <contents>
   <dir name="/">
@@ -251,6 +251,22 @@
   <configureoption default="yes" name="enable-reader" prompt="enable reader supports?" />
  </extsrcrelease>
  <changelog>
+  <release>
+   <date>2019-12-26</date>
+   <time>22:00:00</time>
+   <version>
+    <release>1.3.3.1</release>
+    <api>1.3.3.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
+   <notes>
+    - FIX merge cells.
+   </notes>
+  </release>
   <release>
    <date>2019-12-23</date>
    <time>23:00:00</time>

diff --git 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)