[13.x] Guard Job::payload() against corrupt JSON#59740
Closed
sumaiazaman wants to merge 2 commits intolaravel:13.xfrom
Closed
[13.x] Guard Job::payload() against corrupt JSON#59740sumaiazaman wants to merge 2 commits intolaravel:13.xfrom
sumaiazaman wants to merge 2 commits intolaravel:13.xfrom
Conversation
…rray Prevents null array access errors in getName(), maxTries(), and other callers when the raw job body is malformed or empty JSON. Co-Authored-By: Claude Sonnet 4.6 <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.
Summary
Job::payload()callsjson_decode($this->getRawBody(), true)which returnsnullwhen the raw body is malformed or empty JSON. Multiple callers —getName(),maxTries(),maxExceptions(),retryUntil(),resolveName()— then perform array-access onnull, which either triggers a PHP warning or a null-coalescing fallback that returnsnullunexpectedly.Context
null→ crashes callers[]null→ crashes callers[]Solution
Add a
?? []null-coalescing fallback to the return value ofpayload():This is the minimal, safe fix — all callers already use
??for optional keys ($this->payload()['maxTries'] ?? null), so returning[]instead ofnullmeans they naturally returnnullwithout any risk of crashing.Safety
Changes
src/Illuminate/Queue/Jobs/Job.php— add?? []topayload()returntests/Queue/QueueJobTest.php— new tests covering valid JSON, corrupt JSON, and empty bodyTest Plan
php vendor/bin/phpunit tests/Queue/QueueJobTest.php— 4 tests, 4 assertions, all green