From 9f98628dc220e5b7000f29be077be568c3ced51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 19 Sep 2019 11:02:48 +0300
Subject: [PATCH] vendor: pull in USB Windows fixes
---
vendor/github.com/karalabe/usb/appveyor.yml | 4 ++--
vendor/github.com/karalabe/usb/hidapi/windows/hid.c | 4 +++-
vendor/vendor.json | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/vendor/github.com/karalabe/usb/appveyor.yml b/vendor/github.com/karalabe/usb/appveyor.yml
index 1d921ae51..73a9664ae 100644
--- a/vendor/github.com/karalabe/usb/appveyor.yml
+++ b/vendor/github.com/karalabe/usb/appveyor.yml
@@ -22,8 +22,8 @@ environment:
install:
- rmdir C:\go /s /q
- - appveyor DownloadFile https://storage.googleapis.com/golang/go1.12.6.windows-%GOARCH%.zip
- - 7z x go1.12.6.windows-%GOARCH%.zip -y -oC:\ > NUL
+ - appveyor DownloadFile https://storage.googleapis.com/golang/go1.12.9.windows-%GOARCH%.zip
+ - 7z x go1.12.9.windows-%GOARCH%.zip -y -oC:\ > NUL
- go version
- gcc --version
diff --git a/vendor/github.com/karalabe/usb/hidapi/windows/hid.c b/vendor/github.com/karalabe/usb/hidapi/windows/hid.c
index 4e92cc8bc..60da64608 100644
--- a/vendor/github.com/karalabe/usb/hidapi/windows/hid.c
+++ b/vendor/github.com/karalabe/usb/hidapi/windows/hid.c
@@ -74,6 +74,8 @@ extern "C" {
#pragma warning(disable:4996)
#endif
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -428,7 +430,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
if (str) {
len = strlen(str);
cur_dev->path = (char*) calloc(len+1, sizeof(char));
- strncpy(cur_dev->path, str, sizeof(cur_dev->path));
+ strncpy(cur_dev->path, str, len+1);
cur_dev->path[len] = '\0';
}
else
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 33aab0e11..06b4a2cf4 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -249,10 +249,10 @@
"revisionTime": "2017-04-30T22:20:11Z"
},
{
- "checksumSHA1": "X7ZY5gt+qBd/lafKNbPbouL819w=",
+ "checksumSHA1": "AkW2LisC8HZAFIthaamcxOVl3RU=",
"path": "github.com/karalabe/usb",
- "revision": "6a7de9d893feb2324aaef49331e923ce279c7973",
- "revisionTime": "2019-07-03T09:51:11Z",
+ "revision": "51dc0efba3568b598359930901dc6647e9b2c6a1",
+ "revisionTime": "2019-09-19T08:00:40Z",
"tree": true
},
{
--
GitLab