Skip to content

Guard FontRegistry.createFont against filterData returning null #4267

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
HeikoKlare wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

Guard FontRegistry.createFont against filterData returning null #4267

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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FontRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ private FontRecord createFont(String symbolicName, FontData[] fonts) {
}

FontData[] validData = filterData(fonts, display);
if (validData.length == 0) {
if (validData == null || validData.length == 0) {
//Nothing specified
return null;
}
Expand Down
14 changes: 14 additions & 0 deletions tests/org.eclipse.jface.tests/src/org/eclipse/jface/tests/resources/FontRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,20 @@ public void get_forNameThatWasNeverRegistered_returnsDefaultFontAndIsStableAfter
assertSame(first, second);
}

@Test
public void get_forNameRegisteredWithoutAnyFontData_returnsDefaultFont() {
FontRegistry fontRegistry = new FontRegistry();
// an empty array leaves nothing to filter, so filterData() yields no usable data at all
fontRegistry.put("fontWithoutData", new FontData[0]);

Font first = fontRegistry.get("fontWithoutData");
Font second = fontRegistry.get("fontWithoutData");

assertSame(fontRegistry.get(JFaceResources.DEFAULT_FONT), first,
"a name that cannot be resolved to any font data must fall back to the default font");
assertSame(first, second);
}

@Test
public void getBoldAndGetItalic_returnSameInstanceOnRepeatedCalls() {
FontRegistry fontRegistry = new FontRegistry();
Expand Down
Loading