diff options
| author | Remi Collet <remi@remirepo.net> | 2019-09-20 09:05:54 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-09-20 09:05:54 +0200 |
| commit | a079bb263323bc3315711529ee3b78a3b3609899 (patch) | |
| tree | bcaa5f23a1199dbe2530c697dc600ce133c9da1b /173.patch | |
| parent | 28868c7f14d97453885d0cc9508bc5108b957b99 (diff) | |
- update to 1.2.9
- drop patch merged upstream
- add fix for 32-bit build from
https://github.com/viest/php-ext-excel-export/pull/173
https://github.com/viest/php-ext-excel-export/pull/174
Diffstat (limited to '173.patch')
| -rw-r--r-- | 173.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/173.patch b/173.patch new file mode 100644 index 0000000..ee1071f --- /dev/null +++ b/173.patch @@ -0,0 +1,29 @@ +From a30311cd401221eef7be3bc5b25bf247a134383e Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 20 Sep 2019 08:08:28 +0200 +Subject: [PATCH] fix stack mashing using proper format + +--- + kernel/read.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kernel/read.c b/kernel/read.c +index cd28916..18d66a6 100644 +--- a/kernel/read.c ++++ b/kernel/read.c +@@ -96,7 +96,7 @@ void data_to_custom_type(const char *string_value, zend_ulong type, zval *zv_res + + zend_long _long_value; + +- sscanf(string_value, "%" PRIi64, &_long_value); ++ sscanf(string_value, ZEND_LONG_FMT, &_long_value); + + if (Z_TYPE_P(zv_result_t) == IS_ARRAY) { + add_next_index_long(zv_result_t, _long_value); +@@ -268,4 +268,4 @@ void load_sheet_all_data(xlsxioreadersheet sheet_t, zval *zv_type_t, zval *zv_re + add_next_index_zval(zv_result_t, &_zv_tmp_row); + } + } +-/* }}} */ +\ No newline at end of file ++/* }}} */ |