Removed redundant check

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a5d9fec6d5a972cd588b0bdf165822c327908e33..6bab49c3c74df9a0458408ff819b1ae49a7edb5b 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4831,9 +4831,7 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
                if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
                        /* further blocks will not be relevant... */
                        break;
-               }
-               if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-                       && op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
+               } else if (op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
                        catch_op_num = EX(op_array)->try_catch_array[i].catch_op;
                        catched = 1;
                }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 40b246fbab6abf465692849f370d7282cd48e901..b8e8edf3d7e3bee1bf768e501a5e9ef882d71612 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1043,9 +1043,7 @@ static int ZEND_FASTCALL  ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER
                if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
                        /* further blocks will not be relevant... */
                        break;
-               }
-               if (op_num >= EG(active_op_array)->try_catch_array[i].try_op
-                       && op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
+               } else if (op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
                        catch_op_num = EX(op_array)->try_catch_array[i].catch_op;
                        catched = 1;
                }