[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/registry.c trunk/win32/registry.c

[Stanislav Malyshev]

stas                                     Tue, 13 Oct 2009 20:10:07 +0000

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

Log:
add safeguard for UpdateIniFromRegistry on NULL arg

Changed paths:
    U   php/php-src/branches/PHP_5_3/win32/registry.c
    U   php/php-src/trunk/win32/registry.c

Modified: php/php-src/branches/PHP_5_3/win32/registry.c
===================================================================
--- php/php-src/branches/PHP_5_3/win32/registry.c       2009-10-13 19:58:59 UTC 
(rev 289621)
+++ php/php-src/branches/PHP_5_3/win32/registry.c       2009-10-13 20:10:07 UTC 
(rev 289622)
@@ -168,6 +168,10 @@
        int path_len;
        HashTable **pht;

+       if(!path) {
+               return;
+       }
+
        if (!PW32G(registry_directories)) {
                PW32G(registry_directories) = 
(HashTable*)malloc(sizeof(HashTable));
                zend_hash_init(PW32G(registry_directories), 0, NULL, 
delete_internal_hashtable, 1);

Modified: php/php-src/trunk/win32/registry.c
===================================================================
--- php/php-src/trunk/win32/registry.c  2009-10-13 19:58:59 UTC (rev 289621)
+++ php/php-src/trunk/win32/registry.c  2009-10-13 20:10:07 UTC (rev 289622)
@@ -168,6 +168,10 @@
        int path_len;
        HashTable **pht;

+       if(!path) {
+               return;
+       }
+
        if (!PW32G(registry_directories)) {
                PW32G(registry_directories) = 
(HashTable*)malloc(sizeof(HashTable));
                zend_hash_init(PW32G(registry_directories), 0, NULL, 
delete_internal_hashtable, 1);


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