diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-20 10:40:39 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-20 10:40:39 -0800 |
| commit | e18ec956873d1cc1fcd4647f4a218c25d0f80209 (patch) | |
| tree | 81879f4e11147b6e6876e4803a154cfdefd2ad12 /ext/mssql/php_mssql.c | |
| parent | b5e2661fb6546e17e5f9a6982f052b2dce541860 (diff) | |
| parent | e2744c51b63d1e7c023f25927d3300d647bd97fe (diff) | |
| download | php-git-e18ec956873d1cc1fcd4647f4a218c25d0f80209.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.38 next
Fix bug #68799: Free called on unitialized pointer
Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
Conflicts:
ext/standard/var_unserializer.c
Diffstat (limited to 'ext/mssql/php_mssql.c')
0 files changed, 0 insertions, 0 deletions