Changes in uspace/lib/drv/generic/driver.c [8a637a4:669e9b5] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (3 diffs)

uspace/lib/drv/generic/driver.c

@@ -121 +121 @@
         devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
         
-        ddf_dev_t *dev = create_device();
-        
-        /* Add one reference that will be dropped by driver_dev_remove() */
-        dev_add_ref(dev);
-        dev->handle = dev_handle;
-        
         char *dev_name = NULL;
         int rc = async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
@@ -133 +127 @@
                 return;
         }
-        
+
+        ddf_dev_t *dev = create_device();
+        if (!dev) {
+                free(dev_name);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        /* Add one reference that will be dropped by driver_dev_remove() */
+        dev_add_ref(dev);
+        dev->handle = dev_handle;
         dev->name = dev_name;
         
@@ -495 +499 @@
         if (dev->driver_data != NULL)
                 free(dev->driver_data);
+        if (dev->name)
+                free(dev->name);
         free(dev);
 }