tools: Fix memleaks and buffer overflows in irm tool

This fixes some memleaks and potential buffer overflows in the irm
tool.

Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/tools/irm/irm_unregister.c b/src/tools/irm/irm_unregister.c
index 52491b42..137bc7e9 100644
--- a/src/tools/irm/irm_unregister.c
+++ b/src/tools/irm/irm_unregister.c
@@ -69,7 +69,7 @@ int do_unregister(int argc, char ** argv)
         char *             ipcp[MAX_IPCPS];
         size_t             ipcp_len   = 0;
         struct ipcp_info * ipcps;
-        size_t             len;
+        ssize_t            len;
         size_t             i;
 
         while (argc > 0) {
@@ -103,7 +103,10 @@ int do_unregister(int argc, char ** argv)
         }
 
         len = irm_list_ipcps(&ipcps);
-        for (i = 0; i < len; ++i) {
+        if (len < 0)
+                return -1;
+
+        for (i = 0; i < (size_t) len; ++i) {
                 size_t j;
                 for (j = 0; j < layers_len; j++) {
                         if (wildcard_match(ipcps[i].layer, layers[j]) == 0) {