From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 15 Nov 2018 15:16:08 +0000 (-0500)
Subject: Merge pull request #1437 in SNORT/snort3 from ~CWAXMAN/snort3:fbs_units to master
X-Git-Tag: 3.0.0-250~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a432b896c9edb7907c2a445a19c698060ef156c1;p=thirdparty%2Fsnort3.git

Merge pull request #1437 in SNORT/snort3 from ~CWAXMAN/snort3:fbs_units to master

Squashed commit of the following:

commit 4dc89f3fe85516316744c1cdebb7ffa9179b4ebe
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Nov 15 08:56:00 2018 -0500

    perfmonitor: fixed fbs schema generation when not building with DEBUG
---

diff --git a/src/network_inspectors/perf_monitor/fbs_formatter.cc b/src/network_inspectors/perf_monitor/fbs_formatter.cc
index b0defc60d..60ec3cbcf 100644
--- a/src/network_inspectors/perf_monitor/fbs_formatter.cc
+++ b/src/network_inspectors/perf_monitor/fbs_formatter.cc
@@ -152,9 +152,13 @@ void FbsFormatter::finalize_fields()
     schema += get_tracker_name() + ";";
 
     flatbuffers::Parser parser;
-    assert(parser.Parse(schema.c_str())); // Above code is broken or bad peg names if this hits
-    parser.Serialize();
+#ifndef NDEBUG
+    bool parsed =
+#endif
+    parser.Parse(schema.c_str());
+    assert(parsed); // Above code is broken or bad peg names if this hits
 
+    parser.Serialize();
     auto& schema_builder = parser.builder_;
 
     auto reflection_schema = reflection::GetSchema(schema_builder.GetBufferPointer());