cvs: php4 /main main.c
| From: | Sascha Schumann | Date: | Sun, 27 Aug 2000 20:51:30 +0000 |
| Subject: | cvs: php4 /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1427@lists.php.net to get a copy of this message | ||
sas Sun Aug 27 13:51:30 2000 EDT
Modified files:
/php4/main main.c
Log:
sizeof(old_cwd) evaluated to sizeof(char *) after last commit, so old_cwd
was not set correctly.
Index: php4/main/main.c
diff -u php4/main/main.c:1.302 php4/main/main.c:1.303
--- php4/main/main.c:1.302 Sun Aug 27 12:56:22 2000
+++ php4/main/main.c Sun Aug 27 13:51:30 2000
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.302 2000/08/27 19:56:22 andi Exp $ */
+/* $Id: main.c,v 1.303 2000/08/27 20:51:30 sas Exp $ */
#include <stdio.h>
@@ -1132,8 +1132,8 @@
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 @@
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);
}