diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-20 10:40:11 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-20 10:40:11 -0800 |
| commit | e2744c51b63d1e7c023f25927d3300d647bd97fe (patch) | |
| tree | 5d1ea8d83601ebdcb970479f637d9c877e806954 /ext/mssql/php_mssql.c | |
| parent | a40e004553f68fce94dcdcb924d8693e0008e7d5 (diff) | |
| parent | 8825311ce1e9b0c3b627ff32808dd4e0d577c136 (diff) | |
| download | php-git-e2744c51b63d1e7c023f25927d3300d647bd97fe.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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:
configure.in
main/php_version.h
Diffstat (limited to 'ext/mssql/php_mssql.c')
0 files changed, 0 insertions, 0 deletions