mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent reading from an uninitialized character buffer

Browse Source 
If `GLEXT_glGetInfoLog` fails then `log` is left unchanged which
can lead to a reading from an uninitialized buffer on the following
line. Initializing the buffer ensures this never happens. While I
was touching this code I elected to switch to `std::array` as well
since SFML has made previous efforts to stop using C-style arrays
and I wanted to continue that effort.
This commit is contained in:
Chris Thrasher 2024-09-25 10:14:12 -06:00
parent 0d33ddeccf
commit 9d1e5d9acf
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/SFML/Graphics/Shader.cpp
View File

@ -40,6 +40,7 @@
#include <SFML/System/Vector2.hpp> #include <SFML/System/Vector2.hpp>
#include <SFML/System/Vector3.hpp> #include <SFML/System/Vector3.hpp>
#include <array>
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
#include <ostream> #include <ostream>
@ -882,9 +883,9 @@ bool Shader::compile(std::string_view vertexShaderCode, std::string_view geometr
glCheck(GLEXT_glGetObjectParameteriv(vertexShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success)); glCheck(GLEXT_glGetObjectParameteriv(vertexShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success));
if (success == GL_FALSE) if (success == GL_FALSE)
{ {
char log[1024]; std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(vertexShader, sizeof(log), nullptr, log)); glCheck(GLEXT_glGetInfoLog(vertexShader, sizeof(log), nullptr, log.data()));
err() << "Failed to compile vertex shader:" << '\n' << log << std::endl; err() << "Failed to compile vertex shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(vertexShader)); glCheck(GLEXT_glDeleteObject(vertexShader));
glCheck(GLEXT_glDeleteObject(shaderProgram)); glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
@ -910,9 +911,9 @@ bool Shader::compile(std::string_view vertexShaderCode, std::string_view geometr
glCheck(GLEXT_glGetObjectParameteriv(geometryShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success)); glCheck(GLEXT_glGetObjectParameteriv(geometryShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success));
if (success == GL_FALSE) if (success == GL_FALSE)
{ {
char log[1024]; std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(geometryShader, sizeof(log), nullptr, log)); glCheck(GLEXT_glGetInfoLog(geometryShader, sizeof(log), nullptr, log.data()));
err() << "Failed to compile geometry shader:" << '\n' << log << std::endl; err() << "Failed to compile geometry shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(geometryShader)); glCheck(GLEXT_glDeleteObject(geometryShader));
glCheck(GLEXT_glDeleteObject(shaderProgram)); glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
@ -938,9 +939,9 @@ bool Shader::compile(std::string_view vertexShaderCode, std::string_view geometr
glCheck(GLEXT_glGetObjectParameteriv(fragmentShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success)); glCheck(GLEXT_glGetObjectParameteriv(fragmentShader, GLEXT_GL_OBJECT_COMPILE_STATUS, &success));
if (success == GL_FALSE) if (success == GL_FALSE)
{ {
char log[1024]; std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(fragmentShader, sizeof(log), nullptr, log)); glCheck(GLEXT_glGetInfoLog(fragmentShader, sizeof(log), nullptr, log.data()));
err() << "Failed to compile fragment shader:" << '\n' << log << std::endl; err() << "Failed to compile fragment shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(fragmentShader)); glCheck(GLEXT_glDeleteObject(fragmentShader));
glCheck(GLEXT_glDeleteObject(shaderProgram)); glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
@ -959,9 +960,9 @@ bool Shader::compile(std::string_view vertexShaderCode, std::string_view geometr
glCheck(GLEXT_glGetObjectParameteriv(shaderProgram, GLEXT_GL_OBJECT_LINK_STATUS, &success)); glCheck(GLEXT_glGetObjectParameteriv(shaderProgram, GLEXT_GL_OBJECT_LINK_STATUS, &success));
if (success == GL_FALSE) if (success == GL_FALSE)
{ {
char log[1024]; std::array<char, 1024> log{};
glCheck(GLEXT_glGetInfoLog(shaderProgram, sizeof(log), nullptr, log)); glCheck(GLEXT_glGetInfoLog(shaderProgram, sizeof(log), nullptr, log.data()));
err() << "Failed to link shader:" << '\n' << log << std::endl; err() << "Failed to link shader:" << '\n' << log.data() << std::endl;
glCheck(GLEXT_glDeleteObject(shaderProgram)); glCheck(GLEXT_glDeleteObject(shaderProgram));
return false; return false;
} }