From 8417a239731158b7a8585f323e2c9216cac13c85 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 10 Mar 2018 11:18:21 +0100 Subject: Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault --- Zend/zend_ini_parser.y | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Zend') diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index 90db76a94b..e39d93d294 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -57,11 +57,19 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2) int str_len; char str_result[MAX_LENGTH_OF_LONG+1]; - i_op1 = atoi(Z_STRVAL_P(op1)); - zend_string_free(Z_STR_P(op1)); + if (IS_LONG == Z_TYPE_P(op1)) { + i_op1 = Z_LVAL_P(op1); + } else { + i_op1 = atoi(Z_STRVAL_P(op1)); + zend_string_free(Z_STR_P(op1)); + } if (op2) { - i_op2 = atoi(Z_STRVAL_P(op2)); - zend_string_free(Z_STR_P(op2)); + if (IS_LONG == Z_TYPE_P(op2)) { + i_op2 = Z_LVAL_P(op2); + } else { + i_op2 = atoi(Z_STRVAL_P(op2)); + zend_string_free(Z_STR_P(op2)); + } } else { i_op2 = 0; } -- cgit v1.2.1