diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-28 00:08:11 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-28 00:08:11 +0400 |
| commit | 6e8aa096964e1d723a9cae3572b2f0affa4e53c0 (patch) | |
| tree | a81fec559fdb8c46aa451bdc5834ec216160d2e3 /Zend/zend_language_scanner.c | |
| parent | 391a41e16701dc3a92a4af6dc4a7e23c98a0e314 (diff) | |
| parent | 85e5e60777209c13c71785da31af86a5e0a98d92 (diff) | |
| download | php-git-6e8aa096964e1d723a9cae3572b2f0affa4e53c0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64529 (Ran out of opcode space)
Conflicts:
NEWS
Zend/zend_execute_API.c
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Diffstat (limited to 'Zend/zend_language_scanner.c')
| -rw-r--r-- | Zend/zend_language_scanner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index f2ba6bf9d4..9a62a9c045 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -597,7 +597,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR CG(active_op_array) = original_active_op_array; if (compilation_successful) { pass_two(op_array TSRMLS_CC); - zend_release_labels(TSRMLS_C); + zend_release_labels(0 TSRMLS_CC); } else { efree(op_array); retval = NULL; @@ -772,7 +772,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC) zend_do_return(NULL, 0 TSRMLS_CC); CG(active_op_array) = original_active_op_array; pass_two(op_array TSRMLS_CC); - zend_release_labels(TSRMLS_C); + zend_release_labels(0 TSRMLS_CC); retval = op_array; } } |