Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[egl] shader: fix reliance on null terminated strings

Browse Source 
Compiled in resources often will not contain a null terminator, as such
we must not use functions that rely on it. This implements a memsearch
function that performs like strstr on a buffer instead of a null
terminated string.
This commit is contained in:
Geoffrey McRae
2023-11-11 12:17:37 +11:00
parent 43f9a4c0e1
commit cce12508cc
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/renderers/EGL/shader.c
View File

@@ -20,6 +20,7 @@
#include "shader.h"
#include "common/debug.h"
#include "common/stringutils.h"
#include "util.h"
#include <stdlib.h>
@@ -219,18 +220,22 @@ bool egl_shaderCompile(EGL_Shader * this, const char * vertex_code,
if (useDMA)
{
const char * search = "sampler2D";
const char * replace = "samplerExternalOES";
const char search[] = "sampler2D";
const char replace[] = "samplerExternalOES";
const char * src = fragment_code;
const char * offset = NULL;
int instances = 0;
while((src = strstr(src, search)))
while((offset = memsearch(
fragment_code, fragment_size,
search , sizeof(search)-1,
offset)))
{
++instances;
src += strlen(search);
offset += sizeof(search)-1;
}
const int diff = (strlen(replace) - strlen(search)) * instances;
const int diff = (sizeof(replace) - sizeof(search)) * instances;
const int newLen = fragment_size + diff;
newCode = malloc(newLen + 1);
if (!newCode)
@@ -239,7 +244,7 @@ bool egl_shaderCompile(EGL_Shader * this, const char * vertex_code,
goto exit;
}
src = fragment_code;
const char * src = fragment_code;
char * dst = newCode;
for(int i = 0; i < instances; ++i)
{
@@ -248,10 +253,10 @@ bool egl_shaderCompile(EGL_Shader * this, const char * vertex_code,
memcpy(dst, src, offset);
dst += offset;
src = pos + strlen(search);
src = pos + sizeof(search)-1;
memcpy(dst, replace, strlen(replace));
dst += strlen(replace);
memcpy(dst, replace, sizeof(replace)-1);
dst += sizeof(replace)-1;
}
const int final = fragment_size - (src - fragment_code);