Repository navigation
Pad: skip unnamed binding slots in macro lookups (upstream bug: NeGcon/Jogcon crash) - #583
Merged
Merged
Conversation
…, strlen on null name) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Changes
Fixes upstream code.
Pad::ControllerInfo::GetBindIndexand the macro editor (ControllerMacroEditWidget) skip binding slots that have no name. Adds the rig testtests/zdxsv/padmacro.py.Rationale behind Changes
The NeGcon and Jogcon binding tables have unnamed
{}placeholder slots. A macro button that is not found before such a slot (for exampleStarton NeGcon, often left over after switching from DualShock 2) gets compared with a nullname, sostrlen(nullptr)crashes. This happens when the pad config loads at startup and when the Controllers dialog builds the macro page. Sentry has a crash report from zdxsv-1.0.1 with this stack (ControllerMacroEditWidgetconstructor →strlen). Upstream PCSX2 master still has the bug.Suggested Testing Steps
RUN=<dir> python tests/zdxsv/padmacro.py(no game, no network). Result on windows-mini (private rig) at 4d15d5a: PASS. The control, release zdxsv-1.0.0: FAIL, a startup crash (0xC0000005 in ucrtbase).Did you use AI to help find, test, or implement this issue or feature?
Yes. Claude Code found the cause from the crash report, wrote the fix and the test, and ran them.
🤖 Generated with Claude Code