Changeset 714 in svn for trunk/disassembler.c


Ignore:
Timestamp:
2011-04-09T03:08:38Z (4 years ago)
Author:
Xuefer
Message:

disassembler: DECLARE_INHERITED_CLASS/DELAYED class not found

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/disassembler.c

    r709 r714  
    2323    int bufsize = 2;
    2424    char *buf;
    25     int keysize;
    2625
    2726    xc_compile_result_init_cur(&cr, op_array TSRMLS_CC);
     
    4645        xc_dasm_zend_function(zv, b->pData TSRMLS_CC);
    4746
    48         add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), b->arKey, b->nKeyLength, zv);
     47        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, zv);
    4948    }
    5049    add_assoc_zval_ex(dst, ZEND_STRS("function_table"), list);
     
    5554    b = TG(internal_class_tail) ? TG(internal_class_tail)->pListNext : TG(class_table).pListHead;
    5655    for (; b; b = b->pListNext) {
     56        int keysize, keyLength;
     57
    5758        ALLOC_INIT_ZVAL(zv);
    5859        array_init(zv);
     
    6869        memcpy(buf, BUCKET_KEY_S(b), keysize);
    6970        buf[keysize - 2] = buf[keysize - 1] = ""[0];
    70         keysize = b->nKeyLength;
     71        keyLength = b->nKeyLength;
    7172#ifdef IS_UNICODE
    7273        if (BUCKET_KEY_TYPE(b) == IS_UNICODE) {
    7374            if (buf[0] == ""[0] && buf[1] == ""[0]) {
    74                 keysize ++;
     75                keyLength ++;
    7576            }
    7677        } else
     
    7879        {
    7980            if (buf[0] == ""[0]) {
    80                 keysize ++;
     81                keyLength ++;
    8182            }
    8283        }
    83         add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), b->nKeyLength, zv);
     84        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), keyLength, zv);
    8485    }
    8586    efree(buf);
Note: See TracChangeset for help on using the changeset viewer.