diff --git a/CHANGES b/CHANGES index bb53f9f19f..83b76cdd75 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ + +4.2.0-dev.205 | 2021-09-23 12:24:06 +0200 + + * Avoid allocation of duplicate zero-length strings for new + connections. (Justin Azoff, Corelight) + + * Sanity-check the method passed into ActiveHTTP. Reported by Pierre + Gaulon. (Robin Sommer, Corelight) + 4.2.0-dev.203 | 2021-09-21 15:16:49 -0700 * Sanitize log files names before they go into system(). (Robin Sommer, Corelight) diff --git a/VERSION b/VERSION index f552076e42..b89ddb470f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.2.0-dev.203 +4.2.0-dev.205 diff --git a/src/Conn.cc b/src/Conn.cc index dc81cf045f..e11e149a8e 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -271,7 +271,9 @@ const RecordValPtr& Connection::GetVal() conn_val->AssignTime(3, start_time); // ### conn_val->AssignInterval(4, last_time - start_time); - conn_val->Assign(6, history); + + if ( history.size() ) + conn_val->Assign(6, history); conn_val->SetOrigin(this);