diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:09:34 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:09:34 -0700 |
| commit | b4b082e63ecab2a81e565fb07aafaaaf67b77f66 (patch) | |
| tree | 9d7da5a94c8a948637f2ff50610f859fb74271a3 | |
| parent | 545eddba93fba7a6cbbe77bcb43dc9d3b2c50282 (diff) | |
| parent | 885edfef0a0eb1016a906d197399f92375a795e4 (diff) | |
| download | php-git-b4b082e63ecab2a81e565fb07aafaaaf67b77f66.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958
update news
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
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 6e64a6ba68..c8563ee75b 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2524,7 +2524,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option_2d)(MYSQLND_CONN_DATA * cons DBG_RETURN(ret); oom: SET_OOM_ERROR(*conn->error_info); - conn->m->local_tx_end(conn, this_func, FAIL TSRMLS_CC); + conn->m->local_tx_end(conn, this_func, FAIL TSRMLS_CC); end: DBG_RETURN(FAIL); } |