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 2002/02/28 22:55:57 UTC
cvs commit: xml-xerces/c/src/xercesc/internal ReaderMgr.cpp
tng 02/02/28 13:55:57
Modified: c/src/xercesc/internal ReaderMgr.cpp
Log:
Should check if XMLReader is created successfully.
Revision Changes Path
1.2 +39 -23 xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp
Index: ReaderMgr.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/ReaderMgr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReaderMgr.cpp 1 Feb 2002 22:21:58 -0000 1.1
+++ ReaderMgr.cpp 28 Feb 2002 21:55:57 -0000 1.2
@@ -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: ReaderMgr.cpp,v 1.1 2002/02/01 22:21:58 peiyongz Exp $
+ * $Id: ReaderMgr.cpp,v 1.2 2002/02/28 21:55:57 tng Exp $
*/
// ---------------------------------------------------------------------------
@@ -427,10 +427,10 @@
//
XMLReader* retVal = 0;
- // XMLReader ctor invokes refreshRawBuffer() which calls
+ // XMLReader ctor invokes refreshRawBuffer() which calls
// newStream->readBytes().
- // This readBytes() may throw exception, which neither
- // refresRawBuffer(), nor XMLReader ctor catches.
+ // This readBytes() may throw exception, which neither
+ // refresRawBuffer(), nor XMLReader ctor catches.
// We need to handle this exception to avoid leak on newStream.
try {
@@ -467,6 +467,12 @@
throw;
}
+ // If it failed for any reason, then return zero.
+ if (!retVal) {
+ delete newStream;
+ return 0;
+ }
+
// Set the next available reader number on this reader
retVal->setReaderNum(fNextReaderNum++);
return retVal;
@@ -588,22 +594,32 @@
// as a 'do nothing' transcoder for the already internalized XMLCh
// data that makes up an internal entity.
//
+ BinMemInputStream* newStream = new BinMemInputStream
+ (
+ (const XMLByte*)dataBuf
+ , dataLen * sizeof(XMLCh)
+ , copyBuf ? BinMemInputStream::BufOpt_Copy
+ : BinMemInputStream::BufOpt_Reference
+ );
+ if (!newStream)
+ return 0;
+
XMLReader* retVal = new XMLReader
(
sysId
, 0
- , new BinMemInputStream
- (
- (const XMLByte*)dataBuf
- , dataLen * sizeof(XMLCh)
- , copyBuf ? BinMemInputStream::BufOpt_Copy
- : BinMemInputStream::BufOpt_Reference
- )
+ , newStream
, XMLUni::fgXMLChEncodingString
, refFrom
, type
, XMLReader::Source_Internal
);
+
+ // If it failed for any reason, then return zero.
+ if (!retVal) {
+ delete newStream;
+ return 0;
+ }
// Set the reader number to the next available number
retVal->setReaderNum(fNextReaderNum++);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org