php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,646 Commits 547 Branches 1,483 Tags
fed09a23b7af9024ebb4e7c8fb592752425bdc7a
Commit Graph

4091 Commits

Author SHA1 Message Date
Joe Watkins 21f8cd2a92 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #74764 and add a test case
 2018-09-04 11:12:39 +02:00
Ville Hukkamaki 0f724453c0 Fix bug #74764 and add a test case 2018-09-04 11:12:04 +02:00
Anatol Belski 2476fb76a7 Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3 
It would probably be better to remove this test as it's too much
maintanance for a little gain.
 2018-09-04 10:53:35 +02:00
Nikita Popov fcf78dfb89 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 04:55:15 +02:00
Ville Hukkamaki 742783c3ee Fixed bug #73457 
Correctly report errors when opening FTP data connection.
 2018-09-04 04:53:38 +02:00
Christoph M. Becker 1c3d5659bd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Simplify regression test
 2018-08-23 12:49:26 +02:00
Christoph M. Becker 6644bd005f Simplify regression test 
There's no need to actually try to trigger an out-of-memory condition
to proof the leak; instead we can simply rely on the Zend MM to report
the memory leaks in debug mode (at least on Linux).  Therefore we
simplify the regression test, which also makes it run much faster.
 2018-08-23 12:48:09 +02:00
Christoph M. Becker 10661e28d1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Increase memory_limit to prevent test failures
 2018-08-22 14:30:23 +02:00
Christoph M. Becker 5fb01a3a42 Increase memory_limit to prevent test failures 2018-08-22 14:29:28 +02:00
Christoph M. Becker cdd9eb8c4a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76778: array_reduce leaks memory if callback throws exception
 2018-08-22 13:49:35 +02:00
Christoph M. Becker 70b2fca220 Fix #76778: array_reduce leaks memory if callback throws exception 
We have to release the result variable in the error case, too.
 2018-08-22 13:40:24 +02:00
Christoph M. Becker a96ca13963 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76643: Segmentation fault when using `output_add_rewrite_var`
 2018-07-24 12:28:22 +02:00
Christoph M. Becker 40bd84d3e3 Fix #76643: Segmentation fault when using output_add_rewrite_var 
We have to check whether _SERVER is actually an array before we're
going to use it as such.
 2018-07-24 12:20:13 +02:00
Xinchen Hui 2a181b5ea0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #68553 (array_column: null values in $index_key become incrementing keys in result)
 2018-07-24 11:35:22 +08:00
Xinchen Hui 38d97557da Fixed bug #68553 (array_column: null values in $index_key become incrementing keys in result) 2018-07-24 11:34:57 +08:00
Christoph M. Becker 8efd3c3387 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #73817: Incorrect entries in get_html_translation_table
 2018-07-15 23:19:37 +02:00
Christoph M. Becker 0f8c1ee76d Fix #73817: Incorrect entries in get_html_translation_table 
Due to incorrect string termination and length handling, several HTML
entities missed the trailing semicolon.

We also fix the obviously wrong expectations in two already existing
tests.
 2018-07-15 23:06:38 +02:00
Anatol Belski f28aeaee05 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed RecursiveDirectoryIterator with long path or with edge case length
 2018-07-12 19:57:08 +02:00
Anatol Belski 99fe18503a Fixed RecursiveDirectoryIterator with long path or with edge case length 
The search path needs to be appended with the wild card. Till now, an
edge case existed, so then if a path is 259 bytes long, which is smaller
_MAX_PATH, the suffix would cause the final search path to become longer
than _MAX_PATH. It is an edge case, when the starting path happens to
have a specific length. If the starting path was longer than _MAX_PATH
or the addition of "\\*" would not exceed _MAX_PATH, the function was
correct. Except for rewind, which was broken in the case of the long
path.
 2018-07-12 19:49:32 +02:00
Nikita Popov f3dc67b255 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-05 19:11:25 +02:00
Nikita Popov 791f07e4f0 Fix string.strip_tags filter 
Was segfaulting if no allowed tags are specified and performing an
out of bounds read if they were.
 2018-07-05 19:08:00 +02:00
Nikita Popov 3a236d0587 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 17:59:15 +02:00
Nikita Popov 787593b708 Fix test after serialization change 
And move it to a more appropriate location.
 2018-07-02 17:58:26 +02:00
