From 683785dbfa88f76924f06156fa6ee48864772de8 Mon Sep 17 00:00:00 2001 From: Jim Tilander Date: Tue, 18 Feb 2014 08:17:56 -0800 Subject: [PATCH] Quick guard against NULL ptr dereference of texture type on CPU side --- src/nanovg_gl2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nanovg_gl2.h b/src/nanovg_gl2.h index 6994772..05bbf21 100644 --- a/src/nanovg_gl2.h +++ b/src/nanovg_gl2.h @@ -856,7 +856,7 @@ static void glnvg__renderTriangles(void* uptr, struct NVGpaint* paint, struct NV glUniform1i(gl->shader.loc[GLNVG_LOC_TYPE], NSVG_SHADER_IMG); glUniform2f(gl->shader.loc[GLNVG_LOC_VIEWSIZE], gl->viewWidth, gl->viewHeight); glUniform1i(gl->shader.loc[GLNVG_LOC_TEX], 0); - glUniform1i(gl->shader.loc[GLNVG_LOC_TEXTYPE], tex->type == NVG_TEXTURE_RGBA ? 0 : 1); + glUniform1i(gl->shader.loc[GLNVG_LOC_TEXTYPE], (tex != NULL && tex->type == NVG_TEXTURE_RGBA) ? 0 : 1); glnvg__checkError("tris solid img loc"); glBindBuffer(GL_ARRAY_BUFFER, gl->vertBuf);