Skip to content

textfilecontent54 probe: fix memory leaks in process_file #2370

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.

Sign up for GitHub

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

Open
edznux-dd wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

textfilecontent54 probe: fix memory leaks in process_file #2370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/OVAL/probes/independent/textfilecontent54_probe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,15 @@ static int process_file(const char *prefix, const char *path, const char *file,

if (substr_cnt > 0) {
int k;
SEXP_t *item;
instance_count++;

SEXP_list_add(items, create_item(path, file, pfd->pattern,
instance_count, substrs, substr_cnt, over));
item = create_item(path, file, pfd->pattern,
instance_count, substrs, substr_cnt, over);
/* SEXP_list_add() takes its own reference, so release ours
* to avoid leaking every created item. */
SEXP_list_add(items, item);
SEXP_free(item);

for (k = 0; k < substr_cnt; ++k)
free(substrs[k]);
Expand Down Expand Up @@ -278,6 +283,10 @@ static int process_file(const char *prefix, const char *path, const char *file,
if (whole_path != NULL)
free(whole_path);
free(whole_path_with_prefix);
/* Free the accumulator list. Collected items are owned by the probe
* result object; this releases the list's own references (and frees any
* items that were created but not collected). */
SEXP_free(items);

/* coverity[leaked_storage] - substrs is not leaked */
return ret;
Expand Down
Loading