From: Sascha Schumann <sas@php.net>
Date: Sun, 27 Aug 2000 20:51:30 +0000 (+0000)
Subject: sizeof(old_cwd) evaluated to sizeof(char *) after last commit, so old_cwd
X-Git-Tag: php-4.0.2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e783d75ed31f7a9daf8b529d077e7739cbb25de9;p=php

sizeof(old_cwd) evaluated to sizeof(char *) after last commit, so old_cwd
was not set correctly.
---

diff --git a/main/main.c b/main/main.c
index f22693b7de..4d0e8e7257 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1132,8 +1132,8 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
 			return;
 		}
 	}
-
-	old_cwd = do_alloca(4096);
+#define OLD_CWD_SIZE 4096
+	old_cwd = do_alloca(OLD_CWD_SIZE);
 	old_cwd[0] = '\0';
 
 	if (setjmp(EG(bailout))!=0) {
@@ -1149,7 +1149,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
 
 	if (primary_file->type == ZEND_HANDLE_FILENAME 
 			&& primary_file->filename) {
-		V_GETCWD(old_cwd, sizeof(old_cwd)-1);
+		V_GETCWD(old_cwd, OLD_CWD_SIZE-1);
 		V_CHDIR_FILE(primary_file->filename);
 	}