zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 23:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix uninitialized memory access if a FShaderProgram is destroyed without being fully compiled and linked

Browse source
This commit is contained in:
Magnus Norddahl 2016-08-26 01:40:28 +02:00
parent 960038bb81
commit b68bbaf617
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gl/shaders/gl_shaderprogram.cpp
View file

@ -52,6 +52,12 @@
#include "i_system.h"
#include "doomerrors.h"
FShaderProgram::FShaderProgram()
{
for (int i = 0; i < NumShaderTypes; i++)
mShaders[i] = 0;
}
//==========================================================================
//
// Free shader program resources

4
src/gl/shaders/gl_shaderprogram.h
View file

@ -6,6 +6,7 @@
class FShaderProgram
{
public:
FShaderProgram();
~FShaderProgram();
enum ShaderType
@ -30,6 +31,9 @@ public:
static void PatchFragShader(FString &code);
private:
FShaderProgram(const FShaderProgram &) = delete;
FShaderProgram &operator=(const FShaderProgram &) = delete;
static FString PatchShader(ShaderType type, const FString &code, const char *defines, int maxGlslVersion);
static void PatchCommon(FString &code);