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/10/09 14:19:44 UTC
cvs commit: xml-xerces/c/src/util/MsgLoaders/MsgCatalog MsgCatalogLoader.cpp
tng 01/10/09 05:19:44
Modified: c/src/util/MsgLoaders/MsgCatalog MsgCatalogLoader.cpp
Log:
Leak fix: can call transcode directly instead of using copyString.
Revision Changes Path
1.7 +16 -13 xml-xerces/c/src/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp
Index: MsgCatalogLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MsgCatalogLoader.cpp 2000/07/25 22:28:40 1.6
+++ MsgCatalogLoader.cpp 2001/10/09 12:19:44 1.7
@@ -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
@@ -56,6 +56,9 @@
/*
* $Log: MsgCatalogLoader.cpp,v $
+ * Revision 1.7 2001/10/09 12:19:44 tng
+ * Leak fix: can call transcode directly instead of using copyString.
+ *
* Revision 1.6 2000/07/25 22:28:40 aruna1
* Char definitions in XMLUni moved to XMLUniDefs
*
@@ -153,7 +156,7 @@
char msgString[100];
sprintf(msgString, "Could not find message ID %d from message set %d\n", msgToLoad, msgSet);
char* catMessage = catgets( fCatalogHandle, msgSet, (int)msgToLoad, msgString);
- XMLString::copyString((XMLCh*)toFill, XMLString::transcode(catMessage));
+ XMLString::transcode(catMessage, toFill, maxChars);
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org