summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2022-02-25 00:15:29 +0100
committerSander Vrijders <sander@ouroboros.rocks>2022-03-03 12:00:53 +0100
commit3330f7f22105e3a8b57f5c562144d8c3e338e156 (patch)
treee71198513cbc3f3d0f4d0d7370a3d4ed62114a94
parent27374c05645cb6a656e82a9a0b6bc810082cfe4e (diff)
downloadouroboros-3330f7f22105e3a8b57f5c562144d8c3e338e156.tar.gz
ouroboros-3330f7f22105e3a8b57f5c562144d8c3e338e156.zip
irmd: Fix memory leak of ret_msg
The ret_msg variable can leak in the main loop of the irmd in this failure path. Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks> Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>
-rw-r--r--src/irmd/main.c1
-rw-r--r--src/irmd/prog_table.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index a87f191a..f83e8e1e 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -2078,6 +2078,7 @@ static void * mainloop(void * o)
if (msg == NULL) {
close(sfd);
irm_msg__free_unpacked(msg, NULL);
+ free(ret_msg);
continue;
}
diff --git a/src/irmd/prog_table.c b/src/irmd/prog_table.c
index eb2b1966..4b43626c 100644
--- a/src/irmd/prog_table.c
+++ b/src/irmd/prog_table.c
@@ -110,8 +110,7 @@ void prog_entry_del_name(struct prog_entry * e,
struct str_el * s = list_entry(p, struct str_el, next);
if (!strcmp(name, s->str)) {
list_del(&s->next);
- if (s->str != NULL)
- free(s->str);
+ free(s->str);
free(s);
}
}