diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-11-02 12:13:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-11-02 12:13:35 +0800 |
| commit | d56a534acc52b0bb7d61ac7c3386ab96e8ca4a97 (patch) | |
| tree | 5ea9bf64602faf1abb6ed72dbd78dbd3f1ebc904 /ext/json/json_parser.tab.c | |
| parent | 3fa0cee640bd54a500fcaa8aa8293a255d0d3191 (diff) | |
| download | php-git-d56a534acc52b0bb7d61ac7c3386ab96e8ca4a97.tar.gz | |
RC manipulation cleanup 2
Diffstat (limited to 'ext/json/json_parser.tab.c')
| -rw-r--r-- | ext/json/json_parser.tab.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ext/json/json_parser.tab.c b/ext/json/json_parser.tab.c index 5db1842900..2edcc63703 100644 --- a/ext/json/json_parser.tab.c +++ b/ext/json/json_parser.tab.c @@ -139,8 +139,8 @@ int json_yydebug = 1; /* In a future release of Bison, this section will be replaced by #include "json_parser.tab.h". */ -#ifndef YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED -# define YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED +#ifndef YY_PHP_JSON_YY_HOME_HUIXINCHEN_OPENSOURCE_TRUNK_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED +# define YY_PHP_JSON_YY_HOME_HUIXINCHEN_OPENSOURCE_TRUNK_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -201,7 +201,7 @@ typedef union YYSTYPE YYSTYPE; int php_json_yyparse (php_json_parser *parser); -#endif /* !YY_PHP_JSON_YY_HOME_DMITRY_PHP_PHP_MASTER_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED */ +#endif /* !YY_PHP_JSON_YY_HOME_HUIXINCHEN_OPENSOURCE_TRUNK_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED */ /* Copy the second part of user declarations. */ @@ -1892,10 +1892,7 @@ static int php_json_parser_object_update(php_json_parser *parser, zval *object, } ZVAL_NEW_STR(&zkey, key); zend_std_write_property(object, &zkey, zvalue, NULL); - - if (Z_REFCOUNTED_P(zvalue)) { - Z_DELREF_P(zvalue); - } + Z_TRY_DELREF_P(zvalue); } zend_string_release(key); |