Skip to content

8289697: buffer overflow in MTLVertexCache.m: MTLVertexCache_AddGlyphQuad #9368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VladimirKempik wants to merge 8 commits into from
Closed

8289697: buffer overflow in MTLVertexCache.m: MTLVertexCache_AddGlyphQuad #9368

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35ed932
8289697: buffer overflow in MTLVertexCache.m: MTLVertexCache_AddGlyph…
Jul 4, 2022
88402db
Add the check to one more place
Jul 5, 2022
23438f2
Replace constant with define
Jul 5, 2022
0af4ec8
Change define name
Jul 6, 2022
662a6be
Rename comments
Jul 7, 2022
2676028
oops
Jul 7, 2022
97a4db2
break up comments
Jul 8, 2022
ecfbd56
break up long if
Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLVertexCache.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
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()
{
Expand Down Expand Up @@ -219,7 +223,11 @@ void MTLVertexCache_FreeVertexCache()
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);
Expand Down Expand Up @@ -305,7 +313,9 @@ void MTLVertexCache_FreeVertexCache()
{
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();
Expand Down