summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-05-03 19:55:41 +0100
committerJakub Zelenka <bukka@php.net>2016-05-03 19:55:41 +0100
commit34a9882ad357620ccec2bfadba72fce027acd3d6 (patch)
treed531877fdae8ec4126e8042ca350dcfcdb8b770f /ext/pcre/php_pcre.c
parent93b67dd511fdf890931e2b18846886368798ca5a (diff)
parentee551106bc11d6ac2eb277b810c9b8bb90e318bc (diff)
downloadphp-git-34a9882ad357620ccec2bfadba72fce027acd3d6.tar.gz
Merge branch 'master' into json_parser_method
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++;