Skip to content

G
Geth-Modification
Unverified Commit c0010f02 authored by Péter Szilágyi's avatar Péter Szilágyi Committed by GitHub
Browse files
Options

Merge pull request #20092 from karalabe/vendor-usb-bump 

vendor: pull in USB Windows fixes
parents a6a14f6b 9f98628d
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
vendor/github.com/karalabe/usb/appveyor.yml
View file @ c0010f02
...@@ -22,8 +22,8 @@ environment: ...@@ -22,8 +22,8 @@ environment:
install: install:
- rmdir C:\go /s /q - rmdir C:\go /s /q
- appveyor DownloadFile https://storage.googleapis.com/golang/go1.12.6.windows-%GOARCH%.zip - appveyor DownloadFile https://storage.googleapis.com/golang/go1.12.9.windows-%GOARCH%.zip
- 7z x go1.12.6.windows-%GOARCH%.zip -y -oC:\ > NUL - 7z x go1.12.9.windows-%GOARCH%.zip -y -oC:\ > NUL
- go version - go version
- gcc --version - gcc --version
......
vendor/github.com/karalabe/usb/hidapi/windows/hid.c
View file @ c0010f02
...@@ -74,6 +74,8 @@ extern "C" { ...@@ -74,6 +74,8 @@ extern "C" {
#pragma warning(disable:4996) #pragma warning(disable:4996)
#endif #endif
#pragma GCC diagnostic ignored "-Wstringop-overflow"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -428,7 +430,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor ...@@ -428,7 +430,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
if (str) { if (str) {
len = strlen(str); len = strlen(str);
cur_dev->path = (char*) calloc(len+1, sizeof(char)); 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'; cur_dev->path[len] = '\0';
} }
else else
......
vendor/vendor.json
View file @ c0010f02
...@@ -249,10 +249,10 @@ ...@@ -249,10 +249,10 @@
"revisionTime": "2017-04-30T22:20:11Z" "revisionTime": "2017-04-30T22:20:11Z"
}, },
{ {
"checksumSHA1": "X7ZY5gt+qBd/lafKNbPbouL819w=", "checksumSHA1": "AkW2LisC8HZAFIthaamcxOVl3RU=",
"path": "github.com/karalabe/usb", "path": "github.com/karalabe/usb",
"revision": "6a7de9d893feb2324aaef49331e923ce279c7973", "revision": "51dc0efba3568b598359930901dc6647e9b2c6a1",
"revisionTime": "2019-07-03T09:51:11Z", "revisionTime": "2019-09-19T08:00:40Z",
"tree": true "tree": true
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment