com php-src: Merge branch 'PHP-5.6': ext/filter/sanitizing_fi lters.c
| From: | Nikita Popov | Date: | Sat, 14 Mar 2015 08:18:50 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/filter/sanitizing_fi lters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85514@lists.php.net to get a copy of this message | ||
Commit: 547d3879738dd6b8cc59aaa91081bb71289614f9
Author: Nikita Popov <nikic@php.net> Sat, 14 Mar 2015 09:18:50 +0100
Parents: 7409fd4bf73912b0bf3e5fb2e9bf613cc302c735 846c8059e60b1c5ac918b2036c15b490971eb6e3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=547d3879738dd6b8cc59aaa91081bb71289614f9
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM ext/filter/sanitizing_filters.c
Diff:
diff --cc ext/filter/sanitizing_filters.c
index 43241cc,56ac207..73bf92e
--- a/ext/filter/sanitizing_filters.c
+++ b/ext/filter/sanitizing_filters.c
@@@ -120,10 -118,10 +120,10 @@@ static void php_filter_strip(zval *valu
}
str = (unsigned char *)Z_STRVAL_P(value);
- buf = safe_emalloc(1, Z_STRLEN_P(value) + 1, 1);
+ buf = zend_string_alloc(Z_STRLEN_P(value) + 1, 0);
c = 0;
for (i = 0; i < Z_STRLEN_P(value); i++) {
- if ((str[i] > 127) && (flags & FILTER_FLAG_STRIP_HIGH)) {
+ if ((str[i] >= 127) && (flags & FILTER_FLAG_STRIP_HIGH)) {
} else if ((str[i] < 32) && (flags & FILTER_FLAG_STRIP_LOW)) {
} else if ((str[i] == '`') && (flags & FILTER_FLAG_STRIP_BACKTICK)) {
} else {