felipe                                   Wed, 21 Apr 2010 22:22:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298277

Log:
- Fixed bug #51627 (script path not correctly evaluated)
  Patch by: russell dot tempero at rightnow dot com

Bug: http://bugs.php.net/51627 (Open) script path not correctly evaluated
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/main/fopen_wrappers.c
    U   php/php-src/trunk/main/fopen_wrappers.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-04-21 22:06:18 UTC (rev 298276)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-04-21 22:22:31 UTC (rev 298277)
@@ -18,6 +18,8 @@
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)

+- Fixed bug #51627 (script path not correctly evaluated).
+  (russell dot tempero at rightnow dot com)
 - Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML). (Felipe)
 - Fixed bug #51609 (pg_copy_to: Invalid results when using fourth parameter).
   (Felipe)

Modified: php/php-src/branches/PHP_5_3/main/fopen_wrappers.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/fopen_wrappers.c  2010-04-21 22:06:18 UTC 
(rev 298276)
+++ php/php-src/branches/PHP_5_3/main/fopen_wrappers.c  2010-04-21 22:22:31 UTC 
(rev 298277)
@@ -435,8 +435,8 @@
                }
        } else
 #endif
-       if (PG(doc_root) && path_info && (length = strlen(PG(doc_root)) &&
-               IS_ABSOLUTE_PATH(PG(doc_root), length))) {
+       if (PG(doc_root) && path_info && (length = strlen(PG(doc_root))) &&
+               IS_ABSOLUTE_PATH(PG(doc_root), length)) {
                filename = emalloc(length + strlen(path_info) + 2);
                if (filename) {
                        memcpy(filename, PG(doc_root), length);

Modified: php/php-src/trunk/main/fopen_wrappers.c
===================================================================
--- php/php-src/trunk/main/fopen_wrappers.c     2010-04-21 22:06:18 UTC (rev 
298276)
+++ php/php-src/trunk/main/fopen_wrappers.c     2010-04-21 22:22:31 UTC (rev 
298277)
@@ -435,8 +435,8 @@
                }
        } else
 #endif
-       if (PG(doc_root) && path_info && (length = strlen(PG(doc_root)) &&
-               IS_ABSOLUTE_PATH(PG(doc_root), length))) {
+       if (PG(doc_root) && path_info && (length = strlen(PG(doc_root))) &&
+               IS_ABSOLUTE_PATH(PG(doc_root), length)) {
                filename = emalloc(length + strlen(path_info) + 2);
                if (filename) {
                        memcpy(filename, PG(doc_root), length);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to