Changeset 1339 in svn for trunk/lib/Decompiler.class.php

Timestamp:

2013-07-22T06:39:28Z (3 years ago)

Author:

Xuefer

Message:

Decompiler: multiple catch support for PHP 5.1-

File:

• trunk/lib/Decompiler.class.php (modified) (1 diff)

trunk/lib/Decompiler.class.php

@@ -1376 +1376 @@
             foreach ($op_array['try_catch_array'] as $try_catch_element) {
                 $catch_op = $try_catch_element['catch_op'];
+                $opcodes[$catch_op]['isCatchBegin'] = true;
+            }
+            foreach ($op_array['try_catch_array'] as $try_catch_element) {
+                $catch_op = $try_catch_element['catch_op'];
                 $try_op = $try_catch_element['try_op'];
-                $opcodes[$try_op]['jmpins'][] = $catch_op;
-                $opcodes[$catch_op]['jmpouts'][] = $try_op;
-                $opcodes[$catch_op]['isCatchBegin'] = true;
+                do {
+                    $opcodes[$try_op]['jmpins'][] = $catch_op;
+                    $opcodes[$catch_op]['jmpouts'][] = $try_op;
+                    if ($opcodes[$catch_op]['opcode'] == XC_CATCH) {
+                        $catch_op = $opcodes[$catch_op]['extended_value'];
+                    }
+                    else if ($opcodes[$catch_op + 1]['opcode'] == XC_CATCH) {
+                        $catch_op = $opcodes[$catch_op + 1]['extended_value'];
+                    }
+                    else {
+                        break;
+                    }
+                } while ($catch_op <= $last && empty($opcodes[$catch_op]['isCatchBegin']));
             }
         }