com php-src: Fixed memory leaks: Zend/zend_vm_def.h Zen d/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Fri, 19 Dec 2014 16:43:17 +0000 |
| Subject: | com php-src: Fixed memory leaks: Zend/zend_vm_def.h Zen d/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83806@lists.php.net to get a copy of this message | ||
Commit: 00628afd74c9b133dad5d2b3052d17153e5e9320
Author: Dmitry Stogov <dmitry@zend.com> Fri, 19 Dec 2014 19:43:17 +0300
Parents: ffc49acabc3e331022c4e9423cf85f6bb900da20
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00628afd74c9b133dad5d2b3052d17153e5e9320
Log:
Fixed memory leaks
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c1115fd..024dd2e 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -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();
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 100d2d4..8baec6e 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -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();