com php-src: Fix bug #67917 (gmp compound assignment operator leak): NEWS ext/gmp/bug67917.phpt ext/gmp/gmp.c
| From: | Nikita Popov | Date: | Wed, 27 Aug 2014 20:16:20 +0000 |
| Subject: | com php-src: Fix bug #67917 (gmp compound assignment operator leak): NEWS ext/gmp/bug67917.phpt ext/gmp/gmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81222@lists.php.net to get a copy of this message | ||
Commit: fc5f93166371d275b8982e14e0868b776c039d25
Author: Nikita Popov <nikic@php.net> Wed, 27 Aug 2014 22:15:20 +0200
Parents: db03216e62180000d7296c0498f7141ce62f66d8
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc5f93166371d275b8982e14e0868b776c039d25
Log:
Fix bug #67917 (gmp compound assignment operator leak)
Bugs:
https://bugs.php.net/67917
Changed paths:
M NEWS
A ext/gmp/bug67917.phpt
M ext/gmp/gmp.c
Diff:
diff --git a/NEWS b/NEWS
index 18f83de..d859332 100644
--- a/NEWS
+++ b/NEWS
@@ -6,14 +6,18 @@ PHP NEWS
- Core:
. Fixed bug #67878 (program_prefix not honoured in man pages). (Remi)
-- GD
+- GD:
. Made fontFetch's path parser thread-safe. (Sara)
+- GMP:
+ . Fixed bug #67917 (Using GMP objects with overloaded operators can cause
+ memory exhaustion). (Nikita Popov)
+
- MySQLi:
. Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
-- OpenSSL
- . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3)
+- OpenSSL:
+ . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3).
(Daniel Lowrey)
28 Aug 2014, PHP 5.6.0
diff --git a/ext/gmp/bug67917.phpt b/ext/gmp/bug67917.phpt
new file mode 100644
index 0000000..93d46cb
--- /dev/null
+++ b/ext/gmp/bug67917.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #67917: Using GMP objects with overloaded operators can cause memory exhaustion
+--FILE--
+<?php
+
+$mem1 = memory_get_usage();
+for ($i = 0; $i < 1000; $i++) {
+ $gmp = gmp_init(42);
+ $gmp <<= 1;
+}
+$mem2 = memory_get_usage();
+
+var_dump($mem2 - $mem1 < 100000);
+
+?>
+--EXPECT--
+bool(true)
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index cd50896..486088b 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -523,7 +523,7 @@ static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zva
gmp_zval_unary_op(result, op1, op TSRMLS_CC); \
return SUCCESS;
-static int gmp_do_operation(zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{
*/
+static int gmp_do_operation_ex(zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC) /*
{{{ */
{
switch (opcode) {
case ZEND_ADD:
@@ -560,6 +560,26 @@ static int gmp_do_operation(zend_uchar opcode, zval *result, zval *op1, zval
*op
}
/* }}} */
+static int gmp_do_operation(zend_uchar opcode, zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{
*/
+{
+ zval op1_copy;
+ int retval;
+
+ if (result == op1) {
+ ZVAL_COPY_VALUE(&op1_copy, op1);
+ op1 = &op1_copy;
+ }
+
+ retval = gmp_do_operation_ex(opcode, result, op1, op2 TSRMLS_CC);
+
+ if (retval == SUCCESS && op1 == &op1_copy) {
+ zval_dtor(op1);
+ }
+
+ return retval;
+}
+/* }}} */
+
static int gmp_compare(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
{
gmp_cmp(result, op1, op2 TSRMLS_CC);