fix #4985:

out of bounds access when copying float3 to float4
spring · Nov 1, 2015 · 88c7414 · 88c7414 · abma · Nov 1, 2015
1 parent 9b75b21
commit 88c7414
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/rts/Rendering/GL/Light.h b/rts/Rendering/GL/Light.h
@@ -59,13 +59,13 @@ namespace GL {
 		const float3& GetSpecularDecayRate() const { return specularDecayRate; }
 		const float3& GetDecayFunctionType() const { return decayFunctionType; }
 
-		void SetPosition(const float array[3]) { position = array; }
+		void SetPosition(const float array[3]) { position.fromFloat3(array); }
 		void SetDirection(const float array[3]) { direction = array; }
 		void SetTrackPosition(const float3* pos) { trackPosition = pos; }
 		void SetTrackDirection(const float3* dir) { trackDirection = dir; }
-		void SetAmbientColor(const float array[3]) { ambientColor = array; }
-		void SetDiffuseColor(const float array[3]) { diffuseColor = array; }
-		void SetSpecularColor(const float array[3]) { specularColor = array; }
+		void SetAmbientColor(const float array[3]) { ambientColor.fromFloat3(array); }
+		void SetDiffuseColor(const float array[3]) { diffuseColor.fromFloat3(array); }
+		void SetSpecularColor(const float array[3]) { specularColor.fromFloat3(array); }
 		void SetIntensityWeight(const float array[3]) { intensityWeight = array; }
 		void SetAttenuation(const float array[3]) { attenuation = array; }
 		void SetAmbientDecayRate(const float array[3]) { ambientDecayRate = array; }

diff --git a/rts/System/float4.h b/rts/System/float4.h
@@ -32,6 +32,12 @@ struct float4 : public float3
 		return *this;
 	}
 
+	inline void fromFloat3 (const float f[3]) {
+		x = f[0];
+		y = f[1];
+		z = f[2];
+	}
+
 	inline float4& operator= (const float3& f) {
 		x = f.x;
 		y = f.y;