RTSS: check the result of std::find to prevent erasing 'end' iterator (…

…OGRECave#2676)
paroj · Nov 24, 2022 · 0df846d · 0df846d
1 parent e355af3
commit 0df846d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Components/RTShaderSystem/src/OgreShaderProgramManager.cpp b/Components/RTShaderSystem/src/OgreShaderProgramManager.cpp
@@ -70,7 +70,10 @@ void ProgramManager::releasePrograms(const ProgramSet* programSet)
         if(prg.use_count() > ResourceGroupManager::RESOURCE_SYSTEM_NUM_REFERENCE_COUNTS + 2)
             continue;
 
-        mShaderList.erase(std::find(mShaderList.begin(), mShaderList.end(), prg));
+	const auto it = std::find(mShaderList.begin(), mShaderList.end(), prg);
+        // TODO: this check should not be necessary, but we observed strange prg.use_count() in the wild
+        if(it != mShaderList.end())
+            mShaderList.erase(it);
         GpuProgramManager::getSingleton().remove(prg);
     }
 }