commit 69a445b244ef00eda83ac02bac7c4a27598f5f88
author tedbullock <tedbullock> Thu Feb 15 07:41:04 2007 +0000
committer tedbullock <tedbullock> Thu Feb 15 07:41:04 2007 +0000
tree fac7f953e839e17a0bc92cb5639a9f0b0d40a42e
parent 073ee90c33f409620055b096eea38601a224b5c6

* examples/folders.c: Updated to use new multi device code
* src/libmtp.c: Fixed potential memory leaks
* src/libusb-glue.c: Fixed potential memory leaks and fixed device release segfault for multiple devices

src/libusb-glue.c

diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index ba2ae93..cfb020d 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -1751,14 +1751,9 @@
       return LIBMTP_ERROR_MEMORY_ALLOCATION;
     }
     
-    /* Callbacks and stuff */
-    ptp_usb[current_device]->callback_active = 0;
-    ptp_usb[current_device]->current_transfer_total = 0;
-    ptp_usb[current_device]->current_transfer_complete = 0;
-    ptp_usb[current_device]->current_transfer_callback = NULL;
-      
-    /* Reset device flags */
-    ptp_usb[current_device]->device_flags = DEVICE_FLAG_NONE;
+    /* Start with a blank slate (includes setting device_flags to 0) */
+    memset(params[current_device], 0, sizeof(PTPParams));
+    memset(ptp_usb[current_device], 0, sizeof(PTP_USB));
 
     /* This device has been allocated, continue with next device */
     return prime_device_memory(params, ptp_usb, numdevices, current_device+1);
@@ -1825,7 +1820,6 @@
                                             uint8_t current_device)
 {
   struct usb_endpoint_descriptor *ep;
-  PTPDeviceInfo deviceinfo;
   uint16_t ret=0;
   int n;
 
@@ -1948,6 +1942,7 @@
                     ret);
     usb_release_interface(ptp_usb[current_device]->handle,
             device->config->interface->altsetting->bInterfaceNumber);
+    return LIBMTP_ERROR_CONNECTING;
   }
   else
   {
@@ -1955,7 +1950,8 @@
   }
   
   /* It is permissible to call this before opening the session */
-  if (ptp_getdeviceinfo(params[current_device], &deviceinfo) != PTP_RC_OK)
+  if (ptp_getdeviceinfo(params[current_device],
+                            &params[current_device]->deviceinfo) != PTP_RC_OK)
   {
     fprintf(stderr, "Could not get device info!\n");
     usb_release_interface(ptp_usb[current_device]->handle,
@@ -1992,8 +1988,8 @@
  * @param numdevices number of devices connected to the machine 
  * @return Error Codes as per the type definition
  */ 
-LIBMTP_error_number_t find_usb_devices (PTPParams **params,
-                                            PTP_USB **ptp_usb,
+LIBMTP_error_number_t find_usb_devices (PTPParams ***params,
+                                            PTP_USB ***ptp_usb,
                                             uint8_t interfaceNumber[],
                                             uint8_t *numdevices)
 {
@@ -2037,8 +2033,8 @@
   }
   
   /* Allocate Memory Appropriately and Initialize*/
-  *params = (PTPParams *)malloc(*numdevices * sizeof(void *));
-  *ptp_usb = (PTP_USB *)malloc(*numdevices * sizeof(void *));
+  *params = (PTPParams **)malloc(*numdevices * sizeof(void *));
+  *ptp_usb = (PTP_USB **)malloc(*numdevices * sizeof(void *));
   
   /* Check for allocation Error */
   if(*params == NULL || *ptp_usb == NULL)
@@ -2064,14 +2060,14 @@
 
   fprintf(stderr, "Found %d device(s)\n", *numdevices);
   fprintf(stderr, "Priming USB PTP Memory\n");
-  ret =  prime_device_memory(&(*params), &(*ptp_usb), *numdevices, 0);
+  ret =  prime_device_memory(*params, *ptp_usb, *numdevices, 0);
   fprintf(stderr, "prime_device_memory error code: %d\n", ret);
 
   fprintf(stderr, "Assigning Device Flags to known device(s)\n");
-  assign_known_device_flags(MTPDeviceList, &(*ptp_usb), 0);
+  assign_known_device_flags(MTPDeviceList, *ptp_usb, 0);
   
   fprintf(stderr, "Configuring Device(s)\n");
-  ret = configure_usb_devices(MTPDeviceList, &(*params), &(*ptp_usb), 0);
+  ret = configure_usb_devices(MTPDeviceList, *params, *ptp_usb, 0);
   fprintf(stderr, "configure_usb_devices error code: %d\n", ret);
   
   /* Configure interface number */