Skip to content

libobs/util,text-freetype2: Permit internal nulls#11045

Open
kkartaltepe wants to merge 1 commit intoobsproject:masterfrom
kkartaltepe:txt-nulls
Open

libobs/util,text-freetype2: Permit internal nulls#11045
kkartaltepe wants to merge 1 commit intoobsproject:masterfrom
kkartaltepe:txt-nulls

Conversation

@kkartaltepe
Copy link
Copy Markdown
Collaborator

Description

Fixes handling of text to attempt to parse past the first null character when buffer sizes are known and correct some length handling throughout the plugin.

This probably makes unmeasured conversion twice as slow. Since it introduces a wcslen()/strlen() into the conversion routine that was previously just done during conversion. Maybe reintegrating that is a good first issue for someone :)

Largely just #7622 but with some fixes that were found during review.

Motivation and Context

Fixes #7595

How Has This Been Tested?

utf-8 example file from the issue is fixed.
utf16 is blank instead of being a bunch of broken characters and possibly overrunning buffers, presumably windows will continue working.

It probably needs a second or third set of eyes.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

Fixes handling of text to attempt to parse past the first null character
when buffer sizes are known and correct some length handling throughout
the plugin.

Fixes obsproject#7595
@WizardCM WizardCM added the kind/bug Categorizes issue or PR as related to a bug. label Aug 3, 2024
@Warchamp7
Copy link
Copy Markdown
Member

Triage note: Need to determine if this or #13093 is better.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Categorizes issue or PR as related to a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

'Text (FreeType 2)' element only reading first line of file (when 'Read from file' is checked)

4 participants