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

Added handling of NULL

Browse Source
This commit is contained in:
Robert Osfield 2016-06-30 07:59:37 +01:00
parent 1e0a187613
commit ac136d92e7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osgPlugins/ply/plyfile.cpp
View File

@ -1108,16 +1108,20 @@ void ply_get_property(
elem = find_element (plyfile, elem_name);
plyfile->which_elem = elem;
/* deposit the property information into the element's description */
/* Properties may have several names, separated by | with no spaces */
std::vector<std::string> tokens;
tokenizeProperties(prop->name, tokens, "|");
for(std::vector<std::string>::iterator it_property = tokens.begin();
!prop_ptr && it_property != tokens.end();
++it_property)
if (elem)
{
prop_ptr = find_property(elem, it_property->c_str(), &index);
/* deposit the property information into the element's description */
/* Properties may have several names, separated by | with no spaces */
std::vector<std::string> tokens;
tokenizeProperties(prop->name, tokens, "|");
for(std::vector<std::string>::iterator it_property = tokens.begin();
!prop_ptr && it_property != tokens.end();
++it_property)
{
prop_ptr = find_property(elem, it_property->c_str(), &index);
}
}
if(prop_ptr)