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 rare crashes when rate-limiting happens before queries are blocked #1197

Merged
merged 3 commits into from
Oct 10, 2021

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 3, 2021

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


Ensure blockingreason is initialized to a non-NULL value. Otherwise, FTL may crash when the first blocked query ever since (re)start is rate-limiting a client. This fixes #1189 and has been confirmed working therein.

@DL6ER DL6ER added the Bugfix label Oct 3, 2021
@DL6ER DL6ER requested a review from a team October 3, 2021 12:22
@DL6ER DL6ER mentioned this pull request Oct 3, 2021
5 tasks
@PromoFaux
Copy link
Member

This fixes #1189 and has been confirmed working therein.

I would rather wait for the OP of said issue thread to report back before approving

@DL6ER DL6ER removed the request for review from a team October 3, 2021 17:19
@DL6ER DL6ER marked this pull request as draft October 3, 2021 17:19
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member Author

DL6ER commented Oct 3, 2021

Rebased on latest development

@DL6ER DL6ER marked this pull request as ready for review October 3, 2021 20:07
@DL6ER DL6ER linked an issue Oct 4, 2021 that may be closed by this pull request
@yubiuser
Copy link
Member

OP of the issue confirmed fix is working
#1189 (comment)

@DL6ER DL6ER merged commit 4c42246 into development Oct 10, 2021
@DL6ER DL6ER deleted the fix/rate_limit_crash branch October 10, 2021 15:57
@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-ftl-v5-11-web-v5-8-and-core-v5-6-released/50566/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FTL crash when rate-limiting
4 participants