Changeset 359d96f in mainline

Timestamp:

2011-10-13T21:22:55Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

229629d

Parents:

05a119b

Message:

usbmid: Fix memory leaks.

Location:

uspace/drv/bus/usb/usbmid

Files:

• explore.c (modified) (1 diff)
• usbmid.c (modified) (2 diffs)

uspace/drv/bus/usb/usbmid/explore.c

@@ -174 +174 @@
         rc = ddf_fun_bind(ctl_fun);
         if (rc != EOK) {
+                ddf_fun_destroy(ctl_fun);
                 usb_log_error("Failed to bind control function: %s.\n",
                     str_error(rc));

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -106 +106 @@
             (int) interface_descriptor->interface_number);
         if (rc < 0) {
-                goto error_leave;
+                return ENOMEM;
         }
 
         /* Create the device. */
         child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name);
+        free(child_name);
         if (child == NULL) {
-                rc = ENOMEM;
-                goto error_leave;
+                return ENOMEM;
         }
 
@@ -122 +122 @@
 
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
-            interface_descriptor,
-            &child->match_ids);
+            interface_descriptor, &child->match_ids);
         if (rc != EOK) {
-                goto error_leave;
+                ddf_fun_destroy(child);
+                return rc;
         }
 
         rc = ddf_fun_bind(child);
         if (rc != EOK) {
-                goto error_leave;
+                /* This takes care of match_id deallocation as well. */
+                ddf_fun_destroy(child);
+                return rc;
         }
 
         return EOK;
-
-error_leave:
-        if (child != NULL) {
-                child->name = NULL;
-                /* This takes care of match_id deallocation as well. */
-                ddf_fun_destroy(child);
-        }
-        if (child_name != NULL) {
-                free(child_name);
-        }
-
-        return rc;
 }