diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2016-01-04 15:20:23 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2016-01-04 15:20:23 +0100 |
| commit | 1f0bb8ad5302966e6298c7d4a5d8238a7ffc6be5 (patch) | |
| tree | 716a4c67a4ce16c1429118f144c848c36e9b40e1 | |
| parent | 8ce487819de1d91afff6e87027ddae64b14f7ee0 (diff) | |
| download | libgphoto2-1f0bb8ad5302966e6298c7d4a5d8238a7ffc6be5.tar.gz | |
use calloc(n,s) instead of malloc(n*s)
| -rw-r--r-- | libgphoto2_port/libusb1/libusb1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index a5b56ccd7..a244532e8 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -167,7 +167,7 @@ load_devicelist (GPPortPrivateLibrary *pl) { int i; pl->nrofdevs = libusb_get_device_list (pl->ctx, &pl->devs); - C_MEM (pl->descs = malloc (sizeof(pl->descs[0])*pl->nrofdevs)); + C_MEM (pl->descs = calloc (pl->nrofdevs, sizeof(pl->descs[0]))); for (i=0;i<pl->nrofdevs;i++) LOG_ON_LIBUSB_E (libusb_get_device_descriptor(pl->devs[i], &pl->descs[i])); } @@ -198,7 +198,7 @@ gp_port_library_list (GPPortInfoList *list) C_GP (gp_port_info_list_append (list, info)); nrofdevs = libusb_get_device_list (ctx, &devs); - C_MEM (descs = malloc (sizeof(descs[0])*nrofdevs)); + C_MEM (descs = calloc (nrofdevs, sizeof(descs[0]))); for (i=0;i<nrofdevs;i++) LOG_ON_LIBUSB_E (libusb_get_device_descriptor(devs[i], &descs[i])); |