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

Merge branch 'PHP-7.4' into PHP-8.0

Browse Source 
* PHP-7.4:
  Fix #81283: shmop can't read beyond 2147483647 bytes
This commit is contained in:
Christoph M. Becker
2021-07-23 17:49:24 +02:00
parent 90ee1c36d7 387c0de983
commit 71879d385e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -27,6 +27,9 @@ PHP NEWS
. Fixed bug #81226 (Integer overflow behavior is different with JIT
enabled). (Dmitry)
- Shmop:
. Fixed bug #81283 (shmop can't read beyond 2147483647 bytes). (cmb, Nikita)
- Standard:
. Fixed bug #72146 (Integer overflow on substr_replace). (cmb)
. Fixed bug #81265 (getimagesize returns 0 for 256px ICO images).

2
ext/shmop/shmop.c
View File

@@ -241,7 +241,7 @@ PHP_FUNCTION(shmop_read)
RETURN_THROWS();
}
if (count < 0 || start > (INT_MAX - count) || start + count > shmop->size) {
if (count < 0 || start > (ZEND_LONG_MAX - count) || start + count > shmop->size) {
zend_argument_value_error(3, "is out of range");
RETURN_THROWS();
}