Christoph M. Becker [Tue, 19 Jul 2016 15:58:29 +0000 (17:58 +0200)]
Update NEWS
Christoph M. Becker [Sat, 16 Jul 2016 18:42:47 +0000 (20:42 +0200)]
Fix #43828: broken transparency of imagearc for truecolor in blendingmode
No pixel of a filled arc must ever be drawn multiple times. Otherwise we get
artifacts regarding transparency. That happens with the current
implementation of gdImageFilledArc() unless gdChord or gdNoFill are set.
When gdPie is set, however, the filled arc is drawn in wedges, which are
polygons of three points, and so some overlap is natural.
To resolve the issue, we stick with the current algorithm of calculating the
wedges, but instead of drawing each polygon separately, we put the relevant
points in a large array, and draw a single polygon. That also is supposed to
improve the performance considerably.
Note that this modification will change the results when gdImageSetStyle()
or gdImageSetBrush() are used, but we believe that this modification is also
an improvement in this regard, even though it still might not make much
sense to use these functions with gdImageFilledArc().
The respective fix for libgd is
<https://github.com/libgd/libgd/commit/
e7e20d6>.
Anatol Belski [Tue, 19 Jul 2016 12:45:23 +0000 (14:45 +0200)]
fix test portability and expectation
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.
Pierre Joye [Tue, 19 Jul 2016 12:34:07 +0000 (19:34 +0700)]
#72482, Ilegal write/read access caused by gdImageAALine overflow
Pierre Joye [Tue, 19 Jul 2016 11:23:51 +0000 (18:23 +0700)]
fix #72494, improve input color check and prevent issues when old gd are used, done before gd call
Pierre Joye [Tue, 19 Jul 2016 09:34:55 +0000 (16:34 +0700)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Pierre Joye [Tue, 19 Jul 2016 09:33:17 +0000 (16:33 +0700)]
improve fix #72558, free contribRow as well
Stanislav Malyshev [Tue, 19 Jul 2016 08:56:49 +0000 (01:56 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improve fix #72558, while (u>=0) with unsigned int will always be true
Pierre Joye [Tue, 19 Jul 2016 08:51:43 +0000 (15:51 +0700)]
improve fix #72558, while (u>=0) with unsigned int will always be true
Pierre Joye [Tue, 19 Jul 2016 08:51:43 +0000 (15:51 +0700)]
improve fix #72558, while (u>=0) with unsigned int will always be true
Stanislav Malyshev [Tue, 19 Jul 2016 08:47:40 +0000 (01:47 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix memory leak
Stanislav Malyshev [Tue, 19 Jul 2016 08:47:27 +0000 (01:47 -0700)]
Fix memory leak
Stanislav Malyshev [Tue, 19 Jul 2016 07:53:08 +0000 (00:53 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* 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
Stanislav Malyshev [Tue, 19 Jul 2016 07:51:27 +0000 (00:51 -0700)]
Merge branch 'PHP-5.6.24' into PHP-5.6
* PHP-5.6.24:
Fix for bug #72513
5.6.24RC1
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 19 Jul 2016 07:44:08 +0000 (00:44 -0700)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
fix #72519, possible OOB using imagegif
Anatol Belski [Tue, 19 Jul 2016 07:40:26 +0000 (09:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix #72519, possible OOB using imagegif
Pierre Joye [Tue, 19 Jul 2016 07:11:44 +0000 (14:11 +0700)]
fix #72519, possible OOB using imagegif
Pierre Joye [Tue, 19 Jul 2016 06:37:23 +0000 (13:37 +0700)]
fix #72512, invalid read or write for palette image when invalid transparent index is used
Conflicts:
ext/gd/libgd/gd.c
Pierre Joye [Tue, 19 Jul 2016 00:11:44 +0000 (07:11 +0700)]
fix #72519, possible OOB using imagegif
fix #72519, possible OOB using imagegif
Pierre Joye [Tue, 19 Jul 2016 07:16:01 +0000 (14:16 +0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix #72519, possible OOB using imagegif
Stanislav Malyshev [Tue, 19 Jul 2016 07:13:25 +0000 (00:13 -0700)]
Apparently some envs miss SIZE_MAX
Pierre Joye [Tue, 19 Jul 2016 07:11:44 +0000 (14:11 +0700)]
fix #72519, possible OOB using imagegif
Pierre Joye [Tue, 19 Jul 2016 06:39:46 +0000 (13:39 +0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix #72512, invalid read or write for palette image when invalid transparent index is used
Pierre Joye [Tue, 19 Jul 2016 06:37:23 +0000 (13:37 +0700)]
fix #72512, invalid read or write for palette image when invalid transparent index is used
Stanislav Malyshev [Tue, 19 Jul 2016 06:32:38 +0000 (23:32 -0700)]
Merge branch 'PHP-5.5.38' into PHP-5.5
* PHP-5.5.38:
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
Stanislav Malyshev [Tue, 19 Jul 2016 06:30:51 +0000 (23:30 -0700)]
Fix tests
Stanislav Malyshev [Tue, 19 Jul 2016 06:21:51 +0000 (23:21 -0700)]
Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
Stanislav Malyshev [Tue, 19 Jul 2016 05:20:45 +0000 (22:20 -0700)]
Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
Stanislav Malyshev [Tue, 19 Jul 2016 04:44:39 +0000 (21:44 -0700)]
Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
Christoph M. Becker [Mon, 18 Jul 2016 22:35:14 +0000 (00:35 +0200)]
Merge branch 'pull-request/1991' into PHP-5.6
Christoph M. Becker [Thu, 7 Jul 2016 12:47:55 +0000 (14:47 +0200)]
Fix #70315: 500 Server Error but page is fully rendered
That happens because the external libgd uses other error codes than PHP
(and the bundled libgd), but the libgd error codes are simply forwarded
to php_verror(). We fix that by properly mapping libgd errors to PHP errors.
Stanislav Malyshev [Mon, 18 Jul 2016 07:17:48 +0000 (00:17 -0700)]
Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
Stanislav Malyshev [Sun, 17 Jul 2016 23:34:21 +0000 (16:34 -0700)]
Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
Nikita Popov [Sat, 16 Jul 2016 21:00:47 +0000 (23:00 +0200)]
Revert "Fixed bug #72286 (Segmentation fault During Garbage Collection)"
This reverts commit
1c84b55adea936b065a20102202bea3d1d243225.
Christoph M. Becker [Fri, 15 Jul 2016 17:42:26 +0000 (19:42 +0200)]
Fix #72604: imagearc() ignores thickness for full arcs
We remove the special casing for full arcs, what conforms to external libgd.
Christoph M. Becker [Thu, 14 Jul 2016 22:57:36 +0000 (00:57 +0200)]
Fix bug #66502: DOM document dangling reference
When we decrement the refcount of a node's document, we state that we
won't need it anymore. Therefore we can *always* set the pointer to the
document to NULL, what avoids invalid memory accesses for some edge cases
as demonstrated with the PHPT.
Original patch provided by Sean Heelan.
Dmitry Stogov [Thu, 14 Jul 2016 19:37:25 +0000 (22:37 +0300)]
Fixed bug #72286 (Segmentation fault During Garbage Collection)
Anatol Belski [Thu, 14 Jul 2016 19:13:49 +0000 (21:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Extend libxml exports
Updated NEWS
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Updated NEWS
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
Update PHP 5.5 NEWS entries with CVE info
Anatol Belski [Thu, 14 Jul 2016 19:08:54 +0000 (21:08 +0200)]
Extend libxml exports
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.
Christoph M. Becker [Thu, 14 Jul 2016 14:43:13 +0000 (16:43 +0200)]
Fix bug #72596: imagetypes function won't advertise WEBP support
We add the constant IMG_WEBP and make sure that WebP support is properly
reported by imagetypes().
Nikita Popov [Wed, 13 Jul 2016 19:57:01 +0000 (21:57 +0200)]
Add NEWS entry
nikita2206 [Sun, 15 May 2016 23:58:21 +0000 (02:58 +0300)]
fix: bug72222 for PHP-5.6 reflection export of array consts
Stanislav Malyshev [Wed, 13 Jul 2016 06:27:45 +0000 (23:27 -0700)]
Fix bug #72562 - destroy var_hash properly
Stanislav Malyshev [Wed, 13 Jul 2016 05:37:36 +0000 (22:37 -0700)]
Fix bug #72533 (locale_accept_from_http out-of-bounds access)
Stanislav Malyshev [Wed, 13 Jul 2016 05:03:40 +0000 (22:03 -0700)]
Fix fir bug #72520
Stanislav Malyshev [Wed, 13 Jul 2016 04:48:00 +0000 (21:48 -0700)]
Fix for bug #72513
Stanislav Malyshev [Wed, 13 Jul 2016 04:52:27 +0000 (21:52 -0700)]
Fix for bug #72513
Stanislav Malyshev [Wed, 13 Jul 2016 04:35:02 +0000 (21:35 -0700)]
CS fix and comments with bug ID
Julien Pauli [Tue, 12 Jul 2016 13:47:05 +0000 (15:47 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 Jul 2016 13:46:07 +0000 (15:46 +0200)]
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
This reverts commit
15336b44d95c41079438af8ac73f77ff893aeef7.
Julien Pauli [Tue, 12 Jul 2016 13:45:49 +0000 (15:45 +0200)]
Revert "Fix test for #52384"
This reverts commit
642e44b98f18d867052aa7e02476aae9c8881201.
Julien Pauli [Tue, 12 Jul 2016 13:27:37 +0000 (15:27 +0200)]
Fix test for #52384
Christoph M. Becker [Tue, 12 Jul 2016 12:42:38 +0000 (14:42 +0200)]
Partially fix #72506: idn_to_ascii for UTS #46 incorrect for long domain names
We don't actually fix this issue wrt. the empty $info array, because it is
not clear what this array should contain and we're concerned about the
potential BC break, but at least we fix the inconsistent handling of
resulting domains with 255 bytes (which raise an error), and longer domains
(which just return FALSE), what has to be considered a very minor BC break
if at all.
Julien Pauli [Tue, 12 Jul 2016 08:49:04 +0000 (10:49 +0200)]
Updated NEWS
Bishop Bettini [Tue, 21 Jun 2016 12:16:51 +0000 (08:16 -0400)]
Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.
Julien Pauli [Tue, 12 Jul 2016 08:37:59 +0000 (10:37 +0200)]
Updated NEWS
gooh [Mon, 11 Jul 2016 12:28:04 +0000 (14:28 +0200)]
Fix #72575: using --allow-to-run-as-root should ignore missing user
directive
Trying to start PHP-FPM with the --allow-to-run-as-root flag will not
work when the user directive is not given in the FPM worker pool
configuration. Parsing the config will fail. Consequently, FPM cannot
start.
The check is in place to prevent FPM from getting started with root
privileges by accident. Prior to #61295 the check would also prevent
any non-root user to start PHP-FPM without a user directive present.
This patch adds an additional check to the config parser, checking for
the --allow-to-run-as-root flag to be present. If so, parsing will no
longer abort for root users even if the user directive is missing.
I will also update the PHP docs since they still state the user
directive is a mandatory setting which it is not since #61295.
Julien Pauli [Tue, 12 Jul 2016 08:19:45 +0000 (10:19 +0200)]
Updated NEWS
Loz Calver [Fri, 6 May 2016 09:22:23 +0000 (10:22 +0100)]
Fix 72122 - don't use EH_THROW for calls to getIterator
Xinchen Hui [Tue, 12 Jul 2016 04:14:45 +0000 (12:14 +0800)]
backport to 5.6 (we should not unset the default value)
Christoph M. Becker [Mon, 11 Jul 2016 14:06:35 +0000 (16:06 +0200)]
Bug #66836 has been fixed
Julien Pauli [Mon, 11 Jul 2016 12:58:12 +0000 (14:58 +0200)]
Remove needless zeroing of anonymously mmap'd memory
Michael McConville [Tue, 26 Apr 2016 17:16:38 +0000 (13:16 -0400)]
Remove needless zeroing of anonymously mmap'd memory
All existing systems zero anonymously mmapped memory, and if I
understand correctly POSIX will be specifying this soon. Many projects
already rely on it, so no reasonable system would return memory of
unspecified value.
Derick Rethans [Mon, 11 Jul 2016 10:31:43 +0000 (11:31 +0100)]
Generate new .c file from .re file, as that was missing on my previous commit
Stanislav Malyshev [Sun, 10 Jul 2016 23:17:54 +0000 (16:17 -0700)]
Fix for HTTP_PROXY issue.
The following changes are made:
- _SERVER/_ENV only has HTTP_PROXY if the local environment has it,
and only one from the environment.
- getenv('HTTP_PROXY') only returns one from the local environment
- getenv has optional second parameter, telling it to only consider
local environment
Matteo Beccati [Sun, 10 Jul 2016 11:04:49 +0000 (13:04 +0200)]
Fixed bug #70313 PDO statement fails to throw exception
Julien Pauli [Fri, 8 Jul 2016 14:31:42 +0000 (16:31 +0200)]
Updated NEWS
Jos Elstgeest [Fri, 24 Jun 2016 22:47:15 +0000 (00:47 +0200)]
update filter_var filters for ipv4 addresses to reflect rfc6890
Julien Pauli [Fri, 8 Jul 2016 13:36:38 +0000 (15:36 +0200)]
Updated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:04:50 +0000 (00:04 +0200)]
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.
The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
(cherry picked from commit
16db4d1462bf3eacb93c0cd940f799160a284b24)
(cherry picked from commit
344ff5dd4c538eaebea075f7705321f8b86d0b47)
Julien Pauli [Fri, 8 Jul 2016 12:59:16 +0000 (14:59 +0200)]
Updated NEWS
Julien Pauli [Fri, 8 Jul 2016 12:58:56 +0000 (14:58 +0200)]
Backported bug #71144 (Segmentation fault when using cURL with ZTS)
Michael Maroszek [Thu, 7 Jul 2016 12:24:05 +0000 (14:24 +0200)]
fix bug #72024 (microtime() leaks memory)
Julien Pauli [Fri, 8 Jul 2016 12:35:43 +0000 (14:35 +0200)]
Updated NEWS
Julien Pauli [Fri, 8 Jul 2016 12:24:05 +0000 (14:24 +0200)]
Merge branch 'pull-request/1982' into PHP-5.5
* pull-request/1982:
Update PHP 5.5 NEWS entries with CVE info
Remi Collet [Fri, 8 Jul 2016 08:45:13 +0000 (10:45 +0200)]
add test for bug #72564 (7.x regression)
Christopher Jones [Thu, 7 Jul 2016 01:52:17 +0000 (11:52 +1000)]
Mask DB usernames from expected test output for test portability
Ferenc Kovacs [Wed, 6 Jul 2016 23:46:02 +0000 (01:46 +0200)]
merge NEWS blocks
Ferenc Kovacs [Wed, 6 Jul 2016 23:43:25 +0000 (01:43 +0200)]
5.6.24RC1
Ferenc Kovacs [Wed, 6 Jul 2016 22:09:48 +0000 (00:09 +0200)]
5.6.25 is next
Derick Rethans [Wed, 6 Jul 2016 10:15:42 +0000 (11:15 +0100)]
Updated to version 2016.6 (2016f)
Anatol Belski [Wed, 6 Jul 2016 08:40:52 +0000 (10:40 +0200)]
add tests for bug #72512
Valentin VALCIU [Thu, 21 Apr 2016 16:02:52 +0000 (19:02 +0300)]
Fix bug #55701: GlobIterator throws LogicException
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
Pedro Magalhães [Thu, 30 Jun 2016 07:00:33 +0000 (09:00 +0200)]
Don't enforce LSP if prototype method is private
Fixes bug #72496.
Stanislav Malyshev [Mon, 28 Sep 2015 18:31:14 +0000 (11:31 -0700)]
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
(cherry picked from commit
629e4da7cc8b174acdeab84969cbfc606a019b31)
Lior Kaplan [Mon, 4 Jul 2016 14:06:54 +0000 (16:06 +0200)]
Update PHP 5.5 NEWS entries with CVE info
Pierre Joye [Mon, 4 Jul 2016 08:35:20 +0000 (10:35 +0200)]
Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
Christoph M. Becker [Mon, 4 Jul 2016 01:17:17 +0000 (03:17 +0200)]
Fix typo in comment
Ferenc Kovacs [Sun, 3 Jul 2016 21:31:32 +0000 (23:31 +0200)]
this was actually fixed in 5.6.23
Stanislav Malyshev [Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix the fix for #72403 on nl2br
5.5.38 now
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Mon, 27 Jun 2016 19:30:42 +0000 (12:30 -0700)]
Fix the fix for #72403 on nl2br
Christoph M. Becker [Mon, 27 Jun 2016 15:07:26 +0000 (17:07 +0200)]
Update NEWS
Christoph M. Becker [Mon, 27 Jun 2016 14:55:15 +0000 (16:55 +0200)]
Fix #70628: Clearing bindings on an SQLite3 statement doesn't work
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.
Stanislav Malyshev [Mon, 27 Jun 2016 00:52:09 +0000 (17:52 -0700)]
Fixed bug #72479 - same as #72434
Lior Kaplan [Sat, 25 Jun 2016 17:31:26 +0000 (20:31 +0300)]
Add CVE info for PHP 5.6.22
Lior Kaplan [Sat, 25 Jun 2016 17:28:51 +0000 (20:28 +0300)]
Add CVE info for PHP 5.6.23
Lior Kaplan [Sat, 25 Jun 2016 16:56:00 +0000 (19:56 +0300)]
Add missing entries for PHP 5.6.23
Anatol Belski [Wed, 22 Jun 2016 10:20:02 +0000 (12:20 +0200)]
fix test cleanup
Anatol Belski [Wed, 22 Jun 2016 09:41:05 +0000 (11:41 +0200)]
fix dir separator in test
Ferenc Kovacs [Wed, 22 Jun 2016 01:03:01 +0000 (03:03 +0200)]
update NEWS