]> granicus.if.org Git - php/commitdiff
Fixed memory leaks
authorDmitry Stogov <dmitry@zend.com>
Fri, 19 Dec 2014 16:43:17 +0000 (19:43 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 19 Dec 2014 16:43:17 +0000 (19:43 +0300)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index c1115fd7d6819716d8713564fdae03854afddc48..024dd2e7cd49ff5161793c4f824e56b00120a679 100644 (file)
@@ -402,6 +402,8 @@ ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMPVAR|
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+       FREE_OP2();
        FREE_OP1_VAR_PTR();
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
index 100d2d48ec8862ea3b289ea1f3f6fb3e7b601abe..8baec6e014dc2e76586c5c02645ecf6291d1d96c 100644 (file)
@@ -12251,6 +12251,8 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*b
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+
        if (free_op1) {zval_ptr_dtor_nogc(free_op1);};
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
@@ -15120,6 +15122,8 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*bina
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+
        if (free_op1) {zval_ptr_dtor_nogc(free_op1);};
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
@@ -16645,6 +16649,8 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_TMPVAR(int (*
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+       zval_ptr_dtor_nogc(free_op2);
        if (free_op1) {zval_ptr_dtor_nogc(free_op1);};
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
@@ -18045,6 +18051,9 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+
+
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
        ZEND_VM_INC_OPCODE();
@@ -20224,6 +20233,9 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*b
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+
+
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
        ZEND_VM_INC_OPCODE();
@@ -21602,6 +21614,9 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMPVAR(int
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+       zval_ptr_dtor_nogc(free_op2);
+
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
        ZEND_VM_INC_OPCODE();
@@ -24559,6 +24574,9 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*bi
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+
+
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
        ZEND_VM_INC_OPCODE();
@@ -28757,6 +28775,9 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binar
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+
+
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
        ZEND_VM_INC_OPCODE();
@@ -30793,6 +30814,9 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_TMPVAR(int (*b
                }
        } while (0);
 
+       FREE_OP(free_op_data1);
+       zval_ptr_dtor_nogc(free_op2);
+
        /* assign_obj has two opcodes! */
        CHECK_EXCEPTION();
        ZEND_VM_INC_OPCODE();