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

Handle escaping of manufacturer/product strings #18194

Merged
merged 1 commit into from
Aug 28, 2022

Conversation

fauxpark
Copy link
Member

@fauxpark fauxpark commented Aug 28, 2022

Description

Second fix for #18183, double quotes need to be escaped and unescaped as necessary inside string literals:

#define MANUFACTURER "Hello "World" 123"
// should be
#define MANUFACTURER "Hello \"World\" 123"

as well as backslashes:

#define MANUFACTURER "Hello\ world 123\" // comment"
// should be
#define MANUFACTURER "Hello\\ world 123\\" // comment

Additionally, there were a couple of boards which did not have a manufacturer key in info.json.

Failing builds:
  adpenrose/shisaku:default
  adpenrose/shisaku:via
  handwired/baredev/rev1:default
  handwired/baredev/rev1:via
  hotdox:default
  hotdox:via
  karlb/kbic65:default
  karlb/kbic65:via
  keebio/bamfk4:default
  keebio/bamfk4:via

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@fauxpark fauxpark requested a review from a team August 28, 2022 18:29
@github-actions github-actions bot removed the core label Aug 28, 2022
@zvecr zvecr merged commit 3adaf6a into qmk:develop Aug 28, 2022
@fauxpark fauxpark deleted the usb-string-escaping branch August 28, 2022 18:38
@fauxpark fauxpark mentioned this pull request Aug 28, 2022
14 tasks
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants