Skip to content

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

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

Open
Megmeehey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions src/java.desktop/share/classes/sun/font/HBShaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ private static VarHandle getVarHandle(StructLayout struct, String name) {
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");
Expand Down
24 changes: 22 additions & 2 deletions src/java.desktop/share/native/libfontmanager/hb-jdk-font-p.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {

Expand All @@ -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);
Expand Down