php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source 
* PHP-8.4:
  Fix GH-16991: Getting typeinfo of non DISPATCH variant segfaults
This commit is contained in:
Christoph M. Becker
2024-11-29 16:32:36 +01:00
parent e8154c6c7d 8ea042d954
commit 38a28993fc
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/com_dotnet/com_typeinfo.c
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;

10
ext/com_dotnet/tests/gh16991.phpt Normal file
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