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 nullptr dereferences #6104

Merged
merged 4 commits into from Feb 21, 2018
Merged

Fix nullptr dereferences #6104

merged 4 commits into from Feb 21, 2018

Conversation

Crunsher
Copy link
Contributor

This prevents a number of nullptr dereferences within icinga 2.
Refs CVE-2018-6534

@Crunsher Crunsher added this to the 2.8.2 milestone Feb 20, 2018
@Crunsher
Copy link
Contributor Author

I have no idea why commit c508d74 is in there :/

@dnsmichi
Copy link
Contributor

Wrong rebase base, I'd suggest to start with a fresh master and cherry-pick on-top into a new branch.

@@ -57,6 +57,10 @@ extern Value Empty;
DECLARE_PTR_TYPEDEFS(klass); \
IMPL_TYPE_LOOKUP();

#define RequireNotNull(ptr) RequireNotNullInternal(ptr, #ptr)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Macros should be capitalised throughout, so REQUIRE_NOT_NULL would be correct, wouldn't it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@N-o-X ^

@Crunsher
Copy link
Contributor Author

When merging back into the master the files relevant to the commit are not touched. Sometimes git works in mysterious ways 🙄

@Crunsher Crunsher merged commit eda9bce into master Feb 21, 2018
@Crunsher Crunsher added the backported Fix was included in a bugfix release label Feb 22, 2018
@dnsmichi dnsmichi deleted the fix/nullptr-deref branch April 18, 2018 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported Fix was included in a bugfix release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants