summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 5.6.24php-5.6.24PHP-5.6.24Ferenc Kovacs2016-07-213-8/+43
|
* regenerate date parser with re2c 0.13.5 to fix OSX issuesAnatol Belski2016-07-211-14989/+17877
|
* Fixed arginfoXinchen Hui2016-07-211-1/+2
|
* Regenerate with the -b flag, as we used to do.Derick Rethans2016-07-211-27723/+14187
| | | | Apparently, Apple's LLVM can't handle it otherwise o_O.
* fix test portability and expectationAnatol Belski2016-07-213-5/+5
| | | | | | The test images for #72603 and #72618 are broken, that seems to be the cause of different test output. Seems also to be platform dependent, so it's not reliable to depend on the exact error output.
* improve fix #72558, free contribRow as wellPierre Joye2016-07-211-0/+1
|
* improve fix #72558, while (u>=0) with unsigned int will always be truePierre Joye2016-07-211-3/+4
|
* Fix memory leakStanislav Malyshev2016-07-211-0/+1
|
* fix #72519, possible OOB using imagegifPierre Joye2016-07-211-2/+16
|
* Merge branch 'PHP-5.5' into PHP-5.6Pierre Joye2016-07-213-6/+32
| | | | | * PHP-5.5: fix #72512, invalid read or write for palette image when invalid transparent index is used
* Extend libxml exportsAnatol Belski2016-07-211-0/+2
| | | | | These are needed to support libxslt 1.1.29 on Windows. This libxslt version fixes CVE-2015-7995 and for this reason needs to be used.
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-07-211-2/+2
| | | | | * PHP-5.5: Improve fix for #72520
* Fix for bug #72513Stanislav Malyshev2016-07-211-1/+1
|
* Generate new .c file from .re file, as that was missing on my previous commitDerick Rethans2016-07-211-21149/+30240
|
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-07-2127-215/+522
| | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE Fix bug #72562 - destroy var_hash properly Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 CS fix and comments with bug ID Fix for HTTP_PROXY issue. add tests for bug #72512 Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access Fixed bug #72479 - same as #72434 Conflicts: ext/bz2/bz2.c main/SAPI.c main/php_variables.c
* 5.6.24RC1php-5.6.24RC1Ferenc Kovacs2016-07-073-7/+5
|
* Updated to version 2016.6 (2016f)Derick Rethans2016-07-061-807/+646
|
* Fix bug #55701: GlobIterator throws LogicExceptionValentin VALCIU2016-07-053-1/+341
| | | | | | | | | | GlobIterator throws LogicException with message 'The parent constructor was not called' on its first operation when the glob expression doesn't match any file. It also throws on the first operation after the iteration completes, when the glob expression matches some files. # Resolved conflicts: # ext/spl/spl_directory.c
* Don't enforce LSP if prototype method is privatePedro Magalhães2016-07-053-2/+47
| | | | Fixes bug #72496.
* Fix typo in commentChristoph M. Becker2016-07-041-1/+1
|
* this was actually fixed in 5.6.23Ferenc Kovacs2016-07-031-2/+4
|
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-06-271-1/+1
|\ | | | | | | | | | | | | | | | | | | * PHP-5.5: Fix the fix for #72403 on nl2br 5.5.38 now Conflicts: configure.in main/php_version.h
| * Fix the fix for #72403 on nl2brStanislav Malyshev2016-06-271-1/+1
| |
| * 5.5.38 nowJulien Pauli2016-06-213-5/+9
| |
* | Update NEWSChristoph M. Becker2016-06-271-0/+4
| |
* | Fix #70628: Clearing bindings on an SQLite3 statement doesn't workChristoph M. Becker2016-06-272-0/+61
| | | | | | | | | | Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but also the bound_params of the php_sqlite3_stmt have to be cleared.
* | Add CVE info for PHP 5.6.22Lior Kaplan2016-06-251-4/+6
| |
* | Add CVE info for PHP 5.6.23Lior Kaplan2016-06-251-13/+17
| |
* | Add missing entries for PHP 5.6.23Lior Kaplan2016-06-251-0/+3
| |
* | fix test cleanupAnatol Belski2016-06-221-1/+1
| |
* | fix dir separator in testAnatol Belski2016-06-221-1/+1
| |
* | update NEWSFerenc Kovacs2016-06-221-0/+34
| |
* | fix testAnatol Belski2016-06-211-3/+3
| | | | | | | | | | | | There is a difference between TS and NTS warning message, since virtual_mkdir vs glibc directly is used. This has no effect for the actual fix functionality.
* | re-fix leakAnatol Belski2016-06-211-0/+1
| |
* | Revert "fix leak"Anatol Belski2016-06-211-4/+0
| | | | | | | | This reverts commit c5d9c508976bb289c265d99938bda4dbf14622d3.
* | fix leakAnatol Belski2016-06-211-0/+4
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2016-06-210-0/+0
|\ \ | |/ | | | | | | * PHP-5.5: remove the huge test file, generate it on the fly instead
| * remove the huge test file, generate it on the fly insteadAnatol Belski2016-06-212-1/+23
| |
* | remove the huge test file, generate it on the fly insteadAnatol Belski2016-06-212-1/+23
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-06-210-0/+0
|\ \ | |/ | | | | | | | | * PHP-5.5: Now the right bug # Fix NEWS
| * Now the right bug #Stanislav Malyshev2016-06-211-1/+1
| |
| * Fix NEWSStanislav Malyshev2016-06-211-2/+2
| |
* | Merge branch 'PHP-5.6.23' into PHP-5.6Stanislav Malyshev2016-06-2125-245/+478
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.23: Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize Fix bug #72321 - use efree() for emalloc allocation 5.6.23RC1 Conflicts: configure.in main/php_version.h
| * \ Merge branch 'PHP-5.5' into PHP-5.6.23Stanislav Malyshev2016-06-2121-243/+450
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize update NEWS Fix #66387: Stack overflow with imagefilltoborder Skip test which is 64bits only 5.5.37 now Conflicts: configure.in ext/mcrypt/mcrypt.c ext/spl/spl_directory.c main/php_version.h
| | * iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() ↵Stanislav Malyshev2016-06-202-9/+15
| | | | | | | | | | | | resulting in heap overflow
| | * update NEWSStanislav Malyshev2016-06-201-1/+30
| | |
| | * Merge branch 'PHP-5.5.37' into PHP-5.5Stanislav Malyshev2016-06-2020-246/+449
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5.37: fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize
| | | * fix testsStanislav Malyshev2016-06-201-1/+1
| | | |
| | | * fix buildStanislav Malyshev2016-06-201-1/+1
| | | |
| | | * Fix bug #72455: Heap Overflow due to integer overflowsStanislav Malyshev2016-06-201-42/+50
| | | |