]>
granicus.if.org Git - php/log
Anthony Ferrara [Sat, 7 Jul 2012 02:37:50 +0000 (22:37 -0400)]
Fix two issues with run-tests.php
1. E_STRICT error due to passing return of array_intersect() into reset() directly
2. Details in junit output can produce invalid UTF-8 and XML due to unescaped characters
Nikita Popov [Thu, 5 Jul 2012 18:31:58 +0000 (20:31 +0200)]
Fix potential integer overflow in nl2br
The buffer size was calculated manually, thus creating integer overflows
for very large inputs, e.g. nl2br(str_repeat("\n",
613566757 )).
The code now uses safe_emalloc, thus making the code throw an error
instead of crashing.
Nikita Popov [Thu, 5 Jul 2012 18:14:49 +0000 (20:14 +0200)]
Fix potential integer overflow in bin2hex
The code was already using safe_emalloc but did the multiplication in
the first argument, thus making the use of safe_emalloc pretty useless.
The *2 is now moved to the second argument.
Johannes Schlüter [Wed, 4 Jul 2012 23:15:27 +0000 (01:15 +0200)]
This wil be PHP 5.3.16
johannes [Wed, 4 Jul 2012 22:55:47 +0000 (00:55 +0200)]
Revert change
3f3ad30c50 : There shouldn't be new features in 5.3, especially
not if they aren't in 5.4, too.
Nuno Lopes [Mon, 2 Jul 2012 05:31:40 +0000 (01:31 -0400)]
fix (signed) integer overflow (part of bug #52550
Nikita Popov [Sun, 1 Jul 2012 14:28:57 +0000 (16:28 +0200)]
Revert JSON changes to PHP 5.3
This reverts the following commits:
974324676b2436f159f42d9241c569f813471684
4662151ea7d7b6920d115cf2a2d6e9d4232727a3
84fe2cc890e49f40bac7c3ba74b3cfc6dc4cef2f
This does not revert the JSON changes released in PHP 5.3.14.
Stanislav Malyshev [Sun, 1 Jul 2012 00:36:22 +0000 (17:36 -0700)]
remove duplicates, fix order
Felipe Pena [Sat, 30 Jun 2012 19:29:30 +0000 (16:29 -0300)]
- Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
andrey [Fri, 29 Jun 2012 11:42:36 +0000 (14:42 +0300)]
fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd
andrey [Fri, 29 Jun 2012 11:40:41 +0000 (14:40 +0300)]
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
Nikita Popov [Fri, 29 Jun 2012 10:47:37 +0000 (12:47 +0200)]
Fix some lengths in crypt()
Use salt_len_in instead of strlen(salt) or PHP_MAX_SALT_LEN, otherwise too
much memory will be allocated.
sha512 has a 86 character checksum, not 43. That probably was a copy&paste
from the sha256 code which indeed has 43.
The allocation also was using sizeof(char *), thus allocating 4 or 8 times
as much memory as necessary. The sizeof(char *) was removed in the 5.4
branch in
b7a92c9 but forgotten on 5.3.
The memset 0 call was using PHP_MAX_SALT_LEN which can be smaller than the
output buffer and thus not zeroing out everything. Use the size of the
output buffer (needed) instead.
andrey [Fri, 29 Jun 2012 09:42:54 +0000 (12:42 +0300)]
new charsets
Anthony Ferrara [Fri, 29 Jun 2012 00:00:03 +0000 (20:00 -0400)]
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
Nikita Popov [Thu, 28 Jun 2012 18:09:47 +0000 (20:09 +0200)]
Add json_last_error_msg() function
This replaces json_last_error(true) and is consistent with other custom
error handling functions.
Johannes Schlüter [Wed, 27 Jun 2012 21:26:33 +0000 (23:26 +0200)]
Fix #62432 ReflectionMethod random corrupt memory on high concurrent
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
Nikita Popov [Wed, 27 Jun 2012 10:19:41 +0000 (12:19 +0200)]
Improve JSON error handling
json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.
As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.
Johannes Schlüter [Wed, 27 Jun 2012 09:42:43 +0000 (11:42 +0200)]
Fix memleak in CLI
Stanislav Malyshev [Tue, 26 Jun 2012 22:22:29 +0000 (15:22 -0700)]
ws fix
Moriyoshi Koizumi [Mon, 25 Jun 2012 10:20:38 +0000 (19:20 +0900)]
BFN
Moriyoshi Koizumi [Mon, 25 Jun 2012 10:13:23 +0000 (19:13 +0900)]
Fix bug #62373 (serialize() generates wrong reference to the object)
Nikita Popov [Sun, 24 Jun 2012 21:32:50 +0000 (23:32 +0200)]
Fix memory allocation checks for base64 encode
base64_encode used safe_emalloc, but one of the arguments was derived from a
multiplication, thus making the allocation unsafe again.
There was a size check in place, but it was off by a factor of two as it
didn't account for the signedness of the integer type.
The unsafe allocation is not exploitable, but still causes funny behavior
when the sized overflows into a negative number.
To fix the issue the *4 factor is moved into the size argument (where it is
known to be safe), so safe_emalloc can carry out the multiplication.
The size check is removed as it doesn't really make sense once safe_emalloc
works correctly. (Would only cause base64_encode to silently return false
instead of throwing an error. Also could cause problems with other uses of
the base64 encoding API, which all don't check for a NULL return value.)
Furthermore the (length + 2) < 0 check is replaced with just length < 0.
Allowing lengths -2 and -1 doesn't make sense semantically and also is not
honored in the following code (negative length would access unallocated
memory.)
Actually the length < 0 check doesn't make sense altogether, but I left it
there just to be safe.
Nikita Popov [Sat, 23 Jun 2012 18:46:27 +0000 (20:46 +0200)]
Improve json_encode error handling
json_encode() now returns bool(false) for all possible errors, throws the
respective warning and also sets the respective json_last_error() error
code. Three new error codes have been added:
* JSON_ERROR_RECURSION
* JSON_ERROR_INF_OR_NAN
* JSON_ERROR_UNSUPPORTED_TYPE
To get a partial JSON output instead of bool(false) the option
JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid
segments will be replaced either by null (for recursion, unsupported type
and invalid JSON) or 0 (for Inf and NaN).
The warning for invalid UTF-8 stays intact and is thrown also with
display_errors = On. If this behavior is undesired this can be remedied
later.
Felipe Pena [Sat, 23 Jun 2012 18:21:20 +0000 (15:21 -0300)]
- BFN
Felipe Pena [Sat, 23 Jun 2012 18:10:47 +0000 (15:10 -0300)]
- Improved fix for #62384
Johannes Schlüter [Fri, 22 Jun 2012 18:00:20 +0000 (20:00 +0200)]
Remove unneeded and outdated ChangeLog file
Johannes Schlüter [Fri, 22 Jun 2012 15:32:46 +0000 (17:32 +0200)]
Remove extra ;
Felipe Pena [Fri, 22 Jun 2012 15:05:29 +0000 (12:05 -0300)]
- Fixed bug #62384 (Attempting to invoke a Closure more than once causes segfaul)
Johannes Schlüter [Fri, 22 Jun 2012 10:48:39 +0000 (12:48 +0200)]
Improve check for :memory: pseudo-filename in SQlite
Johannes Schlüter [Wed, 20 Jun 2012 17:46:32 +0000 (19:46 +0200)]
Remove outdated and user-specific files
Nikita Popov [Tue, 19 Jun 2012 16:40:46 +0000 (18:40 +0200)]
Add NEWS for bug #62262
Nikita Popov [Tue, 19 Jun 2012 15:45:04 +0000 (17:45 +0200)]
Fixed bug RecursiveArrayIterator does not implement Countable
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
Anatoliy Belsky [Tue, 19 Jun 2012 15:15:56 +0000 (17:15 +0200)]
sync zip ext version with pecl
Anatoliy Belsky [Tue, 19 Jun 2012 12:42:59 +0000 (14:42 +0200)]
one more correction for COM upgrading notes
Anatoliy Belsky [Tue, 19 Jun 2012 12:08:34 +0000 (14:08 +0200)]
split gzgetc_basic.phpt for zlib 1.2.7
Anatoliy Belsky [Mon, 18 Jun 2012 20:07:19 +0000 (22:07 +0200)]
com ext upgrading correction
Anatoliy Belsky [Mon, 18 Jun 2012 19:56:17 +0000 (21:56 +0200)]
com ext upgrading info
Anatoliy Belsky [Sun, 17 Jun 2012 14:04:36 +0000 (16:04 +0200)]
Reverted the BC fix regarding to #57905, test adopted
New 0.10.1 has a stronger archive integrity check. Restoring
the old behaviour of libzip < 0.10.1 makes no sense at this
place.
Johannes Schlüter [Wed, 13 Jun 2012 08:35:58 +0000 (10:35 +0200)]
Merge PHP 5.3.14 NEWS
Stanislav Malyshev [Tue, 12 Jun 2012 18:49:35 +0000 (11:49 -0700)]
re-add 61755 to NEWS
David Soria Parra [Sun, 10 Jun 2012 14:15:34 +0000 (18:15 +0400)]
Make travis silent
Travis will always build all branches. As we just have a .travis.yml
on master, travis will go ahead and checkout PHP-5.3. It fails and
then sends mails. We really don't want to get spammed, so we add
a .travis.yml that is just silent.
michelangelo [Sat, 9 Jun 2012 16:07:11 +0000 (16:07 +0000)]
Adding a test for ext/posix/tests/posix_getegid_basic.phpt
Stanislav Malyshev [Fri, 8 Jun 2012 08:24:49 +0000 (01:24 -0700)]
typo
Stanislav Malyshev [Fri, 8 Jun 2012 08:21:37 +0000 (01:21 -0700)]
improve overflow checks
Stanislav Malyshev [Fri, 8 Jun 2012 06:05:23 +0000 (23:05 -0700)]
fix potential overflow in _php_stream_scandir
Anatoliy Belsky [Thu, 7 Jun 2012 20:32:03 +0000 (22:32 +0200)]
set current versions for libzip and zip ext
Anatoliy Belsky [Thu, 7 Jun 2012 19:43:07 +0000 (21:43 +0200)]
updated NEWS
Anatoliy Belsky [Thu, 7 Jun 2012 15:59:57 +0000 (17:59 +0200)]
zip windows fixes
Anatoliy Belsky [Thu, 7 Jun 2012 14:27:47 +0000 (16:27 +0200)]
fixed bc break related to #57905
Anatoliy Belsky [Tue, 5 Jun 2012 22:57:12 +0000 (00:57 +0200)]
fixed a bit overlooked from the last libzip port
Anatoliy Belsky [Tue, 5 Jun 2012 21:22:27 +0000 (23:22 +0200)]
brought the fix for #47667 back
Anatoliy Belsky [Tue, 5 Jun 2012 20:49:31 +0000 (22:49 +0200)]
fixed zip entry freeing
Anatoliy Belsky [Tue, 5 Jun 2012 20:11:07 +0000 (22:11 +0200)]
rechecked the merged libzip, took also the indents from the original to
avoid confusion next time
Anatoliy Belsky [Mon, 4 Jun 2012 20:51:31 +0000 (22:51 +0200)]
fixed a double freeing crash
Anatoliy Belsky [Mon, 4 Jun 2012 20:51:00 +0000 (22:51 +0200)]
fixed header include
Anatoliy Belsky [Mon, 4 Jun 2012 19:30:04 +0000 (21:30 +0200)]
initial libzip upgrade patch to 0.10.1
Felipe Pena [Thu, 7 Jun 2012 17:23:17 +0000 (14:23 -0300)]
- BFN
Felipe Pena [Thu, 7 Jun 2012 17:18:34 +0000 (14:18 -0300)]
Pierrick Charron [Thu, 7 Jun 2012 16:02:27 +0000 (18:02 +0200)]
Regenerated files
Pierrick Charron [Thu, 7 Jun 2012 15:44:20 +0000 (17:44 +0200)]
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
Till Klampaeckel [Wed, 6 Jun 2012 16:49:47 +0000 (19:49 +0300)]
Don't depend on a fixed path for PHP shebang but use /usr/bin/env
(cherry picked from commit
89c5d981603ed4a2a54f86c20cec4f263c58ded6 )
Xinchen Hui [Thu, 7 Jun 2012 06:31:35 +0000 (14:31 +0800)]
Remove unused codes
slayercat [Wed, 23 May 2012 12:30:16 +0000 (20:30 +0800)]
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
via http://technet.microsoft.com/en-us/library/ms724284(v=vs.85).aspx
"Do not cast a pointer to a FILETIME structure to either a
ULARGE_INTEGER* or __int64* value because it can cause alignment faults on 64-bit Windows."
Gustavo André dos Santos Lopes [Wed, 6 Jun 2012 10:10:00 +0000 (12:10 +0200)]
Fix ext/intl build on ICU < 4.8
Gustavo André dos Santos Lopes [Wed, 6 Jun 2012 09:36:00 +0000 (11:36 +0200)]
Optimization in ext/intl/msgformat
Don't transform the string to make it apostrophe friendly in ICU 4.8+
as that it is now the default.
Gustavo André dos Santos Lopes [Tue, 5 Jun 2012 14:47:00 +0000 (16:47 +0200)]
Fixed tests in ext/intl
21 is not a valid value for UNUM_PADDING_POSITION. Changed the test to
use 2 instead.
Remove ICU 4.2- test. No one cares.
Felipe Pena [Mon, 4 Jun 2012 23:07:14 +0000 (20:07 -0300)]
- Fixed bug #62227 (Invalid phar stream path causes crash)
Gustavo André dos Santos Lopes [Mon, 4 Jun 2012 08:18:24 +0000 (10:18 +0200)]
Changed XFAILed collator_get_sort_key.phpt
Ressurected and limited to ICU 4.8 in the hope that the sort keys
will remain stable in more recent ICU versions. I have only tested
with ICU 4.8 so far.
Felipe Pena [Sun, 3 Jun 2012 22:00:49 +0000 (19:00 -0300)]
Felipe Pena [Sun, 3 Jun 2012 21:16:57 +0000 (18:16 -0300)]
- Optimize comparison between same HashTable pointer
Felipe Pena [Sun, 3 Jun 2012 18:23:07 +0000 (15:23 -0300)]
- Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind)
Jerome Loyet [Fri, 1 Jun 2012 09:18:48 +0000 (11:18 +0200)]
- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
Jerome Loyet [Fri, 1 Jun 2012 09:16:53 +0000 (11:16 +0200)]
- fix missing include for unix sockets
Jerome Loyet [Fri, 1 Jun 2012 09:16:00 +0000 (11:16 +0200)]
- Comment unused function to avoid warnings
Xinchen Hui [Fri, 1 Jun 2012 06:55:14 +0000 (14:55 +0800)]
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
Stanislav Malyshev [Tue, 29 May 2012 01:54:15 +0000 (18:54 -0700)]
fix unchecked emalloc
(cherry picked from commit
158d8a6b088662ce9d31e0c777c6ebe90efdc854 )
Jille Timmermans [Tue, 29 May 2012 13:44:04 +0000 (15:44 +0200)]
Typofix in comment in proc_open.c
Stanislav Malyshev [Thu, 24 May 2012 18:54:51 +0000 (13:54 -0500)]
fix CVE-2012-2143
Anatoliy Belsky [Tue, 29 May 2012 15:38:30 +0000 (17:38 +0200)]
updated the libmagic patch after Felipes regex fix
Matt Ficken [Tue, 29 May 2012 14:38:57 +0000 (16:38 +0200)]
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Matt Ficken [Tue, 29 May 2012 14:37:19 +0000 (16:37 +0200)]
Bug #62177 deactivate the linux test version on win
Matt Ficken [Tue, 29 May 2012 14:31:47 +0000 (16:31 +0200)]
Fix bug #62177 Test Bug - finfo_file_regex.phpt
Matt Ficken [Tue, 29 May 2012 09:41:44 +0000 (11:41 +0200)]
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
Nuno Lopes [Mon, 28 May 2012 00:13:09 +0000 (20:13 -0400)]
sync with HEAD
Jerome Loyet [Sat, 26 May 2012 17:36:01 +0000 (19:36 +0200)]
Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
Jerome Loyet [Sat, 26 May 2012 17:27:02 +0000 (19:27 +0200)]
Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
Jerome Loyet [Sat, 26 May 2012 16:44:35 +0000 (18:44 +0200)]
- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
Jerome Loyet [Sat, 26 May 2012 16:22:12 +0000 (18:22 +0200)]
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
Jerome Loyet [Sat, 26 May 2012 15:37:33 +0000 (17:37 +0200)]
- add missing headers to avoid warnings
Jerome Loyet [Fri, 25 May 2012 19:21:44 +0000 (21:21 +0200)]
- Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
Jerome Loyet [Fri, 25 May 2012 19:10:17 +0000 (21:10 +0200)]
- Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
Xinchen Hui [Fri, 25 May 2012 14:31:26 +0000 (22:31 +0800)]
Fixed bug #62128 superfluous ";"
Matt Ficken [Fri, 25 May 2012 08:44:59 +0000 (10:44 +0200)]
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
Matt Ficken [Fri, 25 May 2012 08:34:33 +0000 (10:34 +0200)]
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
Matt Ficken [Fri, 25 May 2012 07:53:51 +0000 (09:53 +0200)]
Fixed bug #62147 test bug - popen_pclose_basic-win32
Johannes Schlüter [Thu, 24 May 2012 22:22:25 +0000 (00:22 +0200)]
Fix bug #62146 com_dotnet cannot be built shared, tested by Anatoliy
Johannes Schlüter [Thu, 24 May 2012 22:20:29 +0000 (00:20 +0200)]
Those changes are in 5.3.15
Felipe Pena [Thu, 24 May 2012 16:45:36 +0000 (13:45 -0300)]
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Felipe Pena [Thu, 24 May 2012 16:45:03 +0000 (13:45 -0300)]
- BFN
Felipe Pena [Thu, 24 May 2012 16:42:47 +0000 (13:42 -0300)]
- Fixed magic file regex support