From: Nikita Popov <nikic@php.net>
Date: Sat, 14 Mar 2015 08:18:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~662
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=547d3879738dd6b8cc59aaa91081bb71289614f9;p=php

Merge branch 'PHP-5.6'
---

547d3879738dd6b8cc59aaa91081bb71289614f9
diff --cc ext/filter/sanitizing_filters.c
index 43241cc1ef,56ac207c44..73bf92ed0b
--- 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 {