forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nanovega: fixed segfault in texture manager

This commit is contained in:
Ketmar Dark 2018-03-17 09:00:18 +02:00 committed by Adam D. Ruppe
parent 40d2ad8023
commit 5c5f2d932d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nanovega.d
View File

@ -12022,14 +12022,16 @@ GLNVGtexture* glnvg__allocTexture (GLNVGcontext* gl) nothrow @trusted @nogc {
if (tid == -1) { if (tid == -1) {
if (gl.ntextures >= gl.ctextures) { if (gl.ntextures >= gl.ctextures) {
assert(gl.ntextures == gl.ctextures); assert(gl.ntextures == gl.ctextures);
int ctextures = (gl.ctextures == 0 ? 16 : glnvg__maxi(tid+1, 4)+gl.ctextures/2); // 1.5x overallocate //pragma(msg, GLNVGtexture.sizeof*32);
int ctextures = (gl.ctextures == 0 ? 32 : gl.ctextures+gl.ctextures/2); // 1.5x overallocate
GLNVGtexture* textures = cast(GLNVGtexture*)realloc(gl.textures, GLNVGtexture.sizeof*ctextures); GLNVGtexture* textures = cast(GLNVGtexture*)realloc(gl.textures, GLNVGtexture.sizeof*ctextures);
if (textures is null) return null; if (textures is null) assert(0, "NanoVega: out of memory for textures");
memset(&textures[gl.ctextures], 0, (ctextures-gl.ctextures)*GLNVGtexture.sizeof); memset(&textures[gl.ctextures], 0, (ctextures-gl.ctextures)*GLNVGtexture.sizeof);
version(nanovega_debug_textures) {{ import core.stdc.stdio; printf("allocated more textures (n=%d; c=%d; nc=%d)\n", gl.ntextures, gl.ctextures, ctextures); }} version(nanovega_debug_textures) {{ import core.stdc.stdio; printf("allocated more textures (n=%d; c=%d; nc=%d)\n", gl.ntextures, gl.ctextures, ctextures); }}
gl.textures = textures; gl.textures = textures;
gl.ctextures = ctextures; gl.ctextures = ctextures;
} }
assert(gl.ntextures+1 <= gl.ctextures);
tid = gl.ntextures++; tid = gl.ntextures++;
version(nanovega_debug_textures) {{ import core.stdc.stdio; printf(" got next free texture id %d, ntextures=%d\n", tid+1, gl.ntextures); }} version(nanovega_debug_textures) {{ import core.stdc.stdio; printf(" got next free texture id %d, ntextures=%d\n", tid+1, gl.ntextures); }}
} else { } else {