1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

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

We must not assume that any `VARIANT` implements `IDispatch`.

Closes GH-16992.
This commit is contained in:
Christoph M. Becker
2024-11-29 15:06:32 +01:00
parent 69765d9220
commit 9bae8933a3
3 changed files with 15 additions and 1 deletions

4
NEWS
View File

@@ -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

View File

@@ -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;

View File

@@ -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