Skip to content

Commit 6e7c372

Browse files
committed
Merge branch 'PHP-7.1'
* PHP-7.1: Don't keep dangling pointers.
2 parents 0e3e3ec + 76707dc commit 6e7c372

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ext/opcache/Optimizer/zend_optimizer.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,12 +947,15 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
947947
func_info = ZEND_FUNC_INFO(call_graph.op_arrays[i]);
948948
if (func_info && func_info->ssa.var_info) {
949949
zend_redo_pass_two_ex(call_graph.op_arrays[i], &func_info->ssa);
950-
ZEND_SET_FUNC_INFO(call_graph.op_arrays[i], NULL);
951950
} else {
952951
zend_redo_pass_two(call_graph.op_arrays[i]);
953952
}
954953
}
955954

955+
for (i = 0; i < call_graph.op_arrays_count; i++) {
956+
ZEND_SET_FUNC_INFO(call_graph.op_arrays[i], NULL);
957+
}
958+
956959
zend_arena_release(&ctx.arena, checkpoint);
957960
} else
958961
#endif

0 commit comments

Comments
 (0)