From Laurens Voerman, "I found a new way to crach the osgviewer:

osgviewer "ProxyNode { FileNameList { cow.osgt } num_children 1 }".osgs

The proxy node reader wrongly assumes options to be non NULL.

fixed in attached zip:
src\osgWrappers\deprecated-dotosg\osg\ProxyNode.cpp

applies to both the 3.2 branch and svn trunk"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14483 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-11-19 11:37:33 +00:00
parent 9f0f107c66
commit 0ec0b79d6c

View File

@@ -123,6 +123,8 @@ bool ProxyNode_readLocalData(Object& obj, Input& fr)
iteratorAdvanced = true;
}
bool make_options = (fr.getOptions() == NULL);
if (make_options) fr.setOptions(new osgDB::Options()); //need valid options
unsigned int i;
for(i=0; i<num_children; i++)
{
@@ -154,7 +156,7 @@ bool ProxyNode_readLocalData(Object& obj, Input& fr)
}
}
}
if (make_options) fr.setOptions(NULL);
return iteratorAdvanced;
}