FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Cedric Pinson, "Here a fix about a leak in InputStream::decompress

Browse Source 
I changed
       _in->setStream( new std::stringstream(data) );
to
       _dataDecompress = new std::stringstream(data);
       _in->setStream( _dataDecompress );

Then when the destructor is of InputStream is called I delete the
dataDecompress stringstream.
"
This commit is contained in:
Robert Osfield 2010-06-15 10:02:34 +00:00
parent d9bd6c977e
commit 0c84f2deff
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgDB/InputStream
View File

@ -167,6 +167,9 @@ protected:
osg::ref_ptr<InputIterator> _in;
osg::ref_ptr<InputException> _exception;
osg::ref_ptr<const osgDB::Options> _options;
// store here to avoid a new and a leak in InputStream::decompress
std::stringstream* _dataDecompress;
};
void InputStream::throwException( const std::string& msg )

9
src/osgDB/InputStream.cpp
View File

@ -24,7 +24,7 @@ using namespace osgDB;
static std::string s_lastSchema;
InputStream::InputStream( const osgDB::Options* options )
: _byteSwap(0), _useFloatMatrix(true), _useSchemaData(false), _forceReadingImage(false)
: _byteSwap(0), _useFloatMatrix(true), _useSchemaData(false), _forceReadingImage(false), _dataDecompress(0)
{
if ( !options ) return;
_options = options;
@ -73,6 +73,8 @@ InputStream::InputStream( const osgDB::Options* options )
InputStream::~InputStream()
{
if (_dataDecompress)
delete _dataDecompress;
}
InputStream& InputStream::operator>>( osg::Vec2b& v )
@ -672,8 +674,9 @@ void InputStream::decompress()
if ( !compressor->decompress(*(_in->getStream()), data) )
throwException( "InputStream: Failed to decompress stream." );
if ( getException() ) return;
_in->setStream( new std::stringstream(data) );
_dataDecompress = new std::stringstream(data);
_in->setStream( _dataDecompress );
_fields.pop_back();
}