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

From Chris Denham, "I found a couple of memory leaks in 3DS reader plugin and I have attached corrected files. I have attached an example 3DS file I used to test the leaks/fixes using osgviewer for trunk at rev [14853] and the tagged version 3.2.1.

Browse Source 
The first leak is in the lib3ds module (yeah, I know that probably should be corrected at http://code.google.com/p/lib3ds/ but I'm assuming that as no commits have happened there since 2011 that it may be better to fix the copy we have in the OSG of that project) The leak is caused by lib3d's use of realloc(ptr, 0) to free up memory allocations, but realloc, when ptr==NULL returns malloc(0) rather than NULL and thus leaks a zero byte allocation. The solution here was to adjust the 'lib3ds_util_reserve_array' function so that it realloc is not used to release a NULL pointer.

The second leak is in ReaderWriter3DS.cpp and arises when any of the created StateSet objects added to the StateSetMap don't subsequently get applied to a Node. The solution here was just to simply use the osg::ref_ptr around the raw StateSet pointer that was used in the locally defined StateSetInfo struct."



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14854 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-04-21 17:29:15 +00:00
parent 6a4a21afe3
commit 5237185e8c
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/3ds/ReaderWriter3DS.cpp
View File

@@ -193,7 +193,7 @@ protected:
StateSetInfo(const StateSetInfo & v) : stateset(v.stateset), lib3dsmat(v.lib3dsmat) {}
StateSetInfo & operator=(const StateSetInfo & v) { stateset=v.stateset; lib3dsmat=v.lib3dsmat; return *this; }
osg::StateSet * stateset;
osg::ref_ptr<osg::StateSet> stateset;
Lib3dsMaterial * lib3dsmat;
};
@@ -413,7 +413,7 @@ void ReaderWriter3DS::ReaderObject::addDrawableFromFace(osg::Geode * geode, Face
if (drawable.valid())
{
if (ssi.stateset)
drawable->setStateSet(ssi.stateset);
drawable->setStateSet(ssi.stateset.get());
geode->addDrawable(drawable.get());
}
}
@@ -426,7 +426,7 @@ void ReaderWriter3DS::ReaderObject::addDrawableFromFace(osg::Geode * geode, Face
if (drawable.valid())
{
if (ssi.stateset)
drawable->setStateSet(ssi.stateset);
drawable->setStateSet(ssi.stateset.get());
geode->addDrawable(drawable.get());
}
}

11
src/osgPlugins/3ds/lib3ds/lib3ds_util.c
View File

@@ -41,7 +41,16 @@ void lib3ds_util_reserve_array(void ***ptr, int *n, int *size, int new_size, int
(*ptr)[i] = 0;
}
}
*ptr = (void**)realloc(*ptr, sizeof(void*) * new_size);
if (*ptr || new_size != 0)
{
// As this reserve_array function is also used for cleanup
// by passing in zero as new_size, we only want to call realloc
// when new_size non zero OR there is an existing array allocated.
// This is because realloc(NULL, 0) actually allocates
// storage and thus causes a memory leak when this function
// is used to clear an array that was never allocated.
*ptr = (void**)realloc(*ptr, sizeof(void*) * new_size);
}
*size = new_size;
if (*n > new_size) {
*n = new_size;