Changes in uspace/lib/c/generic/dnsr.c [e948fde:58563585] in mainline

File:

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

uspace/lib/c/generic/dnsr.c

@@ -52 +52 @@
                     IPC_FLAG_BLOCKING);
                 
-                dnsr_sess = loc_service_connect(EXCHANGE_SERIALIZE, dnsr_svc,
+                dnsr_sess = loc_service_connect(dnsr_svc, INTERFACE_DNSR,
                     IPC_FLAG_BLOCKING);
         }
@@ -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);
@@ -127 +132 @@
         info->cname = str_dup(cname_buf);
         
+        if (info->cname == NULL) {
+                free(info);
+                return ENOMEM;
+        }
+
         *rinfo = info;
         return EOK;