![]() ![]() |
![]() |
File: [Pegasus] / pegasus / src / Pegasus / CQL / CQLParser.cpp
(download)
Revision: 1.18, Tue Feb 12 19:37:31 2008 UTC (16 years, 4 months ago) by kumpf Branch: MAIN CVS Tags: TASK_PEP328_SOLARIS_NEVADA_PORT, TASK-PEP328_SOLARIS_NEVADA_PORT_v2-root, TASK-PEP328_SOLARIS_NEVADA_PORT_v2-branch, TASK-PEP328_SOLARIS_NEVADA_PORT-root, TASK-PEP328_SOLARIS_NEVADA_PORT-branch, TASK-PEP328_SOLARIS_IX86_CC_PORT-root, TASK-PEP328_SOLARIS_IX86_CC_PORT-branch-v2, TASK-PEP328_SOLARIS_IX86_CC_PORT-branch, TASK-PEP311_WSMan-root, TASK-PEP311_WSMan-branch, RELEASE_2_8_2-RC1, RELEASE_2_8_2, RELEASE_2_8_1-RC1, RELEASE_2_8_1, RELEASE_2_8_0_BETA, RELEASE_2_8_0-RC2, RELEASE_2_8_0-RC1, RELEASE_2_8_0-FC, RELEASE_2_8_0, RELEASE_2_8-root, RELEASE_2_8-branch, Makefile Changes since 1.17: +1 -0 lines BUG#: 7403 TITLE: Memory leaks in CQL parser DESCRIPTION: Fix dynamic memory leaks in the CQLParser. |
//%2006//////////////////////////////////////////////////////////////////////// // // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; // IBM Corp.; EMC Corporation, The Open Group. // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // EMC Corporation; VERITAS Software Corporation; The Open Group. // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; // EMC Corporation; Symantec Corporation; The Open Group. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // //============================================================================== // // Author: Humberto Rivero (hurivero@us.ibm.com) // // Modified By: David Dillard, VERITAS Software Corp. // (david.dillard@veritas.com) // Josephine Eskaline Joyce (jojustin@in.ibm.com) for PEP#101 // //%///////////////////////////////////////////////////////////////////////////// #include "CQLParser.h" #include "CQLParserState.h" #include <Pegasus/Common/InternalException.h> #include <Pegasus/Common/Mutex.h> #include <Pegasus/Query/QueryCommon/QueryException.h> #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/PegasusVersion.h> PEGASUS_USING_STD; extern int CQL_parse(); extern void CQL_restart (FILE *input_file); extern void CQL_Bison_Cleanup(); extern void CQL_Arglist_Cleanup(); PEGASUS_NAMESPACE_BEGIN CQLParserState* CQL_globalParserState = 0; static Mutex CQL_mutex; void CQLParser::parse( const char* text, CQLSelectStatement& statement) { PEG_METHOD_ENTER(TRC_CQL,"CQLParser::parse"); AutoMutex mtx(CQL_mutex); if (!text) { PEG_METHOD_EXIT(); throw NullPointer(); } statement.clear(); CQL_restart (0); CQL_globalParserState = new CQLParserState; CQL_globalParserState->error = false; CQL_globalParserState->text = text; CQL_globalParserState->textSize = (Uint32)(strlen(text) + 1); CQL_globalParserState->offset = 0; CQL_globalParserState->currentTokenPos = 0; CQL_globalParserState->tokenCount = 0; CQL_globalParserState->currentRule = String::EMPTY; CQL_globalParserState->statement = &statement; try { CQL_parse(); } catch(...) { CQL_Bison_Cleanup(); delete CQL_globalParserState; PEG_METHOD_EXIT(); throw; } if (CQL_globalParserState->error) { String errorMessage = CQL_globalParserState->errorMessage; cleanup(); Uint32 position = CQL_globalParserState->currentTokenPos; Uint32 token = CQL_globalParserState->tokenCount; String rule = CQL_globalParserState->currentRule; delete CQL_globalParserState; PEG_METHOD_EXIT(); throw CQLSyntaxErrorException(errorMessage,token,position,rule); } cleanup(); delete CQL_globalParserState; PEG_METHOD_EXIT(); } void CQLParser::parse( const Buffer& text, CQLSelectStatement& statement) { PEG_METHOD_ENTER(TRC_CQL,"CQLParser::parse"); if (text.size() == 0 || text[text.size() - 1] != '\0') { PEG_METHOD_EXIT(); throw MissingNullTerminator(); } parse(text.getData(), statement); PEG_METHOD_EXIT(); } void CQLParser::parse( const String& text, CQLSelectStatement& statement) { PEG_METHOD_ENTER(TRC_CQL,"CQLParser::parse"); parse(text.getCString(), statement); PEG_METHOD_EXIT(); } void CQLParser::cleanup() { PEG_METHOD_ENTER(TRC_CQL,"CQLParser::cleanup"); Array<char*>& arr = CQL_globalParserState->outstandingStrings; for (Uint32 i = 0, n = arr.size(); i < n; i++) delete [] arr[i]; arr.clear(); PEG_METHOD_EXIT(); } PEGASUS_NAMESPACE_END PEGASUS_USING_PEGASUS; int CQL_error(const char* errorMessage) { PEG_METHOD_ENTER(TRC_CQL,"CQL_error"); CQL_globalParserState->error = true; CQL_globalParserState->errorMessage = errorMessage; // // flex does not automatically flush the input buffer in case of error // CQL_restart (0); // flush ArgList CQL_Arglist_Cleanup(); PEG_METHOD_EXIT(); return -1; } int CQLInput(char* buffer, int& numRead, int numRequested) { PEG_METHOD_ENTER(TRC_CQL,"CQLInput"); // // Be sure to account for the null terminator (the size of the text will // be one or more; this is fixed checked beforehand by CQLParser::parse()). // int remaining = CQL_globalParserState->textSize - CQL_globalParserState->offset - 1; if (remaining == 0) { numRead = 0; PEG_METHOD_EXIT(); return 0; } if (remaining < numRequested) numRequested = remaining; memcpy(buffer, CQL_globalParserState->text + CQL_globalParserState->offset, numRequested); CQL_globalParserState->offset += numRequested; numRead = numRequested; PEG_METHOD_EXIT(); return numRead; }
No CVS admin address has been configured |
Powered by ViewCVS 0.9.2 |