cargilld 2004/01/13 08:34:22
Modified: c/src/xercesc/dom/impl DOMWriterImpl.cpp
c/src/xercesc/internal XMLGrammarPoolImpl.cpp XProtoType.cpp
XSerializeEngine.cpp
c/src/xercesc/util XML256TableTranscoder.cpp
XML88591Transcoder.cpp XMLASCIITranscoder.cpp
XMLDateTime.cpp XMLString.cpp XMLUri.cpp XMLURL.cpp
XMLUTF8Transcoder.cpp
c/src/xercesc/util/NetAccessors/Socket
UnixHTTPURLInputStream.cpp
c/src/xercesc/util/Platforms/AIX AIXPlatformUtils.cpp
c/src/xercesc/util/Platforms/BeOS BeOSPlatformUtils.cpp
c/src/xercesc/util/Platforms/FreeBSD
FreeBSDPlatformUtils.cpp
c/src/xercesc/util/Platforms/HPUX HPPlatformUtils.cpp
c/src/xercesc/util/Platforms/IRIX IRIXPlatformUtils.cpp
c/src/xercesc/util/Platforms/Linux LinuxPlatformUtils.cpp
c/src/xercesc/util/Platforms/NetBSD NetBSDPlatformUtils.cpp
c/src/xercesc/util/Platforms/OpenServer
OpenServerPlatformUtils.cpp
c/src/xercesc/util/Platforms/OS390 OS390PlatformUtils.cpp
c/src/xercesc/util/Platforms/OS400 OS400PlatformUtils.cpp
c/src/xercesc/util/Platforms/QNX QNXPlatformUtils.cpp
c/src/xercesc/util/Platforms/Solaris
SolarisPlatformUtils.cpp
c/src/xercesc/util/Platforms/Tru64 Tru64PlatformUtils.cpp
c/src/xercesc/util/Platforms/UnixWare
UnixWarePlatformUtils.cpp
c/src/xercesc/util/regx RegularExpression.cpp
c/src/xercesc/util/Transcoders/Cygwin CygwinTransService.cpp
c/src/xercesc/util/Transcoders/Iconv400
Iconv400TransService.cpp
c/src/xercesc/util/Transcoders/ICU ICUTransService.cpp
c/src/xercesc/util/Transcoders/MacOSUnicodeConverter
MacOSUnicodeConverter.cpp
c/src/xercesc/util/Transcoders/Win32 Win32TransService.cpp
Log:
Misc memory management changes.
Revision Changes Path
1.48 +20 -3 xml-xerces/c/src/xercesc/dom/impl/DOMWriterImpl.cpp
Index: DOMWriterImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMWriterImpl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- DOMWriterImpl.cpp 17 Dec 2003 00:18:33 -0000 1.47
+++ DOMWriterImpl.cpp 13 Jan 2004 16:34:20 -0000 1.48
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.48 2004/01/13 16:34:20 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.47 2003/12/17 00:18:33 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -540,8 +543,22 @@
if (!canSetFeature(featureId, state))
{
XMLCh tmpbuf[256];
+ unsigned int strLen = XMLString::stringLen(gFeature) +
+ XMLString::stringLen(featName) +
+ XMLString::stringLen(gCantSet) +
+ XMLString::stringLen(gFalse);
+
XMLString::copyString(tmpbuf, gFeature);
- XMLString::catString(tmpbuf, featName);
+ if (strLen < 256)
+ {
+ XMLString::catString(tmpbuf, featName);
+ }
+ else
+ {
+ // truncate the featurename to fit into the 256 buffer
+ XMLString::copyNString(tmpbuf+XMLString::stringLen(gFeature),
+ featName, 200);
+ }
XMLString::catString(tmpbuf, gCantSet);
XMLString::catString(tmpbuf, state? gTrue : gFalse);
throw DOMException(DOMException::NOT_SUPPORTED_ERR, tmpbuf);
1.17 +8 -5 xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.cpp
Index: XMLGrammarPoolImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLGrammarPoolImpl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLGrammarPoolImpl.cpp 17 Dec 2003 00:18:34 -0000 1.16
+++ XMLGrammarPoolImpl.cpp 13 Jan 2004 16:34:20 -0000 1.17
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.17 2004/01/13 16:34:20 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.16 2003/12/17 00:18:34 cargilld
* Update to memory management so that the static memory manager (one used to call
Initialize) is only for static data.
*
@@ -425,9 +428,9 @@
(Revision != gXercesRevision) ||
(SerializationLevel != (unsigned int)
XERCES_GRAMMAR_SERIALIZATION_LEVEL))
{
- XMLCh MajVerChar[4];
- XMLCh MinVerChar[4];
- XMLCh RevisionChar[4];
+ XMLCh MajVerChar[5];
+ XMLCh MinVerChar[5];
+ XMLCh RevisionChar[5];
XMLString::binToText(MajVer, MajVerChar, 4, 10, memMgr);
XMLString::binToText(MinVer, MinVerChar, 4, 10, memMgr);
XMLString::binToText(Revision, RevisionChar, 4, 10, memMgr);
1.4 +7 -4 xml-xerces/c/src/xercesc/internal/XProtoType.cpp
Index: XProtoType.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XProtoType.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XProtoType.cpp 24 Dec 2003 15:24:13 -0000 1.3
+++ XProtoType.cpp 13 Jan 2004 16:34:20 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.4 2004/01/13 16:34:20 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.3 2003/12/24 15:24:13 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -114,8 +117,8 @@
if (classNameLen != inNameLen)
{
- XMLCh value1[16];
- XMLCh value2[16];
+ XMLCh value1[17];
+ XMLCh value2[17];
XMLString::binToText(inNameLen, value1, 16, 10, manager);
XMLString::binToText(classNameLen, value2, 16, 10, manager);
1.12 +9 -6 xml-xerces/c/src/xercesc/internal/XSerializeEngine.cpp
Index: XSerializeEngine.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSerializeEngine.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSerializeEngine.cpp 12 Jan 2004 16:27:41 -0000 1.11
+++ XSerializeEngine.cpp 13 Jan 2004 16:34:20 -0000 1.12
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.12 2004/01/13 16:34:20 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.11 2004/01/12 16:27:41 neilg
* remove use of static buffers
*
@@ -119,7 +122,7 @@
#define TEST_THROW_ARG1(condition, data, err_msg) \
if (condition) \
{ \
- XMLCh value1[16]; \
+ XMLCh value1[17]; \
XMLString::binToText(data, value1, 16, 10, fMemoryManager); \
ThrowXMLwithMemMgr1(XSerializationException \
, err_msg \
@@ -130,8 +133,8 @@
#define TEST_THROW_ARG2(condition, data1, data2, err_msg) \
if (condition) \
{ \
- XMLCh value1[16]; \
- XMLCh value2[16]; \
+ XMLCh value1[17]; \
+ XMLCh value2[17]; \
XMLString::binToText(data1, value1, 16, 10, fMemoryManager); \
XMLString::binToText(data2, value2, 16, 10, fMemoryManager); \
ThrowXMLwithMemMgr2(XSerializationException \
1.5 +2 -2 xml-xerces/c/src/xercesc/util/XML256TableTranscoder.cpp
Index: XML256TableTranscoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XML256TableTranscoder.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XML256TableTranscoder.cpp 17 Dec 2003 00:18:35 -0000 1.4
+++ XML256TableTranscoder.cpp 13 Jan 2004 16:34:20 -0000 1.5
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -173,7 +173,7 @@
//
if (options == UnRep_Throw)
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
1.4 +2 -2 xml-xerces/c/src/xercesc/util/XML88591Transcoder.cpp
Index: XML88591Transcoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XML88591Transcoder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XML88591Transcoder.cpp 17 Dec 2003 00:18:35 -0000 1.3
+++ XML88591Transcoder.cpp 13 Jan 2004 16:34:20 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -164,7 +164,7 @@
//
if (options == UnRep_Throw)
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
1.4 +3 -3 xml-xerces/c/src/xercesc/util/XMLASCIITranscoder.cpp
Index: XMLASCIITranscoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLASCIITranscoder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLASCIITranscoder.cpp 17 Dec 2003 00:18:35 -0000 1.3
+++ XMLASCIITranscoder.cpp 13 Jan 2004 16:34:20 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -129,7 +129,7 @@
if (countDone > 32)
break;
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
@@ -188,7 +188,7 @@
//
if (options == UnRep_Throw)
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
1.22 +9 -4 xml-xerces/c/src/xercesc/util/XMLDateTime.cpp
Index: XMLDateTime.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLDateTime.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XMLDateTime.cpp 3 Jan 2004 00:03:18 -0000 1.21
+++ XMLDateTime.cpp 13 Jan 2004 16:34:20 -0000 1.22
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.22 2004/01/13 16:34:20 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.21 2004/01/03 00:03:18 peiyongz
* parseContent
*
@@ -140,6 +143,7 @@
// Includes
// ---------------------------------------------------------------------------
#include <stdlib.h>
+#include <assert.h>
#include <xercesc/util/XMLDateTime.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUni.hpp>
@@ -1624,7 +1628,8 @@
void XMLDateTime::fillString(XMLCh*& ptr, valueIndex ind, int expLen) const
{
XMLCh strBuffer[16];
- XMLString::binToText(fValue[ind], strBuffer, expLen, 10);
+ assert(expLen < 16);
+ XMLString::binToText(fValue[ind], strBuffer, expLen, 10, fMemoryManager);
int actualLen = XMLString::stringLen(strBuffer);
int i;
//append leading zeros
@@ -1644,7 +1649,7 @@
{
XMLCh strBuffer[16];
// let's hope we get no years of 15 digits...
- XMLString::binToText(fValue[ind], strBuffer, 15, 10);
+ XMLString::binToText(fValue[ind], strBuffer, 15, 10, fMemoryManager);
int actualLen = XMLString::stringLen(strBuffer);
// don't forget that years can be negative...
int negativeYear = 0;
1.30 +44 -6 xml-xerces/c/src/xercesc/util/XMLString.cpp
Index: XMLString.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLString.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XMLString.cpp 24 Dec 2003 15:24:13 -0000 1.29
+++ XMLString.cpp 13 Jan 2004 16:34:20 -0000 1.30
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -136,8 +136,18 @@
// having to check for overflow in the inner loops, and we have to flip
// the resulting XMLString anyway.
//
- char tmpBuf[128];
-
+ char tmpBuffer[128];
+ char* tmpBuf;
+ char* bigBuf = 0;
+ if (maxChars < 128)
+ {
+ tmpBuf = tmpBuffer;
+ }
+ else
+ {
+ bigBuf = (char*) manager->allocate((maxChars+1)* sizeof(char));
+ tmpBuf = bigBuf;
+ }
//
// For each radix, do the optimal thing. For bin and hex, we can special
// case them and do shift and mask oriented stuff. For oct and decimal
@@ -172,14 +182,20 @@
tmpVal /= radix;
}
}
- else
+ else
{
+ if (bigBuf)
+ manager->deallocate(bigBuf);
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Str_UnknownRadix, manager);
}
// See if have enough room in the caller's buffer
if (tmpIndex > maxChars)
+ {
+ if (bigBuf)
+ manager->deallocate(bigBuf);
ThrowXMLwithMemMgr(IllegalArgumentException,
XMLExcepts::Str_TargetBufTooSmall, manager);
+ }
// Reverse the tmp buffer into the caller's buffer
unsigned int outIndex = 0;
@@ -188,6 +204,8 @@
// And cap off the caller's buffer
toFill[outIndex] = char(0);
+ if (bigBuf)
+ manager->deallocate(bigBuf);
}
void XMLString::binToText( const unsigned int toFormat
@@ -799,7 +817,18 @@
// having to check for overflow in the inner loops, and we have to flip
// the resulting sring anyway.
//
- XMLCh tmpBuf[128];
+ XMLCh tmpBuffer[128];
+ XMLCh* tmpBuf;
+ XMLCh* bigBuf = 0;
+ if (maxChars < 128)
+ {
+ tmpBuf = tmpBuffer;
+ }
+ else
+ {
+ bigBuf = (XMLCh*) manager->allocate((maxChars+1)* sizeof(XMLCh));
+ tmpBuf = bigBuf;
+ }
//
// For each radix, do the optimal thing. For bin and hex, we can special
@@ -837,12 +866,18 @@
}
else
{
+ if (bigBuf)
+ manager->deallocate(bigBuf);
ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Str_UnknownRadix, manager);
}
// See if have enough room in the caller's buffer
if (tmpIndex > maxChars)
+ {
+ if (bigBuf)
+ manager->deallocate(bigBuf);
ThrowXMLwithMemMgr(IllegalArgumentException,
XMLExcepts::Str_TargetBufTooSmall, manager);
+ }
// Reverse the tmp buffer into the caller's buffer
unsigned int outIndex = 0;
@@ -851,6 +886,9 @@
// And cap off the caller's buffer
toFill[outIndex] = chNull;
+
+ if (bigBuf)
+ manager->deallocate(bigBuf);
}
void XMLString::binToText( const unsigned int toFormat
1.23 +3 -3 xml-xerces/c/src/xercesc/util/XMLUri.cpp
Index: XMLUri.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUri.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLUri.cpp 12 Jan 2004 22:01:02 -0000 1.22
+++ XMLUri.cpp 13 Jan 2004 16:34:20 -0000 1.23
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -2030,7 +2030,7 @@
{
*outPtr++ = chColon;
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText(fPort, tmpBuf, 16, 10, fMemoryManager);
XMLString::copyString(outPtr, tmpBuf);
outPtr += XMLString::stringLen(tmpBuf);
1.14 +2 -2 xml-xerces/c/src/xercesc/util/XMLURL.cpp
Index: XMLURL.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLURL.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XMLURL.cpp 13 Jan 2004 15:46:56 -0000 1.13
+++ XMLURL.cpp 13 Jan 2004 16:34:20 -0000 1.14
@@ -769,7 +769,7 @@
{
*outPtr++ = chColon;
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText(fPortNum, tmpBuf, 16, 10, fMemoryManager);
XMLString::copyString(outPtr, tmpBuf);
outPtr += XMLString::stringLen(tmpBuf);
1.6 +3 -3 xml-xerces/c/src/xercesc/util/XMLUTF8Transcoder.cpp
Index: XMLUTF8Transcoder.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUTF8Transcoder.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLUTF8Transcoder.cpp 17 Dec 2003 00:18:35 -0000 1.5
+++ XMLUTF8Transcoder.cpp 13 Jan 2004 16:34:20 -0000 1.6
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -381,7 +381,7 @@
// If the options say to throw, then throw
if (options == UnRep_Throw)
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText(curVal, tmpBuf, 16, 16, getMemoryManager());
ThrowXMLwithMemMgr2
(
1.14 +5 -2
xml-xerces/c/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp
Index: UnixHTTPURLInputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/Socket/UnixHTTPURLInputStream.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UnixHTTPURLInputStream.cpp 24 Dec 2003 15:24:13 -0000 1.13
+++ UnixHTTPURLInputStream.cpp 13 Jan 2004 16:34:21 -0000 1.14
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.13 2003/12/24 15:24:13 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -283,7 +286,7 @@
// Convert port number integer to unicode so we can transcode it to ASCII
//
- XMLString::binToText((unsigned int) portNumber, portBuffer, bufSize, 10);
+ XMLString::binToText((unsigned int) portNumber, portBuffer, bufSize, 10,
fMemoryManager);
transSize = XMLString::stringLen(portBuffer)+1;
char* portAsASCII = (char*) fMemoryManager->allocate
(
1.21 +3 -3 xml-xerces/c/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp
Index: AIXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/AIX/AIXPlatformUtils.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AIXPlatformUtils.cpp 24 Dec 2003 15:24:14 -0000 1.20
+++ AIXPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.21
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -369,7 +369,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.13 +6 -3
xml-xerces/c/src/xercesc/util/Platforms/BeOS/BeOSPlatformUtils.cpp
Index: BeOSPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/BeOS/BeOSPlatformUtils.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BeOSPlatformUtils.cpp 6 Jan 2004 17:31:20 -0000 1.12
+++ BeOSPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.13
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.13 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.12 2004/01/06 17:31:20 neilg
* fix static initialization problems, bug 28517; thanks to Reid Spencer
*
@@ -447,7 +450,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.21 +6 -3
xml-xerces/c/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp
Index: FreeBSDPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/FreeBSD/FreeBSDPlatformUtils.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FreeBSDPlatformUtils.cpp 6 Jan 2004 17:31:20 -0000 1.20
+++ FreeBSDPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.21
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.20 2004/01/06 17:31:20 neilg
* fix static initialization problems, bug 28517; thanks to Reid Spencer
*
@@ -490,7 +493,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.19 +6 -3 xml-xerces/c/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp
Index: HPPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/HPUX/HPPlatformUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HPPlatformUtils.cpp 6 Jan 2004 17:31:20 -0000 1.18
+++ HPPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.19
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.18 2004/01/06 17:31:20 neilg
* fix static initialization problems, bug 28517; thanks to Reid Spencer
*
@@ -528,7 +531,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.19 +6 -3
xml-xerces/c/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp
Index: IRIXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/IRIX/IRIXPlatformUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- IRIXPlatformUtils.cpp 6 Jan 2004 17:31:20 -0000 1.18
+++ IRIXPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.19
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.19 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.18 2004/01/06 17:31:20 neilg
* fix static initialization problems, bug 28517; thanks to Reid Spencer
*
@@ -503,7 +506,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.22 +6 -3
xml-xerces/c/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp
Index: LinuxPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Linux/LinuxPlatformUtils.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- LinuxPlatformUtils.cpp 6 Jan 2004 17:31:20 -0000 1.21
+++ LinuxPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.22
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.22 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.21 2004/01/06 17:31:20 neilg
* fix static initialization problems, bug 28517; thanks to Reid Spencer
*
@@ -543,7 +546,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.11 +2 -2
xml-xerces/c/src/xercesc/util/Platforms/NetBSD/NetBSDPlatformUtils.cpp
Index: NetBSDPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/NetBSD/NetBSDPlatformUtils.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NetBSDPlatformUtils.cpp 6 Jan 2004 17:31:20 -0000 1.10
+++ NetBSDPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.11
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -480,7 +480,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.14 +5 -2
xml-xerces/c/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp
Index: OpenServerPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OpenServer/OpenServerPlatformUtils.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- OpenServerPlatformUtils.cpp 24 Dec 2003 15:24:14 -0000 1.13
+++ OpenServerPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.14
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.14 2004/01/13 16:34:21 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.13 2003/12/24 15:24:14 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -430,7 +433,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.17 +3 -3
xml-xerces/c/src/xercesc/util/Platforms/OS390/OS390PlatformUtils.cpp
Index: OS390PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS390/OS390PlatformUtils.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- OS390PlatformUtils.cpp 12 Jan 2004 22:00:18 -0000 1.16
+++ OS390PlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.17
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -883,7 +883,7 @@
pathobj.setPath(newSrc);
// Use a local buffer that is big enough for the largest legal path
- char *absPath = (char*) manager->allocate((_POSIX_PATH_MAX) *
sizeof(char));//new char[_POSIX_PATH_MAX];
+ char *absPath = (char*) manager->allocate((_POSIX_PATH_MAX+1) *
sizeof(char));//new char[_POSIX_PATH_MAX];
ArrayJanitor<char> janText2(absPath, manager);
if ( (pathobj.getPathType() == PATH390_HFS) || (pathobj.getPathType() ==
PATH390_OTHER) ) {
1.17 +3 -3
xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
Index: OS400PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- OS400PlatformUtils.cpp 24 Dec 2003 15:24:14 -0000 1.16
+++ OS400PlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.17
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -453,7 +453,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.9 +3 -3 xml-xerces/c/src/xercesc/util/Platforms/QNX/QNXPlatformUtils.cpp
Index: QNXPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/QNX/QNXPlatformUtils.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- QNXPlatformUtils.cpp 24 Dec 2003 15:24:14 -0000 1.8
+++ QNXPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.9
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -260,7 +260,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.24 +3 -3
xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp
Index: SolarisPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Solaris/SolarisPlatformUtils.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SolarisPlatformUtils.cpp 7 Jan 2004 00:02:44 -0000 1.23
+++ SolarisPlatformUtils.cpp 13 Jan 2004 16:34:21 -0000 1.24
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -395,7 +395,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.16 +3 -3
xml-xerces/c/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp
Index: Tru64PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Tru64/Tru64PlatformUtils.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Tru64PlatformUtils.cpp 24 Dec 2003 15:24:14 -0000 1.15
+++ Tru64PlatformUtils.cpp 13 Jan 2004 16:34:22 -0000 1.16
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -392,7 +392,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.16 +5 -2
xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
Index: UnixWarePlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- UnixWarePlatformUtils.cpp 24 Dec 2003 15:24:14 -0000 1.15
+++ UnixWarePlatformUtils.cpp 13 Jan 2004 16:34:22 -0000 1.16
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2004/01/13 16:34:22 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.15 2003/12/24 15:24:14 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -478,7 +481,7 @@
XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
{
- char dirBuf[PATH_MAX + 1];
+ char dirBuf[PATH_MAX + 2];
char *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
if (!curDir)
1.21 +5 -2 xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp
Index: RegularExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RegularExpression.cpp 6 Jan 2004 18:12:31 -0000 1.20
+++ RegularExpression.cpp 13 Jan 2004 16:34:22 -0000 1.21
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.21 2004/01/13 16:34:22 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.20 2004/01/06 18:12:31 peiyongz
* using ctor/setPattern to avoid exception thrown from ctor
*
@@ -1441,7 +1444,7 @@
case Token::T_BACKREFERENCE:
case Token::T_EMPTY:
ret = compileSingle(token, next, tokenType);
- break;
+ break;
case Token::T_CONCAT:
ret = compileConcat(token, next, reverse);
break;
1.11 +8 -5
xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp
Index: CygwinTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Cygwin/CygwinTransService.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CygwinTransService.cpp 24 Dec 2003 15:24:15 -0000 1.10
+++ CygwinTransService.cpp 13 Jan 2004 16:34:22 -0000 1.11
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.11 2004/01/13 16:34:22 cargilld
+ * Misc memory management changes.
+ *
* Revision 1.10 2003/12/24 15:24:15 cargilld
* More updates to memory management so that the static memory manager.
*
@@ -831,8 +834,8 @@
{
if (toEat == 1)
{
- XMLCh tmpBuf[16];
- XMLString::binToText((unsigned int)(*inPtr), tmpBuf, 16, 16);
+ XMLCh tmpBuf[17];
+ XMLString::binToText((unsigned int)(*inPtr), tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
TranscodingException
@@ -913,8 +916,8 @@
//
if (usedDef && (options == UnRep_Throw))
{
- XMLCh tmpBuf[16];
- XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16);
+ XMLCh tmpBuf[17];
+ XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
TranscodingException
1.11 +6 -6
xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
Index: Iconv400TransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Iconv400TransService.cpp 24 Dec 2003 15:24:15 -0000 1.10
+++ Iconv400TransService.cpp 13 Jan 2004 16:34:22 -0000 1.11
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -428,8 +428,8 @@
if (fFixed)
{
- XMLCh tmpBuf[16];
- XMLString::binToText((unsigned int)(*startTarget), tmpBuf, 16, 16);
+ XMLCh tmpBuf[17];
+ XMLString::binToText((unsigned int)(*startTarget), tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
TranscodingException
@@ -566,8 +566,8 @@
if (err) /[EMAIL PROTECTED]/
{
- XMLCh tmpBuf[16];
- XMLString::binToText((unsigned int)*startSrc, tmpBuf, 16, 16);
+ XMLCh tmpBuf[17];
+ XMLString::binToText((unsigned int)*startSrc, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
TranscodingException
1.14 +6 -6
xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
Index: ICUTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ICUTransService.cpp 24 Dec 2003 15:24:15 -0000 1.13
+++ ICUTransService.cpp 13 Jan 2004 16:34:22 -0000 1.14
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -502,8 +502,8 @@
if (fFixed)
{
- XMLCh tmpBuf[16];
- XMLString::binToText((unsigned int)(*startTarget), tmpBuf, 16, 16);
+ XMLCh tmpBuf[17];
+ XMLString::binToText((unsigned int)(*startTarget), tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
TranscodingException
@@ -663,8 +663,8 @@
if (!res)
{
- XMLCh tmpBuf[16];
- XMLString::binToText((unsigned int)*startSrc, tmpBuf, 16, 16);
+ XMLCh tmpBuf[17];
+ XMLString::binToText((unsigned int)*startSrc, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
TranscodingException
1.20 +3 -3
xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
Index: MacOSUnicodeConverter.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MacOSUnicodeConverter.cpp 24 Dec 2003 15:24:15 -0000 1.19
+++ MacOSUnicodeConverter.cpp 13 Jan 2004 16:34:22 -0000 1.20
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -761,7 +761,7 @@
{
if (status == kTECUnmappableElementErr && options == UnRep_Throw)
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)&srcData[totalCharsConsumed],
tmpBuf, 16, 16);
ThrowXML2
(
1.19 +3 -3
xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
Index: Win32TransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Win32TransService.cpp 13 Jan 2004 13:43:29 -0000 1.18
+++ Win32TransService.cpp 13 Jan 2004 16:34:22 -0000 1.19
@@ -668,7 +668,7 @@
{
if (toEat == 1)
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)(*inPtr), tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
@@ -750,7 +750,7 @@
//
if (usedDef && (options == UnRep_Throw))
{
- XMLCh tmpBuf[16];
+ XMLCh tmpBuf[17];
XMLString::binToText((unsigned int)*srcPtr, tmpBuf, 16, 16,
getMemoryManager());
ThrowXMLwithMemMgr2
(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
