Merge branch 'PHP-5.4' into PHP-5.5

felipensp · felipensp · commit 4bd2f755bacb · 2013-07-12T20:23:31.000-03:00
* PHP-5.4:
  - Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
  Fixed meta data retrieve when OID is larger than 2^31
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
@@ -1333,6 +1333,7 @@ ZEND_FUNCTION(gmp_cmp)
 		res = mpz_cmp_si(*gmpnum_a, Z_LVAL_PP(b_arg));
 	} else {
 		res = mpz_cmp(*gmpnum_a, *gmpnum_b);
+		FREE_GMP_TEMP(temp_b);
 	}
 	FREE_GMP_TEMP(temp_a);
 	

Original file line number	Diff line number	Diff line change
`@@ -1333,6 +1333,7 @@ ZEND_FUNCTION(gmp_cmp)`
`1333`	`1333`	`res = mpz_cmp_si(*gmpnum_a, Z_LVAL_PP(b_arg));`
`1334`	`1334`	`} else {`
`1335`	`1335`	`res = mpz_cmp(gmpnum_a, gmpnum_b);`
	`1336`	`+ FREE_GMP_TEMP(temp_b);`
`1336`	`1337`	`}`
`1337`	`1338`	`FREE_GMP_TEMP(temp_a);`
`1338`	`1339`