Merge pull request #1021 in SNORT/snort3 from firewall_memleak1 to master

Squashed commit of the following:

commit 25d9fcb917501bd63ed0b46633803c66a0ad4c71
Author: Steve Chew <stechew@cisco.com>
Date:   Thu Sep 21 15:25:33 2017 -0400

    Return nullptr from ApplicationDescriptor get funcs when string is empty.

diff --git a/src/network_inspectors/appid/appid_app_descriptor.h b/src/network_inspectors/appid/appid_app_descriptor.h
index caf923e016a36ef58a4b9af400e46fbf1493c2f6..4a91284c735290cc4efeb127768fde3e7cbec87b 100644 (file)
--- a/src/network_inspectors/appid/appid_app_descriptor.h
+++ b/src/network_inspectors/appid/appid_app_descriptor.h
@@ -70,7 +70,7 @@ public:
 
     const char* get_vendor() const
     {
-        return my_vendor.c_str();
+        return my_vendor.empty() ? nullptr : my_vendor.c_str();
     }
 
     void set_vendor(const char* vendor)
@@ -81,7 +81,7 @@ public:
 
     const char* get_version() const
     {
-        return my_version.c_str();
+        return my_version.empty() ? nullptr : my_version.c_str();
     }
 
     void set_version(const char* version)
@@ -159,7 +159,7 @@ public:
 
     const char* get_username() const
     {
-        return my_username.c_str();
+        return my_username.empty() ? nullptr : my_username.c_str();
     }
 
     void update_stats(AppId id) override