libmtp: Fix some leaks in common code paths.

src/libusb1-glue.c

 /*
  * \file libusb1-glue.c
  * Low-level USB interface glue towards libusb.
  *
  * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
  * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2012 Marcus Meissner
  * Copyright (C) 2007 Ted Bullock
  * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com>
  *
@@ skipping 523 matching lines @@
           else {
             // Check whether the device is no USB hub but a PTP.
             if ( dev->config != NULL &&dev->config->interface->altsetting->bInterfaceClass == LIBUSB_CLASS_PTP && dev->descriptor.bDeviceClass != LIBUSB_CLASS_HUB ) {
               *mtp_device_list = append_to_mtpdevice_list(*mtp_device_list, dev, bus->location);
             }
           }
           */
         }
       }
     }
+    libusb_free_device_list (devs, 0);
 
   /* If nothing was found we end up here. */
   if(*mtp_device_list == NULL) {
     return LIBMTP_ERROR_NO_DEVICE_ATTACHED;
   }
   return LIBMTP_ERROR_NONE;
 }
 
 /**
  * Checks if a specific device with a certain bus and device
@@ skipping 408 matching lines @@
     towrite = size-curwrite;
     if (towrite > CONTEXT_BLOCK_SIZE) {
       towrite = CONTEXT_BLOCK_SIZE;
     } else {
       // This magic makes packets the same size that WMP send them.
       if (towrite > ptp_usb->outep_maxpacket && towrite % ptp_usb->outep_maxpacket != 0) {
         towrite -= towrite % ptp_usb->outep_maxpacket;
       }
     }
     int getfunc_ret = handler->getfunc(NULL, handler->priv,towrite,bytes,&towrite);
-    if (getfunc_ret != PTP_RC_OK)
+    if (getfunc_ret != PTP_RC_OK) {
+      free(bytes);
       return getfunc_ret;
+    }
     while (usbwritten < towrite) {
             ret = USB_BULK_WRITE(ptp_usb->handle,
                                     ptp_usb->outep,
                                     bytes+usbwritten,
                                     towrite-usbwritten,
                                     &xwritten,
                                     ptp_usb->timeout);
 
             LIBMTP_USB_DEBUG("USB OUT==>\n");
 
             if (ret != LIBUSB_SUCCESS) {
+              free(bytes);
               return PTP_ERROR_IO;
             }
             LIBMTP_USB_DATA(bytes+usbwritten, xwritten, 16);
             // check for result == 0 perhaps too.
             // Increase counters
             ptp_usb->current_transfer_complete += xwritten;
             curwrite += xwritten;
             usbwritten += xwritten;
     }
     // call callback
     if (ptp_usb->callback_active) {
       if (ptp_usb->current_transfer_complete >= ptp_usb->current_transfer_total) {
         // send last update and disable callback.
         ptp_usb->current_transfer_complete = ptp_usb->current_transfer_total;
         ptp_usb->callback_active = 0;
       }
       if (ptp_usb->current_transfer_callback != NULL) {
         int ret;
         ret = ptp_usb->current_transfer_callback(ptp_usb->current_transfer_complete,
                                                  ptp_usb->current_transfer_total,
                                                  ptp_usb->current_transfer_callback_data);
         if (ret != 0) {
+          free(bytes);
           return PTP_ERROR_CANCEL;
         }
       }
     }
     if (xwritten < towrite) /* short writes happen */
       break;
   }
   free (bytes);
   if (written) {
     *written = curwrite;
@@ skipping 1012 matching lines @@
     LIBMTP_ERROR("LIBMTP PANIC: Unable to find interface & endpoints of device\n");
     return LIBMTP_ERROR_CONNECTING;
   }
 
   /* Copy USB version number */
   ptp_usb->bcdusb = desc.bcdUSB;
 
   /* Attempt to initialize this device */
   if (init_ptp_usb(params, ptp_usb, ldevice) < 0) {
     LIBMTP_ERROR("LIBMTP PANIC: Unable to initialize device\n");
+    libusb_free_device_list (devs, 0);
     return LIBMTP_ERROR_CONNECTING;
   }
 
   /*
    * This works in situations where previous bad applications
    * have not used LIBMTP_Release_Device on exit
    */
   if ((ret = ptp_opensession(params, 1)) == PTP_ERROR_IO) {
     LIBMTP_ERROR("PTP_ERROR_IO: failed to open session, trying again after resetting USB interface\n");
     LIBMTP_ERROR("LIBMTP libusb: Attempt to reset device\n");
     libusb_reset_device (ptp_usb->handle);
     close_usb(ptp_usb);
 
     if(init_ptp_usb(params, ptp_usb, ldevice) <0) {
       LIBMTP_ERROR("LIBMTP PANIC: Could not init USB on second attempt\n");
+      libusb_free_device_list (devs, 0);
       return LIBMTP_ERROR_CONNECTING;
     }
 
     /* Device has been reset, try again */
     if ((ret = ptp_opensession(params, 1)) == PTP_ERROR_IO) {
       LIBMTP_ERROR("LIBMTP PANIC: failed to open session on second attempt\n");
+      libusb_free_device_list (devs, 0);
       return LIBMTP_ERROR_CONNECTING;
     }
   }
 
   /* Was the transaction id invalid? Try again */
   if (ret == PTP_RC_InvalidTransactionID) {
     LIBMTP_ERROR("LIBMTP WARNING: Transaction ID was invalid, increment and try again\n");
     params->transaction_id += 10;
     ret = ptp_opensession(params, 1);
   }
 
   if (ret != PTP_RC_SessionAlreadyOpened && ret != PTP_RC_OK) {
     LIBMTP_ERROR("LIBMTP PANIC: Could not open session! "
             "(Return code %d)\n  Try to reset the device.\n",
             ret);
     libusb_release_interface(ptp_usb->handle, ptp_usb->interface);
+    libusb_free_device_list (devs, 0);
     return LIBMTP_ERROR_CONNECTING;
   }
 
   /* OK configured properly */
   *usbinfo = (void *) ptp_usb;
+  libusb_free_device_list (devs, 0);
   return LIBMTP_ERROR_NONE;
 }
 
 
 void close_device (PTP_USB *ptp_usb, PTPParams *params)
 {
   if (ptp_closesession(params)!=PTP_RC_OK)
     LIBMTP_ERROR("ERROR: Could not close session!\n");
   close_usb(ptp_usb);
 }
@@ skipping 41 matching lines @@
 {
   return libusb_control_transfer(ptp_usb->handle,
                           LIBUSB_ENDPOINT_IN|LIBUSB_RECIPIENT_ENDPOINT,
                           LIBUSB_REQUEST_GET_STATUS,
                           USB_FEATURE_HALT,
                           ep,
                           (unsigned char *) status,
                           2,
                           ptp_usb->timeout);
 }