mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 09:34:18 +02:00
Code Issues Releases Wiki Activity

sprintf ub and warnings fixes

Browse Source
This commit is contained in:
XProger
2018-06-30 02:20:55 +03:00
parent 66cb169240
commit 6dafb30c25
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gapi_gl.h
View File

@@ -357,6 +357,7 @@ namespace GAPI {
default : ASSERT(false); LOG("! wrong pass id\n"); return;
}
char buf[256];
char defines[1024];
defines[0] = 0;
@@ -365,9 +366,11 @@ namespace GAPI {
if (def[i] == SD_SHADOW_SAMPLER)
strcat(defines, "#extension GL_EXT_shadow_samplers : require\n"); // ACHTUNG! must be first in the list
#endif
sprintf(defines, "%s#define %s\n", defines, DefineName[def[i]]);
sprintf(buf, "#define %s\n", DefineName[def[i]]);
strcat(defines, buf);
}
sprintf(defines, "%s#define PASS_%s\n", defines, passNames[pass]);
sprintf(buf, "#define PASS_%s\n", passNames[pass]);
strcat(defines, buf);
#if defined(_OS_RPI) || defined(_OS_CLOVER)
strcat(defines, "#define OPT_VLIGHTPROJ\n");
@@ -391,7 +394,7 @@ namespace GAPI {
if (!(Core::support.shaderBinary && linkBinary(fileName))) { // try to load cached shader
if (linkSource(source, defines) && Core::support.shaderBinary) { // compile shader from source and dump it into cache
#ifndef _OS_WEB
GLenum format, size;
GLenum format = 0, size;
glGetProgramiv(ID, GL_PROGRAM_BINARY_LENGTH, (GLsizei*)&size);
char *data = new char[8 + size];
glGetProgramBinary(ID, size, NULL, &format, &data[8]);
@@ -796,6 +799,7 @@ namespace GAPI {
} rtCache[2];
bool extSupport(const char *str, const char *ext) {
if (!str) return false;
return strstr(str, ext) != NULL;
}

1
src/libs/minimp3/minimp3.cpp
View File

@@ -2646,7 +2646,6 @@ mp3_decoder_t mp3_create(void) {
void mp3_done(mp3_decoder_t dec) {
if (dec) {
mp3_context_t *ctx = (mp3_context_t*)dec;
libc_free(dec);
}
}