CWS-TOOLING: integrate CWS cmcfixes66

2 files changed, 10 insertions, 4 deletions

diff --git a/setup_native/source/ulfconv/ulfconv.cxx b/setup_native/source/ulfconv/ulfconv.cxx
index 6ca6834461f9..7a345f8b365a 100644
--- a/setup_native/source/ulfconv/ulfconv.cxx
+++ b/setup_native/source/ulfconv/ulfconv.cxx
@@ -199,6 +199,8 @@ void read_encoding_table(char * file, EncodingMap& aEncodingMap)
             aEncodingMap.insert( EncodingMap::value_type(language, encoding->value) );
         }
     }
+
+    fclose(fp);
 }
 
 /************************************************************************
@@ -311,6 +313,7 @@ int main( int argc, char * const argv[] )
         ostream = fopen(outfile, "w");
         if ( ostream == NULL ) {
             fprintf(stderr, "ulfconv: %s : %s\n", outfile, strerror(errno));
+            fclose(istream);
             exit(2);
         }
     }
@@ -351,4 +354,7 @@ int main( int argc, char * const argv[] )
             fputs(buffer, ostream);
         }
     }
+
+    fclose(ostream);
+    fclose(istream);
 }
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 41dbd6232bce..e01fe5109190 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -239,7 +239,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
             ) ;
 
             if( cbIssuer <= 0 ) {
-                delete issuer ;
+                delete [] issuer ;
                 throw RuntimeException() ;
             }
 
@@ -252,7 +252,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
             if(issuer[cbIssuer-1] == 0) cbIssuer--; //delimit the last 0x00;
             OUString xIssuer(issuer , cbIssuer ,encoding ) ; //By CP
-            delete issuer ;
+            delete [] issuer ;
 
             return replaceTagSWithTagST(xIssuer);
         } else {
@@ -288,7 +288,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
             ) ;
 
             if( cbSubject <= 0 ) {
-                delete subject ;
+                delete [] subject ;
                 throw RuntimeException() ;
             }
 
@@ -301,7 +301,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl :: getVersion() throw ( ::com::su
 
             if(subject[cbSubject-1] == 0) cbSubject--; //delimit the last 0x00;
             OUString xSubject(subject , cbSubject ,encoding ) ; //By CP
-            delete subject ;
+            delete [] subject ;
 
             return replaceTagSWithTagST(xSubject);
         } else {