From 600e98773e2dfc871f772e7873f26563fc81092d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 20 Nov 2014 10:52:24 +0000 Subject: [PATCH] From Marc Helbling, "here is a trivial fix in the Inventor plugin. In one code path, the pointer validity is checked after dereferencing a pointer that can be null (image->valid()) instead of calling ref_ptr::valid (image.valid())." git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14505 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPlugins/Inventor/ConvertFromInventor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/Inventor/ConvertFromInventor.cpp b/src/osgPlugins/Inventor/ConvertFromInventor.cpp index e841df436..1a5e51a64 100644 --- a/src/osgPlugins/Inventor/ConvertFromInventor.cpp +++ b/src/osgPlugins/Inventor/ConvertFromInventor.cpp @@ -1268,7 +1268,7 @@ SbBool SoVRMLImageTextureOsg::readInstance(SoInput *in, unsigned short flags) if (url.getNum() && url[0].getLength()) { osg::ref_ptr image = loadImage(url[0].getString(), options); - if (!image->valid()) + if (!image.valid()) { OSG_WARN << "Could not read texture file: " << url[0].getString() << std::endl; this->setReadStatus(FALSE);