You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/06/08 19:33:18 UTC
cvs commit: xml-xerces/c/src/framework XMLFormatter.cpp
tng 01/06/08 10:33:18
Modified: c/src/framework XMLFormatter.cpp
Log:
[Bug 2043] XMLFormatter unallocates arrays incorrectly.
Revision Changes Path
1.10 +23 -23 xml-xerces/c/src/framework/XMLFormatter.cpp
Index: XMLFormatter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLFormatter.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLFormatter.cpp 2000/10/17 19:25:36 1.9
+++ XMLFormatter.cpp 2001/06/08 17:33:17 1.10
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/**
- * $Id: XMLFormatter.cpp,v 1.9 2000/10/17 19:25:36 andyh Exp $
+ * $Id: XMLFormatter.cpp,v 1.10 2001/06/08 17:33:17 tng Exp $
*/
@@ -231,11 +231,11 @@
XMLFormatter::~XMLFormatter()
{
- delete fAposRef;
- delete fAmpRef;
- delete fGTRef;
- delete fLTRef;
- delete fQuoteRef;
+ delete [] fAposRef;
+ delete [] fAmpRef;
+ delete [] fGTRef;
+ delete [] fLTRef;
+ delete [] fQuoteRef;
delete [] fOutEncoding;
delete fXCoder;
@@ -479,7 +479,7 @@
);
fTmpBuf[outBytes] = 0; fTmpBuf[outBytes + 1] = 0;
fTmpBuf[outBytes + 2] = 0; fTmpBuf[outBytes + 3] = 0;
-
+
((XMLFormatter*)this)->fAposRef = new XMLByte[outBytes + 4];
memcpy(fAposRef, fTmpBuf, outBytes + 4);
count = fAposLen = outBytes;
@@ -506,7 +506,7 @@
);
fTmpBuf[outBytes] = 0; fTmpBuf[outBytes + 1] = 0;
fTmpBuf[outBytes + 2] = 0; fTmpBuf[outBytes + 3] = 0;
-
+
((XMLFormatter*)this)->fAmpRef = new XMLByte[outBytes + 4];
memcpy(fAmpRef, fTmpBuf, outBytes + 4);
count = fAmpLen = outBytes;
@@ -533,7 +533,7 @@
);
fTmpBuf[outBytes] = 0; fTmpBuf[outBytes + 1] = 0;
fTmpBuf[outBytes + 2] = 0; fTmpBuf[outBytes + 3] = 0;
-
+
((XMLFormatter*)this)->fGTRef = new XMLByte[outBytes + 4];
memcpy(fGTRef, fTmpBuf, outBytes + 4);
count = fGTLen = outBytes;
@@ -560,7 +560,7 @@
);
fTmpBuf[outBytes] = 0; fTmpBuf[outBytes + 1] = 0;
fTmpBuf[outBytes + 2] = 0; fTmpBuf[outBytes + 3] = 0;
-
+
((XMLFormatter*)this)->fLTRef = new XMLByte[outBytes + 4];
memcpy(fLTRef, fTmpBuf, outBytes + 4);
count = fLTLen = outBytes;
@@ -587,7 +587,7 @@
);
fTmpBuf[outBytes] = 0; fTmpBuf[outBytes + 1] = 0;
fTmpBuf[outBytes + 2] = 0; fTmpBuf[outBytes + 3] = 0;
-
+
((XMLFormatter*)this)->fQuoteRef = new XMLByte[outBytes + 4];
memcpy(fQuoteRef, fTmpBuf, outBytes + 4);
count = fQuoteLen = outBytes;
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org