JBR-8201 Vulkan: crash in VKRenderer_MaskFill

Some perf improvement
JetBrains · Jan 31, 2025 · 616a312 · 616a312
1 parent 20626e2
commit 616a312
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/java.desktop/share/native/common/java2d/vulkan/VKRenderer.c b/src/java.desktop/share/native/common/java2d/vulkan/VKRenderer.c
@@ -1261,13 +1261,18 @@ void VKRenderer_MaskFill(VKRenderingContext* context, jint x, jint y, jint w, ji
     Color c = context->color;
 
     uint32_t byteCount = maskscan * h;
+    if (mask == NULL) {
+        maskscan = 0;
+        byteCount = 1;
+    }
     BufferWritingState maskState = VKRenderer_AllocateMaskFillBytes(context, byteCount);
     if (mask != NULL) {
         memcpy(maskState.data, mask + maskoff, byteCount);
     } else {
         // Special case, fully opaque mask
-        memset(maskState.data, 0xFF, byteCount);
+        *((char *)maskState.data) = 0xFF;
     }
+
     int offset = (int) maskState.offset;
     VKMaskFillColorVertex p1 = {x, y, offset, maskscan, c};
     VKMaskFillColorVertex p2 = {x + w, y, offset, maskscan, c};