From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- ui/qt/utils/proto_node.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ui/qt/utils/proto_node.cpp') diff --git a/ui/qt/utils/proto_node.cpp b/ui/qt/utils/proto_node.cpp index 68d1f4c7..222b2d5e 100644 --- a/ui/qt/utils/proto_node.cpp +++ b/ui/qt/utils/proto_node.cpp @@ -12,6 +12,7 @@ #include +// NOLINTNEXTLINE(misc-no-recursion) ProtoNode::ProtoNode(proto_node *node, ProtoNode *parent) : node_(node), parent_(parent) { @@ -28,6 +29,7 @@ ProtoNode::ProtoNode(proto_node *node, ProtoNode *parent) : for (proto_node *child = node_->first_child; child; child = child->next) { if (!isHidden(child)) { + // We recurse here, but we're limited by tree depth checks in epan m_children.append(new ProtoNode(child, this)); } } @@ -70,7 +72,7 @@ QString ProtoNode::labelText() const label = fi->rep->representation; } else { /* no, make a generic label */ - gchar label_str[ITEM_LABEL_LENGTH]; + char label_str[ITEM_LABEL_LENGTH]; proto_item_fill_label(fi, label_str); label = label_str; } -- cgit v1.2.3