[Libreoffice-commits] core.git: xmlsecurity/source

Caolán McNamara caolanm at redhat.com
Wed Jan 18 21:35:20 UTC 2017


 xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 16c9933666a9328a8bc59175248a440d26b3242a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 18 21:33:47 2017 +0000

    convert to std::vector
    
    Change-Id: I77ac7701ccb35aa32152d85a20fc59ed0bd942cf

diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index a4ca2a6..5e61463 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -80,7 +80,7 @@ css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl:
         CERTGeneralName* current = nameList;
 
         int size = GetNamesLength(nameList);
-        CertAltNameEntry* arrCertAltNameEntry = new CertAltNameEntry[size];
+        std::vector<CertAltNameEntry> arrCertAltNameEntry(size);
         for(int i = 0; i < size ; i++){
             switch (current->type) {
                 case certOtherName: {
@@ -146,13 +146,9 @@ css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl:
             current = CERT_GetNextGeneralName(current);
         }
 
-        m_Entries = ::comphelper::arrayToSequence< css::security::CertAltNameEntry >(arrCertAltNameEntry, size);
-
-        delete [] arrCertAltNameEntry;
+        m_Entries = ::comphelper::containerToSequence<css::security::CertAltNameEntry>(arrCertAltNameEntry);
 
         PORT_FreeArena(arena, PR_FALSE);
-
-
     }
 
     return m_Entries;


More information about the Libreoffice-commits mailing list