From: Victor Julien <vjulien@oisf.net>
Date: Tue, 15 Feb 2022 06:37:02 +0000 (+0100)
Subject: dnp3: update gen script to use jb_set_string_from_bytes
X-Git-Tag: suricata-7.0.0-beta1~903
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08346cb239c7932209940b0d1f281f79b9008f19;p=thirdparty%2Fsuricata.git

dnp3: update gen script to use jb_set_string_from_bytes

Bug: #5080.
---

diff --git a/scripts/dnp3-gen/dnp3-gen.py b/scripts/dnp3-gen/dnp3-gen.py
index 6b0f14e3fc..3c14f1eb9c 100755
--- a/scripts/dnp3-gen/dnp3-gen.py
+++ b/scripts/dnp3-gen/dnp3-gen.py
@@ -175,12 +175,8 @@ void OutputJsonDNP3SetItem(JsonBuilder *js, DNP3Object *object,
             jb_set_string(js, "data->{{field.name}}", data->{{field.name}});
 {% elif field.type == "chararray" %}
             if (data->{{field.len_field}} > 0) {
-                /* First create a null terminated string as not all versions
-                 * of jansson have json_stringn. */
-                char tmpbuf[data->{{field.len_field}} + 1];
-                memcpy(tmpbuf, data->{{field.name}}, data->{{field.len_field}});
-                tmpbuf[data->{{field.len_field}}] = '\\0';
-                jb_set_string(js, "{{field.name}}", tmpbuf);
+                jb_set_string_from_bytes(
+                        js, "{{field.name}}", (const uint8_t *)data->{{field.name}}, data->{{field.len_field}});
             } else {
                 jb_set_string(js, "{{field.name}}", "");
             }