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 (file)
--- 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();