diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-09-24 08:54:24 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-09-24 08:54:36 +0200 |
| commit | 628c257f713224663567a35b3da781153829a413 (patch) | |
| tree | 3f9e138c4c9795944b5a92a38d4920f30c89d767 /Zend/zend.c | |
| parent | 96323d1bd7141d7169a0ea454495259f4ff01c6a (diff) | |
| parent | 73d6456d7d6be62340b3607805a45cbf420c1cb8 (diff) | |
| download | php-git-628c257f713224663567a35b3da781153829a413.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index dbda709198..43a9cefbe4 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -916,6 +916,8 @@ void zend_set_utility_values(zend_utility_values *utility_values) /* {{{ */ /* this should be compatible with the standard zenderror */ ZEND_COLD void zenderror(const char *error) /* {{{ */ { + CG(parse_error) = 0; + if (EG(exception)) { /* An exception was thrown in the lexer, don't throw another in the parser. */ return; |