iliaa Fri Dec 8 17:50:04 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/filter/tests bug39763.phpt
Modified files:
/php-src NEWS
/php-src/ext/filter filter.c
Log:
Fixed bug #39763 (magic quotes are applied twice by ext/filter in
parse_str())
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.412&r2=1.2027.2.547.2.413&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.412 php-src/NEWS:1.2027.2.547.2.413
--- php-src/NEWS:1.2027.2.547.2.412 Fri Dec 8 17:11:42 2006
+++ php-src/NEWS Fri Dec 8 17:50:03 2006
@@ -50,6 +50,8 @@
- Fixed wrong signature initialization in imagepng (Takeshi Abe)
- Added optimization for imageline with horizontal and vertial lines (Pierre)
- Fixed bug #39775 ("Indirect modification ..." message is not shown). (Dmitry)
+- Fixed bug #39763 (magic quotes are applied twice by ext/filter in
+ parse_str()). (Ilia)
- Fixed bug #39754 (Some POSIX extension functions not thread safe).
(Ilia, wharmby at uk dot ibm dot com)
- Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.34&r2=1.52.2.35&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.34
php-src/ext/filter/filter.c:1.52.2.35
--- php-src/ext/filter/filter.c:1.52.2.34 Fri Dec 8 17:04:01 2006
+++ php-src/ext/filter/filter.c Fri Dec 8 17:50:04 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.34 2006/12/08 17:04:01 tony2001 Exp $ */
+/* $Id: filter.c,v 1.52.2.35 2006/12/08 17:50:04 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -275,7 +275,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.34 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.35 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -397,7 +397,7 @@
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);
php_zval_filter(&tmp_new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/, 0 TSRMLS_CC);
- } else if (PG(magic_quotes_gpc)) {
+ } else if (PG(magic_quotes_gpc) && !retval) { /* for
PARSE_STRING php_register_variable_safe() will do the addslashes() */
Z_STRVAL(new_var) = php_addslashes(*val,
Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC);
} else {
Z_STRVAL(new_var) = estrndup(*val, val_len);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug39763.phpt?view=markup&rev=1.1
Index: php-src/ext/filter/tests/bug39763.phpt
+++ php-src/ext/filter/tests/bug39763.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
