From de7ea07a3d47e07fff0662e1bec62ba421a08f92 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 7 Apr 2020 08:51:55 +0200 Subject: [PATCH] Fixed URBDRC parsing error reported in #6024. --- channels/urbdrc/client/libusb/libusb_udevman.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 1220907cf..67360ad43 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -352,13 +352,13 @@ static BOOL udevman_parse_device_addr(const char* str, size_t maxLen, UINT8* id1 { unsigned long rc; char s1[8] = { 0 }; - char* s2; + char* s2 = strchr(str, sign); size_t len = strnlen(str, maxLen); size_t cpLen; - s2 = (strchr(str, sign)) + 1; if (!s2) return FALSE; + s2++; cpLen = len - (strnlen(s2, len) + 1); @@ -386,14 +386,14 @@ static BOOL udevman_parse_device_pid_vid(const char* str, size_t maxLen, UINT16* { unsigned long rc; char s1[8] = { 0 }; - char* s2; + char* s2 = strchr(str, sign); size_t len = strnlen(str, maxLen); size_t cpLen; - s2 = (strchr(str, sign)) + 1; if (!s2) return FALSE; + s2++; /* We need the PID, not ':' */ cpLen = len - (strnlen(s2, len) + 1); if (cpLen >= sizeof(s1))