Merge pull request #19 from jwetzell/message-tests

fix up some OSC string parsing issues and test for them

.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: go.mod
+      - name: Run tests
+        run: go test -v -coverprofile=coverage.txt .
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: coverage.txt

bundle.go

@@ -30,7 +30,11 @@ func BundleFromBytes(bytes []byte) (*OSCBundle, []byte, error) {
 		return nil, bytes, errors.New("bundle must start with a #")
 	}
 
-	bundleHeader, bytesAfterBundleHeader := readOSCString(bytes)
+	bundleHeader, bytesAfterBundleHeader, err := readOSCString(bytes)
+
+	if err != nil {
+		return nil, bytes, err
+	}
 
 	if bundleHeader != "#bundle" {
 		return nil, bytesAfterBundleHeader, errors.New("bundle must start with #bundle string")

go.mod

@@ -2,4 +2,4 @@ module github.com/jwetzell/osc-go
 
 go 1.25.1
 
-require github.com/urfave/cli/v3 v3.6.2
+require github.com/urfave/cli/v3 v3.8.0

go.sum

@@ -4,7 +4,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/urfave/cli/v3 v3.6.2 h1:lQuqiPrZ1cIz8hz+HcrG0TNZFxU70dPZ3Yl+pSrH9A8=
-github.com/urfave/cli/v3 v3.6.2/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
+github.com/urfave/cli/v3 v3.8.0 h1:XqKPrm0q4P0q5JpoclYoCAv0/MIvH/jZ2umzuf8pNTI=
+github.com/urfave/cli/v3 v3.8.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

message.go

@@ -29,11 +29,14 @@ func MessageFromBytes(bytes []byte) (*OSCMessage, error) {
 	if len(bytes) == 0 {
 		return nil, errors.New("cannot create OSC Message from empty byte array")
 	}
+	if bytes[0] != 47 {
+		return nil, errors.New("OSC Message must start with /")
+	}
 
-	address, typeAndArgBytes := readOSCString(bytes)
+	address, typeAndArgBytes, err := readOSCString(bytes)
 
-	if address[0] != 47 {
-		return nil, errors.New("OSC Message address must start with /")
+	if err != nil {
+		return nil, err
 	}
 
 	oscMessage := OSCMessage{
@@ -41,7 +44,16 @@ func MessageFromBytes(bytes []byte) (*OSCMessage, error) {
 		Args:    []OSCArg{},
 	}
 
-	typeString, argBytes := readOSCString(typeAndArgBytes)
+	if len(typeAndArgBytes) == 0 {
+		// NOTE(jwetzell): no type string return early.
+		return &oscMessage, nil
+	}
+
+	typeString, argBytes, err := readOSCString(typeAndArgBytes)
+
+	if err != nil {
+		return nil, err
+	}
 
 	for index, oscType := range typeString {
 		if index == 0 {
@@ -49,9 +61,9 @@ func MessageFromBytes(bytes []byte) (*OSCMessage, error) {
 				return nil, errors.New("type string is malformed")
 			}
 		} else {
-			oscArg, remainingBytes, error := readOSCArg(argBytes, string(oscType))
-			if error != nil {
-				return nil, error
+			oscArg, remainingBytes, err := readOSCArg(argBytes, string(oscType))
+			if err != nil {
+				return nil, err
 			}
 			argBytes = remainingBytes
 			oscMessage.Args = append(oscMessage.Args, oscArg)

message_test.go

@@ -1,30 +1,29 @@
 package osc
 
 import (
-	"fmt"
 	"math"
 	"reflect"
 	"testing"
 )
 
-func TestOSCMessageEncoding(t *testing.T) {
+func TestGoodOSCMessageEncoding(t *testing.T) {
 
 	testCases := []struct {
-		description string
-		message     *OSCMessage
-		expected    []byte
+		name     string
+		message  *OSCMessage
+		expected []byte
 	}{
 		{
-			"simple hello",
-			&OSCMessage{
+			name: "simple hello",
+			message: &OSCMessage{
 				Address: "/hello",
 				Args:    []OSCArg{},
 			},
-			[]byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0},
 		},
 		{
-			"simple address string arg",
-			&OSCMessage{
+			name: "simple address string arg",
+			message: &OSCMessage{
 				Address: "/hello",
 				Args: []OSCArg{
 					{
@@ -33,58 +32,58 @@ func TestOSCMessageEncoding(t *testing.T) {
 					},
 				},
 			},
-			[]byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0},
 		},
 		{
-			description: "simple address integer arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: 35}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
+			name:     "simple address integer arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: 35}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
 		},
 		{
-			description: "simple address float arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: 34.5}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
+			name:     "simple address float arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: 34.5}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
 		},
 		{
-			description: "simple address blob arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
+			name:     "simple address blob arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
 		},
 		{
-			description: "simple address True arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "T", Value: true}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
+			name:     "simple address True arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "T", Value: true}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
 		},
 		{
-			description: "simple address False arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
+			name:     "simple address False arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
 		},
 		{
-			description: "simple address color arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
+			name:     "simple address color arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
 		},
 		{
-			description: "simple address nil arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
+			name:     "simple address nil arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
 		},
 		{
-			description: "simple address int64 arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: 281474976710655}}},
-			expected:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
+			name:     "simple address int64 arg",
+			message:  &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: 281474976710655}}},
+			expected: []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
 		},
 		{
-			description: "simple address float64 arg",
-			message:     &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "d", Value: 12.7654763}}},
+			name:    "simple address float64 arg",
+			message: &OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "d", Value: 12.7654763}}},
 			expected: []byte{
 				47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
 			},
 		},
 		// TODO(jwetzell): get array args working working
 		// {
-		// 	description: "simple address array arg",
+		// 	name: "simple address array arg",
 		// 	message: OSCMessage{
 		// 		Address: "/hello",
 		// 		Args: []OSCArg{
@@ -100,15 +99,15 @@ func TestOSCMessageEncoding(t *testing.T) {
 		// 	},
 		// },
 		{
-			description: "osc 1.0 spec example 1",
-			message:     &OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: 440}}},
+			name:    "osc 1.0 spec example 1",
+			message: &OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: 440}}},
 			expected: []byte{
 				47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
 				102, 0, 0, 67, 220, 0, 0,
 			},
 		},
 		{
-			description: "osc 1.0 spec example 2",
+			name: "osc 1.0 spec example 2",
 			message: &OSCMessage{
 				Address: "/foo",
 				Args: []OSCArg{
@@ -128,81 +127,80 @@ func TestOSCMessageEncoding(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			actual := testCase.message.ToBytes()
 
-		actual := testCase.message.ToBytes()
-
-		if !reflect.DeepEqual(actual, testCase.expected) {
-			t.Errorf("Test '%s' failed to encode properly", testCase.description)
-			fmt.Printf("expected: %v\n", testCase.expected)
-			fmt.Printf("actual: %v\n", actual)
-		}
+			if !reflect.DeepEqual(actual, testCase.expected) {
+				t.Fatalf("failed to encode properly got '%v', expected '%v'", actual, testCase.expected)
+			}
+		})
 	}
 
 }
 
