Merge branch 'PHP-8.2'

Girgias · Girgias · commit 3fe8b090d330 · 2023-01-25T00:12:32.000Z
* PHP-8.2:
  Fix incorrect check in zend_internal_call_should_throw()
  Fix incorrect check in cs_8559_5 in map_from_unicode()
  Fix incorrect page_size check
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1228,7 +1228,7 @@ static zend_never_inline ZEND_ATTRIBUTE_UNUSED bool zend_verify_internal_arg_typ
  * trust that arginfo matches what is enforced by zend_parse_parameters. */
 ZEND_API bool zend_internal_call_should_throw(zend_function *fbc, zend_execute_data *call)
 {
-	if (fbc->internal_function.handler == ZEND_FN(pass) || (fbc->internal_function.fn_flags | ZEND_ACC_FAKE_CLOSURE)) {
+	if (fbc->internal_function.handler == ZEND_FN(pass) || (fbc->internal_function.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {
 		/* Be lenient about the special pass function and about fake closures. */
 		return 0;
 	}
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3212,7 +3212,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
`@@ -1228,7 +1228,7 @@ static zend_never_inline ZEND_ATTRIBUTE_UNUSED bool zend_verify_internal_arg_typ`
`1228`	`1228`	`* trust that arginfo matches what is enforced by zend_parse_parameters. */`
`1229`	`1229`	`ZEND_API bool zend_internal_call_should_throw(zend_function fbc, zend_execute_data call)`
`1230`	`1230`	`{`
`1231`		`- if (fbc->internal_function.handler == ZEND_FN(pass) \|\| (fbc->internal_function.fn_flags \| ZEND_ACC_FAKE_CLOSURE)) {`
	`1231`	`+ if (fbc->internal_function.handler == ZEND_FN(pass) \|\| (fbc->internal_function.fn_flags & ZEND_ACC_FAKE_CLOSURE)) {`
`1232`	`1232`	`/* Be lenient about the special pass function and about fake closures. */`
`1233`	`1233`	`return 0;`
`1234`	`1234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3212,7 +3212,7 @@ static zend_result accel_post_startup(void)`
`3212`	`3212`	`size_t page_size;`
`3213`	`3213`
`3214`	`3214`	`page_size = zend_get_page_size();`
`3215`		`- if (!page_size && (page_size & (page_size - 1))) {`
	`3215`	`+ if (!page_size \|\| (page_size & (page_size - 1))) {`
`3216`	`3216`	`zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - can't get page size.");`
`3217`	`3217`	`abort();`
`3218`	`3218`	`}`