Avoid potential crashes with the new aux render passes

YafaRay · Sep 20, 2016 · 2bab411 · 2bab411
1 parent bd8a434
commit 2bab411
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/yafraycore/renderpasses.cc b/src/yafraycore/renderpasses.cc
@@ -362,9 +362,17 @@ intPassTypes_t renderPasses_t::intPassTypeFromString(std::string intPassTypeStri
 
 externalPassTileTypes_t renderPasses_t::tileType(int extPassIndex) const { return extPasses.at(extPassIndex).tileType; }
 
-intPassTypes_t renderPasses_t::intPassTypeFromExtPassIndex(int extPassIndex) const { return extPasses.at(extPassIndex).intPassType; }
+intPassTypes_t renderPasses_t::intPassTypeFromExtPassIndex(int extPassIndex) const
+{
+    if(extPassesSize() > extPassIndex) return extPasses.at(extPassIndex).intPassType;
+    else return PASS_INT_DISABLED;
+}
 
-intPassTypes_t renderPasses_t::intPassTypeFromAuxPassIndex(int auxPassIndex) const { return auxPasses.at(auxPassIndex).intPassType; }
+intPassTypes_t renderPasses_t::intPassTypeFromAuxPassIndex(int auxPassIndex) const
+{
+    if(auxPassesSize() > auxPassIndex) return auxPasses.at(auxPassIndex).intPassType;
+    else return PASS_INT_DISABLED;
+}
 
 int renderPasses_t::extPassIndexFromType(extPassTypes_t extPassType) const
 {