fix(caldav): Ignore invalid events for reminder generation #38301
Conversation
This file contains 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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -267,7 +275,14 @@ | |||
| if ($masterItem) { | |||
| $processedAlarms = []; | |||
| $masterAlarms = []; | |||
| $masterHash = $this->getEventHash($masterItem); | |||
| try { | |||
| $masterHash = $this->getEventHash($recurrenceException); | |||
Check notice
Code scanning / Psalm
PossiblyUndefinedVariable
| @@ -397,7 +412,14 @@ | |||
| bool $isRecurring = false, | |||
| bool $isRecurrenceException = false):array { | |||
| if ($eventHash === null) { | |||
| $eventHash = $this->getEventHash($valarm->parent); | |||
| try { | |||
| $eventHash = $this->getEventHash($valarm->parent); | |||
Check notice
Code scanning / Psalm
ArgumentTypeCoercion
tcitworld
reviewed
May 16, 2023
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
ChristophWurst
changed the title
ChristophWurst
force-pushed
the
fix/carddav/catch-invalid-event-reminder-service
branch
from
cbe36c2
to
b7e7d80
Compare
ChristophWurst
added
3. to review
ChristophWurst
requested review from
tcitworld,
kesselb,
hamza221 and
JohannesGGE
tcitworld
requested changes
May 31, 2023
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
tcitworld
approved these changes
May 31, 2023
|
/backport to stable27 |
|
/backport to stable26 |
|
/backport to stable25 |
kesselb
approved these changes
May 31, 2023
ChristophWurst
added
4. to release
hamza221
approved these changes
May 31, 2023
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport to stable25 |
|
the backport worked locally |
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
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
Fixes
Call to a member function serialize() on null at apps/dav/lib/CalDAV/Reminder/ReminderService.php:261with 25.0.4.TODO
Checklist