summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix #78876: Long variables cause OOM and temp files are not cleanedphp-7.3.18PHP-7.3.18Christoph M. Becker2020-05-122-3/+5
| | | | | | We use the proper type for size calculations, which is `size_t`. (cherry picked from commit 3c8582ca4b8e84e5647220b647914876d2c3b124)
* Fix #78875: Long filenames cause OOM and temp files are not cleanedChristoph M. Becker2020-05-122-2/+5
| | | | | | | | We must not cast `size_t` to `int` (unless the `size_t` value is guaranteed to be less than or equal to `INT_MAX`). In this case we can declare `array_len` as `size_t` in the first place. (cherry picked from commit 1c9bd513ac5c7c1d13d7f0dfa7c16a7ad2ce0f87)
* Bump versionChristoph M. Becker2020-05-124-11/+9
|
* Fix #79528: Different object of the same xml between 7.4.5 and 7.4.4Christoph M. Becker2020-05-016-108/+13
| | | | | | | | Revert "Fix #61597: SXE properties may lack attributes and content" This reverts commit 7c081db885756d7b176a55b90b8746f664d1e042. (cherry picked from commit 54148fd68677e8b13b5a11c309c601d1248fb78b)
* Prepare for 7.3.18RC1php-7.3.18RC1Christoph M. Becker2020-04-284-9/+7
|
* Bump versionChristoph M. Becker2020-04-284-6/+8
|
* Fix #79470: PHP incompatible with 3rd party file system on demandChristoph M. Becker2020-04-272-1/+15
| | | | | We add support for Activision HSM (`IO_REPARSE_TAG_ACTIVISION_HSM`) and VFS for Git (`IO_REPARSE_TAG_PROJFS`). The latter fixes bug #78784.
* Updated to version 2020.1 (2020a)Derick Rethans2020-04-241-792/+830
|
* Add additional preg_match test caseGraham Campbell2020-04-231-0/+35
| | | | | (cherry picked from commit a1a044dcc74379fafb2b63db5ab033aa062aada7 on author's explicit request)
* Fix #79503: Memory leak on duplicate metadataChristoph M. Becker2020-04-224-0/+27
| | | | | Duplicate metadata can only happen if someone tampers with the phar, so we can and should treat that as error.
* Fix #79491: Search for .user.ini extends up to root dirChristoph M. Becker2020-04-202-3/+6
| | | | | | | | | | The `start` parameter of `php_cgi_ini_activate_user_config` is supposed to hold the byte offset of the doc root in the given `path`. However, the current expression which fixes a potential type incompatibility will ever only evaluate to zero or one, because it uses the *logical* and operator (`&&`). Furthermore we notice that subtracting one from `doc_root_len` is not necessary, so there is even no need for the `start` parameter at all.
* Apply doc root fix for FPMNikita Popov2020-04-201-3/+3
| | | | | | This is the change from GH-5417 but for FPM. This was stripping the last character from the doc_root. Given how it is used, this should be harmless, but let's make it less confusing...
* Fix #79497: Fix php_openssl_subtract_timeval()Joe Cai2020-04-202-2/+6
| | | | | | | | | I stumbled upon this while debugging a strange issue with stream_socket_client() where it randomly throws out errors when the connection timeout is set to below 1s. The logic to calculate time difference in php_openssl_subtract_timeval() is wrong when a.tv_usec < b.tv_usec, causing connection errors before the timeout is reached.
* zend_timeout() may access EX(opline)Dmitry Stogov2020-04-172-2/+2
|
* Fix MySQL local infile / attr handling on big endian systemsguirish2020-04-164-12/+12
| | | | | | Make sure pointer types match what is used by libmysql everywhere. Closes GH-5380.
* Fixed bug #79477Nikita Popov2020-04-153-1/+22
| | | | Make sure to deindirect properties when creating array.
* Add missing CVEChristoph M. Becker2020-04-141-1/+1
|
* Merge branch 'PHP-7.2' into PHP-7.3Sara Golemon2020-04-140-0/+0
|\ | | | | | | | | | | * PHP-7.2: Fixed bug #79468 NEWS
| * Fixed bug #79468dinosaur2020-04-143-0/+29
| | | | | | | | Close the stream filter resources when removing them from the stream.
| * NEWSSara Golemon2020-04-141-0/+3
| |
* | Don't leak peername if accept failsNikita Popov2020-04-141-0/+3
| | | | | | | | Even if the accept fails, the peername may be populated.
* | Fix test casesChristoph M. Becker2020-04-142-2/+2
| |
* | Fixed bug #79468dinosaur2020-04-143-0/+31
| | | | | | | | Close the stream filter resources when removing them from the stream.
* | Add NEWS entries [ci skip]Christoph M. Becker2020-04-141-0/+2
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2020-04-132-2/+11
|\ \ | |/ | | | | | | | | * PHP-7.2: Fix bug #79465 - use unsigneds as indexes. Fix bug #79330 - make all execution modes consistent in rejecting \0
| * Fix bug #79465 - use unsigneds as indexes.Stanislav Malyshev2020-04-131-2/+2
| |
| * Fix bug #79330 - make all execution modes consistent in rejecting \0Stanislav Malyshev2020-04-131-0/+9
| |
* | Fix memory leak introduced by fixing bug #78221Christoph M. Becker2020-04-081-2/+9
| | | | | | | | | | | | | | | | | | | | We have to free the retrieved text content; to keep the code readable, we extract a helper function to check for empty nodes. Unfortunately, we cannot use xmlIsBlankNode(), because that also recognizes whitespace only text content. We also make sure to properly handle NULL returns from xmlNodeGetContent().
* | Revert "Went to fast and forgot to update tests"George Peter Banyard2020-04-073-16/+32
| | | | | | | | This reverts commit 656eac74fa6074aebc087bb73d2e4651f7dc8c9e.
* | Revert "Fix Bug #79448 0 is a valid Unicode codepoint, but ↵George Peter Banyard2020-04-072-12/+1
| | | | | | | | | | | | | | | | | | mb_substitute_character(0) fails" This commit brings some substantial changes in behaviour due to the weird implementation. This will be fixed in master due to BC concerns. This reverts commit 1333b46d6dc0c293c1fd626803f91bc69743eb79.
* | Fix #78221: DOMNode::normalize() doesn't remove empty text nodesChristoph M. Becker2020-04-073-0/+29
| | | | | | | | | | If a text node is not followed by another text node, we remove it, if its textContent is empty.
* | Went to fast and forgot to update testsGeorge Peter Banyard2020-04-033-32/+16
| | | | | | | | However due to the really lax conversion to integer all strings pass as 0
* | Fix Bug #79448 0 is a valid Unicode codepoint, but ↵George Peter Banyard2020-04-032-1/+12
| | | | | | | | mb_substitute_character(0) fails
* | Fix incorrect free for last_messageQianqian Bu2020-04-031-1/+1
| | | | | | | | | | | | | | | | In commit a7305eb539596e175bd6c3ae9a20953358c5d677 the last_message field of the connection object was changed to be always non-persistent. But there is a place on change_user path that still treats it depending on conn->persistent flag. This will cause PHP crash after com_change_user success when there is last_message set
* | Fixed bug #79434Nikita Popov2020-04-023-14/+26
| |
* | Fix literal compaction collision between string and doubleNikita Popov2020-04-012-3/+8
| | | | | | | | | | For the sake of simplicity I'm using a separate hashtable, rather than trying to do hash perturabation on the double strings.
* | Add NEWS entryc [ci skip]Christoph M. Becker2020-04-011-0/+4
| |
* | Fix bug 79441George Peter Banyard2020-04-013-4/+17
| |
* | Next is 7.3.18Christoph M. Becker2020-03-314-6/+8
| |
* | Fix #79413: session_create_id() fails for active sessionsChristoph M. Becker2020-03-314-3/+21
| | | | | | | | | | | | | | | | | | The comment on `PS_VALIDATE_SID_FUNC(files)` is very clear that the function is supposed to return `SUCCESS` if the session already exists. So to detect a collision, we have to check for `SUCCESS`, not `FAILURE`. We also fix the wrong condition in session_regenerate_id() as well.
* | Fix #79427: Integer Overflow in shmop_open()Christoph M. Becker2020-03-302-0/+8
| | | | | | | | | | | | If `shm.shm_segsz > ZEND_LONG_MAX` the assignment to `shmop->size` a few lines below would overflow, so we catch that early and bail out if necessary.
* | Fix #79424 ext/zip: don't use gl_pathc after call to globfreeMax Rees2020-03-292-1/+4
| | | | | | | | | | This breaks on Linux with the musl libc, since it zeroes out gl_pathc during globfree.
* | Add missing 'skip' to bug79332.phpt skip messageLukas Berger2020-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The skip message must start with the word 'skip', otherwise the test will not be skipped. *Before:* Running selected tests. TEST 1/1 [ext/com_dotnet/tests/bug79332.phpt] ========DIFF======== 001+ Fatal error: Uncaught Error: Class 'COMPersistHelper' not found in /srv/php/ext/com_dotnet/tests/bug79332.php:2 001- A com_exception has been thrown 002+ Stack trace: 003+ #0 {main} 004+ thrown in /srv/php/ext/com_dotnet/tests/bug79332.php on line 2 ========DONE======== FAIL Bug #79332 (php_istreams are never freed) [ext/com_dotnet/tests/bug79332.phpt] *After:* Running selected tests. SKIP Bug #79332 (php_istreams are never freed) [ext/com_dotnet/tests/bug79332.phpt] reason: com_dotnet extension not available
* | Fixed bug #79412 (Opcache chokes and uses 100% CPU on specific script).Dmitry Stogov2020-03-253-3/+45
| |
* | Fix bug #79410 (system() swallows last chunk if it is exactly 4095 bytes ↵Christian Schneider2020-03-253-0/+21
| | | | | | | | | | | | without newline) Closes GH-5292.
* | Add test fileNikita Popov2020-03-231-0/+19
| | | | | | | | Forgot the git add again...
* | Handle NULL caller_call_oplineNikita Popov2020-03-234-6/+16
| | | | | | | | | | This can happen if there is an EXIT in the call arguments, in which case the DO_CALL opcode may be eliminated as unreachable.
* | Fix test for WindowsChristoph M. Becker2020-03-231-1/+1
| | | | | | | | | | Windows filenames may very well contain a colon, so we adjust the test accordingly.
* | Fix #79200: Some iconv functions cut Windows-1258Christoph M. Becker2020-03-233-38/+68
| | | | | | | | | | | | | | | | | | | | | | To cater to potentially state-dependent encodings, we have to reset the conversion descriptor into its initial shift state to properly finish the conversion. Furthermore, state-dependent encodings may not show progress when comparing `in_left` before and after the conversion; we rather have to see whether `out_left` has decreased. Also we have to cater to the fact that the final potentially state resetting call does not signal failure, but we still have to break respective loops afterwards.
* | Fix #79393: Null coalescing operator failing with SplFixedArrayChristoph M. Becker2020-03-233-13/+31
| | | | | | | | | | | | | | We favor the KISS principle over optimization[1] – SPL is already special enough. [1] <https://github.com/php/php-src/pull/2489/commits/352f3d4476a79bb86136b431719df7394e5a8d4e#r112498098>ff