Changeset 1dc5c4a in git


Ignore:
Timestamp:
2012-03-25T16:32:20Z (8 years ago)
Author:
Xuefer <xuefer@…>
Branches:
3.0, 3.1, 3.2, master, trunk
Children:
e5943a1
Parents:
94bb249
Message:

do not opt out brk_cont_array in any case as it is required by ZEND_HANDLE_EXCEPTION

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@845 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • optimizer.c

    r07ca0ee r1dc5c4a  
    5757{
    5858    int i;
    59     zend_bool preserve_brk_cont_array = 0;
    6059
    6160    if (op_array->brk_cont_array == NULL) {
     
    7675#ifdef ZEND_GOTO
    7776        case ZEND_GOTO:
    78             preserve_brk_cont_array = 1;
     77#endif
    7978            continue;
    80 #endif
    8179
    8280        default:
     
    109107                    if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
    110108                        can_convert = 0;
    111                         preserve_brk_cont_array = 1;
    112109                    }
    113110                    break;
     
    133130    }
    134131
    135     if (!preserve_brk_cont_array) {
    136         if (op_array->brk_cont_array != NULL) {
    137             efree(op_array->brk_cont_array);
    138             op_array->brk_cont_array = NULL;
    139         }
    140         op_array->last_brk_cont = 0;
    141     }
    142132    return SUCCESS;
    143133}
Note: See TracChangeset for help on using the changeset viewer.