From d33afdb73c49d631aa1dfd7073cfc01c6ac0cb0b Mon Sep 17 00:00:00 2001 From: "Shravan Rangarajuvenkata (shrarang)" Date: Thu, 27 Aug 2020 20:59:14 +0000 Subject: [PATCH] Merge pull request #2425 in SNORT/snort3 from ~CLJUDGE/snort3:ssl_check_host_for_null to master Squashed commit of the following: commit 2d74e652df3a89b010de5eb38bfea7e2dc955efe Author: cljudge Date: Tue Aug 18 01:26:19 2020 -0400 appid: adding check for nullptr before setting tls host --- src/network_inspectors/appid/appid_session_api.h | 9 ++++++--- .../appid/test/appid_session_api_test.cc | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/network_inspectors/appid/appid_session_api.h b/src/network_inspectors/appid/appid_session_api.h index bb5ab6ecc..4a061c451 100644 --- a/src/network_inspectors/appid/appid_session_api.h +++ b/src/network_inspectors/appid/appid_session_api.h @@ -188,9 +188,12 @@ private: void set_tls_host(const char* host) { - if (tls_host) - snort_free(tls_host); - tls_host = snort_strdup(host); + if (host) + { + if (tls_host) + snort_free(tls_host); + tls_host = snort_strdup(host); + } } friend AppIdSession; diff --git a/src/network_inspectors/appid/test/appid_session_api_test.cc b/src/network_inspectors/appid/test/appid_session_api_test.cc index 9fd0de792..093d86a09 100644 --- a/src/network_inspectors/appid/test/appid_session_api_test.cc +++ b/src/network_inspectors/appid/test/appid_session_api_test.cc @@ -131,10 +131,14 @@ TEST(appid_session_api, get_tls_host) { AppidChangeBits change_bits; change_bits.set(APPID_TLSHOST_BIT); + mock_session->tsession->set_tls_host(nullptr, 0, change_bits); + mock_session->set_tls_host(change_bits); + const char* val = mock_session->get_api().get_tls_host(); + STRCMP_EQUAL(val, nullptr); char* host = snort_strdup(APPID_UT_TLS_HOST); mock_session->tsession->set_tls_host(host, 0, change_bits); mock_session->set_tls_host(change_bits); - const char* val = mock_session->get_api().get_tls_host(); + val = mock_session->get_api().get_tls_host(); STRCMP_EQUAL(val, APPID_UT_TLS_HOST); } -- 2.47.3