iliaa Mon Dec 18 15:04:36 2006 UTC
Modified files:
/php-src/ext/filter sanitizing_filters.c
/php-src/ext/standard string.c php_string.h
Log:
MFB: Less hackish support for spaces at the start of tags within
strip_tags()
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.17
php-src/ext/filter/sanitizing_filters.c:1.18
--- php-src/ext/filter/sanitizing_filters.c:1.17 Mon Dec 18 04:24:38 2006
+++ php-src/ext/filter/sanitizing_filters.c Mon Dec 18 15:04:36 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sanitizing_filters.c,v 1.17 2006/12/18 04:24:38 iliaa Exp $ */
+/* $Id: sanitizing_filters.c,v 1.18 2006/12/18 15:04:36 iliaa Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -179,7 +179,7 @@
php_filter_encode_html(value, enc);
/* strip tags, implicitly also removes \0 chars */
- new_len = php_strip_tags(Z_STRVAL_P(value), Z_STRLEN_P(value), NULL,
NULL, -1);
+ new_len = php_strip_tags_ex(Z_STRVAL_P(value), Z_STRLEN_P(value), NULL,
NULL, 0, 1);
Z_STRLEN_P(value) = new_len;
if (new_len == 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.622&r2=1.623&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.622 php-src/ext/standard/string.c:1.623
--- php-src/ext/standard/string.c:1.622 Mon Dec 18 04:24:38 2006
+++ php-src/ext/standard/string.c Mon Dec 18 15:04:36 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.622 2006/12/18 04:24:38 iliaa Exp $ */
+/* $Id: string.c,v 1.623 2006/12/18 15:04:36 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -5988,7 +5988,7 @@
RETURN_UNICODEL((UChar *)buf, retval_len, 0);
} else {
buf = estrndup(str, str_len);
- retval_len = php_strip_tags((char *)buf, str_len, NULL, (char
*)allow, allow_len);
+ retval_len = php_strip_tags_ex((char *)buf, str_len, NULL,
(char *)allow, allow_len, 0);
RETURN_STRINGL((char *)buf, retval_len, 0);
}
}
@@ -6502,9 +6502,14 @@
}
/* }}} */
+PHPAPI size_t php_strip_tags(char *rbuf, int len, int *stateptr, char *allow,
int allow_len)
+{
+ return php_strip_tags_ex(rbuf, len, stateptr, allow, allow_len, 0);
+}
+
/* {{{ php_strip_tags
*/
-PHPAPI size_t php_strip_tags(char *rbuf, int len, int *stateptr, char *allow,
int allow_len)
+PHPAPI size_t php_strip_tags_ex(char *rbuf, int len, int *stateptr, char
*allow, int allow_len, zend_bool allow_tag_spaces)
{
char *tbuf, *buf, *p, *tp, *rp, c, lc;
int br, i=0, depth=0;
@@ -6532,7 +6537,7 @@
case '\0':
break;
case '<':
- if (isspace(*(p + 1)) && allow_len >=- 0) {
+ if (isspace(*(p + 1)) && !allow_tag_spaces) {
goto reg_char;
}
if (state == 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_string.h?r1=1.104&r2=1.105&diff_format=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.104
php-src/ext/standard/php_string.h:1.105
--- php-src/ext/standard/php_string.h:1.104 Tue Dec 5 04:52:44 2006
+++ php-src/ext/standard/php_string.h Mon Dec 18 15:04:36 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.104 2006/12/05 04:52:44 pollita Exp $ */
+/* $Id: php_string.h,v 1.105 2006/12/18 15:04:36 iliaa Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -146,6 +146,7 @@
PHPAPI char *php_trim(char *c, int len, char *what, int what_len, zval
*return_value, int mode TSRMLS_DC);
PHPAPI int php_u_strip_tags(UChar *rbuf, int len, int *stateptr, UChar *allow,
int allow_len TSRMLS_DC);
PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int
allow_len);
+PHPAPI size_t php_strip_tags_ex(char *rbuf, int len, int *stateptr, char
*allow, int allow_len, zend_bool allow_tag_spaces);
PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int
to_len, zval *result, int case_sensitivity, int *replace_count);
PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int
to_len, zval *result);
PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
