diff options
author | Christopher Jones <sixd@php.net> | 2014-03-10 16:46:39 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2014-03-10 16:46:39 -0700 |
commit | 4dc8610d34edd497fc3b0c8d22112bf7289db6f6 (patch) | |
tree | 0bb43f808b58995c5585ce1ad52097a0a4419fe2 | |
parent | b9d494a33b4052afc93fd87382760702bbbbcd2f (diff) | |
parent | 8391277fb87e26a769fb8f9bfc2e57d49aadae1d (diff) | |
download | php-git-4dc8610d34edd497fc3b0c8d22112bf7289db6f6.tar.gz |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Pierre Joye
# Via Pierre Joye
* 'PHP-5.4' of https://git.php.net/repository/php-src:
fix #66872, invalid argument crashes gmp_testbit
fix #66872, invalid argument crashes gmp_testbit
add vc12 (2013)
-rw-r--r-- | NEWS | 15 | ||||
-rw-r--r-- | ext/gmp/gmp.c | 16 | ||||
-rw-r--r-- | win32/build/confutils.js | 4 |
3 files changed, 20 insertions, 15 deletions
@@ -2,16 +2,19 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.4.27 -- MySQLi: - . Fixed bug #66762i (Segfault in mysqli_stmt::bind_result() when link closed) - (Remi) +- Core: + . Fixed bug #60602 (proc_open() changes environment array) (Tjerk) + +- GMP + . fixed bug#66872 (invalid argument crashes gmp_testbit) (Pierre) - Mail: . Fixed bug #66535 (Don't add newline after X-PHP-Originating-Script) (Tjerk) -- Core: - . Fixed bug #60602 (proc_open() changes environment array) (Tjerk) - +- MySQLi: + . Fixed bug #66762i (Segfault in mysqli_stmt::bind_result() when link closed) + (Remi) + ?? ??? 2014, PHP 5.4.26 - JSON: diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 25e8203030..134cc4819a 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -1511,25 +1511,23 @@ ZEND_FUNCTION(gmp_clrbit) Tests if bit is set in a */ ZEND_FUNCTION(gmp_testbit) { - zval **a_arg; + zval *a_arg; long index; - mpz_t *gmpnum_a; + mpz_ptr gmpnum_a; + gmp_temp_t temp_a; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zl", &a_arg, &index) == FAILURE){ + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl", &a_arg, &index) == FAILURE){ return; } - ZEND_FETCH_RESOURCE(gmpnum_a, mpz_t *, a_arg, -1, GMP_RESOURCE_NAME, le_gmp); - if (index < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Index must be greater than or equal to zero"); RETURN_FALSE; } - if (mpz_tstbit(*gmpnum_a, index)) { - RETURN_TRUE; - } - RETURN_FALSE; + FETCH_GMP_ZVAL(gmpnum_a, a_arg, temp_a); + RETVAL_BOOL(mpz_tstbit(gmpnum_a, index)); + FREE_GMP_TEMP(temp_a); } /* }}} */ diff --git a/win32/build/confutils.js b/win32/build/confutils.js index c0a1ce895b..e0df4f621b 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -46,6 +46,8 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)'; VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
+VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
+VC_VERSIONS[1800] = 'MSVC12 (Visual C++ 2013)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -54,6 +56,8 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1'; VC_VERSIONS_SHORT[1400] = 'VC8';
VC_VERSIONS_SHORT[1500] = 'VC9';
VC_VERSIONS_SHORT[1600] = 'VC10';
+VC_VERSIONS_SHORT[1700] = 'VC11';
+VC_VERSIONS_SHORT[1800] = 'VC12';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
|