Merge pull request #1352 in SNORT/snort3 from sip_valgrind_fixes to master

Squashed commit of the following:

commit 3a57dd5dbfe0ee2850b0589746481bf807175da4
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Tue Sep 4 14:38:35 2018 -0400

    appid: Fix valgrind issues in SIP event handler

diff --git a/src/network_inspectors/appid/detector_plugins/detector_sip.cc b/src/network_inspectors/appid/detector_plugins/detector_sip.cc
index 71c85a40e900b560eff9e235845fac2216289c71..03315f904e60c882304811913c2aaf0fa2a66175 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_sip.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_sip.cc
@@ -496,12 +496,16 @@ void SipEventHandler::client_handler(SipEvent& sip_event, AppIdSession& asd)
 
     if ( sip_event.is_invite() && direction == APP_ID_FROM_INITIATOR )
     {
-        if (sip_event.get_from_len())
-            fd->from = sip_event.get_from();
-        if (sip_event.get_user_name_len())
-            fd->user_name = sip_event.get_user_name();
-        if (sip_event.get_user_agent_len())
-            fd->user_agent = sip_event.get_user_agent();
+        size_t len;
+        len = sip_event.get_from_len();
+        if (len > 0)
+            fd->from.assign(sip_event.get_from(), len);
+        len = sip_event.get_user_name_len();
+        if (len > 0)
+            fd->user_name.assign(sip_event.get_user_name(), len);
+        len = sip_event.get_user_agent_len();
+        if (len > 0)
+            fd->user_agent.assign(sip_event.get_user_agent(), len);
     }
 
     if ( !fd->user_agent.empty() )