Fix repeated wodle modules #1128
Merged
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
vikman90
requested changes
Aug 20, 2018
src/config/wmodules-command.c
Outdated
| command_tag_length = strlen(WM_COMMAND_CONTEXT.name) + 2; | ||
| command_tag = malloc(sizeof(char) * command_tag_length); | ||
| snprintf(command_tag, command_tag_length, "%s", WM_COMMAND_CONTEXT.name); | ||
| os_strdup(command_tag, nodes[i]->content); |
There was a problem hiding this comment.
os_strdup sets from left to right. In this case, it would be overwriting the content of the XML structure and producing a memory leak.
Did you mean...?
os_strdup(command_tag, command->tag);
src/config/wmodules-command.c
Outdated
| snprintf(command_tag, command_tag_length, "%s:%s", WM_COMMAND_CONTEXT.name, command->tag); | ||
| } | ||
|
|
||
| os_strdup(command_tag, module->tag); |
There was a problem hiding this comment.
This sentence duplicates the string at command_tag, but this variable is never freed. This produces a memory leak.
src/wazuh_modules/wmodules.c
Outdated
| if (i->context->name == j->context->name) { | ||
| mdebug1("Deleting repeated module '%s'.", j->context->name); | ||
| if(i->tag && j->tag){ | ||
| if(!strcmp(i->tag,"command") || !strcmp(j->tag,"command")){ |
There was a problem hiding this comment.
This should not be mandatory at this point. We should warn about it in the configuration reader.
cristgl
force-pushed
the
fix-repeated-wodle
branch
from
51b7651
to
a0766e4
Compare
cristgl
force-pushed
the
fix-repeated-wodle
branch
from
9a7f122
to
97f1463
Compare
cristgl
force-pushed
the
fix-repeated-wodle
branch
from
97f1463
to
cae382b
Compare
crolopez
approved these changes
Aug 22, 2018
vikman90
approved these changes
Aug 22, 2018
|
GJ @cristgl !! |
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.
This PR fixes the issue #1057.
Added a new field to wodle modules named
tag, consisting of the 'command' word plus the command tag in case of the Command wodle, in other case, it shows the name of the module.