diff --git a/src/cwc.c b/src/cwc.c
index 58c1e08b..3c0b5ae9 100644
--- a/src/cwc.c
+++ b/src/cwc.c
@@ -1857,7 +1857,8 @@ cwc_emm_cryptoworks(cwc_t *cwc, uint8_t *data, int len)
         cwc_send_msg(cwc, composed, elen + 12, 0, 1);
         free(composed);
         free(tmp);
-      }
+      } else if (tmp)
+        free(tmp);
       cwc->cwc_cryptoworks_emm.shared_emm = NULL;
       cwc->cwc_cryptoworks_emm.shared_len = 0;
     }
diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index e4b30c51..861c1117 100644
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -520,6 +520,7 @@ tda_add(int adapter_num)
   dirp = opendir(path);
   if (!dirp)
     return;
+  closedir(dirp);
 
   /* Check each frontend */
   // Note: this algo will fail if there are really exotic variations
diff --git a/src/main.c b/src/main.c
index 40261213..61cebd72 100644
--- a/src/main.c
+++ b/src/main.c
@@ -283,6 +283,7 @@ show_usage
         }
         tok = strtok(NULL, "\n");
       }
+      free(desc);
     }
   }
   printf("\n");