php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
134,646 Commits 545 Branches 1,479 Tags
be8589651da52ce132e4e9c4a9c2ebcc23824c94
Commit Graph

134646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
be8589651d Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15652: Segmentation fault in the Zend engine when JIT enabled (#15717)
 2024-09-02 21:55:40 +03:00
Dmitry Stogov
1e78cf941c Fix GH-15652: Segmentation fault in the Zend engine when JIT enabled (#15717) 2024-09-02 21:55:19 +03:00
Ilija Tovilo
d7febabd23 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Backport libmysql build fix (d9a9696)
 2024-09-02 12:09:36 +02:00
Ilija Tovilo
57f9041165 [skip ci] Backport libmysql build fix (d9a9696) 2024-09-02 12:08:55 +02:00
Christoph M. Becker
71b908748a Fix run-tests.php to propagate status code on Windows 
There is now a workaround in `system_with_timeout()` to avoid issues
with quotes and spaces in the filenames of the executable by using
`start`[1].  However, calling `start` will not propagate the process
status of the actual process.  Thus, calling `proc_get_status()`
is pretty meaningless, and especially Microsoft errors cannot be
detected (typically, access violations etc.), and as such no "Termsig"
message is output.

We fix this by executing `exit` after the started command has finished.

[1] <a6d7d5234b/run-tests.php (L1157-L1162)>

Closes GH-15378.
 2024-09-02 00:52:31 +02:00
Christoph M. Becker
a51f54b54b Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15552: Signed integer overflow in ext/standard/scanf.c
 2024-09-01 17:25:18 +02:00
Christoph M. Becker
08841bf79c Fix GH-15552: Signed integer overflow in ext/standard/scanf.c 
We ensure that the argnum `value` is in the allowed range, *before*
mapping it to the `objIndex`, not *afterwards*.

Closes GH-15581.
 2024-09-01 17:24:17 +02:00
Christoph M. Becker
ac4039df20 Mark gd14930.phpt as dynamic xfail 
This test only fails when `NAME_MAX` is defined, which is never the
case on Windows, so we let the test pass there.  This could be extended
to other environments where `NAME_MAX` is not defined.
 2024-09-01 15:04:54 +02:00
Christoph M. Becker
5f504f10dd Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15628: php_stream_memory_get_buffer() not zero-terminated
 2024-09-01 14:56:54 +02:00
Christoph M. Becker
93021c635d Fix GH-15628: php_stream_memory_get_buffer() not zero-terminated 
We're reasonably sure that appending the NUL is not an OOB write, since
the memory stream implementation uses `zend_string` APIs instead of
fiddling with the buffer.

We don't add a regression test because that would require to set up
something in the zend_test extension, and regressions are supposed
to be caught by external consumers of this API, such as mailparse.

Closes GH-15648.
 2024-09-01 14:55:40 +02:00
Niels Dossche
9cb23a3dec Fix GH-15654: Signed integer overflow in ext/dom/nodelist.c 
There's implicit truncation casts from zend_long to int which cause
issues because checks are done against the zend_longs. Since the
iterator infrastructure uses zend_longs, just convert everything to
zend_long.

Closes GH-15669.
 2024-08-31 11:47:08 +02:00
Go Kudo
8ad7d8f1cd Merge branch 'PHP-8.2' into PHP-8.3 2024-08-31 15:57:26 +09:00
Go Kudo
bf9929a26c standard: supress msan (#15665) 2024-08-31 15:56:11 +09:00
David Carlier
d7d40b4c80 Merge branch 'PHP-8.2' into PHP-8.3 2024-08-30 17:17:20 +01:00
David Carlier
7db1a5843f Fix GH-15653: fgetcsv overflow on length parameter. 
close GH-15655
 2024-08-30 17:16:57 +01:00
Dmitry Stogov
b55816e9d1 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Don't set IS_STR_PERMANENT flag for strings stored in the file cache (#15643)
 2024-08-30 01:01:22 +03:00
Dmitry Stogov
afba2010c0 Don't set IS_STR_PERMANENT flag for strings stored in the file cache (#15643) 2024-08-30 00:59:06 +03:00
Dmitry Stogov
bf98023f1a Prevent possible incorrect optimization caused by ZEND_ASSUME() 2024-08-29 23:10:34 +03:00
Dmitry Stogov
c15bb9afe2 Restore error message incorrectly removed by commit 10d43c4 (related to GH-15497) 2024-08-29 16:59:14 +03:00
Dmitry Stogov
17e313ee62 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15497: Opcache with file_cache and JIT enabled crashes (#15635)
 2024-08-29 16:46:56 +03:00
Dmitry Stogov
fd42cdbd0a Fix GH-15497: Opcache with file_cache and JIT enabled crashes (#15635) 2024-08-29 16:46:49 +03:00
Arnaud Le Blanc
0e9e5912c1 [ci skip] NEWS for GH-15330 2024-08-28 17:45:32 +02:00
Arnaud Le Blanc
f551a719dc Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [ci skip] NEWS for GH-15330
  Do not scan generator frames more than once (#15330)
 2024-08-28 17:44:41 +02:00
Arnaud Le Blanc
4db78140a0 [ci skip] NEWS for GH-15330 2024-08-28 17:44:20 +02:00
Arnaud Le Blanc
cd25500766 Do not scan generator frames more than once (#15330) 2024-08-28 17:43:17 +02:00
Peter Kokot
0f487e7d23 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix iconv_open basic test (#15611)
 2024-08-28 14:31:24 +02:00
Peter Kokot
7878a2c322 Fix iconv_open basic test (#15611) 
Transliteration works differently across the iconv implementations and
the system. When using GNU libiconv the output in this test is:
string(16) "Zlutouck'y kun\n"
(like on Windows). On glibc's built-in iconv output is:
string(15) "Zlutoucky kun\n"
 2024-08-28 14:29:49 +02:00
Dmitry Stogov
12b854f91b Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15502: Crash with JIT and Excimer (#15601)
 2024-08-27 21:12:43 +03:00
Dmitry Stogov
eb87de1c87 Fix GH-15502: Crash with JIT and Excimer (#15601) 2024-08-27 21:12:29 +03:00
David Carlier
618edb5e15 Merge branch 'PHP-8.2' into PHP-8.3 2024-08-27 04:57:13 +01:00
David Carlier
cc67220ea3 Fixed GH-15547: curl_multi_wait expects a signed int for timeout. 
confusion might come from the previous argument type.
PHP expects ms so we check it fits integer boundaries before the cast.
raising a warning at least for stable branches.

close GH-15548
 2024-08-27 04:56:32 +01:00
Peter Kokot
5c44610093 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15587: Autotools: fix configure check for aarch64 CRC32 API
 2024-08-25 18:01:33 +02:00
Bernd Kuhls
5947db6bb8 Fix GH-15587: Autotools: fix configure check for aarch64 CRC32 API 
On arm32 bit the check succeeds leading to a build error later on:

/home/autobuild/autobuild/instance-3/output-1/build/php-8.3.10/ext/standard/crc32.c:70:12:
 error: 'armv8-a' does not support feature 'nothing'
   70 | #   pragma GCC target ("+nothing+crc")

Co-authored-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[http://lists.busybox.net/pipermail/buildroot/2024-August/761151.html]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 2024-08-25 18:00:29 +02:00
Niels Dossche
cd6bac7f9f [ci skip] Fix mistake in UPGRADING 2024-08-25 13:19:03 +02:00
Niels Dossche
8da94cfc41 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15565: --disable-ipv6 during compilation produces error EAI_SYSTEM not found
 2024-08-24 14:14:57 +02:00
Niels Dossche
4b6575a1f9 Fix GH-15565: --disable-ipv6 during compilation produces error EAI_SYSTEM not found 
Closes GH-15567.
 2024-08-24 14:14:20 +02:00
Niels Dossche
8a00faa2bb Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15551: Segmentation fault (access null pointer) in ext/dom/xml_common.h
 2024-08-23 19:42:36 +02:00
Niels Dossche
9af574c26e Fix GH-15551: Segmentation fault (access null pointer) in ext/dom/xml_common.h 
Closes GH-15556.
 2024-08-23 19:40:42 +02:00
Jakub Zelenka
70c5e366f6 Revert fix for GH-14930: truncating readdir output (#15533) 2024-08-22 23:41:34 +01:00
Peter Kokot
d5b5e61d80 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix bug GH-15514 (Configure error: genif.sh: syntax error)
 2024-08-21 18:17:58 +02:00
Peter Kokot
48a18e5be7 Fix bug GH-15514 (Configure error: genif.sh: syntax error) 
Autoconf assigns the current suitable shell to SHELL variable. This
notably fixes cases on Solaris 10 when using C shell or KornShell where
genif.sh: syntax error at line 35 occurs due to using the `sh` command.
 2024-08-21 18:16:07 +02:00
Peter Kokot
9e63e20a2c Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15515: Configure error grep illegal option q (#15516)
 2024-08-21 15:54:56 +02:00
Peter Kokot
63841ba7cf Fix GH-15515: Configure error grep illegal option q (#15516) 
On Solaris default grep doesn't support the -q option. In such cases
the grep output can be redirected to /dev/null and the exit status is
checked.
 2024-08-21 15:51:27 +02:00
Go Kudo
89daa8354f zend_max_execution_timer: fix gcc compatibility (#15447) 2024-08-20 16:28:03 +02:00
Christoph M. Becker
3162ddbd84 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Fix NEWS
 2024-08-20 16:20:29 +02:00
Christoph M. Becker
6652a34006 [skip ci] Fix NEWS 2024-08-20 16:17:19 +02:00
Christoph M. Becker
a3dbd39be0 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-15432: Heap corruption when querying a vector
 2024-08-20 15:44:40 +02:00
Christoph M. Becker
b1211c1e4a Fix GH-15432: Heap corruption when querying a vector 
Since the mysqlnd result set is arena allocated, we must not simply
free it, but rather call the appropriate `free_result` method.

Co-authored-by: Kamil Tekiela <tekiela246@gmail.com>
 2024-08-20 15:43:21 +02:00
Christoph M. Becker
093aee63ec Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  zend_max_execution_timer: fix gcc compatibility (#15447)
  [ci skip] fix NEWS
  [ci skip] Update NEWS
 2024-08-20 15:36:26 +02:00
Go Kudo
836e6fa900 zend_max_execution_timer: fix gcc compatibility (#15447) 2024-08-17 05:20:04 +09:00