Skip to content

Commit ba8a06f

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed compiler reenterability Fixed compiler reenterability Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h
2 parents e73beb8 + f99befa commit ba8a06f

File tree

4 files changed

+351
-346
lines changed

4 files changed

+351
-346
lines changed

Zend/zend_compile.c

+1
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ ZEND_API void file_handle_dtor(zend_file_handle *fh) /* {{{ */
219219
void init_compiler(TSRMLS_D) /* {{{ */
220220
{
221221
CG(active_op_array) = NULL;
222+
memset(&CG(context), 0, sizeof(CG(context)));
222223
zend_init_compiler_data_structures(TSRMLS_C);
223224
zend_init_rsrc_list(TSRMLS_C);
224225
zend_hash_init(&CG(filenames_table), 5, NULL, (dtor_func_t) free_estring, 0);

0 commit comments

Comments
 (0)