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 crash on multiple replies #2141

Merged
merged 1 commit into from
Dec 22, 2024
Merged

Fix crash on multiple replies #2141

merged 1 commit into from
Dec 22, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 22, 2024

What does this implement/fix?

Fixes #2140 by moving callback for multiple replies into the loop. This was recently broken in #2136 where some code refactoring by Simon Kelley unintentionally kicked a bit of FTL code out of the loop into a region where it shouldn't have been. Testing didn't reveal this as rather specific conditions need to be met to trigger a crash.


Related issue or feature (if applicable): #2140

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

@DL6ER DL6ER requested a review from a team December 22, 2024 20:02
@DL6ER DL6ER linked an issue Dec 22, 2024 that may be closed by this pull request
@DL6ER
Copy link
Member Author

DL6ER commented Dec 22, 2024

OP already confirmed the fix: #2140 (comment)

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-crash-after-updating-this-morning/74689/3

@rdwebdesign
Copy link
Member

Approved based on user confirmation.

@DL6ER DL6ER merged commit 2237f97 into development Dec 22, 2024
18 checks passed
@DL6ER DL6ER deleted the fix/dnsmasq_multi_replies branch December 22, 2024 20:27
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FTL is stuck in a crash loop
3 participants