-func TestOSCMessageDecoding(t *testing.T) {
+func TestGoodOSCMessageDecoding(t *testing.T) {
 	testCases := []struct {
-		description string
-		bytes       []byte
-		expected    OSCMessage
+		name     string
+		bytes    []byte
+		expected OSCMessage
 	}{
 		{
-			description: "simple address no args",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{}},
+			name:     "simple address no args",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{}},
 		},
 		{
-			description: "simple address string arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "s", Value: "arg1"}}},
+			name:     "simple address string arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "s", Value: "arg1"}}},
 		},
 		{
-			description: "simple address integer arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: int32(35)}}},
+			name:     "simple address integer arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "i", Value: int32(35)}}},
 		},
 		{
-			description: "simple address float arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: float32(34.5)}}},
+			name:     "simple address float arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "f", Value: float32(34.5)}}},
 		},
 		{
-			description: "simple address blob arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
+			name:     "simple address blob arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "b", Value: []byte{98, 108, 111, 98}}}},
 		},
 		{
-			description: "simple address True arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "T", Value: true}}},
+			name:     "simple address True arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "T", Value: true}}},
 		},
 		{
-			description: "simple address False arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
+			name:     "simple address False arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "F", Value: false}}},
 		},
 		{
-			description: "simple address color arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
+			name:     "simple address color arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "r", Value: OSCColor{r: 20, g: 21, b: 22, a: 10}}}},
 		},
 		{
-			description: "simple address nil arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
+			name:     "simple address nil arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "N", Value: nil}}},
 		},
 		{
-			description: "simple address Inifinitum arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 73, 0, 0},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "I", Value: math.MaxInt32}}},
+			name:     "simple address Inifinitum arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 73, 0, 0},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "I", Value: math.MaxInt32}}},
 		},
 		{
-			description: "simple address int64 arg",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
-			expected:    OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: int64(281474976710655)}}},
+			name:     "simple address int64 arg",
+			bytes:    []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255},
+			expected: OSCMessage{Address: "/hello", Args: []OSCArg{{Type: "h", Value: int64(281474976710655)}}},
 		},
 		{
-			description: "simple address float64 arg",
+			name: "simple address float64 arg",
 			bytes: []byte{
 				47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
 			},
@@ -210,7 +208,7 @@ func TestOSCMessageDecoding(t *testing.T) {
 		},
 		// TODO(jwetzell): support OSC array
 		// {
-		// 	description: "simple address array arg",
+		// 	name: "simple address array arg",
 		// 	bytes: []byte{
 		// 		47, 104, 101, 108, 108, 111, 0, 0, 44, 91, 100, 105, 93, 0, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
 		// 		0, 0, 3, 232,
@@ -226,15 +224,15 @@ func TestOSCMessageDecoding(t *testing.T) {
 		// 	},
 		// },
 		{
-			description: "simple address no type string",
-			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0},
+			name:  "simple address no type string",
+			bytes: []byte{47, 104, 101, 108, 108, 111, 0, 0},
 			expected: OSCMessage{
 				Address: "/hello",
 				Args:    []OSCArg{},
 			},
 		},
 		{
-			description: "osc 1.0 spec example 1",
+			name: "osc 1.0 spec example 1",
 			bytes: []byte{
 				47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
 				102, 0, 0, 67, 220, 0, 0,
@@ -242,7 +240,7 @@ func TestOSCMessageDecoding(t *testing.T) {
 			expected: OSCMessage{Address: "/oscillator/4/frequency", Args: []OSCArg{{Type: "f", Value: float32(440)}}},
 		},
 		{
-			description: "osc 1.0 spec example 2",
+			name: "osc 1.0 spec example 2",
 			bytes: []byte{
 				47, 102, 111, 111, 0, 0, 0, 0, 44, 105, 105, 115, 102, 102, 0, 0, 0, 0, 3, 232, 255, 255, 255, 255, 104, 101, 108,
 				108, 111, 0, 0, 0, 63, 157, 243, 182, 64, 181, 178, 45,
@@ -262,24 +260,83 @@ func TestOSCMessageDecoding(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
 
-		actual, error := MessageFromBytes(testCase.bytes)
+			actual, err := MessageFromBytes(testCase.bytes)
 
-		if error != nil {
-			fmt.Println(error)
-			t.Errorf("Test '%s' failed to encode properly", testCase.description)
-		}
+			if err != nil {
+				t.Fatalf("failed to encode properly: %s", err.Error())
+			}
 
-		if !reflect.DeepEqual(actual.Address, testCase.expected.Address) {
-			t.Errorf("Test '%s' failed to encode address properly", testCase.description)
-			fmt.Printf("expected: %v\n", testCase.expected.Address)
-			fmt.Printf("actual: %v\n", actual.Address)
-		}
+			if !reflect.DeepEqual(actual.Address, testCase.expected.Address) {
+				t.Fatalf("failed to encode address propertly got '%s', expected '%s'", actual.Address, testCase.expected.Address)
+			}
 
-		if !reflect.DeepEqual(actual.Args, testCase.expected.Args) {
-			t.Errorf("Test '%s' failed to encode args properly", testCase.description)
-			fmt.Printf("expected: %v\n", testCase.expected.Args)
-			fmt.Printf("actual: %v\n", actual.Args)
-		}
+			if !reflect.DeepEqual(actual.Args, testCase.expected.Args) {
+				t.Fatalf("failed to encode args properly got '%+v', expected '%+v'", actual.Args, testCase.expected.Args)
+			}
+		})
+	}
+}
+
+func TestBadOSCMessageDecoding(t *testing.T) {
+	testCases := []struct {
+		name        string
+		bytes       []byte
+		errorString string
+	}{
+		{
+			name:        "empty byte array",
+			bytes:       []byte{},
+			errorString: "cannot create OSC Message from empty byte array",
+		},
+		{
+			name:        "does not start with /",
+			bytes:       []byte{0, 104, 101, 108, 108, 111, 0, 0},
+			errorString: "OSC Message must start with /",
+		},
+		{
+			name:        "address string not padded",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0},
+			errorString: "OSC string is not properly padded",
+		},
+		{
+			name:        "type string not padded",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 44, 0},
+			errorString: "OSC string is not properly padded",
+		},
+		{
+			name:        "type string does not start with ,",
+			bytes:       []byte{47, 104, 101, 108, 108, 111, 0, 0, 45, 0, 0, 0},
+			errorString: "type string is malformed",
+		},
+		{
+			name: "string arg not null-terminated",
+			bytes: []byte{
+				47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49,
+			},
+			errorString: "OSC string must be null-terminated",
+		},
+		{
+			name: "string arg not padded",
+			bytes: []byte{
+				47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 104, 105, 0,
+			},
+			errorString: "OSC string is not properly padded",
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			got, err := MessageFromBytes(testCase.bytes)
+
+			if err == nil {
+				t.Fatalf("MessageFromBytes expected to fail but got: %+v", got)
+			}
+
+			if err.Error() != testCase.errorString {
+				t.Fatalf("MessageFromBytes got error '%s', expected '%s'", err.Error(), testCase.errorString)
+			}
+		})
 	}
 }

