- Merge: fix crash for bug #47627

diff --git a/main/main.c b/main/main.c
index 815fb9cb5c617b82e6f22587658ffb0863e2a941..9e7cc2fe20d96a619e2640aec5d6cc5088c0d48e 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -2162,7 +2162,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;
@@ -2252,7 +2254,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;

diff --git a/win32/registry.c b/win32/registry.c
index d5f84af59546ef3243ea9e702eb80085d77e9c3b..77089ba6a72f237b6a5fb59267ce46eba789e26e 100644 (file)
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -168,6 +168,10 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC)
        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);