Issue #722: Set DataValue.Value to Variant(nil) for no value

This patch ensures that DataValue.Value contains a Variant(nil) if there is no value. Closes #722
gopcua · Dec 10, 2024 · bada93d · bada93d
1 parent d7282d1
commit bada93d
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/ua/datatypes.go b/ua/datatypes.go
@@ -39,8 +39,8 @@ type DataValue struct {
 func (d *DataValue) Decode(b []byte) (int, error) {
 	buf := NewBuffer(b)
 	d.EncodingMask = buf.ReadByte()
+	d.Value = new(Variant)
 	if d.Has(DataValueValue) {
-		d.Value = new(Variant)
 		buf.ReadStruct(d.Value)
 	}
 	if d.Has(DataValueStatusCode) {

diff --git a/ua/datatypes_test.go b/ua/datatypes_test.go
@@ -11,6 +11,17 @@ import (
 
 func TestDataValue(t *testing.T) {
 	cases := []CodecTestCase{
+		{
+			Name: "no value",
+			Struct: &DataValue{
+				EncodingMask: 0x00,
+				Value:        MustVariant(nil),
+			},
+			Bytes: []byte{
+				// EncodingMask
+				0x00,
+			},
+		},
 		{
 			Name: "value only",
 			Struct: &DataValue{
@@ -45,14 +56,31 @@ func TestDataValue(t *testing.T) {
 				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
 			},
 		},
+		{
+			Name: "source timestamp, server timestamp",
+			Struct: &DataValue{
+				EncodingMask:    0x0c,
+				Value:           MustVariant(nil),
+				SourceTimestamp: time.Date(2018, time.September, 17, 14, 28, 29, 112000000, time.UTC),
+				ServerTimestamp: time.Date(2018, time.September, 17, 14, 28, 29, 112000000, time.UTC),
+			},
+			Bytes: []byte{
+				// EncodingMask
+				0x0c,
+				// SourceTimestamp
+				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
+				// SeverTimestamp
+				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
+			},
+		},
 	}
 	RunCodecTest(t, cases)
 }
 
 func TestDataValueArray(t *testing.T) {
 	cases := []CodecTestCase{
 		{
-			Name: "value only and value, source timestamp, server timestamp",
+			Name: "value only; value, source timestamp, server timestamp; source timestamp, server timestamp",
 			Struct: []*DataValue{
 				{
 					EncodingMask: 0x01,
@@ -64,10 +92,16 @@ func TestDataValueArray(t *testing.T) {
 					SourceTimestamp: time.Date(2018, time.September, 17, 14, 28, 29, 112000000, time.UTC),
 					ServerTimestamp: time.Date(2018, time.September, 17, 14, 28, 29, 112000000, time.UTC),
 				},
+				{
+					EncodingMask:    0x0c,
+					Value:           MustVariant(nil),
+					SourceTimestamp: time.Date(2018, time.September, 17, 14, 28, 29, 112000000, time.UTC),
+					ServerTimestamp: time.Date(2018, time.September, 17, 14, 28, 29, 112000000, time.UTC),
+				},
 			},
 			Bytes: []byte{
 				// length
-				0x02, 0x00, 0x00, 0x00,
+				0x03, 0x00, 0x00, 0x00,
 
 				// EncodingMask
 				0x01,
@@ -84,6 +118,13 @@ func TestDataValueArray(t *testing.T) {
 				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
 				// ServerTimestamp
 				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
+
+				// EncodingMask
+				0x0c,
+				// SourceTimestamp
+				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
+				// ServerTimestamp
+				0x80, 0x3b, 0xe8, 0xb3, 0x92, 0x4e, 0xd4, 0x01,
 			},
 		},
 	}