fix(Notes Dashboard Widget): avoid HTTP 500 due mid-UTF8 excerpt truncation #630
Conversation
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
Contributor
Author
|
Quote a bunch of automated tests are failing but it seems due to a infrastructure problem, not my code change… |
korelstar
requested changes
Nov 22, 2020
Member
There was a problem hiding this comment.
Thank you very much for your contribution! Although I wasn't able to reproduce the issue, it's very reasonable that this will fix it. Before I merge this, please
- replace
strlenbymb_strlenin order to make sure that this won't break anything (see comments) - rebase the PR, since I just fixed the failing CI tests (GitHub changed something recently)
- sign your work, see https://github.com/nextcloud/server/blob/master/.github/CONTRIBUTING.md#sign-your-work
bentolor
force-pushed
the
fix/dashboard-http500-nonasciinotest-issue-620
branch
2 times, most recently
from
e21c606 to
c92cd67
Compare
Fix courtesty due to @D-side This issue occurs when 100 bytes past the start of the note is inside a UTF-8 multibyte character. E. g. if a note is comprised of 99 single-bytes and 100th multibyte. This is very easy to hit in Russian, since it uses a Cyrillic charset (2 bytes per UTF-8 char), but spaces and punctuation from ASCII (1 byte each). But since the condition is so obscure, some texts work and some don't seemingly at random (except not!). Based on https://stackoverflow.com/q/9087502/ it seems that using `mb_substr` with `utf-8` seems to be the better approach Signed-off-by: Benjamin Schmid <bentolor@users.noreply.github.com>
As pointed out by @korelstar in his review, this should avoid strange issues in handling truncation of UTF-8 encoded, potential multibyte data streams Signed-off-by: Benjamin Schmid <bentolor@users.noreply.github.com>
bentolor
force-pushed
the
fix/dashboard-http500-nonasciinotest-issue-620
branch
from
c92cd67 to
45444f1
Compare
Contributor
Author
|
Thanks, @korelstar for your quick and helpful feedback. I think I succeeded in adopting your proposed changes as well as mastering all the hurdles to get my MR ready for integration! Thank you again for you quick feedback! |
korelstar
approved these changes
Nov 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fix courtesty due to @D-side
This issue occurs when 100 bytes past the start of the note is inside
a UTF-8 multibyte character. E. g. if a note is comprised of 99
single-bytes and 100th multibyte.
This is very easy to hit in Russian, since it uses a Cyrillic charset
(2 bytes per UTF-8 char), but spaces and punctuation from ASCII
(1 byte each). But since the condition is so obscure, some texts
work and some don't seemingly at random (except not!).
Based on https://stackoverflow.com/q/9087502/ it seems that
using
mb_substrwithutf-8seems to be the better approach