From eb73dcb7f46b25eeb73567f7d6067900e703f48a Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 30 May 2013 22:58:58 -0500 Subject: [PATCH] Catch more bad shader syntax cases Use to only ignore file in cases where both { and \0 were missing after shader name. Now ignore file when either are missing, such as "}\0". --- code/renderergl1/tr_shader.c | 2 +- code/renderergl2/tr_shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c index aa88e50b..611bebb0 100644 --- a/code/renderergl1/tr_shader.c +++ b/code/renderergl1/tr_shader.c @@ -2955,7 +2955,7 @@ static void ScanAndLoadShaderFiles( void ) oldp = p; token = COM_ParseExt(&p, qtrue); - if(token[0] != '{' && token[1] != '\0') + if(token[0] != '{' || token[1] != '\0') { ri.Printf(PRINT_WARNING, "WARNING: Bad shader file %s has incorrect syntax.\n", filename); ri.FS_FreeFile(buffers[i]); diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c index 2cb86684..416b7f17 100644 --- a/code/renderergl2/tr_shader.c +++ b/code/renderergl2/tr_shader.c @@ -3595,7 +3595,7 @@ static void ScanAndLoadShaderFiles( void ) oldp = p; token = COM_ParseExt(&p, qtrue); - if(token[0] != '{' && token[1] != '\0') + if(token[0] != '{' || token[1] != '\0') { ri.Printf(PRINT_WARNING, "WARNING: Bad shader file %s has incorrect syntax.\n", filename); ri.FS_FreeFile(buffers[i]);