Merge branch 'master' of github.com:viest/php-ext-excel-export

README.md

@@ -1,4 +1,6 @@
-![php-excel](resource/logo.png)
+<div align=center>
+<img height="214" src="resource/logo_now.png"/>
+</div>
 
 <div align=center>
 <a href="https://travis-ci.org/viest/php-ext-xlswriter"><img src="https://travis-ci.org/viest/php-ext-xlswriter.svg?branch=master"/></a>

README_zh.md

@@ -1,4 +1,6 @@
-![php-excel](resource/logo.png)
+<div align=center>
+<img height="214" src="resource/logo_now.png"/>
+</div>
 
 <div align=center>
 <a href="https://travis-ci.org/viest/php-ext-xlswriter"><img src="https://travis-ci.org/viest/php-ext-xlswriter.svg?branch=master"/></a>

kernel/excel.c

@@ -392,7 +392,6 @@ PHP_METHOD(vtiful_xls, header)
 
     ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(header), header_l_key, header_value)
          type_writer(header_value, 0, header_l_key, &obj->write_ptr, NULL, obj->format_ptr.format);
-         zval_ptr_dtor(header_value);
     ZEND_HASH_FOREACH_END();
 
     SHEET_LINE_ADD(obj)
@@ -419,7 +418,6 @@ PHP_METHOD(vtiful_xls, data)
         if(Z_TYPE_P(data_r_value) == IS_ARRAY) {
             ZEND_HASH_FOREACH_BUCKET(Z_ARRVAL_P(data_r_value), Bucket *bucket)
                 type_writer(&bucket->val, SHEET_CURRENT_LINE(obj), bucket->h, &obj->write_ptr, NULL, obj->format_ptr.format);
-                zval_ptr_dtor(&bucket->val);
             ZEND_HASH_FOREACH_END();
 
             SHEET_LINE_ADD(obj)

kernel/write.c

@@ -25,7 +25,9 @@ void type_writer(zval *value, zend_long row, zend_long columns, xls_resource_wri
     zend_uchar value_type = Z_TYPE_P(value);
 
     if (value_type == IS_STRING) {
-        worksheet_write_string(res->worksheet, lxw_row, lxw_col, ZSTR_VAL(zval_get_string(value)), format_handle);
+        zend_string *_zs_value = zval_get_string(value);
+        worksheet_write_string(res->worksheet, lxw_row, lxw_col, ZSTR_VAL(_zs_value), format_handle);
+        zend_string_release(_zs_value);
         return;
     }