infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-29 00:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

8378603: libfontmanager FFM path needs to use FFM to locate both malloc and free

Browse Source 
Reviewed-by: kizune, azvegint, jdv
This commit is contained in:
Phil Race 2026-04-27 16:14:34 +00:00
parent e29ffd108f
commit 704efcb20d
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java.desktop/share/classes/sun/font/HBShaper.java
View File

@ -174,6 +174,17 @@ public class HBShaper {
MethodHandle tmp1 = LINKER.downcallHandle(malloc_symbol, mallocDescriptor);
malloc_handle = tmp1;
MemorySegment free_symbol = SYM_LOOKUP.findOrThrow("free");
long free_address = free_symbol.address();
FunctionDescriptor setFreeFnDescriptor = FunctionDescriptor.ofVoid(JAVA_LONG);
MemorySegment set_free = SYM_LOOKUP.findOrThrow("HBSetFreeFn");
@SuppressWarnings("restricted")
MethodHandle set_free_handle = LINKER.downcallHandle(set_free, setFreeFnDescriptor);
try {
set_free_handle.invokeExact(free_address);
} catch (Throwable t) {
}
FunctionDescriptor createFaceDescriptor =
FunctionDescriptor.of(ADDRESS, ADDRESS);
MemorySegment create_face_symbol = SYM_LOOKUP.findOrThrow("HBCreateFace");

24
src/java.desktop/share/native/libfontmanager/hb-jdk-font-p.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -174,6 +174,22 @@ static void _do_nothing(void) {
typedef int (*GetTableDataFn) (int tag, char **dataPtr);
typedef void (*ffm_free_t) (void *ptr);
static ffm_free_t ffm_free_fn = NULL;
/* We pass the address of "free" which was obtained by FFM so that it matches
* the malloc found by FFM
*/
#include <stdio.h>
static void ffmfree(void *ptr) {
if (ffm_free_fn != NULL) {
ffm_free_fn(ptr);
} else {
free(ptr);
}
}
static hb_blob_t *
reference_table(hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) {
@ -200,11 +216,15 @@ reference_table(hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) {
*/
return hb_blob_create((const char *)tableData, length,
HB_MEMORY_MODE_WRITABLE,
tableData, free);
tableData, ffmfree);
}
extern "C" {
JDKEXPORT void HBSetFreeFn(void *free_fn) {
ffm_free_fn = (ffm_free_t)free_fn;
}
JDKEXPORT hb_face_t* HBCreateFace(GetTableDataFn *get_data_upcall_fn) {
hb_face_t *face = hb_face_create_for_tables(reference_table, get_data_upcall_fn, NULL);