Enforce distance2 index bounding

Author: Auburn

FastNoiseSIMD/FastNoiseSIMD.cpp

@@ -29,6 +29,7 @@
 #include "FastNoiseSIMD.h"
 #include <assert.h>
 #include <stdlib.h>
+#include <algorithm>
 #include <cstdint>
 
 #ifdef FN_COMPILE_NO_SIMD_FALLBACK
@@ -524,6 +525,15 @@ float FastNoiseSIMD::CalculateFractalBounding(int octaves, float gain)
 	return 1.0f / ampFractal;
 }
 
+void FastNoiseSIMD::SetCellularDistance2Indicies(int cellularDistanceIndex0, int cellularDistanceIndex1)
+{
+	m_cellularDistanceIndex0 = std::min(cellularDistanceIndex0, cellularDistanceIndex1);
+	m_cellularDistanceIndex1 = std::max(cellularDistanceIndex0, cellularDistanceIndex1);
+
+	m_cellularDistanceIndex0 = std::min(std::max(m_cellularDistanceIndex0, 0), FN_CELLULAR_INDEX_MAX);
+	m_cellularDistanceIndex1 = std::min(std::max(m_cellularDistanceIndex1, 0), FN_CELLULAR_INDEX_MAX);
+}
+
 void FastNoiseVectorSet::Free()
 {
 	size = -1;

FastNoiseSIMD/FastNoiseSIMD.h

@@ -198,7 +198,9 @@ class FastNoiseSIMD
 
 	// Sets the 2 distance indicies used for distance2 return types
 	// Default: 0, 1
-	void SetCellularDistance2Indicies(int cellularDistanceIndex0, int cellularDistanceIndex1) { m_cellularDistanceIndex0 = cellularDistanceIndex0; m_cellularDistanceIndex1 = cellularDistanceIndex1; }
+	// Note: index0 should be lower than index1
+	// index1 must be < 4, both indicies must be >= 0
+	void SetCellularDistance2Indicies(int cellularDistanceIndex0, int cellularDistanceIndex1);
 
 
 	// Enables position perturbing for all noise types
@@ -343,6 +345,8 @@ struct FastNoiseVectorSet
 	void SetSize(int _size);
 };
 
+#define FN_CELLULAR_INDEX_MAX 3
+
 #define FN_NO_SIMD_FALLBACK 0
 #define FN_SSE2 1
 #define FN_SSE41 2

FastNoiseSIMD/FastNoiseSIMD_internal.cpp

@@ -1888,8 +1888,8 @@ static SIMDf VECTORCALL FUNC(Cellular##returnFunc##distanceFunc##Single)(SIMDi s
 #define CELLULAR_DISTANCE2CAVE_SINGLE(distanceFunc)\
 static SIMDf VECTORCALL FUNC(CellularDistance2Cave##distanceFunc##Single)(SIMDi seed, SIMDf x, SIMDf y, SIMDf z, int index0, int index1)\
 {\
-	SIMDf distance0[4] = {SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999)};\
-	SIMDf distance1[4] = {SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999)};\
+	SIMDf distance0[FN_CELLULAR_INDEX_MAX+1] = {SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999)};\
+	SIMDf distance1[FN_CELLULAR_INDEX_MAX+1] = {SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999),SIMDf_NUM(999999)};\
 	\
 	SIMDi xc     = SIMDi_SUB(SIMDi_CONVERT_TO_INT(x), SIMDi_NUM(1));\
 	SIMDi ycBase = SIMDi_SUB(SIMDi_CONVERT_TO_INT(y), SIMDi_NUM(1));\