From d3f5aef5efc78fb28a3534cc2aee9cf5d8746a6e Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 9 Jun 2016 11:41:14 +0100 Subject: [PATCH] Fixed "Using invalid iterator" bug in getTile() methods, detected by Covertity. --- src/osgVolume/Volume.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/osgVolume/Volume.cpp b/src/osgVolume/Volume.cpp index 6880cfed8..ec8df1038 100644 --- a/src/osgVolume/Volume.cpp +++ b/src/osgVolume/Volume.cpp @@ -51,9 +51,7 @@ VolumeTile* Volume::getVolumeTile(const TileID& tileID) OpenThreads::ScopedLock lock(_mutex); VolumeTileMap::iterator itr = _volumeTileMap.find(tileID); - if (itr != _volumeTileMap.end()) return 0; - - return itr->second; + return (itr != _volumeTileMap.end()) ? itr->second : 0; } const VolumeTile* Volume::getVolumeTile(const TileID& tileID) const @@ -61,9 +59,7 @@ const VolumeTile* Volume::getVolumeTile(const TileID& tileID) const OpenThreads::ScopedLock lock(_mutex); VolumeTileMap::const_iterator itr = _volumeTileMap.find(tileID); - if (itr != _volumeTileMap.end()) return 0; - - return itr->second; + return (itr != _volumeTileMap.end()) ? itr->second : 0; } void Volume::dirtyRegisteredVolumeTiles()