- Fixed crash in com_print_typeinfo when an invalid typelib is given

diff --git a/NEWS b/NEWS
index ad35a7ab97f3547e3193d173123183c5025ab8e2..f77091ea0d8bdffee2045144fafa51194d6ee52d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.3.1 RC3
+- Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
+
 - Fixed bug #49986 (Missing ICU DLLs on windows package). (Pierre)
 - Fixed bug #48752 (Crash during date parsing with invalid date). (Pierre)
 

diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c
index 90a21860ca92efd94045c5a7c3249ef4c9279342..772f1f30a0be5d6a0d6403c2094d33b4908a358d 100644 (file)
--- a/ext/com_dotnet/com_typeinfo.c
+++ b/ext/com_dotnet/com_typeinfo.c
@@ -309,7 +309,7 @@ ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj
                }
        } else if (typelibname) {
                /* Fetch the typelibrary and use that to look things up */
-               typelib = php_com_load_typelib(typelibname, obj->code_page TSRMLS_CC);
+               typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP TSRMLS_CC);
        } 
 
        if (!gotguid && dispname && typelib) {