Trashbin truncate filename unicode - #62698
Open
icewind1991 wants to merge 2 commits into
Open
Conversation
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
requested review from
Altahrim,
come-nc,
leftybournes and
salmart-dev
and removed request for
a team
July 30, 2026 14:01
Member
Author
|
/backport to stable34 |
Member
Author
|
/backport to stable33 |
Member
Author
|
/backport to stable32 |
CarlSchwan
approved these changes
Jul 30, 2026
ShGKme
previously approved these changes
Jul 30, 2026
ShGKme
reviewed
Jul 30, 2026
|
|
||
| $charsToRemove = $length - $maxLength + 1; | ||
| $charLength = mb_strlen($trashFilename); | ||
| $start = mb_substr($trashFilename, 0, floor(($charLength / 2) - $charsToRemove)); |
Contributor
There was a problem hiding this comment.
apps/files_trashbin/lib/Trashbin.php:1218:42: InvalidScalarArgument: Argument 3 of mb_substr expects int|null, but float provided (see https://psalm.dev/012)
We don't have strict_types?
Contributor
There was a problem hiding this comment.
Suggested change
| $start = mb_substr($trashFilename, 0, floor(($charLength / 2) - $charsToRemove)); | |
| $start = mb_substr($trashFilename, 0, intdiv($charLength, 2) - $charsToRemove)); |
| $charsToRemove = $length - $maxLength + 1; | ||
| $charLength = mb_strlen($trashFilename); | ||
| $start = mb_substr($trashFilename, 0, floor(($charLength / 2) - $charsToRemove)); | ||
| $end = mb_substr($trashFilename, floor($charLength / 2)); |
Contributor
There was a problem hiding this comment.
Suggested change
| $end = mb_substr($trashFilename, floor($charLength / 2)); | |
| $end = mb_substr($trashFilename, intdiv($charLength, 2)); |
Comment on lines
1210
to
+1220
| $length = strlen($trashFilename); | ||
| // oc_filecache `name` column has a limit of 250 chars | ||
| $maxLength = 250; | ||
| if ($length > $maxLength) { | ||
| $trashFilename = substr_replace( | ||
| $trashFilename, | ||
| '', | ||
| $maxLength / 2, | ||
| $length - $maxLength | ||
| ); | ||
| // truncate at the middle, since the last characters are fairly likely to have meaningful information such as version numbering | ||
|
|
||
| $charsToRemove = $length - $maxLength + 1; | ||
| $charLength = mb_strlen($trashFilename); | ||
| $start = mb_substr($trashFilename, 0, floor(($charLength / 2) - $charsToRemove)); | ||
| $end = mb_substr($trashFilename, floor($charLength / 2)); | ||
| return $start . '_' . $end; |
Contributor
There was a problem hiding this comment.
Is it possible that the length is, e.g., 1000.
charsToRemove = 750
floor(($charLength / 2) - $charsToRemove = 1000 / 2 - 750 = -250 - negative value.
With floor(($charLength / 2) - $charsToRemove) we remove not IN the middle, but "after" the middle.
ShGKme
reviewed
Jul 30, 2026
ShGKme
left a comment
ShGKme
left a comment
Contributor
There was a problem hiding this comment.
To remove the middle instead of "after the middle"
Comment on lines
+1215
to
+1220
|
|
||
| $charsToRemove = $length - $maxLength + 1; | ||
| $charLength = mb_strlen($trashFilename); | ||
| $start = mb_substr($trashFilename, 0, floor(($charLength / 2) - $charsToRemove)); | ||
| $end = mb_substr($trashFilename, floor($charLength / 2)); | ||
| return $start . '_' . $end; |
Contributor
There was a problem hiding this comment.
Suggested change
| $charsToRemove = $length - $maxLength + 1; | |
| $charLength = mb_strlen($trashFilename); | |
| $start = mb_substr($trashFilename, 0, floor(($charLength / 2) - $charsToRemove)); | |
| $end = mb_substr($trashFilename, floor($charLength / 2)); | |
| return $start . '_' . $end; | |
| $half = intdiv($maxLength - 1, 2); // One char for _ | |
| return mb_substr($trashFilename, 0, $half) | |
| . '_' | |
| . mb_substr($trashFilename, -$half); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The old logic can cut right in the middle of multi-byte unicode codepoints.
TODO
Checklist
3. to review, feature component)stable32)AI (if applicable)