Fix: possible segfault on startup if duplicate ip+CIDR in ip match list #2890
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
| @@ -259,6 +259,7 @@ int InsertNetmask(TreeNode *node, TreeNode *parent, TreeNode *new_node, | |||
|
|
|||
| node->count++; | |||
| node->netmasks = reinterpret_cast<unsigned char *>(malloc(node->count * sizeof(unsigned char))); | |||
| memset(node->netmasks, 0, (node->count * sizeof(unsigned char))); | |||
There was a problem hiding this comment.
@martinhsv This memset should probably go below the null check 2 lines down. Same for the other 2 in this PR.
| @@ -410,6 +411,7 @@ TreeNode *CPTAddElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree | |||
| node->count++; | |||
| new_node = node; | |||
| node->netmasks = reinterpret_cast<unsigned char *>(malloc(node->count * sizeof(unsigned char))); | |||
| memset(node->netmasks, 0, (node->count * sizeof(unsigned char))); | |||
There was a problem hiding this comment.
Here is another potential crash if we are out of memory. Malloc above may return null and there is no check below for this condition.
|
Thanks @mirkodziadzka-avi . The location of the first memset has been corrected via #2891 |
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.
No description provided.