Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_apple_x509_cl / lib / clNssUtils.cpp

diff --git a/OSX/libsecurity_apple_x509_cl/lib/clNssUtils.cpp b/OSX/libsecurity_apple_x509_cl/lib/clNssUtils.cpp
index bad0ce39baa7dc9456f2d4963dc678284a5854e8..d94b373d265151446831ce60ceb3fc868bb438e0 100644 (file)
--- a/OSX/libsecurity_apple_x509_cl/lib/clNssUtils.cpp
+++ b/OSX/libsecurity_apple_x509_cl/lib/clNssUtils.cpp
@@ -50,7 +50,6 @@ void *ArenaAllocator::malloc(size_t len) throw(std::bad_alloc)
 /* intentionally not implemented, should never be called */
 void ArenaAllocator::free(void *p) throw()
 {
 /* intentionally not implemented, should never be called */
 void ArenaAllocator::free(void *p) throw()
 {

-       throw std::bad_alloc();

 }
        
 void *ArenaAllocator::realloc(void *p, size_t len) throw(std::bad_alloc)
 }
        
 void *ArenaAllocator::realloc(void *p, size_t len) throw(std::bad_alloc)


@@ -827,7 +826,7 @@ void CL_qualCertStatementsToCssm(
                return;
        }
        cdsaObj.qcStatements = (CE_QC_Statement *)alloc.malloc(
                return;
        }
        cdsaObj.qcStatements = (CE_QC_Statement *)alloc.malloc(

-               numQcs * sizeof(CE_AccessDescription));
+               numQcs * sizeof(CE_QC_Statement));

        cdsaObj.numQCStatements = numQcs;
        for(unsigned dex=0; dex<numQcs; dex++) {
                CE_QC_Statement *dst = &cdsaObj.qcStatements[dex];
        cdsaObj.numQCStatements = numQcs;
        for(unsigned dex=0; dex<numQcs; dex++) {
                CE_QC_Statement *dst = &cdsaObj.qcStatements[dex];