Skip to content
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.

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

strings should be UTF8, but also check ASCII without crashing in dev #1077

Merged
merged 1 commit into from
Dec 12, 2018

Conversation

bridiver
Copy link
Collaborator

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@bridiver bridiver self-assigned this Dec 12, 2018
if (!base::IsStringUTF8(notification_info.text) ||
!base::UTF8ToUTF16(notification_info.text.c_str(),
notification_info.text.length(), &text)) {
if (base::IsStringASCII(notification_info.text))
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is probably not necessary, but doesn't hurt anything

@tmancey tmancey merged commit be9aaa0 into master Dec 12, 2018
@tmancey tmancey deleted the issues/2507 branch December 12, 2018 21:44
@bbondy
Copy link
Member

bbondy commented Dec 18, 2018

Please remember to set merged labels and adjust the associated issue milestone.

@bbondy
Copy link
Member

bbondy commented Dec 18, 2018

I think it only landed in c61, so marking that.

@tmancey
Copy link
Collaborator

tmancey commented Dec 18, 2018

@bridiver Could you please confirm label is correct as I thought this was merged into 0.59.x, thanks

tmancey added a commit that referenced this pull request Dec 18, 2018
strings should be UTF8, but also check ASCII without crashing in dev
@bridiver
Copy link
Collaborator Author

0.60.x dbaa399

@rebron
Copy link
Collaborator

rebron commented Dec 20, 2018

I need a corresponding issue for this. Please add one.

Approving uplift-request for 0.59.x-beta. cc: @kjozwiak cc: @srirambv

@bbondy bbondy added this to the 0.60.x - Dev milestone Jan 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants