summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2010-07-13 05:45:23 +0000
committerPierrick Charron <pierrick@php.net>2010-07-13 05:45:23 +0000
commite0c7dbf30d98a3bde0f951c585fa87db02e1ef75 (patch)
tree4032ee2d29d8762d35989b68fa2eff3d5fef80be
parent6bed6c114e4ea2f27ebef3f40db77c07e88190db (diff)
downloadphp-git-e0c7dbf30d98a3bde0f951c585fa87db02e1ef75.tar.gz
- Add YYNOERRORRECOVERY to disable error recovery processing
- Remove warning
-rw-r--r--Zend/zend_ini_parser.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 06d9a00bf2..4f978edd7c 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -32,6 +32,7 @@
#include "zend_extensions.h"
#define NDEBUG
+#define YYNOERRORRECOVERY
#define ZEND_INI_PARSER_CB (CG(ini_parser_param))->ini_parser_cb
#define ZEND_INI_PARSER_ARG (CG(ini_parser_param))->arg
@@ -89,7 +90,7 @@ static void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
*/
static void zend_ini_init_string(zval *result)
{
- Z_STRVAL_P(result) = malloc(1);
+ Z_STRVAL_P(result) = (char *) malloc(1);
Z_STRVAL_P(result)[0] = 0;
Z_STRLEN_P(result) = 0;
Z_TYPE_P(result) = IS_STRING;