com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/gd/gd.c ext/gmp/gmp .c ext/openssl/openssl.c
ext/openssl/xp_ssl.c

From: Date: Mon, 10 Mar 2014 11:45:17 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/gd/gd.c ext/gmp/gmp .c ext/openssl/openssl.c
ext/openssl/xp_ssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76419@lists.php.net to get a copy of this message
Commit: 82c056235a07d76fea761972ca0188f658a1757b Author: Anatol Belski <ab@php.net> Mon, 10 Mar 2014 12:45:17 +0100 Parents: b582be1e23b83420dfb4c9938dc547d818f6cfa0 dd7ecf2c5b4ca734d5146f7179bf261eb1cdb874 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82c056235a07d76fea761972ca0188f658a1757b Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 * origin/master: fix ZTS update NEWS fix #66872, invalid argument crashes gmp_testbit fix #66872, invalid argument crashes gmp_testbit update news - fix #66869, Invalid 2nd argument crashes imageaffinematrixget Fixed mcrypt test case add vc12 (2013) add vc12 (2013) Conflicts: ext/openssl/openssl.c Bugs: https://bugs.php.net/66872 https://bugs.php.net/66869 Changed paths: MM ext/gd/gd.c MM ext/gmp/gmp.c MM ext/openssl/openssl.c MM ext/openssl/xp_ssl.c Diff: diff --cc ext/gmp/gmp.c index 18aadb8,d34d78f..5d36be6 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@@ -1757,10 -1757,11 +1757,11 @@@ ZEND_FUNCTION(gmp_clrbit ZEND_FUNCTION(gmp_testbit) { zval *a_arg; - long index; + php_int_t index; 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, "zi", &a_arg, &index) == FAILURE){ return; } diff --cc ext/openssl/openssl.c index e8561e0,3176152..545f5f1 mode 100644,100755..100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c

« previous php.cvs (#76419) next »