descriptor: Fix addition overflow by correcting casts

The addition could overflow, the upcast needs to be performed before, not after. Fixes all clang-tidy bugprone-misplaced-widening-cast warnings References libusb#1479
indigo-astronomy · Jul 28, 2024 · 55f8c95 · 55f8c95
1 parent e3ccc46
commit 55f8c95
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -3,7 +3,6 @@ Checks: "-*,\
 boost-*,\
 bugprone-*,\
 -bugprone-easily-swappable-parameters,\
--bugprone-misplaced-widening-cast,\
 -bugprone-narrowing-conversions,\
 -bugprone-signed-char-misuse,\
 -bugprone-switch-missing-default-case,\

diff --git a/libusb/descriptor.c b/libusb/descriptor.c
@@ -411,7 +411,7 @@ static int parse_configuration(struct libusb_context *ctx,
 		ptrdiff_t len = buffer - begin;
 		if (len > 0) {
 			uint8_t *extra = realloc((void *)config->extra,
-						 (size_t)(config->extra_length + len));
+						 (size_t)(config->extra_length) + (size_t)len);
 
 			if (!extra) {
 				r = LIBUSB_ERROR_NO_MEM;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11923
+#define LIBUSB_NANO 11924
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define LIBUSB_NANO 11923
		#define LIBUSB_NANO 11924