infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

8289697: buffer overflow in MTLVertexCache.m: MTLVertexCache_AddGlyphQuad

Browse Source 
Backport-of: d852e99ae9de4c611438c50ce37ea1806f58cbdf
This commit is contained in:
Vladimir Kempik 2022-07-08 17:49:53 +00:00
parent eeaf0bbabc
commit c142fbbbaf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLVertexCache.m
View File

@ -65,6 +65,10 @@ static id<MTLRenderCommandEncoder> encoder = NULL;
MTLVC_ADD_VERTEX(TX1, TY1, DX1, DY1, 0); \
} while (0)
// Next define should exactly match to the amount
// of MTLVC_ADD_VERTEX in MTLVC_ADD_TRIANGLES
#define VERTS_FOR_A_QUAD 6
jboolean
MTLVertexCache_InitVertexCache()
{
@ -219,7 +223,11 @@ MTLVertexCache_AddMaskQuad(MTLContext *mtlc,
J2dTraceLn1(J2D_TRACE_INFO, "MTLVertexCache_AddMaskQuad: %d",
maskCacheIndex);
if (maskCacheIndex >= MTLVC_MASK_CACHE_MAX_INDEX)
// MTLVC_ADD_TRIANGLES at the end of this function
// will place VERTS_FOR_A_QUAD vertexes to the vertex cache
// check free space and flush if needed.
if ((maskCacheIndex >= MTLVC_MASK_CACHE_MAX_INDEX) ||
((vertexCacheIndex + VERTS_FOR_A_QUAD) >= MTLVC_MAX_INDEX))
{
J2dTraceLn2(J2D_TRACE_INFO, "maskCacheIndex = %d, vertexCacheIndex = %d", maskCacheIndex, vertexCacheIndex);
MTLVertexCache_FlushVertexCache(mtlc);
@ -305,7 +313,9 @@ MTLVertexCache_AddGlyphQuad(MTLContext *mtlc,
{
J2dTraceLn(J2D_TRACE_INFO, "MTLVertexCache_AddGlyphQuad");
if (vertexCacheIndex >= MTLVC_MAX_INDEX)
// MTLVC_ADD_TRIANGLES adds VERTS_FOR_A_QUAD vertexes into Cache
// so need to check space for VERTS_FOR_A_QUAD elements
if ((vertexCacheIndex + VERTS_FOR_A_QUAD) >= MTLVC_MAX_INDEX)
{
J2dTraceLn2(J2D_TRACE_INFO, "maskCacheIndex = %d, vertexCacheIndex = %d", maskCacheIndex, vertexCacheIndex);
MTLVertexCache_FlushGlyphVertexCache();