Fix panic on unmarshalling JSON (#68)

baibaratsky · web-flow · commit 92f87d060799 · 2021-05-03T17:45:47.000+02:00
diff --git a/id.go b/id.go
@@ -253,6 +253,10 @@ func (id *ID) UnmarshalJSON(b []byte) error {
 		*id = nilID
 		return nil
 	}
+	// Check the slice length to prevent panic on passing it to UnmarshalText()
+	if len(b) < 2 {
+		return ErrInvalidID
+	}
 	return id.UnmarshalText(b[1 : len(b)-1])
 }
 
diff --git a/id_test.go b/id_test.go
@@ -176,6 +176,10 @@ func TestIDJSONUnmarshalingError(t *testing.T) {
 	if err != ErrInvalidID {
 		t.Errorf("json.Unmarshal() err=%v, want %v", err, ErrInvalidID)
 	}
+	err = json.Unmarshal([]byte(`{"ID":1}`), &v)
+	if err != ErrInvalidID {
+		t.Errorf("json.Unmarshal() err=%v, want %v", err, ErrInvalidID)
+	}
 }
 
 func TestIDDriverValue(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,10 @@ func (id *ID) UnmarshalJSON(b []byte) error {`
`253`	`253`	`*id = nilID`
`254`	`254`	`return nil`
`255`	`255`	`}`
	`256`	`+ // Check the slice length to prevent panic on passing it to UnmarshalText()`
	`257`	`+ if len(b) < 2 {`
	`258`	`+ return ErrInvalidID`
	`259`	`+ }`
`256`	`260`	`return id.UnmarshalText(b[1 : len(b)-1])`
`257`	`261`	`}`
`258`	`262`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,10 @@ func TestIDJSONUnmarshalingError(t *testing.T) {`
`176`	`176`	`if err != ErrInvalidID {`
`177`	`177`	`t.Errorf("json.Unmarshal() err=%v, want %v", err, ErrInvalidID)`
`178`	`178`	`}`
	`179`	+ err = json.Unmarshal([]byte(`{"ID":1}`), &v)
	`180`	`+ if err != ErrInvalidID {`
	`181`	`+ t.Errorf("json.Unmarshal() err=%v, want %v", err, ErrInvalidID)`
	`182`	`+ }`
`179`	`183`	`}`
`180`	`184`
`181`	`185`	`func TestIDDriverValue(t *testing.T) {`