JSON converter: fix malformed JSON output when an octetBytes field with zero size is converted

Lukas955 · Lukas955 · commit 054496593dde · 2019-11-11T14:48:25.000+01:00
diff --git a/src/converters/json.c b/src/converters/json.c
@@ -229,8 +229,7 @@ to_octet(struct context *buffer, const struct fds_drec_field *field)
 {
     if (field->size <= 8) {
         // Print as unsigned integer
-        to_uint(buffer, field);
-        return FDS_OK;
+        return to_uint(buffer, field);
     }
 
     const size_t mem_req = (2 * field->size) + 5U; // "0x" + 2 chars per byte + 2x "\"" + "\0"

Original file line number	Diff line number	Diff line change
`@@ -229,8 +229,7 @@ to_octet(struct context buffer, const struct fds_drec_field field)`
`229`	`229`	`{`
`230`	`230`	`if (field->size <= 8) {`
`231`	`231`	`// Print as unsigned integer`
`232`		`- to_uint(buffer, field);`
`233`		`- return FDS_OK;`
	`232`	`+ return to_uint(buffer, field);`
`234`	`233`	`}`
`235`	`234`
`236`	`235`	`const size_t mem_req = (2 * field->size) + 5U; // "0x" + 2 chars per byte + 2x "\"" + "\0"`