Fix bug #69814 Enabling php_curl, php_mysqli, and php_openssl causes php-cgi to crash

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 330fff187d5ba7bf43aaee3e8c28dfff54dd4187..cc3fff44162950a3a09540e7626c3b6390e485e3 100644 (file)
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -553,6 +553,11 @@ CWD_API char *virtual_getcwd_ex(size_t *length) /* {{{ */
                return retval;
        }
 #endif
+       if (!state->cwd) {
+               *length = 0;
+               return NULL;
+       }
+
        *length = state->cwd_length;
        return estrdup(state->cwd);
 }
@@ -574,6 +579,9 @@ CWD_API char *virtual_getcwd(char *buf, size_t size) /* {{{ */
                errno = ERANGE; /* Is this OK? */
                return NULL;
        }
+       if (!cwd) {
+               return NULL;
+       }
        memcpy(buf, cwd, length+1);
        efree(cwd);
        return buf;