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

fix(game/five): check for vehicle type on drawhandler shader access #2961

Conversation

slashkeyvalue
Copy link
Contributor

@slashkeyvalue slashkeyvalue commented Nov 25, 2024

Goal of this PR

Addresses a crash caused by the game wrongfully assuming that every entity/fragment that uses a model of type 'vehicle' is parented by a vehicle ( in which the entity would have a valid vehicle shader )

How is this PR achieving the goal

Add proper validation for vehicle shader access

This PR applies to the following area(s)

FiveM

Successfully tested on

Game builds: 3095, 3258

Platforms: Windows

Checklist

  • Code compiles and has been tested successfully.
  • Code explains itself well and/or is documented.
  • My commit message explains what the changes do and what they are for.
  • No extra compilation warnings are added by these changes.

Fixes issues

@github-actions github-actions bot added the triage Needs a preliminary assessment to determine the urgency and required action label Nov 25, 2024
@neptunium-cfx neptunium-cfx added ready-to-merge This PR is enqueued for merging and removed triage Needs a preliminary assessment to determine the urgency and required action labels Nov 25, 2024
@neptunium-cfx neptunium-cfx merged commit 4f294e4 into citizenfx:master Nov 25, 2024
8 of 12 checks passed
@slashkeyvalue slashkeyvalue deleted the fix/crash-object-access-vehicle-shader branch November 26, 2024 00:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR is enqueued for merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants