Browse Source

enforce correct order of QualifiedName member encoding/decoding

Tom Lötzsch 6 years ago
parent
commit
4209f74e21
1 changed files with 6 additions and 4 deletions
  1. 6 4
      src/ua_types_encoding_binary.c

+ 6 - 4
src/ua_types_encoding_binary.c

@@ -731,13 +731,15 @@ DECODE_BINARY(ExpandedNodeId) {
 
 
 /* QualifiedName */
 /* QualifiedName */
 ENCODE_BINARY(QualifiedName) {
 ENCODE_BINARY(QualifiedName) {
-    return ENCODE_DIRECT(&src->namespaceIndex, UInt16) |
-           ENCODE_DIRECT(&src->name, String);
+    status ret = ENCODE_DIRECT(&src->namespaceIndex, UInt16);
+    ret |= ENCODE_DIRECT(&src->name, String);
+    return ret;
 }
 }
 
 
 DECODE_BINARY(QualifiedName) {
 DECODE_BINARY(QualifiedName) {
-    return DECODE_DIRECT(&dst->namespaceIndex, UInt16) |
-           DECODE_DIRECT(&dst->name, String);
+    status ret = DECODE_DIRECT(&dst->namespaceIndex, UInt16);
+    ret |= DECODE_DIRECT(&dst->name, String);
+    return ret;
 }
 }
 
 
 /* LocalizedText */
 /* LocalizedText */