Merge branch 'PHP-8.1' into PHP-8.2

Girgias · Girgias · commit 0d9bf101c4aa · 2023-01-25T00:10:56.000Z
* PHP-8.1:
  Fix incorrect check in cs_8559_5 in map_from_unicode()
  Fix incorrect page_size check
diff --git a/NEWS b/NEWS
@@ -12,13 +12,19 @@ PHP                                                                        NEWS
 - GMP:
   . Properly implement GMP::__construct(). (nielsdos)
 
+- Opcache:
+  . Fix incorrect page_size check. (nielsdos)
+
 - Random:
   . Fix GH-10390 (Do not trust arc4random_buf() on glibc). (timwolla)
   . Fix GH-10292 (Made the default value of the first param of srand() and
     mt_srand() unknown). (kocsismate)
 
 - Standard:
   - Fixed bug GH-8086 (Introduce mail.mixed_lf_and_crlf INI). (Jakub Zelenka)
+  . Fixed bug GH-10292 (Made the default value of the first param of srand() and
+    mt_srand() unknown). (kocsismate)
+  . Fix incorrect check in cs_8559_5 in map_from_unicode(). (nielsdos)
 
 02 Feb 2023, PHP 8.2.2
 
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3205,7 +3205,7 @@ static zend_result accel_post_startup(void)
 			size_t page_size;
 
 			page_size = zend_get_page_size();
-			if (!page_size && (page_size & (page_size - 1))) {
+			if (!page_size || (page_size & (page_size - 1))) {
 				zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - can't get page size.");
 				abort();
 			}
diff --git a/ext/standard/html.c b/ext/standard/html.c
@@ -477,7 +477,7 @@ static inline int map_from_unicode(unsigned code, enum entity_charset charset, u
 			*res = 0xF0; /* numero sign */
 		} else if (code == 0xA7) {
 			*res = 0xFD; /* section sign */
-		} else if (code >= 0x0401 && code <= 0x044F) {
+		} else if (code >= 0x0401 && code <= 0x045F) {
 			if (code == 0x040D || code == 0x0450 || code == 0x045D)
 				return FAILURE;
 			*res = code - 0x360;
diff --git a/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt b/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt
@@ -358,47 +358,47 @@ CYRILLIC SMALL LETTER YA: &#x44F; => ef
 NUMERO SIGN: &#x2116; => f0
 &#xF0; => &#xF0;
 
-CYRILLIC SMALL LETTER IO: &#x451; => 2623783435313b
+CYRILLIC SMALL LETTER IO: &#x451; => f1
 &#xF1; => &#xF1;
 
-CYRILLIC SMALL LETTER DJE: &#x452; => 2623783435323b
+CYRILLIC SMALL LETTER DJE: &#x452; => f2
 &#xF2; => &#xF2;
 
-CYRILLIC SMALL LETTER GJE: &#x453; => 2623783435333b
+CYRILLIC SMALL LETTER GJE: &#x453; => f3
 &#xF3; => &#xF3;
 
-CYRILLIC SMALL LETTER UKRAINIAN IE: &#x454; => 2623783435343b
+CYRILLIC SMALL LETTER UKRAINIAN IE: &#x454; => f4
 &#xF4; => &#xF4;
 
-CYRILLIC SMALL LETTER DZE: &#x455; => 2623783435353b
+CYRILLIC SMALL LETTER DZE: &#x455; => f5
 &#xF5; => &#xF5;
 
-CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I: &#x456; => 2623783435363b
+CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I: &#x456; => f6
 &#xF6; => &#xF6;
 
-CYRILLIC SMALL LETTER YI: &#x457; => 2623783435373b
+CYRILLIC SMALL LETTER YI: &#x457; => f7
 &#xF7; => &#xF7;
 
-CYRILLIC SMALL LETTER JE: &#x458; => 2623783435383b
+CYRILLIC SMALL LETTER JE: &#x458; => f8
 &#xF8; => &#xF8;
 
-CYRILLIC SMALL LETTER LJE: &#x459; => 2623783435393b
+CYRILLIC SMALL LETTER LJE: &#x459; => f9
 &#xF9; => &#xF9;
 
-CYRILLIC SMALL LETTER NJE: &#x45A; => 2623783435413b
+CYRILLIC SMALL LETTER NJE: &#x45A; => fa
 &#xFA; => &#xFA;
 
-CYRILLIC SMALL LETTER TSHE: &#x45B; => 2623783435423b
+CYRILLIC SMALL LETTER TSHE: &#x45B; => fb
 &#xFB; => &#xFB;
 
-CYRILLIC SMALL LETTER KJE: &#x45C; => 2623783435433b
+CYRILLIC SMALL LETTER KJE: &#x45C; => fc
 &#xFC; => &#xFC;
 
 SECTION SIGN: &#xA7; => fd
 &#xFD; => &#xFD;
 
-CYRILLIC SMALL LETTER SHORT U: &#x45E; => 2623783435453b
+CYRILLIC SMALL LETTER SHORT U: &#x45E; => fe
 &#xFE; => &#xFE;
 
-CYRILLIC SMALL LETTER DZHE: &#x45F; => 2623783435463b
+CYRILLIC SMALL LETTER DZHE: &#x45F; => ff
 &#xFF; => &#xFF;

Original file line number	Diff line number	Diff line change
`@@ -3205,7 +3205,7 @@ static zend_result accel_post_startup(void)`
`3205`	`3205`	`size_t page_size;`
`3206`	`3206`
`3207`	`3207`	`page_size = zend_get_page_size();`
`3208`		`- if (!page_size && (page_size & (page_size - 1))) {`
	`3208`	`+ if (!page_size \|\| (page_size & (page_size - 1))) {`
`3209`	`3209`	`zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - can't get page size.");`
`3210`	`3210`	`abort();`
`3211`	`3211`	`}`