Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- #41555: truncate_utf8 infinite loop on invalid utf-8

4.6.x
Steven Wittens 2006-02-09 08:57:47 +00:00
parent a48a57cac4
commit 8acb44c544
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/common.inc
View File

@ -1666,15 +1666,18 @@ function truncate_utf8($string, $len, $wordsafe = FALSE) {
return $string; return $string;
} }
if ($wordsafe) { if ($wordsafe) {
$end = $len;
while (($string[--$len] != ' ') && ($len > 0)) {}; while (($string[--$len] != ' ') && ($len > 0)) {};
if ($len == 0) {
$len = $end;
}
} }
if ((ord($string[$len]) < 0x80) || (ord($string[$len]) >= 0xC0)) { if ((ord($string[$len]) < 0x80) || (ord($string[$len]) >= 0xC0)) {
return substr($string, 0, $len); return substr($string, 0, $len);
} }
while (ord($string[--$len]) < 0xC0) {}; while (--$len >= 0 && ord($string[$len]) >= 0x80 && ord($string[$len]) < 0xC0) {};
return substr($string, 0, $len); return substr($string, 0, $len);
} }
/** /**
* Encodes MIME/HTTP header values that contain non-ASCII, UTF-8 encoded * Encodes MIME/HTTP header values that contain non-ASCII, UTF-8 encoded
* characters. * characters.