Changeset 714

Timestamp:

2011-04-09T05:08:38+02:00 (2 years ago)

Author:

moo

Message:

disassembler: DECLARE_INHERITED_CLASS/DELAYED class not found

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Decompiler.class.php (modified) (2 diffs)
• NEWS (modified) (1 diff)
• const_string_opcodes_php6.x.h (modified) (3 diffs)
• disassembler.c (modified) (5 diffs)

trunk/ChangeLog

@@ -12 +12 @@
 1.3.2 2011-??-??
 ========
+ * disassembler: DECLARE_INHERITED_CLASS/DELAYED class not found
  * disassembler: don't dump builtin functions
  * fix win32 build against win32 native gnu tools

trunk/Decompiler.class.php

@@ -1073 +1073 @@
                     // }}}
                 case XC_DECLARE_CLASS: 
-                case XC_DECLARE_INHERITED_CLASS: // {{{
+                case XC_DECLARE_INHERITED_CLASS:
+                case XC_DECLARE_INHERITED_CLASS_DELAYED: // {{{
                     $key = $op1['u.constant'];
+                    if (!isset($this->dc['class_table'][$key])) {
+                        echo 'class not found: ', $key, 'existing classes are:', "\n";
+                        var_dump(array_keys($this->dc['class_table']));
+                        exit;
+                    }
                     $class = &$this->dc['class_table'][$key];
-                    if (!isset($class)) {
-                        echo 'class not found: ' . $key;
-                        exit;
-                    }
                     $class['name'] = $this->unquoteName($this->getOpVal($op2, $EX));
-                    if ($opc == XC_DECLARE_INHERITED_CLASS) {
+                    if ($opc == XC_DECLARE_INHERITED_CLASS || $opc == XC_DECLARE_INHERITED_CLASS_DELAYED) {
                         $ext /= XC_SIZEOF_TEMP_VARIABLE;
                         $class['parent'] = $T[$ext];
@@ -1867 +1869 @@
     'XC_DECLARE_CLASS' => -1,
     'XC_DECLARE_INHERITED_CLASS' => -1,
+    'XC_DECLARE_INHERITED_CLASS_DELAYED' => -1,
     'XC_ADD_INTERFACE' => -1,
     'XC_POST_DEC_OBJ' => -1,

trunk/NEWS

@@ -4 +4 @@
 1.3.2 2011-??-??
 ========
+ * memory leak on recompile
+ * disassembler fixes and updates for new PHP
  * win32 build fix
  * improve compatibility with ionCube Loader

trunk/const_string_opcodes_php6.x.h

@@ -1 @@
-/* size = 154 */
+/* size = 157 */
 static const char *const xc_opcode_names[] = {
 /* 0 */ "NOP",
@@ -112 +112 @@
 /* 109 */   "FETCH_CLASS",
 /* 110 */   "CLONE",
-/* 111 */   "UNDEF",
+/* 111 */   "RETURN_BY_REF",
 /* 112 */   "INIT_METHOD_CALL",
 /* 113 */   "INIT_STATIC_METHOD_CALL",
@@ -152 +152 @@
 /* 149 */   "HANDLE_EXCEPTION",
 /* 150 */   "USER_OPCODE",
-/* 151 */   "U_NORMALIZE",
+/* 151 */   "UNDEF",
 /* 152 */   "JMP_SET",
-/* 153 */   "DECLARE_LAMBDA_FUNCTION"
+/* 153 */   "DECLARE_LAMBDA_FUNCTION",
+/* 154 */   "ADD_TRAIT",
+/* 155 */   "BIND_TRAITS",
+/* 156 */   "SEPARATE"
 };

trunk/disassembler.c

@@ -23 +23 @@
     int bufsize = 2;
     char *buf;
-    int keysize;
 
     xc_compile_result_init_cur(&cr, op_array TSRMLS_CC);
@@ -46 +45 @@
         xc_dasm_zend_function(zv, b->pData TSRMLS_CC);
 
-        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), b->arKey, b->nKeyLength, zv);
+        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, zv);
     }
     add_assoc_zval_ex(dst, ZEND_STRS("function_table"), list);
@@ -55 +54 @@
     b = TG(internal_class_tail) ? TG(internal_class_tail)->pListNext : TG(class_table).pListHead;
     for (; b; b = b->pListNext) {
+        int keysize, keyLength;
+
         ALLOC_INIT_ZVAL(zv);
         array_init(zv);
@@ -68 +69 @@
         memcpy(buf, BUCKET_KEY_S(b), keysize);
         buf[keysize - 2] = buf[keysize - 1] = ""[0];
-        keysize = b->nKeyLength;
+        keyLength = b->nKeyLength;
 #ifdef IS_UNICODE
         if (BUCKET_KEY_TYPE(b) == IS_UNICODE) {
             if (buf[0] == ""[0] && buf[1] == ""[0]) {
-                keysize ++;
+                keyLength ++;
             }
         } else
@@ -78 +79 @@
         {
             if (buf[0] == ""[0]) {
-                keysize ++;
+                keyLength ++;
             }
         }
-        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), b->nKeyLength, zv);
+        add_u_assoc_zval_ex(list, BUCKET_KEY_TYPE(b), ZSTR(buf), keyLength, zv);
     }
     efree(buf);