com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd.c ext/phar/phar.c ext/phar/phar_object.c
| From: | Stanislav Malyshev | Date: | Tue, 07 Jul 2015 04:52:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqlnd/mysqlnd.c ext/phar/phar.c ext/phar/phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87813@lists.php.net to get a copy of this message | ||
Commit: 303d97feda15e97f9058e4ab96799ec2dbd3652f
Author: Stanislav Malyshev <stas@php.net> Mon, 6 Jul 2015 21:52:49 -0700
Parents: 8f2e08239fc1f8aabc26398393303fa685e810dd 0d2f147d80bd02d4d1ccaa0fa530d9d4846b3c75
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=303d97feda15e97f9058e4ab96799ec2dbd3652f
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/mysqlnd/mysqlnd.c
Bugs:
https://bugs.php.net/69669
https://bugs.php.net/69923
https://bugs.php.net/69958
Changed paths:
MM ext/mysqlnd/mysqlnd.c
MM ext/phar/phar.c
MM ext/phar/phar_object.c
Diff:
diff --cc ext/mysqlnd/mysqlnd.c
index 7e982f5,61daf96..6e64a6b
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@@ -464,22 -445,30 +464,29 @@@ mysqlnd_switch_to_ssl_if_needed
}
#ifdef MYSQLND_SSL_SUPPORTED
- if ((greet_packet->server_capabilities & CLIENT_SSL) && (mysql_flags &
CLIENT_SSL)) {
- zend_bool verify = mysql_flags & CLIENT_SSL_VERIFY_SERVER_CERT? TRUE:FALSE;
- DBG_INF("Switching to SSL");
- if (!PACKET_WRITE(auth_packet, conn)) {
- CONN_SET_STATE(conn, CONN_QUIT_SENT);
- conn->m->send_close(conn TSRMLS_CC);
- SET_CLIENT_ERROR(*conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE,
mysqlnd_server_gone);
- goto end;
- }
+ if (mysql_flags & CLIENT_SSL) {
+ zend_bool server_has_ssl = (greet_packet->server_capabilities & CLIENT_SSL)? TRUE:FALSE;
+ if (server_has_ssl == FALSE) {
+ goto close_conn;
+ } else {
+ zend_bool verify = mysql_flags & CLIENT_SSL_VERIFY_SERVER_CERT? TRUE:FALSE;
+ DBG_INF("Switching to SSL");
+ if (!PACKET_WRITE(auth_packet, conn)) {
+ goto close_conn;
+ }
- conn->net->data->m.set_client_option(conn->net, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
(const char *) &verify TSRMLS_CC);
- conn->net->m.set_client_option(conn->net, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (const
char *) &verify TSRMLS_CC);
++ conn->net->data->m.set_client_option(conn->net, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
(const char *) &verify TSRMLS_CC);
- if (FAIL == conn->net->data->m.enable_ssl(conn->net TSRMLS_CC)) {
- goto end;
- if (FAIL == conn->net->m.enable_ssl(conn->net TSRMLS_CC)) {
++ if (FAIL == conn->net->data->m.enable_ssl(conn->net TSRMLS_CC)) {
+ goto end;
+ }
}
}
+ #else
+ auth_packet->client_flags &= ~CLIENT_SSL;
+ if (!PACKET_WRITE(auth_packet, conn)) {
+ goto close_conn;
+ }
#endif
ret = PASS;
end:
diff --cc ext/phar/phar_object.c
index 0712b86,1184863..98f06e9
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -1771,9 -1839,13 +1771,9 @@@ PHP_METHOD(Phar, buildFromDirectory
INIT_PZVAL(&arg);
ZVAL_STRINGL(&arg, dir, dir_len, 0);
INIT_PZVAL(&arg2);
-#if PHP_VERSION_ID < 50300
- ZVAL_LONG(&arg2, 0);
-#else
ZVAL_LONG(&arg2, SPL_FILE_DIR_SKIPDOTS|SPL_FILE_DIR_UNIXPATHS);
-#endif
- zend_call_method_with_2_params(&iter, spl_ce_RecursiveDirectoryIterator,
+ zend_call_method_with_2_params(&iter, spl_ce_RecursiveDirectoryIterator,
&spl_ce_RecursiveDirectoryIterator->constructor, "__construct", NULL,
&arg, &arg2);
if (EG(exception)) {