Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix type confusion with session SID constant

Author: ndossche

NEWS

@@ -75,6 +75,9 @@ PHP                                                                        NEWS
 - PHPDBG:
   . Fix crashes in function registration + test. (nielsdos, Girgias)
 
+- Session:
+  . Fix type confusion with session SID constant. (nielsdos)
+
 - SimpleXML:
   . Fixed bug GH-17409 (Assertion failure Zend/zend_hash.c:1730). (nielsdos)
 

ext/session/session.c

@@ -1562,15 +1562,15 @@ PHPAPI zend_result php_session_reset_id(void) /* {{{ */
 		smart_str_appends(&var, ZSTR_VAL(PS(id)));
 		smart_str_0(&var);
 		if (sid) {
-			zval_ptr_dtor_str(sid);
+			zval_ptr_dtor(sid);
 			ZVAL_STR(sid, smart_str_extract(&var));
 		} else {
 			REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s),  CONST_DEPRECATED);
 			smart_str_free(&var);
 		}
 	} else {
 		if (sid) {
-			zval_ptr_dtor_str(sid);
+			zval_ptr_dtor(sid);
 			ZVAL_EMPTY_STRING(sid);
 		} else {
 			REGISTER_STRINGL_CONSTANT("SID", "", 0, CONST_DEPRECATED);

ext/session/tests/SID_type_confusion.phpt

@@ -0,0 +1,19 @@
+--TEST--
+SID constant type confusion
+--EXTENSIONS--
+session
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--INI--
+session.use_cookies=0
+session.use_only_cookies=1
+--FILE--
+<?php
+
+define('SID', [0xdeadbeef]);
+session_start();
+var_dump(SID);
+
+?>
+--EXPECT--
+string(0) ""