iliaa Mon Aug 7 16:53:12 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
Log:
Removed extra byte
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.10&r2=1.52.2.11&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.10
php-src/ext/filter/filter.c:1.52.2.11
--- php-src/ext/filter/filter.c:1.52.2.10 Thu Aug 3 19:35:23 2006
+++ php-src/ext/filter/filter.c Mon Aug 7 16:53:12 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.10 2006/08/03 19:35:23 tony2001 Exp $ */
+/* $Id: filter.c,v 1.52.2.11 2006/08/07 16:53:12 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,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.10 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.11 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -362,7 +362,7 @@
/* FIXME: Should not use php_register_variable_ex as that also
registers
* globals when register_globals is turned on */
Z_STRLEN(raw_var) = val_len;
- Z_STRVAL(raw_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(raw_var) = estrndup(*val, val_len);
Z_TYPE(raw_var) = IS_STRING;
php_register_variable_ex(var, &raw_var, array_ptr TSRMLS_CC);
@@ -376,12 +376,12 @@
Z_TYPE(new_var) = IS_STRING;
if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
- Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(new_var) = estrndup(*val, val_len);
php_zval_filter(&new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC);
} else if (PG(magic_quotes_gpc)) {
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 + 1);
+ Z_STRVAL(new_var) = estrndup(*val, val_len);
}
} else { /* empty string */
ZVAL_EMPTY_STRING(&new_var);
@@ -400,7 +400,7 @@
}
efree(*val);
if (Z_STRLEN(new_var)) {
- *val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var) +
1);
+ *val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var));
} else {
*val = estrdup("");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
