From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 16 May 2013 18:01:47 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/SSPCPP-543
X-Git-Tag: 2.5.2~20
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=9e9c5e9cd9455855edf3d0ce7a1ca5e491c64047

https://issues.shibboleth.net/jira/browse/SSPCPP-543
---

diff --git a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
index 22589ca..61742ed 100644
--- a/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/MetadataAttributeExtractor.cpp
@@ -310,7 +310,7 @@ void MetadataExtractor::doLogo(
     if (request && request->startLangMatching()) {
         do {
             for (vector<Logo*>::const_iterator i = logos.begin(); i != logos.end(); ++i) {
-                if (request->matchLang((*i)->getLang())) {
+                if (!(*i)->getLang() || request->matchLang((*i)->getLang())) {
                     sizediff = 0;
                     if (h > 0) {
                         dim = (*i)->getHeight();