Merge remote-tracking branch 'libusb/master'

Author: KritzelKratzel

.github/workflows/linux.yml

@@ -18,16 +18,16 @@ jobs:
 
       - name: netlink
         # Disable tests for netlink as it doesn't seem to work in the CI environment.
-        run: .private/ci-build.sh --build-dir build-netlink --no-test -- --disable-udev
+        run: .private/ci-build.sh --werror --build-dir build-netlink --no-test -- --disable-udev
 
       - name: udev
-        run: .private/ci-build.sh --build-dir build-udev -- --enable-udev
+        run: .private/ci-build.sh --werror --build-dir build-udev -- --enable-udev
 
       - name: debug-log
-        run: .private/ci-build.sh --build-dir build-debug -- --enable-debug-log
+        run: .private/ci-build.sh --werror --build-dir build-debug -- --enable-debug-log
 
       - name: disable-log
-        run: .private/ci-build.sh --build-dir build-nolog -- --disable-log
+        run: .private/ci-build.sh --werror --build-dir build-nolog -- --disable-log
 
       - uses: mymindstorm/setup-emsdk@v13
 

.private/ci-build.sh

@@ -30,6 +30,10 @@ while [ $# -gt 0 ]; do
 		asan=no
 		shift
 		;;
+	--werror)
+		cflags+=" -Werror"
+		shift
+		;;
 	--)
 		shift
 		break;
@@ -53,7 +57,7 @@ fi
 mkdir "${builddir}"
 cd "${builddir}"
 
-cflags="-O2"
+cflags+=" -O2"
 
 # enable extra warnings
 cflags+=" -Winline"

libusb/core.c

@@ -2310,7 +2310,7 @@ int API_EXPORTED libusb_endpoint_supports_raw_io(libusb_device_handle* dev_handl
  * \returns another LIBUSB_ERROR code on other failure
  *
  * \see libusb_endpoint_supports_raw_io()
- * \seealso https://learn.microsoft.com/en-us/windows-hardware/drivers/usbcon/winusb-functions-for-pipe-policy-modification
+ * \see https://learn.microsoft.com/en-us/windows-hardware/drivers/usbcon/winusb-functions-for-pipe-policy-modification
  *
  * Since version 1.0.30, \ref LIBUSB_API_VERSION >= 0x0100010C
  */

libusb/descriptor.c

@@ -148,6 +148,8 @@ static void clear_interface(struct libusb_interface *usb_interface)
 				usb_interface->altsetting + i;
 
 			free((void *)ifp->extra);
+			ifp->extra = NULL;
+			ifp->extra_length = 0;
 			if (ifp->endpoint) {
 				uint8_t j;
 
@@ -156,10 +158,13 @@ static void clear_interface(struct libusb_interface *usb_interface)
 						       ifp->endpoint + j);
 			}
 			free((void *)ifp->endpoint);
+			ifp->endpoint = NULL;
+			ifp->bNumEndpoints = 0;
 		}
 	}
 	free((void *)usb_interface->altsetting);
 	usb_interface->altsetting = NULL;
+	usb_interface->num_altsetting = 0;
 }
 
 static int parse_interface(libusb_context *ctx,
@@ -322,7 +327,11 @@ static void clear_configuration(struct libusb_config_descriptor *config)
 					config->interface + i);
 	}
 	free((void *)config->interface);
+	config->interface = NULL;
+	config->bNumInterfaces = 0;
 	free((void *)config->extra);
+	config->extra = NULL;
+	config->extra_length = 0;
 }
 
 static int parse_configuration(struct libusb_context *ctx,
@@ -1665,6 +1674,7 @@ int API_EXPORTED libusb_get_device_string(libusb_device *dev,
 	}
 	if (NULL == data) {
 		length = 0;
+		data = NULL;
 	} else if (length > 0) {
 		*data = 0;  // return an empty string on errors when possible
 	}

libusb/io.c

@@ -1370,8 +1370,10 @@ static int arm_timer_for_next_timeout(struct libusb_context *ctx)
 
 		/* act on first transfer that has not already been handled */
 		if (!(itransfer->timeout_flags & (USBI_TRANSFER_TIMEOUT_HANDLED | USBI_TRANSFER_OS_HANDLES_TIMEOUT))) {
+#ifdef ENABLE_LOGGING
 			struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
 			usbi_dbg(ctx, "next timeout originally %ums", transfer->timeout);
+#endif
 			return usbi_arm_timer(&ctx->timer, cur_ts);
 		}
 	}
@@ -1434,9 +1436,11 @@ static int add_to_flying_list(struct usbi_transfer *itransfer)
 	if (first && usbi_using_timer(ctx) && TIMESPEC_IS_SET(timeout)) {
 		/* if this transfer has the lowest timeout of all active transfers,
 		 * rearm the timer with this transfer's timeout */
+#ifdef ENABLE_LOGGING
 		struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
 		usbi_dbg(ctx, "arm timer for timeout in %ums (first in line)",
 			transfer->timeout);
+#endif
 		r = usbi_arm_timer(&ctx->timer, timeout);
 	}
 #else

libusb/libusb.h

@@ -262,6 +262,24 @@ enum libusb_class_code {
 	/** Personal Healthcare */
 	LIBUSB_CLASS_PERSONAL_HEALTHCARE = 0x0f,
 
+	/** Audio & Video */
+	LIBUSB_CLASS_AUDIO_VIDEO = 0x10,
+
+	/** Billboard */
+	LIBUSB_CLASS_BILLBOARD = 0x11,
+
+	/** Interface class */
+	LIBUSB_CLASS_TYPE_C_BRIDGE = 0x12,
+
+	/** Bulk display */
+	LIBUSB_CLASS_BULK_DISPLAY_PROTOCOL = 0x13,
+
+	/** MCTP */
+	LIBUSB_CLASS_MCTP = 0x14,
+
+	/** I3C */
+	LIBUSB_CLASS_I3C = 0x3c,
+
 	/** Diagnostic Device */
 	LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
 

libusb/os/linux_usbfs.c

@@ -473,6 +473,8 @@ static int op_get_device_string(struct libusb_device *dev,
 		case LIBUSB_DEVICE_STRING_MANUFACTURER: attr = "manufacturer"; break;
 		case LIBUSB_DEVICE_STRING_PRODUCT: attr = "product"; break;
 		case LIBUSB_DEVICE_STRING_SERIAL_NUMBER: attr = "serial"; break;
+		case LIBUSB_DEVICE_STRING_COUNT:
+			/* intentional fall-through, avoid -Wswitch-enum */
 		default:
 			return LIBUSB_ERROR_INVALID_PARAM;
 	}

libusb/version_nano.h

@@ -1 +1 @@
-#define LIBUSB_NANO 11995
+#define LIBUSB_NANO 12002