From 9c2587f867c6d903efdfd001e977b83030bb1a2c Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Wed, 18 Aug 2010 10:38:23 +0200 Subject: assignment segfaults if right hand is a NULL pointer Signed-off-by: Nikola Pajkovsky --- lib/plugins/Bugzilla.cpp | 2 +- lib/plugins/RHTSupport.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/Bugzilla.cpp b/lib/plugins/Bugzilla.cpp index bcdb7730..815abffa 100644 --- a/lib/plugins/Bugzilla.cpp +++ b/lib/plugins/Bugzilla.cpp @@ -979,7 +979,7 @@ void CReporterBugzilla::SetSettings(const map_plugin_settings_t& pSettings) /* Should not be deleted (why?) */ const map_plugin_settings_t& CReporterBugzilla::GetSettings() { - m_pSettings["BugzillaURL"] = m_bugzilla_url; + m_pSettings["BugzillaURL"] = (m_bugzilla_url)? m_bugzilla_url: ""; m_pSettings["Login"] = (m_login)? m_login: ""; m_pSettings["Password"] = (m_password)? m_password: ""; m_pSettings["SSLVerify"] = m_ssl_verify ? "yes" : "no"; diff --git a/lib/plugins/RHTSupport.cpp b/lib/plugins/RHTSupport.cpp index 313d426d..d13ff467 100644 --- a/lib/plugins/RHTSupport.cpp +++ b/lib/plugins/RHTSupport.cpp @@ -314,9 +314,9 @@ void CReporterRHticket::SetSettings(const map_plugin_settings_t& pSettings) /* Should not be deleted (why?) */ const map_plugin_settings_t& CReporterRHticket::GetSettings() { - m_pSettings["URL"] = m_strata_url; - m_pSettings["Login"] = m_login; - m_pSettings["Password"] = m_password; + m_pSettings["URL"] = (m_strata_url)? m_strata_url: ""; + m_pSettings["Login"] = (m_login)? m_login: ""; + m_pSettings["Password"] = (m_password)? m_password: ""; m_pSettings["SSLVerify"] = m_ssl_verify ? "yes" : "no"; return m_pSettings; -- cgit