From 030c4696e664245377cb1a5eb94127ec7fa62201 Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Fri, 22 Sep 2017 09:41:53 -0400 Subject: [PATCH] Merge pull request #1021 in SNORT/snort3 from firewall_memleak1 to master Squashed commit of the following: commit 25d9fcb917501bd63ed0b46633803c66a0ad4c71 Author: Steve Chew Date: Thu Sep 21 15:25:33 2017 -0400 Return nullptr from ApplicationDescriptor get funcs when string is empty. --- src/network_inspectors/appid/appid_app_descriptor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/network_inspectors/appid/appid_app_descriptor.h b/src/network_inspectors/appid/appid_app_descriptor.h index caf923e01..4a91284c7 100644 --- 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 -- 2.47.3