From 1a6faa9f667ffcadf9548eeb11b23f4f9a9bdd2b Mon Sep 17 00:00:00 2001 From: evilsocket Date: Thu, 18 Apr 2019 10:56:10 +0200 Subject: [PATCH] misc: updated gatt library to fix an invalid memory access bug --- Gopkg.lock | 4 ++-- vendor/github.com/bettercap/gatt/linux/hci.go | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 54c8bc5e..8b0d730c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -27,7 +27,7 @@ [[projects]] branch = "master" - digest = "1:881bb9d751b9408f038b83e9331ce3c57603710f3546f16e7d43b5c24e974f6d" + digest = "1:67f303802ce14d56880d9f2142adc00511441f0fcf7b7fd4ad5856e234963f15" name = "github.com/bettercap/gatt" packages = [ ".", @@ -40,7 +40,7 @@ "xpc", ] pruneopts = "UT" - revision = "d1a17475747afe7c0d78813596d4e95801a5d592" + revision = "fac16c0ad797bbccae1fe4acf49761b98f7516e7" [[projects]] branch = "master" diff --git a/vendor/github.com/bettercap/gatt/linux/hci.go b/vendor/github.com/bettercap/gatt/linux/hci.go index ac2f73ef..7191df81 100644 --- a/vendor/github.com/bettercap/gatt/linux/hci.go +++ b/vendor/github.com/bettercap/gatt/linux/hci.go @@ -359,10 +359,13 @@ func (h *HCI) handleConnection(b []byte) { return } h.plistmu.Lock() - pd := h.plist[ep.PeerAddress] - h.plistmu.Unlock() - pd.Conn = c - h.AcceptSlaveHandler(pd) + if pd := h.plist[ep.PeerAddress]; pd != nil { + h.plistmu.Unlock() + pd.Conn = c + h.AcceptSlaveHandler(pd) + } else { + log.Printf("HCI: can't find data for %v", ep.PeerAddress) + } } func (h *HCI) handleDisconnectionComplete(b []byte) error {