fix(bacnet): fixed string length calculation for helper

apache · Apr 20, 2022 · 00417e4 · 00417e4
1 parent b34ce11
commit 00417e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
@@ -551,23 +551,23 @@ func CreateBACnetContextTagDouble(tagNumber uint8, value float64) *BACnetContext
 }
 
 func CreateBACnetApplicationTagOctetString(value string) *BACnetApplicationTagOctetString {
-	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_OCTET_STRING), uint32(len(value)))
-	return NewBACnetApplicationTagOctetString(NewBACnetTagPayloadOctetString(value, uint32(len(value))), header)
+	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_OCTET_STRING), uint32(len(value)+1))
+	return NewBACnetApplicationTagOctetString(NewBACnetTagPayloadOctetString(value, uint32(len(value)+1)), header)
 }
 
 func CreateBACnetContextTagOctetString(tagNumber uint8, value string) *BACnetContextTagOctetString {
-	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)))
-	return NewBACnetContextTagOctetString(NewBACnetTagPayloadOctetString(value, uint32(len(value))), header, tagNumber, true)
+	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)+1))
+	return NewBACnetContextTagOctetString(NewBACnetTagPayloadOctetString(value, uint32(len(value)+1)), header, tagNumber, true)
 }
 
 func CreateBACnetApplicationTagCharacterString(baCnetCharacterEncoding BACnetCharacterEncoding, value string) *BACnetApplicationTagCharacterString {
-	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_CHARACTER_STRING), uint32(len(value)))
-	return NewBACnetApplicationTagCharacterString(NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value))), header)
+	header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_CHARACTER_STRING), uint32(len(value)+1))
+	return NewBACnetApplicationTagCharacterString(NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value)+1)), header)
 }
 
 func CreateBACnetContextTagCharacterString(tagNumber uint8, baCnetCharacterEncoding BACnetCharacterEncoding, value string) *BACnetContextTagCharacterString {
-	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)))
-	return NewBACnetContextTagCharacterString(NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value))), header, tagNumber, true)
+	header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)+1))
+	return NewBACnetContextTagCharacterString(NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value)+1)), header, tagNumber, true)
 }
 
 func requiredLength(value uint) uint32 {

diff --git a/...ers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java b/...ers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
@@ -573,23 +573,23 @@ public static BACnetContextTagDouble createBACnetContextTagDouble(byte tagNumber
     }
 
     public static BACnetApplicationTagOctetString createBACnetApplicationTagOctetString(String value) {
-        BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.OCTET_STRING.getValue(), value.length());
-        return new BACnetApplicationTagOctetString(header, new BACnetTagPayloadOctetString(value, (long) value.length()));
+        BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.OCTET_STRING.getValue(), value.length() + 1);
+        return new BACnetApplicationTagOctetString(header, new BACnetTagPayloadOctetString(value, (long) value.length() + 1));
     }
 
     public static BACnetContextTagOctetString createBACnetContextTagOctetString(byte tagNumber, String value) {
-        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length());
-        return new BACnetContextTagOctetString(header, new BACnetTagPayloadOctetString(value, (long) value.length()), (short) tagNumber, true);
+        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length() + 1);
+        return new BACnetContextTagOctetString(header, new BACnetTagPayloadOctetString(value, (long) value.length() + 1), (short) tagNumber, true);
     }
 
     public static BACnetApplicationTagCharacterString createBACnetApplicationTagCharacterString(BACnetCharacterEncoding baCnetCharacterEncoding, String value) {
-        BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.CHARACTER_STRING.getValue(), value.length());
-        return new BACnetApplicationTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length()));
+        BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.CHARACTER_STRING.getValue(), value.length() + 1);
+        return new BACnetApplicationTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length() + 1));
     }
 
     public static BACnetContextTagCharacterString createBACnetContextTagCharacterString(byte tagNumber, BACnetCharacterEncoding baCnetCharacterEncoding, String value) {
-        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length());
-        return new BACnetContextTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length()), (short) tagNumber, true);
+        BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length() + 1);
+        return new BACnetContextTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length() + 1), (short) tagNumber, true);
     }
 
     private static long requiredLength(long value) {