osc.go

@@ -171,28 +171,37 @@ func argsToBuffer(args []OSCArg) []byte {
 	return argBuffers
 }
 
-func readOSCString(bytes []byte) (string, []byte) {
-	//TODO(jwetzell): add error handling
+func readOSCString(bytes []byte) (string, []byte, error) {
 	oscString := ""
 	stringEndIndex := 0
 
+	nullByteFound := false
 	for index, byteIn := range bytes {
 		if byteIn == 0 {
+			nullByteFound = true
 			oscString = string(bytes[0:index])
 			stringEndIndex = index + 1
 			break
 		}
 	}
 
+	if !nullByteFound {
+		return "", bytes, errors.New("OSC string must be null-terminated")
+	}
+
 	stringPadding := 4 - (stringEndIndex % 4)
 
 	if stringPadding < 4 {
 		stringEndIndex = stringEndIndex + stringPadding
 	}
 
+	if stringEndIndex > len(bytes) {
+		return "", bytes, errors.New("OSC string is not properly padded")
+	}
+
 	remainingBytes := bytes[stringEndIndex:]
 
-	return oscString, remainingBytes
+	return oscString, remainingBytes, nil
 }
 
 func readOSCInt32(bytes []byte) (int32, []byte, error) {
@@ -287,27 +296,30 @@ func readOSCArg(bytes []byte, oscType string) (OSCArg, []byte, error) {
 	//TODO(jwetzell): add error handling
 	switch oscType {
 	case "s":
-		argString, bytesLeft := readOSCString(bytes)
+		argString, bytesLeft, err := readOSCString(bytes)
+		if err != nil {
+			return OSCArg{}, bytes, err
+		}
 		oscArg.Value = argString
 		remainingBytes = bytesLeft
 	case "i":
-		argInt, bytesLeft, error := readOSCInt32(bytes)
-		if error != nil {
-			readArgError = error
+		argInt, bytesLeft, err := readOSCInt32(bytes)
+		if err != nil {
+			readArgError = err
 		}
 		oscArg.Value = argInt
 		remainingBytes = bytesLeft
 	case "f":
-		argFloat, bytesLeft, error := readOSCFloat32(bytes)
-		if error != nil {
-			readArgError = error
+		argFloat, bytesLeft, err := readOSCFloat32(bytes)
+		if err != nil {
+			readArgError = err
 		}
 		oscArg.Value = argFloat
 		remainingBytes = bytesLeft
 	case "b":
-		argBytes, bytesLeft, error := readOSCBlob(bytes)
-		if error != nil {
-			readArgError = error
+		argBytes, bytesLeft, err := readOSCBlob(bytes)
+		if err != nil {
+			readArgError = err
 		}
 		oscArg.Value = argBytes
 		remainingBytes = bytesLeft
@@ -324,23 +336,23 @@ func readOSCArg(bytes []byte, oscType string) (OSCArg, []byte, error) {
 		oscArg.Value = math.MaxInt32
 		remainingBytes = bytes
 	case "r":
-		argColor, bytesLeft, error := readOSCColor(bytes)
-		if error != nil {
-			readArgError = error
+		argColor, bytesLeft, err := readOSCColor(bytes)
+		if err != nil {
+			readArgError = err
 		}
 		oscArg.Value = argColor
 		remainingBytes = bytesLeft
 	case "h":
-		argInt, bytesLeft, error := readOSCInt64(bytes)
-		if error != nil {
-			readArgError = error
+		argInt, bytesLeft, err := readOSCInt64(bytes)
+		if err != nil {
+			readArgError = err
 		}
 		oscArg.Value = argInt
 		remainingBytes = bytesLeft
 	case "d":
-		argFloat, bytesLeft, error := readOSCFloat64(bytes)
-		if error != nil {
-			readArgError = error
+		argFloat, bytesLeft, err := readOSCFloat64(bytes)
+		if err != nil {
+			readArgError = err
 		}
 		oscArg.Value = argFloat
 		remainingBytes = bytesLeft