Merge pull request #173 from remicollet/issue-172

viest · web-flow · commit 6258018c2366 · 2019-09-20T01:28:43.000-05:00
fix stack mashing using proper format
diff --git 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);
     }
 }
-/* }}} */
+/* }}} */

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void data_to_custom_type(const char string_value, zend_ulong type, zval zv_res`
`96`	`96`
`97`	`97`	`zend_long _long_value;`
`98`	`98`
`99`		`- sscanf(string_value, "%" PRIi64, &_long_value);`
	`99`	`+ sscanf(string_value, ZEND_LONG_FMT, &_long_value);`
`100`	`100`
`101`	`101`	`if (Z_TYPE_P(zv_result_t) == IS_ARRAY) {`
`102`	`102`	`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`
`268`	`268`	`add_next_index_zval(zv_result_t, &_zv_tmp_row);`
`269`	`269`	`}`
`270`	`270`	`}`
`271`		`-/* }}} */`
	`271`	`+/* }}} */`