Skip to content

Fix bug 64823: ZTS GD fails to to find system TrueType font #17366

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
wants to merge 2 commits into from
Closed

Fix bug 64823: ZTS GD fails to to find system TrueType font #17366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582f1cd
Fix bug 64823: ZTS GD fails to to find system TrueType font
cmb69 Jan 5, 2025
1df75a2
Drop test case
cmb69 Jan 6, 2025
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
12 changes: 0 additions & 12 deletions ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3374,18 +3374,6 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
}
}

#ifdef VIRTUAL_DIR
{
char tmp_font_path[MAXPATHLEN];

if (!VCWD_REALPATH(fontname, tmp_font_path)) {
fontname = NULL;
}
}
#endif /* VIRTUAL_DIR */

PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");

// libgd note: Those should return const char * ideally, but backward compatibility ..
if (EXT) {
error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex);
Expand Down
Loading