Skip to content

Issue #352359 by cwgordon7, catch, jhedstrom, grendzy, Damien Tournou… #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
damienmckenna wants to merge 1 commit into
base: 6.x
Choose a base branch
from
Open

Issue #352359 by cwgordon7, catch, jhedstrom, grendzy, Damien Tournou… #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions includes/unicode.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,13 @@ function drupal_substr($text, $start, $length = NULL) {
}
else {
$strlen = strlen($text);
// Find the starting byte offset
// Find the starting byte offset.
$bytes = 0;
if ($start > 0) {
// Count all the continuation bytes from the start until we have found
// $start characters
// $start characters or the end of the string.
$bytes = -1; $chars = -1;
while ($bytes < $strlen && $chars < $start) {
while ($bytes < $strlen - 1 && $chars < $start) {
$bytes++;
$c = ord($text[$bytes]);
if ($c < 0x80 || $c >= 0xC0) {
Expand All @@ -515,7 +515,7 @@ function drupal_substr($text, $start, $length = NULL) {
}
else if ($start < 0) {
// Count all the continuation bytes from the end until we have found
// abs($start) characters
// abs($start) characters.
$start = abs($start);
$bytes = $strlen; $chars = 0;
while ($bytes > 0 && $chars < $start) {
Expand All @@ -528,40 +528,50 @@ function drupal_substr($text, $start, $length = NULL) {
}
$istart = $bytes;

// Find the ending byte offset
// Find the ending byte offset.
if ($length === NULL) {
$bytes = $strlen - 1;
$iend = $strlen;
}
else if ($length > 0) {
// Count all the continuation bytes from the starting index until we have
// found $length + 1 characters. Then backtrack one byte.
$bytes = $istart; $chars = 0;
while ($bytes < $strlen && $chars < $length) {
$bytes++;
$c = ord($text[$bytes]);
// found $length characters or reached the end of the string, then
// backtrace one byte.
$iend = $istart - 1; $chars = -1;
while ($iend < $strlen - 1 && $chars < $length) {
$iend++;
$c = ord($text[$iend]);
if ($c < 0x80 || $c >= 0xC0) {
$chars++;
}
}
$bytes--;
// Backtrace one byte if the end of the string was not reached.
if ($iend < $strlen - 1) {
$iend--;
}
}
else if ($length < 0) {
// Count all the continuation bytes from the end until we have found
// abs($length) characters
// abs($start) characters, then backtrace one byte.
$length = abs($length);
$bytes = $strlen - 1; $chars = 0;
while ($bytes >= 0 && $chars < $length) {
$c = ord($text[$bytes]);
$iend = $strlen; $chars = 0;
while ($iend > 0 && $chars < $length) {
$iend--;
$c = ord($text[$iend]);
if ($c < 0x80 || $c >= 0xC0) {
$chars++;
}
$bytes--;
}
// Backtrace one byte if we are not at the begining of the string.
if ($iend > 0) {
$iend--;
}
}
else {
// $length == 0, return an empty string.
$iend = $istart - 1;
}
$iend = $bytes;

return substr($text, $istart, max(0, $iend - $istart + 1));
}
}