pajoye                                   Tue, 27 Oct 2009 19:16:55 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289996

Log:
- Fixed crash in com_print_typeinfo when an invalid typelib is given

Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c
    U   php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c
    U   php/php-src/branches/PHP_5_3_1/NEWS
    U   php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c
    U   php/php-src/trunk/ext/com_dotnet/com_typeinfo.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-10-27 19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-10-27 19:16:55 UTC (rev 289996)
@@ -6,6 +6,8 @@
 - 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

Modified: php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c  2009-10-27 
19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_2/ext/com_dotnet/com_typeinfo.c  2009-10-27 
19:16:55 UTC (rev 289996)
@@ -309,7 +309,7 @@
                }
        } 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) {

Modified: php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c  2009-10-27 
19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c  2009-10-27 
19:16:55 UTC (rev 289996)
@@ -309,7 +309,7 @@
                }
        } 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) {

Modified: php/php-src/branches/PHP_5_3_1/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3_1/NEWS 2009-10-27 19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_3_1/NEWS 2009-10-27 19:16:55 UTC (rev 289996)
@@ -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)


Modified: php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c
===================================================================
--- php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c        
2009-10-27 19:14:53 UTC (rev 289995)
+++ php/php-src/branches/PHP_5_3_1/ext/com_dotnet/com_typeinfo.c        
2009-10-27 19:16:55 UTC (rev 289996)
@@ -309,7 +309,7 @@
                }
        } 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) {

Modified: php/php-src/trunk/ext/com_dotnet/com_typeinfo.c
===================================================================
--- php/php-src/trunk/ext/com_dotnet/com_typeinfo.c     2009-10-27 19:14:53 UTC 
(rev 289995)
+++ php/php-src/trunk/ext/com_dotnet/com_typeinfo.c     2009-10-27 19:16:55 UTC 
(rev 289996)
@@ -309,7 +309,7 @@
                }
        } 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) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to