]>
granicus.if.org Git - php/log
Christoph M. Becker [Fri, 12 Aug 2016 22:31:55 +0000 (00:31 +0200)]
Fix #60665: call to empty() on NULL result using PDO::FETCH_LAZY returns false
The has_property handler only checked whether a respective column name
exists, but neither whether the column value is set, nor whether it is
empty, respectively. We fix that to match the behavior of POD:FETCH_OBJ in
particular and PHP in general.
Yasuo Ohgaki [Wed, 10 Aug 2016 22:18:35 +0000 (07:18 +0900)]
Fix URL rewriter partially
Yasuo Ohgaki [Wed, 10 Aug 2016 23:08:26 +0000 (08:08 +0900)]
Support "git worktree"
Christoph M. Becker [Mon, 8 Aug 2016 16:43:33 +0000 (18:43 +0200)]
Add test for bug #69107: finfo no longer detects PHP files
Nikita Popov [Sun, 7 Aug 2016 16:36:32 +0000 (18:36 +0200)]
Fix stream_socket_enable_crypto() test
The whole test doesn't make any sense at all, but this only fixes
the additional warnings you get when linked against openssl w/o
SSL3.
Kalle Sommer Nielsen [Sat, 6 Aug 2016 10:08:13 +0000 (12:08 +0200)]
Fix the fix (Nikita), thanks!
Kalle Sommer Nielsen [Sat, 6 Aug 2016 08:17:49 +0000 (10:17 +0200)]
Check the return value of dbconvert() in mssql_guid_string(), as it may return -1 in case the conversion failed. In that case false is returned.
Also initialize buffer and buffer2 to NULL, which should fix bug #72039 (Use of uninitialised value on mssql_guid_string).
This only applies to 5.6, as we do not have mssql in 7.0 anymore
Ville Hukkamaki [Fri, 5 Aug 2016 13:09:13 +0000 (16:09 +0300)]
Fix #72764
Negotiate data channel encryption after NLST command.
This is to prevent issues with IIS and ProFTPD.
Christoph M. Becker [Thu, 4 Aug 2016 10:06:07 +0000 (12:06 +0200)]
Fix broken skip marker in test case
Matteo Beccati [Thu, 4 Aug 2016 07:28:58 +0000 (09:28 +0200)]
Clean up FR #72633
Christopher Jones [Thu, 4 Aug 2016 04:48:07 +0000 (14:48 +1000)]
Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
Stanislav Malyshev [Thu, 4 Aug 2016 05:59:01 +0000 (22:59 -0700)]
Fix bug #72716 - initialize buffer before read
Ferenc Kovacs [Wed, 3 Aug 2016 23:39:37 +0000 (01:39 +0200)]
5.6.26 will be next
Anatol Belski [Wed, 3 Aug 2016 16:26:29 +0000 (18:26 +0200)]
improve the check, avoid strlen on NULL
Anatol Belski [Wed, 3 Aug 2016 15:38:11 +0000 (17:38 +0200)]
update NEWS
Kalle Sommer Nielsen [Wed, 3 Aug 2016 15:05:31 +0000 (17:05 +0200)]
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.
The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.
This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.
(cherry picked from commit
aabcb5481d9e717df77192dab2894468b9fc63b4 )
Anatol Belski [Wed, 3 Aug 2016 13:03:41 +0000 (15:03 +0200)]
update libs_versions.txt
Anatol Belski [Wed, 3 Aug 2016 10:16:42 +0000 (12:16 +0200)]
fix ts build
Christoph M. Becker [Tue, 2 Aug 2016 16:41:20 +0000 (18:41 +0200)]
Fix #72709: imagesetstyle() causes OOB read for empty $styles
Calling imagesetstyle() with an empty $styles array caused gdImageSetStyle()
to be called with `noOfPixels==0`, what could have lead to OOB reads.
Actually, this issue will be fixed in libgd, but to avoid issues when older
libgd is in use, we simply disallow passing an empty $styles array to
imagesetstyle(), what wouldn't serve a useful purpose anyway.
Anatol Belski [Tue, 2 Aug 2016 12:36:56 +0000 (14:36 +0200)]
update NEWS
Anatol Belski [Tue, 2 Aug 2016 12:35:24 +0000 (14:35 +0200)]
cleanup table after test
Pablo Santiago Sánchez [Thu, 28 Jul 2016 01:12:56 +0000 (22:12 -0300)]
- lastInsertId using Postgres Lastval() function
Nikita Popov [Sat, 30 Jul 2016 16:34:34 +0000 (18:34 +0200)]
Revert "Fixed bug #71219"
This reverts commit
14d674442ef86ad4e862228a1ff5ecd322ae7759 .
I misread the discussion on the bug -- this is not the correct
fix. However the other proposed fix does not work either, so just
reverting for now.
Nikita Popov [Sat, 30 Jul 2016 16:21:19 +0000 (18:21 +0200)]
Fixed bug #71219
Nikita Popov [Sat, 30 Jul 2016 14:28:42 +0000 (16:28 +0200)]
Add missing TSRMLS_FETCH()
Nikita Popov [Sat, 30 Jul 2016 13:10:54 +0000 (15:10 +0200)]
Fixed bug #72142
ju1ius [Sat, 30 Jul 2016 04:08:25 +0000 (06:08 +0200)]
fixes bad address given to onig_error_code_to_str
Closes bug #72710
(cherry picked from commit
0fb7eb6723bcc6fd98053911543e801edb5ab763 )
Christoph M. Becker [Thu, 28 Jul 2016 22:24:46 +0000 (00:24 +0200)]
Fix #71894: AddressSanitizer: global-buffer-overflow in zif_cal_from_jd
Julian days < 347998 denote invalid Jewish calendar dates, so
cal_from_jd($jd, CAL_JEWISH) and jdmonthname($jd, CAL_MONTH_JEWISH) should
actually fail. For BC we don't yet let them though, but we fix the OOB read
that happens in this case, and we also adjust cal_from_jd()'s return value
to have empty strings for "abbrevdayname" and "dayname" instead of "Sun"/
"Sunday" and NULL for "dow" instead of 0, which doesn't make any sense.
Christoph M. Becker [Thu, 28 Jul 2016 17:59:14 +0000 (19:59 +0200)]
Implement FR #65462: Please add tests for gregorian and jewish overflow fixes
Christoph M. Becker [Thu, 28 Jul 2016 17:13:58 +0000 (19:13 +0200)]
Fix #67976: cal_days_month() fails for final month of the French calendar
The French calendar ends on 0014-13-05, so trying to calculate the Julian
day of 0015-01-01 fails. We cater to that by returning the hard-coded value.
Christoph M. Becker [Thu, 28 Jul 2016 16:22:19 +0000 (18:22 +0200)]
Bug #69975 had already been fixed as of PHP 5.6.12
Also CVE-2015-8879 had been assigned.
Christoph M. Becker [Thu, 28 Jul 2016 15:19:47 +0000 (17:19 +0200)]
Fix #72677: SCM_CREDENTIALS related tests should be skipped on AIX
Patch provided by matthieu dot sarter dot external at atos dot net.
Christoph M. Becker [Thu, 28 Jul 2016 14:49:45 +0000 (16:49 +0200)]
Fix #72676: Test cli_process_title_unix fails on AIX
Patch provided by matthieu dot sarter dot external at atos dot net.
Christoph M. Becker [Thu, 28 Jul 2016 13:21:48 +0000 (15:21 +0200)]
Fix #72694: mb_ereg_search_setpos does not accept a string's last position
Setting the search position immediately behind the last character should be
allowed, so we fix this off-by-one error.
Christoph M. Becker [Thu, 28 Jul 2016 11:56:40 +0000 (13:56 +0200)]
Fix #72693: mb_ereg_search increments search position when a match zero-width
That's caused by an off-by-one error, which we fix.
Christoph M. Becker [Thu, 28 Jul 2016 11:07:05 +0000 (13:07 +0200)]
Fix #72691: mb_ereg_search raises a warning if a match zero-width
That warning doesn't make sense (PCRE doesn't throw such a warning either),
so we remove it.
Christoph M. Becker [Thu, 28 Jul 2016 10:26:41 +0000 (12:26 +0200)]
Bug #6836 has already been fixed in PHP 5.6.24 and 7.0.9
Pierrick Charron [Thu, 28 Jul 2016 03:30:20 +0000 (23:30 -0400)]
Fixed bug #71929 (CURLINFO_CERTINFO data parsing error).
Pierrick Charron [Wed, 27 Jul 2016 21:52:05 +0000 (17:52 -0400)]
Update NEWS
Christoph M. Becker [Wed, 27 Jul 2016 16:50:52 +0000 (18:50 +0200)]
Fix #72688: preg_match missing group names in matches
We have to multiply with 0x100 to properly scale the high byte.
Christoph M. Becker [Wed, 27 Jul 2016 14:37:49 +0000 (16:37 +0200)]
Implement #72653: SQLite should allow opening with empty filename
From the [sqlite3_open](https://www.sqlite.org/c3ref/open.html) docs:
| If the filename is an empty string, then a private, temporary on-disk
| database will be created. This private database will be automatically
| deleted as soon as the database connection is closed.
We make that facility available to userland.
While we're at it, we also do some minor optimizations, remove the
unnecessary check for NUL characters in filename, which is already catered
to by ZPP(p), and add a missing `return` in case db_obj isn't initialized.
Ville Hukkamäki [Mon, 25 Jul 2016 18:50:38 +0000 (18:50 +0000)]
Fix bug #72667
Open data stream after receiving PASV reply, before sending the
main request.
Included test cases for opendir() with ftp:// and ftps:// wrappers.
Test cases re-use ext/ftp/tests/server.inc
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Pierrick Charron [Wed, 27 Jul 2016 04:33:13 +0000 (00:33 -0400)]
Fixed bug #72686 (zlib: url support is broken).
zlib: support is broken since a really long time.
It never worked on versions >= PHP5.6 so we can just remove
this dead code.
Bug was introduced 2006-05-14 (Before 5.2.0)
Pierrick Charron [Wed, 27 Jul 2016 00:34:16 +0000 (20:34 -0400)]
Fixed bug #72684 (AppendIterator segfault with closed generator)
Pierrick Charron [Tue, 26 Jul 2016 22:50:15 +0000 (18:50 -0400)]
Fixed bug #71709
When curl_setopt is called with an empty slist as value, we should
not add the empty slist to the list of slist to free.
Christoph M. Becker [Mon, 25 Jul 2016 15:03:10 +0000 (17:03 +0200)]
Further fixes wrt. bug #72668
Not only SQLite3::querySingle(), but also SQLite3::query() and
SQLite3Stmt::execute() were affected.
Anatol Belski [Mon, 25 Jul 2016 08:14:18 +0000 (10:14 +0200)]
update NEWS
y-uti [Sat, 26 Mar 2016 09:56:25 +0000 (18:56 +0900)]
Make phpize use PHP_PREFIX as the default location (windows)
The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.
y-uti [Mon, 28 Mar 2016 10:50:31 +0000 (19:50 +0900)]
Enable 'nmake test' on building extensions
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
Christoph M. Becker [Mon, 25 Jul 2016 00:00:37 +0000 (02:00 +0200)]
Fix broken test case
d28f1da introduced a test regression, due to potentially additional output
regarding FreeType support. We fix that by making the test more resilient.
Christoph M. Becker [Sun, 24 Jul 2016 22:13:44 +0000 (00:13 +0200)]
Fix broken test case
The test claims that it would be "checking all the values in returned array",
but due to the use of %a it actually skipped elements. We fix that by using
%s instead.
Anatol Belski [Sun, 24 Jul 2016 12:50:10 +0000 (14:50 +0200)]
regenerate date parser with re2c 0.15.3
Nikita Popov [Sat, 23 Jul 2016 22:13:42 +0000 (00:13 +0200)]
More tolerance in another IntlCalendar test
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
Anatol Belski [Sat, 23 Jul 2016 18:55:39 +0000 (20:55 +0200)]
fix test
Christoph M. Becker [Sat, 23 Jul 2016 17:29:43 +0000 (19:29 +0200)]
Fix #68712: suspicious if-else statements
Christoph M. Becker [Sat, 23 Jul 2016 16:09:18 +0000 (18:09 +0200)]
Fix copy&paste errors in gd_interpolation.c
According to <https://github.com/libgd/libgd/commit/
f101380 >.
Christoph M. Becker [Sat, 23 Jul 2016 14:48:07 +0000 (16:48 +0200)]
Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.
[1] <https://github.com/libgd/libgd/commit/
aa1d71c >
vhuk [Thu, 21 Jul 2016 09:20:06 +0000 (12:20 +0300)]
Fix for bug #54431
Nikita Popov [Fri, 22 Jul 2016 15:20:56 +0000 (17:20 +0200)]
Make IntlCalendar::getNow() test more tolerant
Due to the *1000 factor the two values may be off-by-1000 even
without any actual delay, so increase the check to 2000.
Christoph M. Becker [Fri, 22 Jul 2016 12:55:13 +0000 (14:55 +0200)]
Fix #72646: SplFileObject::getCsvControl does not return the escape character
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
Remi Collet [Fri, 22 Jul 2016 07:35:09 +0000 (09:35 +0200)]
FPM: add test for CVE-2016-5385
Christoph M. Becker [Thu, 21 Jul 2016 16:36:12 +0000 (18:36 +0200)]
Fix #72330: CSV fields incorrectly split if escape char followed by UTF chars
We must not forget to properly reset the state for multibyte characters
following an escape character.
Pieter Hordijk [Fri, 15 Jul 2016 19:58:13 +0000 (21:58 +0200)]
Removed incorrect (leftover?) sentence in ini
about mbstring or iconv output handler
Anatol Belski [Wed, 20 Jul 2016 23:52:03 +0000 (01:52 +0200)]
update libs_versions.txt
Ferenc Kovacs [Wed, 20 Jul 2016 22:36:07 +0000 (00:36 +0200)]
update NEWs
Anatol Belski [Wed, 20 Jul 2016 15:57:39 +0000 (17:57 +0200)]
regenerate date parser with re2c 0.13.5 to fix OSX issues
Xinchen Hui [Wed, 20 Jul 2016 10:07:02 +0000 (18:07 +0800)]
Fixed arginfo
Derick Rethans [Wed, 20 Jul 2016 09:19:53 +0000 (10:19 +0100)]
Regenerate with the -b flag, as we used to do.
Apparently, Apple's LLVM can't handle it otherwise o_O.
Stanislav Malyshev [Wed, 20 Jul 2016 05:37:44 +0000 (22:37 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Improve fix for #72520
Stanislav Malyshev [Wed, 20 Jul 2016 05:37:03 +0000 (22:37 -0700)]
Improve fix for #72520
Pierre Joye [Tue, 19 Jul 2016 17:18:56 +0000 (00:18 +0700)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Pierre Joye [Tue, 19 Jul 2016 17:18:25 +0000 (00:18 +0700)]
#72482, revert for 5.6 for now
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