summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fixed bug #73172 parse error: Invalid numeric literalAnatol Belski2016-09-263-2/+22
| |/ / /
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-7.0: update libs_versions.txt update libs_versions.txt
| * | | update libs_versions.txtAnatol Belski2016-09-261-1/+1
| | | |
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-260-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.6: update libs_versions.txt
| | * | update libs_versions.txtAnatol Belski2016-09-261-1/+1
| | | |
* | | | On PHP-7.1 and above we have to check CALL_INFO instead of symbol_table.Dmitry Stogov2016-09-261-1/+1
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Dmitry Stogov2016-09-263-3/+78
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: Fixed bug #73156 (segfault on undefined function)
| * | | Fixed bug #73156 (segfault on undefined function)Dmitry Stogov2016-09-263-3/+78
| | | |
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-251-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: Add an include path for freetype which is relevant for cmake builds
| * | | Add an include path for freetype which is relevant for cmake buildsAnatol Belski2016-09-251-1/+1
| | | |
* | | | Use SEND_USER for CONST|TMP as wellNikita Popov2016-09-256-36/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we're missing the "expected to be a reference, value given" warning that appears for ordinary calls to call_user_func(). Also update an UPGRADING note with recent changes wrt call_user_func().
* | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-252-2/+63
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-252-2/+63
| |\ \ \ | | |/ /
| | * | Fix test_image_equals_file() wrt. palette imagesChristoph M. Becker2016-09-252-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recently introduced test_image_equals_file() doesn't properly work for palette images, because in this case only the palette indexes are compared, what can lead to false positives and negatives as shown in the added test. To fix that we convert palette images to truecolor, what is supposed to be faster than calling imagecolorsforindex() for each pixel. We furthermore rely on PHP's refcounting to free unused images; after all, this is not C.
* | | | Fix a couple of ASSIGN_DIM/OBJ inference bugsNikita Popov2016-09-242-0/+93
| | | | | | | | | | | | | | | | Account for possible null return values better.
* | | | Add range inference for ZEND_STRLENNikita Popov2016-09-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | On 32-bit systems we conservatively allow negative lengths. On 64-bit systems, the range could additionally be restricted to the canonical 48-bit size.
* | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-241-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-241-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'pull-request/2120' into PHP-5.6Christoph M. Becker2016-09-241-2/+2
| | |\ \
| | | * | Fix potential memory issue with USE_ZEND_ALLOC=0Christoph M. Becker2016-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PHP core and extensions are written with the assumption that memory allocation either succeeds, or the allocator bails out (i.e. the allocator is infallible). Therefore the result of emalloc() and friends are not checked for NULL values. However, with USE_ZEND_ALLOC=0, malloc() and friends are used as allocators, but these are fallible, i.e. they return NULL instead of bailing out if they fail. This easily leads to invalid memory accesses in the following, such as in <https://bugs.php.net/73032>. Some of these cases may constitute exploitable vulnerabilities. Therefore we make the infallible __zend_alloc() and friends the default for USE_ZEND_ALLOC=0.
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-09-243-11/+38
|\ \ \ \ \ | |/ / / /
| * | | | Fixed bug #73163Nikita Popov2016-09-243-29/+43
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-244-5/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-244-5/+24
| |\ \ \ \ | | |/ / /
| | * | | Fix #73161: imagecreatefromgd2() may leak memoryChristoph M. Becker2016-09-244-5/+24
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-243-1/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-243-1/+24
| |\ \ \ \ | | |/ / /
| | * | | Fix #73159: imagegd2(): unrecognized formats may result in corrupted filesChristoph M. Becker2016-09-243-1/+24
| | | | | | | | | | | | | | | | | | | | We must not apply the format correction twice for truecolor images.
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-243-2/+31
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-243-2/+31
| |\ \ \ \ | | |/ / /
| | * | | Fix #73155: imagegd2() writes wrong chunk sizes on boundariesChristoph M. Becker2016-09-243-2/+31
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-240-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-240-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Fix #73157 (again): imagegd2() ignores 3rd param if 4 are givenChristoph M. Becker2016-09-243-4/+27
| | | | | | | | | | | | | | | | | | | | Obviously, there was a bad merge.
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-243-4/+27
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-233-4/+27
| |\ \ \ \
| | * | | | Fix #73157: imagegd2() ignores 3rd param if 4 are givenChristoph M. Becker2016-09-233-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | We must initialize `q` for *more* than three parameters, too.
* | | | | | update NEWSAdam Baratz2016-09-231-0/+11
| | | | | |
* | | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-233-200/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * PHP-7.0: Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
| * | | | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-233-200/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * PHP-5.6: Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
| | * | | | Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"Anatol Belski2016-09-233-200/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f9a699f6c3aa7acea922242a0f14731f6b829742.
* | | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-231-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: skip this test for now as it seems to have issues running dev server Fixed bug #73037 SoapServer reports Bad Request when gzipped
| * | | | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-231-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: skip this test for now as it seems to have issues running dev server Fixed bug #73037 SoapServer reports Bad Request when gzipped
| | * | | | skip this test for now as it seems to have issues running dev serverAnatol Belski2016-09-231-0/+1
| | | | | |
| | * | | | Fixed bug #73037 SoapServer reports Bad Request when gzippedAnatol Belski2016-09-233-1/+199
| | |/ / / | | | | | | | | | | | | | | | (cherry picked from commit 410c68788ae4826807e8ced3f4a02e676142b22a)
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-231-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-231-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Update NEWSChristoph M. Becker2016-09-231-0/+2
| | | | |
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-233-1/+199
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.0: Fixed bug #73037 SoapServer reports Bad Request when gzipped
| * | | | Fixed bug #73037 SoapServer reports Bad Request when gzippedAnatol Belski2016-09-233-1/+199
| | | | |