]> granicus.if.org Git - php/commitdiff
fix crash for bug #47627
authorStanislav Malyshev <stas@php.net>
Tue, 13 Oct 2009 19:58:59 +0000 (19:58 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 13 Oct 2009 19:58:59 +0000 (19:58 +0000)
main/main.c

index 8ef3d593afb8681e9b9b8a638909d5f41b2f316b..14c6559cb756562963222a2fee9f11df89974510 100644 (file)
@@ -2283,7 +2283,9 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                char realfile[MAXPATHLEN];
 
 #ifdef PHP_WIN32
-               UpdateIniFromRegistry(primary_file->filename TSRMLS_CC);
+               if(primary_file->filename) {
+                       UpdateIniFromRegistry(primary_file->filename TSRMLS_CC);
+               }
 #endif
 
                PG(during_request_startup) = 0;
@@ -2372,7 +2374,9 @@ PHPAPI int php_execute_simple_script(zend_file_handle *primary_file, zval **ret
 
        zend_try {
 #ifdef PHP_WIN32
-               UpdateIniFromRegistry(primary_file->filename TSRMLS_CC);
+               if(primary_file->filename) {
+                       UpdateIniFromRegistry(primary_file->filename TSRMLS_CC);
+               }
 #endif
 
                PG(during_request_startup) = 0;