- Fixed crash in com_print_typeinfo when an invalid typelib is given

diff --git a/NEWS b/NEWS
index 173416f063a22773973a5675c0c07d71aec63365..85f2a2370732a3a06ec1bfe9f2a465377319cc6a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Introduced a max_file_uploads INI setting, which is set to limit the
   number of file uploads per-request to 100 by default, to prevent possible
   DOS via temporary file exhaustion. (Ilia)
+
+- Fixed crash in com_print_typeinfo when an invalid typelib is given
 - Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.  
   (Rasmus)
 - Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz 

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) {