cvs: php-src(PHP_5_1) /main main.c
| From: | Sara Golemon | Date: | Thu, 09 Mar 2006 20:32:23 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37207@lists.php.net to get a copy of this message | ||
pollita Thu Mar 9 20:32:23 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
Log:
MFH: Move temporary local storage of primary file's realpath up one block to ensure it stays
on the stack.
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.16&r2=1.640.2.17&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.16 php-src/main/main.c:1.640.2.17
--- php-src/main/main.c:1.640.2.16 Sun Feb 26 10:49:51 2006
+++ php-src/main/main.c Thu Mar 9 20:32:22 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.16 2006/02/26 10:49:51 helly Exp $ */
+/* $Id: main.c,v 1.640.2.17 2006/03/09 20:32:22 pollita Exp $ */
/* {{{ includes
*/
@@ -1662,6 +1662,8 @@
#endif
zend_try {
+ char realfile[MAXPATHLEN];
+
#ifdef PHP_WIN32
UpdateIniFromRegistry(primary_file->filename TSRMLS_CC);
#endif
@@ -1680,7 +1682,6 @@
}
if (primary_file->filename) {
- char realfile[MAXPATHLEN];
int realfile_len;
int dummy = 1;
if (VCWD_REALPATH(primary_file->filename, realfile)) {