Was returning nulls from mapper calls

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@433 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shib-target/shib-rpcerror.cpp b/shib-target/shib-rpcerror.cpp
index f1ffc65..fd1e228 100644 (file)
--- a/shib-target/shib-rpcerror.cpp
+++ b/shib-target/shib-rpcerror.cpp
@@ -265,18 +265,20 @@ int RPCError::getCode() { return m_priv->status; }
 
 const char* RPCError::getOriginErrorURL()
 {
-    const char* res="No URL Available";
+    const char* res=NULL;
+    static const char* msg="No URL Available";
     if (!m_priv->origin.empty())
     {
         OriginSiteMapper mapper;
         res=mapper.getErrorURL(m_priv->origin.c_str());
     }
-    return res;
+    return res ? res : msg;
 }
 
 const char* RPCError::getOriginContactName()
-{ 
-    const char* res="No Name Available";
+{
+    const char* res=NULL;
+    static const char* msg="No Name Available";
     if (!m_priv->origin.empty())
     {
         OriginSiteMapper mapper;
@@ -291,12 +293,13 @@ const char* RPCError::getOriginContactName()
             }
         }
     }
-    return res;
+    return res ? res : msg;
 }
 
 const char* RPCError::getOriginContactEmail()
 {
-    const char* res="No Email Available";
+    const char* res=NULL;
+    static const char* msg="No Email Available";
     if (!m_priv->origin.empty())
     {
         OriginSiteMapper mapper;
@@ -311,5 +314,5 @@ const char* RPCError::getOriginContactEmail()
             }
         }
     }
-    return res;
+    return res ? res : msg;
 }