diff options
| -rw-r--r-- | examples/dpfp.c | 2 | ||||
| -rw-r--r-- | examples/dpfp_threaded.c | 2 | ||||
| -rw-r--r-- | libusb/core.c | 2 | ||||
| -rw-r--r-- | libusb/os/darwin_usb.c | 2 | ||||
| -rw-r--r-- | libusb/sync.c | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/examples/dpfp.c b/examples/dpfp.c index c7d6347..ff98b5d 100644 --- a/examples/dpfp.c +++ b/examples/dpfp.c @@ -164,7 +164,7 @@ static void LIBUSB_CALL cb_mode_changed(struct libusb_transfer *transfer) static int set_mode_async(unsigned char data) { - unsigned char *buf = malloc(LIBUSB_CONTROL_SETUP_SIZE + 1); + unsigned char *buf = (unsigned char*) malloc(LIBUSB_CONTROL_SETUP_SIZE + 1); struct libusb_transfer *transfer; if (!buf) diff --git a/examples/dpfp_threaded.c b/examples/dpfp_threaded.c index e1df6ee..c8cbb28 100644 --- a/examples/dpfp_threaded.c +++ b/examples/dpfp_threaded.c @@ -193,7 +193,7 @@ static void LIBUSB_CALL cb_mode_changed(struct libusb_transfer *transfer) static int set_mode_async(unsigned char data) { - unsigned char *buf = malloc(LIBUSB_CONTROL_SETUP_SIZE + 1); + unsigned char *buf = (unsigned char*) malloc(LIBUSB_CONTROL_SETUP_SIZE + 1); struct libusb_transfer *transfer; if (!buf) diff --git a/libusb/core.c b/libusb/core.c index 82cf782..8845909 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -683,7 +683,7 @@ int API_EXPORTED libusb_get_port_path(libusb_context *ctx, libusb_device *dev, u { int i = path_len; ssize_t r; - struct libusb_device **devs; + struct libusb_device **devs = NULL; /* The device needs to be open, else the parents may have been destroyed */ r = libusb_get_device_list(ctx, &devs); diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index ac67b35..63c2bae 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -1698,6 +1698,8 @@ static int op_handle_events(struct libusb_context *ctx, struct pollfd *fds, POLL if (hpriv->fds[0] == pollfd->fd) break; } + if (!hpriv) + continue; if (!(pollfd->revents & POLLERR)) { ret = read (hpriv->fds[0], &message, sizeof (message)); diff --git a/libusb/sync.c b/libusb/sync.c index 9defc14..5033387 100644 --- a/libusb/sync.c +++ b/libusb/sync.c @@ -81,7 +81,7 @@ int API_EXPORTED libusb_control_transfer(libusb_device_handle *dev_handle, if (!transfer) return LIBUSB_ERROR_NO_MEM; - buffer = malloc(LIBUSB_CONTROL_SETUP_SIZE + wLength); + buffer = (unsigned char*) malloc(LIBUSB_CONTROL_SETUP_SIZE + wLength); if (!buffer) { libusb_free_transfer(transfer); return LIBUSB_ERROR_NO_MEM; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 071c2ef..6df4602 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10535 +#define LIBUSB_NANO 10536 |