From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 4 Sep 2013 18:40:02 +0000 (+0000)
Subject: Fix double free issue when attributes are resolved.
X-Git-Tag: 1.0.0~4
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=70288d161008834583659da65f87e96397ffce3a

Fix double free issue when attributes are resolved.
---

diff --git a/src/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp
index dd7bbbf..5648c43 100644
--- a/src/shibresolver/resolver.cpp
+++ b/src/shibresolver/resolver.cpp
@@ -517,8 +517,10 @@ void RemotedResolver::resolve(
                     )
                 );
             resolver->resolveAttributes(*ctx.get());
-            if (!ctx->getResolvedAttributes().empty())
+            if (!ctx->getResolvedAttributes().empty()) {
                 resolvedAttrs.insert(resolvedAttrs.end(), ctx->getResolvedAttributes().begin(), ctx->getResolvedAttributes().end());
+                ctx->getResolvedAttributes().clear();
+            }
         }
     }
     catch (exception& ex) {