[iortcw] 193/497: All: Fix incorrect rgbGen const reading uninitialized memory

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit ec14d7f1bbe4b6ca2e8f210631d7102722b085e7
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Fri Aug 29 16:22:32 2014 +0000

    All: Fix incorrect rgbGen const reading uninitialized memory
---
 MP/code/rend2/tr_shader.c    | 2 ++
 MP/code/renderer/tr_shader.c | 2 ++
 SP/code/rend2/tr_shader.c    | 2 ++
 SP/code/renderer/tr_shader.c | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/MP/code/rend2/tr_shader.c b/MP/code/rend2/tr_shader.c
index f0fbd2b..cc55ef2 100644
--- a/MP/code/rend2/tr_shader.c
+++ b/MP/code/rend2/tr_shader.c
@@ -1064,6 +1064,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) {
 			} else if ( !Q_stricmp( token, "const" ) )    {
 				vec3_t color;
 
+				VectorClear( color );
+
 				ParseVector( text, 3, color );
 				stage->constantColor[0] = 255 * color[0];
 				stage->constantColor[1] = 255 * color[1];
diff --git a/MP/code/renderer/tr_shader.c b/MP/code/renderer/tr_shader.c
index d3ee107..d991201 100644
--- a/MP/code/renderer/tr_shader.c
+++ b/MP/code/renderer/tr_shader.c
@@ -825,6 +825,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) {
 			} else if ( !Q_stricmp( token, "const" ) )    {
 				vec3_t color;
 
+				VectorClear( color );
+
 				ParseVector( text, 3, color );
 				stage->constantColor[0] = 255 * color[0];
 				stage->constantColor[1] = 255 * color[1];
diff --git a/SP/code/rend2/tr_shader.c b/SP/code/rend2/tr_shader.c
index 36ffae0..79baee9 100644
--- a/SP/code/rend2/tr_shader.c
+++ b/SP/code/rend2/tr_shader.c
@@ -1062,6 +1062,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) {
 			} else if ( !Q_stricmp( token, "const" ) )    {
 				vec3_t color;
 
+				VectorClear( color );
+
 				ParseVector( text, 3, color );
 				stage->constantColor[0] = 255 * color[0];
 				stage->constantColor[1] = 255 * color[1];
diff --git a/SP/code/renderer/tr_shader.c b/SP/code/renderer/tr_shader.c
index b528393..4b1b39c 100644
--- a/SP/code/renderer/tr_shader.c
+++ b/SP/code/renderer/tr_shader.c
@@ -822,6 +822,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text ) {
 			} else if ( !Q_stricmp( token, "const" ) )    {
 				vec3_t color;
 
+				VectorClear( color );
+
 				ParseVector( text, 3, color );
 				stage->constantColor[0] = 255 * color[0];
 				stage->constantColor[1] = 255 * color[1];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git