You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2007/07/31 23:39:37 UTC
svn commit: r561562 - in /incubator/uima/uimacpp/trunk: examples/src/
src/cas/ src/framework/ src/test/src/ src/utils/
Author: eae
Date: Tue Jul 31 14:39:36 2007
New Revision: 561562
URL: http://svn.apache.org/viewvc?view=rev&rev=561562
Log:
UIMA-423 Additional problems found with valgrind
Modified:
incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.cpp
incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.cpp
incubator/uima/uimacpp/trunk/src/cas/cas.cpp
incubator/uima/uimacpp/trunk/src/cas/sofastream.cpp
incubator/uima/uimacpp/trunk/src/cas/xcasdeserializer.cpp
incubator/uima/uimacpp/trunk/src/cas/xmideserializer.cpp
incubator/uima/uimacpp/trunk/src/cas/xmiwriter.cpp
incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp
incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.cpp
incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.cpp
incubator/uima/uimacpp/trunk/src/test/src/test_iterators.cpp
incubator/uima/uimacpp/trunk/src/utils/runAECpp.cpp
Modified: incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.cpp (original)
+++ incubator/uima/uimacpp/trunk/examples/src/ExampleApplication.cpp Tue Jul 31 14:39:36 2007
@@ -211,7 +211,7 @@
tcas->setDocumentText(ustrInputText.getBuffer(), ustrInputText.length(), true);
- delete pBuffer;
+ delete[] pBuffer;
/* process the CAS */
TyErrorId utErrorId = ((AnalysisEngine*)pEngine)->process(*tcas);
CheckError(utErrorId, *pEngine);
Modified: incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.cpp (original)
+++ incubator/uima/uimacpp/trunk/examples/src/SofaDataAnnotator.cpp Tue Jul 31 14:39:36 2007
@@ -121,7 +121,7 @@
/** close the stream */
pStream->close();
delete pStream;
- delete pBuffer;
+ delete[] pBuffer;
cout << "SofaDataAnnotator: process() ends" << endl;
return (TyErrorId)UIMA_ERR_NONE;
Modified: incubator/uima/uimacpp/trunk/src/cas/cas.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/cas/cas.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/cas/cas.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/cas/cas.cpp Tue Jul 31 14:39:36 2007
@@ -173,6 +173,8 @@
iv_typeSystem(NULL),
iv_heap(NULL),
initialSofaCreated(false),
+ iv_sofaNum(0),
+ iv_sofaCount(0),
iv_initialView(NULL),
iv_indexRepository(NULL),
iv_filterBuilder(NULL),
@@ -201,7 +203,6 @@
iv_filterBuilder = new uima::FSFilterBuilder();
assert( EXISTS(iv_filterBuilder) );
- iv_sofaCount = 0;
isbaseCas = true;
iv_baseCas = this;
isDeletingViews = false;
@@ -210,6 +211,8 @@
// Constructor used for views
CAS::CAS(CAS* inCas, SofaFS inSofa):
+ iv_sofaNum(0),
+ iv_sofaCount(0),
iv_cpDocument(NULL),
iv_uiDocumentLength(0),
iv_copyOfDocument(NULL),
@@ -255,6 +258,8 @@
: iv_casDefinition( & casDefs ),
iv_typeSystem(NULL),
iv_heap(NULL),
+ iv_sofaNum(0),
+ iv_sofaCount(0),
initialSofaCreated(false),
iv_initialView(NULL),
iv_indexRepository(NULL),
@@ -284,7 +289,6 @@
iv_filterBuilder = new uima::FSFilterBuilder();
assert( EXISTS(iv_filterBuilder) );
- iv_sofaCount = 0;
isbaseCas = true;
iv_baseCas = this;
bOwnsCASDefinition=ownsCasDef;
@@ -299,7 +303,7 @@
iv_indexRepository = NULL;
}
if (this->iv_cpDocument != NULL) {
- delete this->iv_cpDocument;
+ delete[] this->iv_cpDocument;
this->iv_cpDocument = NULL;
}
//initial call to delete object
Modified: incubator/uima/uimacpp/trunk/src/cas/sofastream.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/cas/sofastream.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/cas/sofastream.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/cas/sofastream.cpp Tue Jul 31 14:39:36 2007
@@ -517,7 +517,7 @@
//close
void LocalSofaDataStream::close() {
if (iv_pstringsofadata != NULL)
- delete iv_pstringsofadata;
+ delete[] iv_pstringsofadata;
iv_pstringsofadata = NULL;
iv_curpos=0;
iv_psofadata = NULL;
Modified: incubator/uima/uimacpp/trunk/src/cas/xcasdeserializer.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/cas/xcasdeserializer.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/cas/xcasdeserializer.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/cas/xcasdeserializer.cpp Tue Jul 31 14:39:36 2007
@@ -76,7 +76,9 @@
void XCASDeserializer::deserialize(char const * xcasFilename, CAS & cas) {
- LocalFileInputSource fileIS (XMLString::transcode(xcasFilename));
+ XMLCh* native = XMLString::transcode(xcasFilename);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XCASDeserializer::deserialize(fileIS, cas);
}
@@ -84,13 +86,17 @@
void XCASDeserializer::deserialize(UnicodeString & xcasFilename, CAS & cas) {
char buff[1024];
xcasFilename.extract(0, xcasFilename.length(), buff);
- LocalFileInputSource fileIS (XMLString::transcode(buff));
+ XMLCh* native = XMLString::transcode(buff);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XCASDeserializer::deserialize(fileIS, cas);
}
void XCASDeserializer::deserialize(char const * xcasFilename, CAS & cas, uima::AnnotatorContext * const ctx) {
- LocalFileInputSource fileIS (XMLString::transcode(xcasFilename));
+ XMLCh* native = XMLString::transcode(xcasFilename);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XCASDeserializer::deserialize(fileIS, cas, ctx);
}
Modified: incubator/uima/uimacpp/trunk/src/cas/xmideserializer.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/cas/xmideserializer.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/cas/xmideserializer.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/cas/xmideserializer.cpp Tue Jul 31 14:39:36 2007
@@ -76,7 +76,9 @@
void XmiDeserializer::deserialize(char const * xmiFilename, CAS & cas) {
- LocalFileInputSource fileIS (XMLString::transcode(xmiFilename));
+ XMLCh* native = XMLString::transcode(xmiFilename);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XmiDeserializer::deserialize(fileIS, cas);
}
@@ -84,7 +86,9 @@
void XmiDeserializer::deserialize(UnicodeString & xmiFilename, CAS & cas) {
char buff[1024];
xmiFilename.extract(0, xmiFilename.length(), buff);
- LocalFileInputSource fileIS (XMLString::transcode(buff));
+ XMLCh* native = XMLString::transcode(buff);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XmiDeserializer::deserialize(fileIS, cas);
}
@@ -108,6 +112,7 @@
char* message = XMLString::transcode(e.getMessage());
cerr << "XMLException message is: \n"
<< message << "\n";
+ delete message;
ErrorInfo errInfo;
errInfo.setErrorId((TyErrorId)UIMA_ERR_RESOURCE_CORRUPTED);
@@ -128,6 +133,8 @@
char* message = XMLString::transcode(e.getMessage());
cerr << "SaxParseException message is: \n"
<< message << "\n";
+ delete message;
+
ErrorInfo errInfo;
errInfo.setErrorId((TyErrorId)UIMA_ERR_RESOURCE_CORRUPTED);
ErrorMessage msg(UIMA_MSG_ID_EXC_XML_SAXPARSE_FATALERROR);
@@ -210,6 +217,7 @@
char* message = XMLString::transcode(e.getMessage());
cerr << "XMLException message is: \n"
<< message << "\n";
+ delete message;
ErrorInfo errInfo;
errInfo.setErrorId((TyErrorId)UIMA_ERR_RESOURCE_CORRUPTED);
@@ -230,6 +238,8 @@
char* message = XMLString::transcode(e.getMessage());
cerr << "SaxParseException message is: \n"
<< message << "\n";
+ delete message;
+
ErrorInfo errInfo;
errInfo.setErrorId((TyErrorId)UIMA_ERR_RESOURCE_CORRUPTED);
ErrorMessage msg(UIMA_MSG_ID_EXC_XML_SAXPARSE_FATALERROR);
@@ -294,7 +304,9 @@
CAS & cas,
XmiSerializationSharedData & sharedData) {
- LocalFileInputSource fileIS (XMLString::transcode(xmiFilename));
+ XMLCh* native = XMLString::transcode(xmiFilename);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XmiDeserializer::deserialize(fileIS, cas, sharedData);
}
@@ -304,7 +316,9 @@
XmiSerializationSharedData & sharedData) {
char buff[1024];
xmiFilename.extract(0, xmiFilename.length(), buff);
- LocalFileInputSource fileIS (XMLString::transcode(buff));
+ XMLCh* native = XMLString::transcode(buff);
+ LocalFileInputSource fileIS (native);
+ XMLString::release(&native);
XmiDeserializer::deserialize(fileIS, cas, sharedData);
}
}
Modified: incubator/uima/uimacpp/trunk/src/cas/xmiwriter.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/cas/xmiwriter.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/cas/xmiwriter.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/cas/xmiwriter.cpp Tue Jul 31 14:39:36 2007
@@ -475,7 +475,7 @@
//printf ("itoahexadecimal: %d %d\n",i, arrayfs.get(i));
str << out[0] << out[1];
}
- delete out;
+ delete[] out;
break;
}
case internal::gs_tyShortArrayType: {
Modified: incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/framework/resmgr.cpp Tue Jul 31 14:39:36 2007
@@ -331,9 +331,9 @@
strncpy(handlerdllfilename,curptr, len);
handlerdllfilename[len]='\0';
registerStreamHandlerForURIScheme(urischeme, handlerdllfilename);
- delete handlerdllfilename;
+ delete [] handlerdllfilename;
}
- delete urischeme;
+ delete [] urischeme;
}
//move ptr
Modified: incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/SofaStreamHandlerFile.cpp Tue Jul 31 14:39:36 2007
@@ -236,7 +236,7 @@
stream=NULL;
}
if (buffer != NULL) {
- delete buffer;
+ delete[] buffer;
buffer=NULL;
}
return;
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_casserializer.cpp Tue Jul 31 14:39:36 2007
@@ -234,7 +234,7 @@
/* convert to unicode and set tcas document text*/
UnicodeString ustrInputText(pBuffer, (int32_t)numread, "utf-8");
- delete pBuffer;
+ delete[] pBuffer;
/* set TCAS Document text */
CAS * tcas = pEngine->newCAS();
Modified: incubator/uima/uimacpp/trunk/src/test/src/test_iterators.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/test/src/test_iterators.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/test/src/test_iterators.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/test/src/test_iterators.cpp Tue Jul 31 14:39:36 2007
@@ -584,7 +584,7 @@
/* convert to unicode and set tcas document text*/
UnicodeString ustrInputText(pBuffer, (int32_t)numread, "utf-8");
- delete pBuffer;
+ delete[] pBuffer;
/* set TCAS Document text */
CAS * tcas = pEngine->newCAS();
ASSERT_OR_THROWEXCEPTION( EXISTS(tcas) );
@@ -651,7 +651,7 @@
/* convert to unicode and set tcas document text*/
UnicodeString ustrInputText(pBuffer, (int32_t)numread, "utf-8");
- delete pBuffer;
+ delete[] pBuffer;
/* set TCAS Document text */
CAS * tcas = pEngine->newCAS();
ASSERT_OR_THROWEXCEPTION( EXISTS(tcas) );
Modified: incubator/uima/uimacpp/trunk/src/utils/runAECpp.cpp
URL: http://svn.apache.org/viewvc/incubator/uima/uimacpp/trunk/src/utils/runAECpp.cpp?view=diff&rev=561562&r1=561561&r2=561562
==============================================================================
--- incubator/uima/uimacpp/trunk/src/utils/runAECpp.cpp (original)
+++ incubator/uima/uimacpp/trunk/src/utils/runAECpp.cpp Tue Jul 31 14:39:36 2007
@@ -235,7 +235,9 @@
if (xcasInput != textFormat) {
/* initialize from an xcas or xmicas */
//cout << "runAECpp::processing xml file " << in << endl;
- LocalFileInputSource fileIS(XMLString::transcode(in.c_str()));
+ XMLCh* native = XMLString::transcode(in.c_str());
+ LocalFileInputSource fileIS(native);
+ XMLString::release(&native);
if (xcasInput == xcasFormat) {
XCASDeserializer::deserialize(fileIS, *cas);
}
@@ -267,7 +269,7 @@
/* convert to unicode and set tcas document text*/
UnicodeString ustrInputText(pBuffer, (int32_t)numread, "utf-8");
cas->setDocumentText(UnicodeStringRef(ustrInputText));
- delete pBuffer;
+ delete[] pBuffer;
}
// Is the input a tcas?