fix: handle nil cases for reads and writes (#4)

Krajiyah · Dec 23, 2019 · 1be6242 · 1be6242
1 parent c7654c3
commit 1be6242
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -185,6 +185,9 @@ func (client *BLEClient) WriteValue(uuid string, data []byte) error {
 }
 
 func (client *BLEClient) writeValue(uuid string, data []byte) error {
+	if data == nil || len(data) == 0 {
+		return errors.New("Empty data provided. Will skip writing.")
+	}
 	c, err := client.getCharacteristic(uuid)
 	if err != nil {
 		return err

diff --git a/pkg/server/characteristic.go b/pkg/server/characteristic.go
@@ -2,6 +2,7 @@ package server
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -79,6 +80,10 @@ func generateReadHandler(server *BLEServer, uuid string, load func(string, conte
 				server.listener.OnReadOrWriteError(err)
 				return
 			}
+			if data == nil || len(data) == 0 {
+				server.listener.OnReadOrWriteError(errors.New("empty data returned from read char loader"))
+				return
+			}
 			encryptedData, err := util.Encrypt(data, server.secret)
 			if err != nil {
 				server.listener.OnReadOrWriteError(err)