From cee73cffb7e25e7cc65ba749271ff77a601fa2fa Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 12 Sep 2011 16:34:43 +0000
Subject: [PATCH] https://issues.shibboleth.net/jira/browse/SSPCPP-392

---
 saml/SAMLConfig.cpp                  | 4 ++--
 saml/binding/impl/SecurityPolicy.cpp | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index fbe109f..5842713 100644
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -234,8 +234,8 @@ void SAMLInternalConfig::generateRandomBytes(void* buf, unsigned int len)
 void SAMLInternalConfig::generateRandomBytes(std::string& buf, unsigned int len)
 {
     buf.erase();
-    auto_ptr<unsigned char> hold(new unsigned char[len]);
-    generateRandomBytes(hold.get(),len);
+    auto_arrayptr<unsigned char> hold(new unsigned char[len]);
+    generateRandomBytes(const_cast<unsigned char*>(hold.get()), len);
     for (unsigned int i=0; i<len; i++)
         buf+=(hold.get())[i];
 }
diff --git a/saml/binding/impl/SecurityPolicy.cpp b/saml/binding/impl/SecurityPolicy.cpp
index ba31f94..078194c 100644
--- a/saml/binding/impl/SecurityPolicy.cpp
+++ b/saml/binding/impl/SecurityPolicy.cpp
@@ -106,6 +106,7 @@ SecurityPolicy::SecurityPolicy(
 
 SecurityPolicy::~SecurityPolicy()
 {
+    delete m_role;
     delete m_metadataCriteria;
     delete m_issuer;
 }
-- 
2.1.4