diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-23 22:30:46 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-08-23 22:30:46 +0000 |
| commit | 10c2f8ca9af659c5b7a56fdc8e8f84e931d3f6d4 (patch) | |
| tree | 8a307b5138b18dba0ed277d4deb85a8ca8e64347 /src/irmd | |
| parent | 1ca26ab86712575a5e89dcd68295b57fd27c5703 (diff) | |
| parent | 47bd452352389925188ca4d36ae1c1ba611e6aeb (diff) | |
| download | ouroboros-10c2f8ca9af659c5b7a56fdc8e8f84e931d3f6d4.tar.gz ouroboros-10c2f8ca9af659c5b7a56fdc8e8f84e931d3f6d4.zip | |
Merged in sandervrijders/ouroboros/be-memleaks (pull request #568)
lib, ipcpd, irmd: Fix several memleaks
Diffstat (limited to 'src/irmd')
| -rw-r--r-- | src/irmd/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c index 66c230c8..c8c75ef9 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -848,7 +848,7 @@ static int name_reg(const char * name, continue; hash = malloc(IPCP_HASH_LEN(e)); - if (hash == NULL) + if (hash == NULL) break; str_hash(e->dir_hash_algo, hash, name); @@ -1827,10 +1827,8 @@ void * mainloop(void * o) if (sfd == -1) { pthread_mutex_unlock(&irmd.cmd_lock); - if (tpm_check()) { - close(sfd); + if (tpm_check()) break; - } continue; } |