Changeset 401840b in mainline

Timestamp:

2016-06-17T13:30:58Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

554e70f

Parents:

741b2fb1

git-author:

Manuele Conti <conti.manuele@…> (2016-06-17 13:30:58)

git-committer:

Jakub Jermar <jakub@…> (2016-06-17 13:30:58)

Message:

Fix memory leak in dnsr_name2host and missing call to async_forget

File:

• uspace/lib/c/generic/dnsr.c (modified) (5 diffs)

uspace/lib/c/generic/dnsr.c

@@ -69 +69 @@
 int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, ip_ver_t ver)
 {
-        dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
-        if (info == NULL)
-                return ENOMEM;
-        
         async_exch_t *exch = dnsr_exchange_begin();
         
@@ -85 +81 @@
                 return rc;
         }
+
+        dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
+        if (info == NULL)
+                return ENOMEM;
         
         ipc_call_t answer_addr;
@@ -96 +96 @@
                 async_exchange_end(exch);
                 async_forget(req);
+                free(info);
                 return (int) retval_addr;
         }
@@ -111 +112 @@
         if (retval_cname != EOK) {
                 async_forget(req);
+                free(info);
                 return (int) retval_cname;
         }
@@ -117 +119 @@
         async_wait_for(req, &retval);
         
-        if (retval != EOK)
+        if (retval != EOK) {
+                async_forget(req);
+                free(info);
                 return (int) retval;
-        
+        }
+
         size_t act_size = IPC_GET_ARG2(answer_cname);
         assert(act_size <= DNSR_NAME_MAX_SIZE);
         
         cname_buf[act_size] = '\0';
-        
+
         info->cname = str_dup(cname_buf);
-        
+
         *rinfo = info;
         return EOK;