summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-05-03 19:55:55 +0100
committerJakub Zelenka <bukka@php.net>2016-05-03 19:55:55 +0100
commitafb4062c2c66d3080c08693af47c670bb63c285e (patch)
tree4c860a31501a3dadf59c0b9322f7f52764ae75d3 /ext/pcre/php_pcre.c
parent37048c0f6cef53b015c04c8370f94e6597588fdc (diff)
parent34a9882ad357620ccec2bfadba72fce027acd3d6 (diff)
downloadphp-git-afb4062c2c66d3080c08693af47c670bb63c285e.tar.gz
Merge branch 'json_parser_method' into json_parser_method_embed
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index f6f86304e5..35ba1a06f1 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1030,7 +1030,7 @@ static int preg_get_backref(char **str, int *backref)
}
if (in_brace) {
- if (*walk == 0 || *walk != '}')
+ if (*walk != '}')
return 0;
else
walk++;