iliaa Tue Dec 20 14:28:03 2005 EDT
Modified files: (Branch: PHP_4_4)
/TSRM tsrm_virtual_cwd.c tsrm_config_common.h
/php-src/main php.h
Log:
MFH: Fixed bug #31347 (is_dir and is_file (incorrectly) return true for any
string greater then 255 characters).
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.41.2.11.2.2&r2=1.41.2.11.2.3&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.41.2.11.2.2
TSRM/tsrm_virtual_cwd.c:1.41.2.11.2.3
--- TSRM/tsrm_virtual_cwd.c:1.41.2.11.2.2 Wed Aug 3 14:51:24 2005
+++ TSRM/tsrm_virtual_cwd.c Tue Dec 20 14:28:03 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.41.2.11.2.2 2005/08/03 14:51:24 hyanantha Exp $
*/
+/* $Id: tsrm_virtual_cwd.c,v 1.41.2.11.2.3 2005/12/20 14:28:03 iliaa Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -700,7 +700,9 @@
int retval;
CWD_STATE_COPY(&new_state, &CWDG(cwd));
- virtual_file_ex(&new_state, path, NULL, 1);
+ if (virtual_file_ex(&new_state, path, NULL, 1)) {
+ return -1;
+ }
retval = stat(new_state.cwd, buf);
http://cvs.php.net/viewcvs.cgi/TSRM/tsrm_config_common.h?r1=1.9.2.4&r2=1.9.2.4.2.1&diff_format=u
Index: TSRM/tsrm_config_common.h
diff -u TSRM/tsrm_config_common.h:1.9.2.4 TSRM/tsrm_config_common.h:1.9.2.4.2.1
--- TSRM/tsrm_config_common.h:1.9.2.4 Fri Feb 11 03:34:04 2005
+++ TSRM/tsrm_config_common.h Tue Dec 20 14:28:03 2005
@@ -42,6 +42,8 @@
#ifndef MAXPATHLEN
# ifdef PATH_MAX
# define MAXPATHLEN PATH_MAX
+# elif defined(MAX_PATH)
+# define MAXPATHLEN MAX_PATH
# else
# define MAXPATHLEN 256
# endif
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.178.2.14.2.2&r2=1.178.2.14.2.3&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.178.2.14.2.2 php-src/main/php.h:1.178.2.14.2.3
--- php-src/main/php.h:1.178.2.14.2.2 Wed Jul 27 10:26:25 2005
+++ php-src/main/php.h Tue Dec 20 14:28:03 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.178.2.14.2.2 2005/07/27 10:26:25 hyanantha Exp $ */
+/* $Id: php.h,v 1.178.2.14.2.3 2005/12/20 14:28:03 iliaa Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -232,6 +232,8 @@
#ifndef MAXPATHLEN
# ifdef PATH_MAX
# define MAXPATHLEN PATH_MAX
+# elif defined(MAX_PATH)
+# define MAXPATHLEN MAX_PATH
# else
# define MAXPATHLEN 256 /* Should be safe for any weird systems that do
not define it */
# endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
