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

Add recursion limit for curly braces in WGSL #5447

Conversation

ErichDonGubler
Copy link
Member

@ErichDonGubler ErichDonGubler commented Mar 27, 2024

Connections
Link to the issues addressed by this PR, or dependent PRs in other repositories

Intended to resolve #4352.

Description
Describe what problem this is solving, and how it's solved.

Testing
Explain how this change is tested.

Checklist

  • Run cargo fmt.
  • Run cargo clippy. If applicable, add:
    • --target wasm32-unknown-unknown
    • --target wasm32-unknown-emscripten
  • Run cargo xtask test to run tests.
  • Add change to CHANGELOG.md. See simple instructions inside file.

@ErichDonGubler ErichDonGubler self-assigned this Mar 27, 2024
@ErichDonGubler ErichDonGubler added area: validation Issues related to validation, diagnostics, and error handling area: correctness We're behaving incorrectly naga Shader Translator area: naga front-end lang: WGSL WebGPU Shading Language labels Mar 27, 2024
jimblandy

This comment was marked as outdated.

@ErichDonGubler ErichDonGubler force-pushed the limit-wgsl-statement-nesting branch 3 times, most recently from 8c520cf to 60a072e Compare March 28, 2024 21:48
@ErichDonGubler ErichDonGubler marked this pull request as ready for review March 28, 2024 21:50
@ErichDonGubler ErichDonGubler requested review from a team as code owners March 28, 2024 21:50
@ErichDonGubler ErichDonGubler changed the title Add limits for braces and parentheses in WGSL Add parsing limits for braces in WGSL Mar 28, 2024
@ErichDonGubler

This comment was marked as resolved.

@ErichDonGubler ErichDonGubler force-pushed the limit-wgsl-statement-nesting branch 2 times, most recently from b943742 to 6c7ea07 Compare April 2, 2024 00:52
@ErichDonGubler ErichDonGubler changed the title Add parsing limits for braces in WGSL Add recursion limit for curly braces in WGSL Apr 2, 2024
jimblandy

This comment was marked as resolved.

@ErichDonGubler

This comment was marked as resolved.

@ErichDonGubler

This comment was marked as duplicate.

@ErichDonGubler ErichDonGubler enabled auto-merge (rebase) April 3, 2024 17:42
@ErichDonGubler

This comment was marked as resolved.

Copy link
Member

@jimblandy jimblandy left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@ErichDonGubler ErichDonGubler merged commit fb305b8 into gfx-rs:trunk Apr 3, 2024
27 checks passed
@ErichDonGubler ErichDonGubler deleted the limit-wgsl-statement-nesting branch April 3, 2024 21:25
@kornelski kornelski mentioned this pull request Aug 23, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: correctness We're behaving incorrectly area: naga front-end area: validation Issues related to validation, diagnostics, and error handling lang: WGSL WebGPU Shading Language naga Shader Translator
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[wgsl-in] Enforce WGSL statement nesting depth limit
2 participants