Browse Source

implement correct fix for segfault on 64bit platform

migration/RELEASE_1_0_0
Antony Dovgal 21 years ago
parent
commit
88605a22ff
  1. 2
      Zend/zend_compile.c
  2. 4
      Zend/zend_compile.h

2
Zend/zend_compile.c

@ -4377,7 +4377,7 @@ void zend_do_label(znode *label TSRMLS_DC)
void zend_resolve_goto_label(zend_op_array *op_array, zend_op *opline, int pass2 TSRMLS_DC)
{
zend_label *dest;
int current, distance;
long current, distance;
if (CG(labels) == NULL ||
zend_u_hash_find(CG(labels), Z_TYPE(opline->op2.u.constant), Z_UNIVAL(opline->op2.u.constant), Z_UNILEN(opline->op2.u.constant)+1, (void**)&dest) == FAILURE) {

4
Zend/zend_compile.h

@ -199,8 +199,8 @@ struct _zend_op_array {
zend_uint T;
zend_brk_cont_element *brk_cont_array;
zend_uint last_brk_cont;
zend_uint current_brk_cont;
int last_brk_cont;
int current_brk_cont;
zend_try_catch_element *try_catch_array;
int last_try_catch;

Loading…
Cancel
Save