From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 31 Aug 2010 21:41:15 +0000 (+0000)
Subject: Check for empty strings rather than returning them.
X-Git-Tag: 1.4RC1~38
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=commitdiff_plain;h=7b621b3bc3b89649d6785e85c0795d33965e1b0d

Check for empty strings rather than returning them.
---

diff --git a/xmltooling/security/impl/CredentialCriteria.cpp b/xmltooling/security/impl/CredentialCriteria.cpp
index fb1dc19..c5a31e5 100644
--- a/xmltooling/security/impl/CredentialCriteria.cpp
+++ b/xmltooling/security/impl/CredentialCriteria.cpp
@@ -64,7 +64,7 @@ void CredentialCriteria::setUsage(unsigned int usage)
 
 const char* CredentialCriteria::getPeerName() const
 {
-    return m_peerName.c_str();
+    return m_peerName.empty() ? nullptr : m_peerName.c_str();
 }
 
 void CredentialCriteria::setPeerName(const char* peerName)
@@ -76,7 +76,7 @@ void CredentialCriteria::setPeerName(const char* peerName)
 
 const char* CredentialCriteria::getKeyAlgorithm() const
 {
-    return m_keyAlgorithm.c_str();
+    return m_keyAlgorithm.empty() ? nullptr : m_keyAlgorithm.c_str();
 }
 
 void CredentialCriteria::setKeyAlgorithm(const char* keyAlgorithm)