Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow only U+0020..U+007E characters for axis tag.

Browse Source 
CSS Font4 only allows U+0020..U+007E characters for tag string.
Reject outside of this range.

Bug: 33062398
Test: am instrument -w -e class android.graphics.VariationParserTest \
com.android.frameworks.graphicstests/android.test.InstrumentationTestRunner
Change-Id: Ia119151bc67caebfdaacda17aa3ee261a9e5d872
This commit is contained in:
Seigo Nonaka
2016-12-01 19:29:30 -08:00
parent cf952e74b0
commit 0ec4f416ff
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/graphics/FontListParser.java
View File

@@ -155,7 +155,7 @@ public class FontListParser {
@VisibleForTesting
public static int makeTag(char c1, char c2, char c3, char c4) {
return (c1 << 24) + (c2 << 16) + (c3 << 8) + c4;
return (c1 << 24) | (c2 << 16) | (c3 << 8) | c4;
}
private static boolean isSpacer(char c) {
@@ -228,8 +228,10 @@ public class FontListParser {
return new Font(fullFilename, index, axes, weight, isItalic);
}
/** The 'tag' attribute value is read as four character values between 0 and 255 inclusive. */
private static final Pattern TAG_PATTERN = Pattern.compile("[\\x00-\\xFF]{4}");
/** The 'tag' attribute value is read as four character values between U+0020 and U+007E
* inclusive.
*/
private static final Pattern TAG_PATTERN = Pattern.compile("[\\x20-\\x7E]{4}");
/** The 'styleValue' attribute has an optional leading '-', followed by '<digits>',
* '<digits>.<digits>', or '.<digits>' where '<digits>' is one or more of [0-9].

11
graphics/tests/graphicstests/src/android/graphics/VariationParserTest.java
View File

@@ -104,10 +104,19 @@ public class VariationParserTest extends TestCase {
assertEquals(1, axis.length);
}
@SmallTest
public void testInvalidTagCharacters() {
FontListParser.Axis[] axis =
FontListParser.parseFontVariationSettings("'\u0000\u0000\u0000\u0000' 10");
assertEquals(0, axis.length);
axis = FontListParser.parseFontVariationSettings("'\u3042\u3044\u3046\u3048' 10");
assertEquals(0, axis.length);
}
@SmallTest
public void testMakeTag() {
assertEquals(0x77647468, FontListParser.makeTag('w', 'd', 't', 'h'));
assertEquals(0x41582020, FontListParser.makeTag('A', 'X', ' ', ' '));
assertEquals(0x20202020, FontListParser.makeTag(' ', ' ', ' ', ' '));
}
}
}