Nikita Popov 09bb2527e9 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 17:29:32 +02:00
Nikita Popov c793885b76 Fixed bug #74670 
Validate that "C" serialization payload is followed by "}" prior to
calling the unserialize() handler. This mitigates issues caused by
unserialize() not correctly handling strings that are not NUL
terminated. Making sure that there is a "}" at the end avoids the
problem.
 2018-07-02 17:27:43 +02:00
Christoph M. Becker e2285eb542 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #71848: getimagesize with $imageinfo returns false
 2018-06-30 16:40:32 +02:00
Christoph M. Becker ae04110032 Fix #71848: getimagesize with $imageinfo returns false 
Some JFIF images contain empty APP segments, i.e. those which consist
only of the marker bytes and the length, but without actual content.
It appears to be doubtful to have empty APP segments, but we should
apply the robustness principle, and accept these, instead of simply
failing in this case.

We choose to add empty APP segments to $imageinfo with an empty string
as value, instead of NULL, or even to omit these segments altogether.

This patch also fixes the potential issue that php_stream_read() might
not read the supposed number of bytes, which could result in garbage to
be added to the read value.
 2018-06-30 16:29:30 +02:00
Xinchen Hui 939e1095f2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
 2018-06-21 17:26:27 +08:00
Xinchen Hui 6531719da5 Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys) 2018-06-21 17:26:05 +08:00
Pedro Magalhães 13e9a471d7 Fix #76300 - Dont attempt to change visibility of a parent private 2018-06-17 15:53:55 -07:00
Stanislav Malyshev 5fbb0988d1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #76390 - do not allow invalid strings in range()
 2018-06-04 22:51:38 -07:00
Stanislav Malyshev 73bf238507 Fix bug #76390 - do not allow invalid strings in range() 2018-06-04 22:44:05 -07:00
Anatol Belski 1228f31cd2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76335 "link(): Bad file descriptor" with non-ASCII path
 2018-05-14 10:44:49 +02:00
Anatol Belski 9b8d8cac04 Fixed bug #76335 "link(): Bad file descriptor" with non-ASCII path 2018-05-14 10:43:11 +02:00
atvoicu 17ed2f21cf Add missing skip prefix for some SKIPIF messages 2018-03-23 18:56:36 +01:00
Anatol Belski 615ca3c99d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync test with newer output
 2018-03-16 18:56:08 +01:00
Anatol Belski dfc07f038b Sync test with newer output 
Czech Republic vs. newer Czechia
 2018-03-16 18:54:55 +01:00
Anatol Belski cf0012dad0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
 2018-03-10 11:20:11 +01:00
Anatol Belski 8417a23973 Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault 2018-03-10 11:18:21 +01:00
Nikita Popov 634a1ff033 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-05 15:32:39 +01:00
Nikita Popov fd5bd37ab1 Revert "Fixed bug #75961 (Strange references behavior)" 
This reverts commit 94e9d0a2ae.

This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.

Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.
 2018-03-05 15:32:21 +01:00
Stanislav Malyshev ab9f9b5d3b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:55 -08:00
Stanislav Malyshev a6f7760d57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:50 -08:00
Stanislav Malyshev dde7a05978 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:26 -08:00
Stanislav Malyshev 523f230c83 Fix bug #75981: prevent reading beyond buffer start 2018-02-26 22:25:51 -08:00
Xinchen Hui 26dda8999c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75961 (Strange references behavior)
 2018-02-17 16:33:39 +08:00
Xinchen Hui 94e9d0a2ae Fixed bug #75961 (Strange references behavior) 2018-02-17 16:33:15 +08:00
Gabriel Caruso 8a3f45f90b Remove getmxrr alias dns_get_mx test 
The test is currently failing, and the same functionality is
already tested (in a better way) in the getmxrr() test.
 2018-02-14 19:00:07 +01:00
Michael Wallner 3ef3f74a65 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix bug #75916 DNS_CAA record results contain garbage
 2018-02-05 09:08:12 +01:00
Michael Wallner 42f2ae0572 fix bug #75916 DNS_CAA record results contain garbage 
It is assumed that DNS_CAA record values are zero terminated,
while its length is defined as (RDATA_LENGTH - tag_length - 2).
 2018-02-05 09:04:07 +01:00