[xmltooling] 44/65: CPPXT-108 - Potential nullpointer dereference in InlineCredential::getKeyInfo

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to branch debian/master
in repository xmltooling.

commit 499de15a3581453dff0a7ac866d684a4ad6b9a62
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Mon Jun 20 10:03:32 2016 -0400

    CPPXT-108 - Potential nullpointer dereference in InlineCredential::getKeyInfo
    
    https://issues.shibboleth.net/jira/browse/CPPXT-108
---
 xmltooling/security/impl/InlineKeyResolver.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xmltooling/security/impl/InlineKeyResolver.cpp b/xmltooling/security/impl/InlineKeyResolver.cpp
index acaf492..9d637d2 100644
--- a/xmltooling/security/impl/InlineKeyResolver.cpp
+++ b/xmltooling/security/impl/InlineKeyResolver.cpp
@@ -96,10 +96,10 @@ namespace xmltooling {
                             x509Datas.erase(x509Datas.begin() + pos);
                     }
                 }
-            }
-            if (!ret->hasChildren()) {
-                delete ret;
-                ret = nullptr;
+                if (!ret->hasChildren()) {
+                    delete ret;
+                    ret = nullptr;
+                }
             }
             return ret;
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git