Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-16991: Getting typeinfo of non DISPATCH variant segfaults

Author: cmb69

NEWS

@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed jdtogregorian overflow. (David Carlier)
   . Fixed cal_to_jd julian_days argument overflow. (David Carlier)
 
+- COM:
+  . Fixed bug GH-16991 (Getting typeinfo of non DISPATCH variant segfaults).
+    (cmb)
+
 - Core:
   . Fail early in *nix configuration build script. (hakre)
   . Fixed bug GH-16727 (Opcache bad signal 139 crash in ZTS bookworm

ext/com_dotnet/com_typeinfo.c

@@ -331,7 +331,7 @@ ITypeInfo *php_com_locate_typeinfo(zend_string *type_lib_name, php_com_dotnet_ob
 			if (obj->typeinfo) {
 				ITypeInfo_AddRef(obj->typeinfo);
 				return obj->typeinfo;
-			} else {
+			} else if (V_VT(&obj->v) == VT_DISPATCH) {
 				IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &typeinfo);
 				if (typeinfo) {
 					return typeinfo;

ext/com_dotnet/tests/gh16991.phpt

@@ -0,0 +1,10 @@
+--TEST--
+GH-16991 (Getting typeinfo of non DISPATCH variant segfaults)
+--EXTENSIONS--
+com_dotnet
+--FILE--
+<?php
+com_print_typeinfo(new variant("hello"));
+?>
+--EXPECTF--
+Warning: com_print_typeinfo(): Unable to find typeinfo using the parameters supplied in %s on line %d