Changes in / [00a8f1b:54935cf6] in mainline

Location:

uspace

Files:

• drv/bus/usb/usbmast/main.c (modified) (3 diffs)
• lib/c/generic/ns.c (modified) (1 diff)

uspace/drv/bus/usb/usbmast/main.c

@@ -158 +158 @@
         }
 
-        free(fun_name);
-
         /* Allocate soft state */
         mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
@@ -170 +168 @@
         mfun->mdev = mdev;
         mfun->lun = lun;
-
-        fun_name = NULL;
 
         /* Set up a connection handler. */
@@ -219 +215 @@
                 goto error;
         }
+
+        free(fun_name);
 
         return EOK;

uspace/lib/c/generic/ns.c

@@ -75 +75 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
         async_sess_t *sess =
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+
+        if (!sess)
+                return NULL;
         
         /*