You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2004/02/21 09:26:54 UTC
cvs commit: xml-security/c/src/xenc/impl XENCCipherValueImpl.cpp
blautenb 2004/02/21 00:26:54
Modified: c/src/dsig DSIGConstants.cpp DSIGKeyInfoName.cpp
DSIGKeyInfoX509.cpp
c/src/framework XSECAlgorithmMapper.cpp XSECEnv.cpp
XSECException.cpp XSECURIResolverXerces.cpp
c/src/samples IOStreamOutputter.cpp simpleValidate.cpp
c/src/tools/checksig AnonymousResolver.cpp
InteropResolver.cpp checksig.cpp
c/src/tools/cipher XencInteropResolver.cpp cipher.cpp
c/src/tools/siginf siginf.cpp
c/src/tools/templatesign templatesign.cpp
c/src/tools/txfmout txfmout.cpp
c/src/tools/xtest xtest.cpp
c/src/transformers TXFMDocObject.cpp
c/src/utils XSECDOMUtils.cpp XSECSafeBuffer.cpp
XSECXPathNodeList.cpp
c/src/utils/unixutils XSECURIResolverGenericUnix.cpp
c/src/utils/winutils XSECURIResolverGenericWin32.cpp
c/src/xenc/impl XENCCipherValueImpl.cpp
Log:
Use XMLString::release rather than delete[] for all Xerces strings
Revision Changes Path
1.20 +43 -43 xml-security/c/src/dsig/DSIGConstants.cpp
Index: DSIGConstants.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGConstants.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DSIGConstants.cpp 8 Feb 2004 10:20:51 -0000 1.19
+++ DSIGConstants.cpp 21 Feb 2004 08:26:53 -0000 1.20
@@ -136,48 +136,48 @@
void DSIGConstants::destroy() {
// Delete the static strings
- delete[] (XMLCh *) s_unicodeStrEmpty;
- delete[] (XMLCh *) s_unicodeStrNL;
- delete[] (XMLCh *) s_unicodeStrXmlns;
- delete[] (XMLCh *) s_unicodeStrURI;
+ XMLString::release((XMLCh **) &s_unicodeStrEmpty);
+ XMLString::release((XMLCh **) &s_unicodeStrNL);
+ XMLString::release((XMLCh **) &s_unicodeStrXmlns);
+ XMLString::release((XMLCh **) &s_unicodeStrURI);
- delete[] (XMLCh *) s_unicodeStrAlgorithm;
+ XMLString::release((XMLCh **) &s_unicodeStrAlgorithm);
- delete[] (XMLCh *) s_unicodeStrURIRawX509;
- delete[] (XMLCh *) s_unicodeStrURIDSIG;
- delete[] (XMLCh *) s_unicodeStrURIEC;
- delete[] (XMLCh *) s_unicodeStrURIXPF;
- delete[] (XMLCh *) s_unicodeStrURIXENC;
- delete[] (XMLCh *) s_unicodeStrURISHA1;
- delete[] (XMLCh *) s_unicodeStrURIMD5;
- delete[] (XMLCh *) s_unicodeStrURIBASE64;
- delete[] (XMLCh *) s_unicodeStrURIXPATH;
- delete[] (XMLCh *) s_unicodeStrURIXSLT;
- delete[] (XMLCh *) s_unicodeStrURIENVELOPE;
- delete[] (XMLCh *) s_unicodeStrURIC14N_NOC;
- delete[] (XMLCh *) s_unicodeStrURIC14N_COM;
- delete[] (XMLCh *) s_unicodeStrURIEXC_C14N_NOC;
- delete[] (XMLCh *) s_unicodeStrURIEXC_C14N_COM;
- delete[] (XMLCh *) s_unicodeStrURIDSA_SHA1;
- delete[] (XMLCh *) s_unicodeStrURIRSA_SHA1;
- delete[] (XMLCh *) s_unicodeStrURIHMAC_SHA1;
- delete[] (XMLCh *) s_unicodeStrURIXMLNS;
- delete[] (XMLCh *) s_unicodeStrURIMANIFEST;
+ XMLString::release((XMLCh **) &s_unicodeStrURIRawX509);
+ XMLString::release((XMLCh **) &s_unicodeStrURIDSIG);
+ XMLString::release((XMLCh **) &s_unicodeStrURIEC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXPF);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXENC);
+ XMLString::release((XMLCh **) &s_unicodeStrURISHA1);
+ XMLString::release((XMLCh **) &s_unicodeStrURIMD5);
+ XMLString::release((XMLCh **) &s_unicodeStrURIBASE64);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXPATH);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXSLT);
+ XMLString::release((XMLCh **) &s_unicodeStrURIENVELOPE);
+ XMLString::release((XMLCh **) &s_unicodeStrURIC14N_NOC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIC14N_COM);
+ XMLString::release((XMLCh **) &s_unicodeStrURIEXC_C14N_NOC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIEXC_C14N_COM);
+ XMLString::release((XMLCh **) &s_unicodeStrURIDSA_SHA1);
+ XMLString::release((XMLCh **) &s_unicodeStrURIRSA_SHA1);
+ XMLString::release((XMLCh **) &s_unicodeStrURIHMAC_SHA1);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXMLNS);
+ XMLString::release((XMLCh **) &s_unicodeStrURIMANIFEST);
- delete[] (XMLCh *) s_unicodeStrURI3DES_CBC;
- delete[] (XMLCh *) s_unicodeStrURIAES128_CBC;
- delete[] (XMLCh *) s_unicodeStrURIAES192_CBC;
- delete[] (XMLCh *) s_unicodeStrURIAES256_CBC;
- delete[] (XMLCh *) s_unicodeStrURIKW_AES128;
- delete[] (XMLCh *) s_unicodeStrURIKW_AES192;
- delete[] (XMLCh *) s_unicodeStrURIKW_AES256;
- delete[] (XMLCh *) s_unicodeStrURIKW_3DES;
- delete[] (XMLCh *) s_unicodeStrURIRSA_1_5;
- delete[] (XMLCh *) s_unicodeStrURIRSA_OAEP_MGFP1;
- delete[] (XMLCh *) s_unicodeStrURIXENC_ELEMENT;
- delete[] (XMLCh *) s_unicodeStrURIXENC_CONTENT;
+ XMLString::release((XMLCh **) &s_unicodeStrURI3DES_CBC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIAES128_CBC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIAES192_CBC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIAES256_CBC);
+ XMLString::release((XMLCh **) &s_unicodeStrURIKW_AES128);
+ XMLString::release((XMLCh **) &s_unicodeStrURIKW_AES192);
+ XMLString::release((XMLCh **) &s_unicodeStrURIKW_AES256);
+ XMLString::release((XMLCh **) &s_unicodeStrURIKW_3DES);
+ XMLString::release((XMLCh **) &s_unicodeStrURIRSA_1_5);
+ XMLString::release((XMLCh **) &s_unicodeStrURIRSA_OAEP_MGFP1);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXENC_ELEMENT);
+ XMLString::release((XMLCh **) &s_unicodeStrURIXENC_CONTENT);
- delete[] (XMLCh *) s_unicodeStrPROVOpenSSL;
- delete[] (XMLCh *) s_unicodeStrPROVWinCAPI;
+ XMLString::release((XMLCh **) &s_unicodeStrPROVOpenSSL);
+ XMLString::release((XMLCh **) &s_unicodeStrPROVWinCAPI);
}
1.8 +3 -3 xml-security/c/src/dsig/DSIGKeyInfoName.cpp
Index: DSIGKeyInfoName.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoName.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DSIGKeyInfoName.cpp 8 Feb 2004 10:20:51 -0000 1.7
+++ DSIGKeyInfoName.cpp 21 Feb 2004 08:26:53 -0000 1.8
@@ -66,7 +66,7 @@
DSIGKeyInfoName::~DSIGKeyInfoName() {
if (mp_decodedDName != NULL)
- delete[] mp_decodedDName;
+ XMLString::release(&mp_decodedDName);
};
@@ -181,7 +181,7 @@
if (mp_decodedDName != NULL) {
- delete[] mp_decodedDName;
+ XMLString::release(&mp_decodedDName);
mp_decodedDName = NULL;
}
1.13 +7 -7 xml-security/c/src/dsig/DSIGKeyInfoX509.cpp
Index: DSIGKeyInfoX509.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoX509.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DSIGKeyInfoX509.cpp 8 Feb 2004 10:20:51 -0000 1.12
+++ DSIGKeyInfoX509.cpp 21 Feb 2004 08:26:53 -0000 1.13
@@ -85,10 +85,10 @@
// encoded DName held in the DOM
if (mp_X509IssuerName != NULL)
- delete[] mp_X509IssuerName;
+ XMLString::release(&mp_X509IssuerName);
if (mp_X509SubjectName != NULL)
- delete[] mp_X509SubjectName;
+ XMLString::release(&mp_X509SubjectName);
X509ListType::iterator i;
@@ -103,7 +103,7 @@
m_X509List.clear();
if (mp_rawRetrievalURI != NULL)
- delete[] mp_rawRetrievalURI;
+ XMLString::release(&mp_rawRetrievalURI);
};
@@ -431,7 +431,7 @@
void DSIGKeyInfoX509::setX509SubjectName(const XMLCh * name) {
if (mp_X509SubjectName != NULL)
- delete[] mp_X509SubjectName;
+ XMLString::release(&mp_X509SubjectName);
mp_X509SubjectName = XMLString::replicate(name);
@@ -468,7 +468,7 @@
void DSIGKeyInfoX509::setX509IssuerSerial(const XMLCh * name, const XMLCh * serial) {
if (mp_X509IssuerName != NULL)
- delete[] mp_X509IssuerName;
+ XMLString::release(&mp_X509IssuerName);
mp_X509IssuerName = XMLString::replicate(name);
@@ -528,7 +528,7 @@
void DSIGKeyInfoX509::setRawRetrievalURI(const XMLCh * uri) {
if (mp_rawRetrievalURI != NULL)
- delete[] mp_rawRetrievalURI;
+ XMLString::release(&mp_rawRetrievalURI);
mp_rawRetrievalURI = XMLString::replicate(uri);
1.3 +2 -2 xml-security/c/src/framework/XSECAlgorithmMapper.cpp
Index: XSECAlgorithmMapper.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECAlgorithmMapper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSECAlgorithmMapper.cpp 8 Feb 2004 10:24:23 -0000 1.2
+++ XSECAlgorithmMapper.cpp 21 Feb 2004 08:26:53 -0000 1.3
@@ -77,7 +77,7 @@
while (it != m_mapping.end()) {
- delete[] (*it)->mp_uri;
+ XMLString::release(&((*it)->mp_uri));
delete (*it)->mp_handler;
delete (*it);
1.6 +9 -9 xml-security/c/src/framework/XSECEnv.cpp
Index: XSECEnv.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECEnv.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECEnv.cpp 8 Feb 2004 10:24:23 -0000 1.5
+++ XSECEnv.cpp 21 Feb 2004 08:26:53 -0000 1.6
@@ -98,19 +98,19 @@
}
if (mp_prefixNS != NULL) {
- delete[] mp_prefixNS;
+ XMLString::release(&mp_prefixNS);
}
if (mp_ecPrefixNS != NULL) {
- delete[] mp_ecPrefixNS;
+ XMLString::release(&mp_ecPrefixNS);
}
if (mp_xpfPrefixNS != NULL) {
- delete[] mp_xpfPrefixNS;
+ XMLString::release(&mp_xpfPrefixNS);
}
if (mp_xencPrefixNS != NULL) {
- delete[] mp_xencPrefixNS;
+ XMLString::release(&mp_xencPrefixNS);
}
if (mp_URIResolver != NULL) {
@@ -146,7 +146,7 @@
void XSECEnv::setDSIGNSPrefix(const XMLCh * prefix) {
if (mp_prefixNS != NULL)
- delete[] mp_prefixNS;
+ XMLString::release(&mp_prefixNS);
mp_prefixNS = XMLString::replicate(prefix);
@@ -155,7 +155,7 @@
void XSECEnv::setECNSPrefix(const XMLCh * prefix) {
if (mp_ecPrefixNS != NULL)
- delete[] mp_ecPrefixNS;
+ XMLString::release(&mp_ecPrefixNS);
mp_ecPrefixNS = XMLString::replicate(prefix);
@@ -164,7 +164,7 @@
void XSECEnv::setXPFNSPrefix(const XMLCh * prefix) {
if (mp_xpfPrefixNS != NULL)
- delete[] mp_xpfPrefixNS;
+ XMLString::release(&mp_xpfPrefixNS);
mp_xpfPrefixNS = XMLString::replicate(prefix);
@@ -173,7 +173,7 @@
void XSECEnv::setXENCNSPrefix(const XMLCh * prefix) {
if (mp_xencPrefixNS != NULL)
- delete[] mp_xencPrefixNS;
+ XMLString::release(&mp_xencPrefixNS);
mp_xencPrefixNS = XMLString::replicate(prefix);
1.5 +1 -1 xml-security/c/src/framework/XSECException.cpp
Index: XSECException.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECException.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSECException.cpp 8 Feb 2004 10:24:24 -0000 1.4
+++ XSECException.cpp 21 Feb 2004 08:26:53 -0000 1.5
@@ -77,7 +77,7 @@
XSECException::~XSECException() {
if (msg != NULL)
- delete[] msg;
+ XMLString::release(&msg);
}
1.9 +3 -3 xml-security/c/src/framework/XSECURIResolverXerces.cpp
Index: XSECURIResolverXerces.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolverXerces.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSECURIResolverXerces.cpp 8 Feb 2004 10:24:24 -0000 1.8
+++ XSECURIResolverXerces.cpp 21 Feb 2004 08:26:53 -0000 1.9
@@ -56,7 +56,7 @@
XSECURIResolverXerces::~XSECURIResolverXerces() {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
}
// --------------------------------------------------------------------------------
@@ -125,7 +125,7 @@
void XSECURIResolverXerces::setBaseURI(const XMLCh * uri) {
if (mp_baseURI != 0)
- delete mp_baseURI;
+ XMLString::release(&mp_baseURI);
mp_baseURI = XMLString::replicate(uri);
1.6 +1 -1 xml-security/c/src/samples/IOStreamOutputter.cpp
Index: IOStreamOutputter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/IOStreamOutputter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IOStreamOutputter.cpp 8 Feb 2004 10:24:38 -0000 1.5
+++ IOStreamOutputter.cpp 21 Feb 2004 08:26:53 -0000 1.6
@@ -876,7 +876,7 @@
{
char *p = s.transcode();
target << p;
- delete [] p;
+ XMLString::release(&p);
return target;
}
1.7 +4 -4 xml-security/c/src/samples/simpleValidate.cpp
Index: simpleValidate.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleValidate.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- simpleValidate.cpp 8 Feb 2004 10:24:38 -0000 1.6
+++ simpleValidate.cpp 21 Feb 2004 08:26:53 -0000 1.7
@@ -191,7 +191,7 @@
if (kname != NULL) {
char * n = XMLString::transcode(kname);
cout << "Key Name = " << n << endl;
- delete[] n;
+ XMLString::release(&n);
}
}
@@ -206,7 +206,7 @@
char * err = XMLString::transcode(sig->getErrMsgs());
cout << "Incorrect Signature\n";
cout << err << endl;
- delete[] err;
+ XMLString::release(&err);
}
amt->setNodeValue(MAKE_UNICODE_STRING("$0.50"));
@@ -220,7 +220,7 @@
char * err = XMLString::transcode(sig->getErrMsgs());
cout << "Incorrect Signature\n";
cout << err << endl;
- delete[] err;
+ XMLString::release(&err);
}
amt->setNodeValue(MAKE_UNICODE_STRING("$16.50"));
@@ -234,7 +234,7 @@
char * err = XMLString::transcode(sig->getErrMsgs());
cout << "Incorrect Signature\n";
cout << err << endl;
- delete[] err;
+ XMLString::release(&err);
}
1.5 +3 -3 xml-security/c/src/tools/checksig/AnonymousResolver.cpp
Index: AnonymousResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/AnonymousResolver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AnonymousResolver.cpp 8 Feb 2004 10:24:58 -0000 1.4
+++ AnonymousResolver.cpp 21 Feb 2004 08:26:54 -0000 1.5
@@ -46,7 +46,7 @@
AnonymousResolver::~AnonymousResolver() {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
}
@@ -69,7 +69,7 @@
void AnonymousResolver::setBaseURI(const XMLCh * uri) {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
mp_baseURI = XMLString::replicate(uri);
1.9 +6 -6 xml-security/c/src/tools/checksig/InteropResolver.cpp
Index: InteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/InteropResolver.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InteropResolver.cpp 8 Feb 2004 10:24:58 -0000 1.8
+++ InteropResolver.cpp 21 Feb 2004 08:26:54 -0000 1.9
@@ -66,7 +66,7 @@
InteropResolver::~InteropResolver() {
if (mp_baseURI != NULL)
- delete[]mp_baseURI;
+ XMLString::release(&mp_baseURI);
}
@@ -98,7 +98,7 @@
char * base = XMLString::transcode(mp_baseURI);
safeBuffer path = base;
- delete[] base;
+ XMLString::release(&base);
path.sbStrcatIn("/certs/*.crt");
@@ -322,12 +322,12 @@
if (strcmp(xserial, cserial) == 0) {
OPENSSL_free(xserial);
- delete[] cserial;
+ XMLString::release(&cserial);
return true;
}
//delete[] xserial;
- delete[] cserial;
+ XMLString::release(&cserial);
OPENSSL_free(xserial);
}
@@ -401,7 +401,7 @@
X509_NAME * x509name = X509_get_subject_name(x);
X509_NAME * snname = X509_NAME_create_from_txt(csn);
- delete[] csn;
+ XMLString::release(&csn);
if (snname != NULL) {
1.28 +4 -4 xml-security/c/src/tools/checksig/checksig.cpp
Index: checksig.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/checksig.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- checksig.cpp 8 Feb 2004 10:24:58 -0000 1.27
+++ checksig.cpp 21 Feb 2004 08:26:54 -0000 1.28
@@ -116,7 +116,7 @@
{
char *p = XMLString::transcode(s);
target << p;
- delete [] p;
+ XMLString::release(&p);
return target;
}
@@ -487,7 +487,7 @@
char * msg = XMLString::transcode(e.getMsg());
cerr << "An error occured during signature verification\n Message: "
<< msg << endl;
- delete [] msg;
+ XMLString::release(&msg);
errorsOccured = true;
return 2;
}
@@ -527,7 +527,7 @@
cout << "Signature failed verification" << endl;
const char * e = XMLString::transcode(sig->getErrMsgs());
cout << e << endl;
- delete [] (char *) e;
+ XMLString::release((char **) &e);
retResult = 1;
}
1.4 +2 -2 xml-security/c/src/tools/cipher/XencInteropResolver.cpp
Index: XencInteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/XencInteropResolver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XencInteropResolver.cpp 8 Feb 2004 10:24:58 -0000 1.3
+++ XencInteropResolver.cpp 21 Feb 2004 08:26:54 -0000 1.4
@@ -257,7 +257,7 @@
XencInteropResolver::~XencInteropResolver() {
if (mp_baseURI != NULL)
- delete[]mp_baseURI;
+ XMLString::release(&mp_baseURI);
}
// --------------------------------------------------------------------------------
1.15 +3 -3 xml-security/c/src/tools/cipher/cipher.cpp
Index: cipher.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/cipher.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cipher.cpp 8 Feb 2004 10:24:58 -0000 1.14
+++ cipher.cpp 21 Feb 2004 08:26:54 -0000 1.15
@@ -133,7 +133,7 @@
{
char *p = XMLString::transcode(s);
target << p;
- delete [] p;
+ XMLString::release(&p);
return target;
}
@@ -702,7 +702,7 @@
char * msg = XMLString::transcode(e.getMsg());
cerr << "An error occured during encryption/decryption operation\n Message: "
<< msg << endl;
- delete [] msg;
+ XMLString::release(&msg);
errorsOccured = true;
if (formatTarget != NULL)
delete formatTarget;
1.9 +6 -6 xml-security/c/src/tools/siginf/siginf.cpp
Index: siginf.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/siginf/siginf.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- siginf.cpp 8 Feb 2004 10:24:59 -0000 1.8
+++ siginf.cpp 21 Feb 2004 08:26:54 -0000 1.9
@@ -93,7 +93,7 @@
{
char *p = XMLString::transcode(s);
target << p;
- delete [] p;
+ XMLString::release(&p);
return target;
}
@@ -107,7 +107,7 @@
mp_cStr = XMLString::transcode(in);
}
~X2C() {
- delete[] mp_cStr;
+ XMLString::release(&mp_cStr);
}
char * str(void) {
@@ -248,7 +248,7 @@
// Now the expression
char * str = XMLString::transcode(e->getFilter());
cout << str << "\"" << endl;
- delete[] str;
+ XMLString::release(&str);
}
@@ -464,7 +464,7 @@
char * msg = XMLString::transcode(e.getMessage());
cerr << "An error occured during parsing\n Message: "
<< msg << endl;
- delete[] msg;
+ XMLString::release(&msg);
errorsOccured = true;
}
@@ -526,7 +526,7 @@
char * msg = XMLString::transcode(e.getMsg());
cerr << "An error occured during signature loading\n Message: "
<< msg << endl;
- delete [] msg;
+ XMLString::release(&msg);
errorsOccured = true;
return 2;
}
1.19 +3 -3 xml-security/c/src/tools/templatesign/templatesign.cpp
Index: templatesign.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/templatesign/templatesign.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- templatesign.cpp 9 Feb 2004 10:55:51 -0000 1.18
+++ templatesign.cpp 21 Feb 2004 08:26:54 -0000 1.19
@@ -1251,7 +1251,7 @@
char * m = XMLString::transcode(e.getMsg());
cerr << "An error occured during signing operation\n Message: "
<< m << endl;
- delete m;
+ XMLString::release(&m);
errorsOccured = true;
exit (1);
}
@@ -1301,7 +1301,7 @@
cout << doc;
delete [] gEncodingName;
- delete [] (XMLCh *) encNameStr; // Cast to allow delete[] const
+ XMLString::release((XMLCh **) &encNameStr); // Cast to allow delete[] const
delete formatTarget;
#if defined (_WIN32) && defined (HAVE_WINCAPI)
1.14 +3 -3 xml-security/c/src/tools/txfmout/txfmout.cpp
Index: txfmout.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/txfmout/txfmout.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- txfmout.cpp 8 Feb 2004 10:24:59 -0000 1.13
+++ txfmout.cpp 21 Feb 2004 08:26:54 -0000 1.14
@@ -97,7 +97,7 @@
{
char *p = XMLString::transcode(s);
target << p;
- delete [] p;
+ XMLString::release(&p);
return target;
}
@@ -568,7 +568,7 @@
char * m = XMLString::transcode(e.getMsg());
cerr << "An error occured during signature processing\n Message: "
<< m << endl;
- delete[] m;
+ XMLString::release(&m);
errorsOccured = true;
exit (2);
}
1.41 +4 -4 xml-security/c/src/tools/xtest/xtest.cpp
Index: xtest.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/xtest/xtest.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xtest.cpp 16 Feb 2004 11:30:02 -0000 1.40
+++ xtest.cpp 21 Feb 2004 08:26:54 -0000 1.41
@@ -898,7 +898,7 @@
cerr << "Failed" << endl;
char * e = XMLString::transcode(sig->getErrMsgs());
cout << e << endl;
- delete [] e;
+ XMLString::release(&e);
exit(1);
}
@@ -991,7 +991,7 @@
cerr << "Failed\n" << endl;
char * e = XMLString::transcode(sig->getErrMsgs());
cerr << e << endl;
- delete [] e;
+ XMLString::release(&e);
exit(1);
}
@@ -1967,7 +1967,7 @@
// Output some info
char * provName = XMLString::transcode(XSECPlatformUtils::g_cryptoProvider->getProviderName());
cerr << "Crypto Provider string : " << provName << endl;
- delete[] provName;
+ XMLString::release(&provName);
// Test signature functions
if (doSignatureTest) {
1.6 +2 -2 xml-security/c/src/transformers/TXFMDocObject.cpp
Index: TXFMDocObject.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/transformers/TXFMDocObject.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TXFMDocObject.cpp 8 Feb 2004 10:25:16 -0000 1.5
+++ TXFMDocObject.cpp 21 Feb 2004 08:26:54 -0000 1.6
@@ -42,7 +42,7 @@
TXFMDocObject::~TXFMDocObject() {
if (fragmentId != NULL)
- delete[] fragmentId;
+ XMLString::release(&fragmentId);
}
1.18 +1 -1 xml-security/c/src/utils/XSECDOMUtils.cpp
Index: XSECDOMUtils.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XSECDOMUtils.cpp 8 Feb 2004 10:25:39 -0000 1.17
+++ XSECDOMUtils.cpp 21 Feb 2004 08:26:54 -0000 1.18
@@ -273,7 +273,7 @@
XMLT::~XMLT (void) {
- delete[] mp_unicodeStr;
+ XMLString::release(&mp_unicodeStr);
}
1.13 +6 -6 xml-security/c/src/utils/XSECSafeBuffer.cpp
Index: XSECSafeBuffer.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBuffer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSECSafeBuffer.cpp 8 Feb 2004 10:25:39 -0000 1.12
+++ XSECSafeBuffer.cpp 21 Feb 2004 08:26:54 -0000 1.13
@@ -162,7 +162,7 @@
}
if (mp_XMLCh != NULL)
- delete[] mp_XMLCh;
+ XMLString::release(&mp_XMLCh);
}
@@ -542,7 +542,7 @@
checkBufferType(BUFFER_CHAR);
if (mp_XMLCh != NULL)
- delete mp_XMLCh;
+ XMLString::release(&mp_XMLCh);
mp_XMLCh = XMLString::transcode((char *) buffer);
@@ -569,7 +569,7 @@
strcpy((char *) buffer, t);
m_bufferType = BUFFER_CHAR;
- delete[] t;
+ XMLString::release(&t);
}
@@ -591,7 +591,7 @@
XMLString::copyString((XMLCh *) buffer, t);
m_bufferType = BUFFER_UNICODE;
- delete[] t;
+ XMLString::release(&t);
}
@@ -646,7 +646,7 @@
XMLString::catString((XMLCh *) buffer, t);
- delete[] t;
+ XMLString::release(&t);
}
void safeBuffer::sbXMLChCat8(const char * str) {
1.9 +3 -3 xml-security/c/src/utils/XSECXPathNodeList.cpp
Index: XSECXPathNodeList.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECXPathNodeList.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSECXPathNodeList.cpp 8 Feb 2004 10:25:39 -0000 1.8
+++ XSECXPathNodeList.cpp 21 Feb 2004 08:26:54 -0000 1.9
@@ -162,7 +162,7 @@
for (unsigned j = 0; j < m_num; ++j) {
newElts[j] = mp_elts[j];
}
- delete mp_elts;
+ delete[] mp_elts;
mp_elts = newElts;
}
@@ -181,7 +181,7 @@
const DOMNode ** newElts = new const DOMNode*[m_size];
memcpy(newElts, mp_elts, sizeof(DOMNode *) * m_num);
- delete mp_elts;
+ delete[] mp_elts;
mp_elts = newElts;
}
1.9 +6 -3 xml-security/c/src/utils/unixutils/XSECURIResolverGenericUnix.cpp
Index: XSECURIResolverGenericUnix.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/unixutils/XSECURIResolverGenericUnix.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSECURIResolverGenericUnix.cpp 8 Feb 2004 10:50:22 -0000 1.8
+++ XSECURIResolverGenericUnix.cpp 21 Feb 2004 08:26:54 -0000 1.9
@@ -28,6 +28,9 @@
* $Id$
*
* $Log$
+ * Revision 1.9 2004/02/21 08:26:54 blautenb
+ * Use XMLString::release rather than delete[] for all Xerces strings
+ *
* Revision 1.8 2004/02/08 10:50:22 blautenb
* Update to Apache 2.0 license
*
@@ -115,7 +118,7 @@
XSECURIResolverGenericUnix::~XSECURIResolverGenericUnix() {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
}
@@ -261,7 +264,7 @@
void XSECURIResolverGenericUnix::setBaseURI(const XMLCh * uri) {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
mp_baseURI = XMLString::replicate(uri);
1.10 +6 -3 xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.cpp
Index: XSECURIResolverGenericWin32.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSECURIResolverGenericWin32.cpp 8 Feb 2004 10:25:40 -0000 1.9
+++ XSECURIResolverGenericWin32.cpp 21 Feb 2004 08:26:54 -0000 1.10
@@ -28,6 +28,9 @@
* $Id$
*
* $Log$
+ * Revision 1.10 2004/02/21 08:26:54 blautenb
+ * Use XMLString::release rather than delete[] for all Xerces strings
+ *
* Revision 1.9 2004/02/08 10:25:40 blautenb
* Convert to Apache 2.0 license
*
@@ -116,7 +119,7 @@
XSECURIResolverGenericWin32::~XSECURIResolverGenericWin32() {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
}
@@ -262,7 +265,7 @@
void XSECURIResolverGenericWin32::setBaseURI(const XMLCh * uri) {
if (mp_baseURI != NULL)
- delete[] mp_baseURI;
+ XMLString::release(&mp_baseURI);
mp_baseURI = XMLString::replicate(uri);
1.7 +4 -4 xml-security/c/src/xenc/impl/XENCCipherValueImpl.cpp
Index: XENCCipherValueImpl.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/xenc/impl/XENCCipherValueImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XENCCipherValueImpl.cpp 8 Feb 2004 10:26:01 -0000 1.6
+++ XENCCipherValueImpl.cpp 21 Feb 2004 08:26:54 -0000 1.7
@@ -79,7 +79,7 @@
XENCCipherValueImpl::~XENCCipherValueImpl() {
if (mp_cipherString != NULL)
- delete[] mp_cipherString;
+ XMLString::release(&mp_cipherString);
}
@@ -123,7 +123,7 @@
// Rest
if (mp_cipherString != NULL) {
- delete[] mp_cipherString;
+ XMLString::release(&mp_cipherString);
mp_cipherString = NULL;
}
@@ -176,7 +176,7 @@
txt->setNodeValue(value);
if (mp_cipherString != NULL)
- delete[] mp_cipherString;
+ XMLString::release(&mp_cipherString);
mp_cipherString = XMLString::replicate(value);