tony2001 Tue Feb 13 15:55:45 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard proc_open.c
Log:
fix #40455 (proc_open() uses wrong commandline when safe_mode_exec_dir is set)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.534&r2=1.2027.2.547.2.535&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.534 php-src/NEWS:1.2027.2.547.2.535
--- php-src/NEWS:1.2027.2.547.2.534 Tue Feb 13 02:16:22 2007
+++ php-src/NEWS Tue Feb 13 15:55:45 2007
@@ -5,9 +5,13 @@
- Upgraded PCRE to version 7.0 (Nuno)
- Add --ri switch to CLI which allows to check extension information. (Marcus)
- Added tidyNode::getParent() method (John, Nuno)
+- Fixed bug #40455 (proc_open() uses wrong commandline when safe_mode_exec_dir
+ is set). (Tony)
- Fixed bug #40432 (strip_tags() fails with greater than in attribute). (Ilia)
- Fixed bug #40431 (dynamic properties may cause crash in ReflectionProperty
methods). (Tony)
+- Fixed bug #40451 (addAttribute() may crash when used with non-existent child
+ node). (Tony)
- Fixed bug #40428 (imagepstext() doesn't accept optional parameter). (Pierre)
- Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony)
- Fixed bug #40109 (iptcembed fails on non-jfif jpegs). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.8&r2=1.36.2.1.2.9&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.8
php-src/ext/standard/proc_open.c:1.36.2.1.2.9
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.8 Tue Jan 9 16:27:17 2007
+++ php-src/ext/standard/proc_open.c Tue Feb 13 15:55:45 2007
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.8 2007/01/09 16:27:17 dmitry Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.9 2007/02/13 15:55:45 tony2001 Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -276,7 +276,7 @@
sep = zend_memrchr(arg0, PHP_DIR_SEPARATOR, larg0);
- spprintf(safecmd, 0, "%s%c%s%s", PG(safe_mode_exec_dir), (sep ? *sep :
'/'), (sep ? "" : arg0), (space ? cmd + larg0 : ""));
+ spprintf(safecmd, 0, "%s%s%s%s", PG(safe_mode_exec_dir), (sep ? sep :
"/"), (sep ? "" : arg0), (space ? cmd + larg0 : ""));
efree(arg0);
arg0 = php_escape_shell_cmd(*safecmd);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
