diff options
author | prr <unknown> | 2019-07-18 07:25:17 -0700 |
---|---|---|
committer | bell-sw <liberica@bell-sw.com> | 2020-04-20 20:48:57 +0300 |
commit | ee12937a3c769f1627f271b6256a5f60ed7699d3 (patch) | |
tree | 4db630c7825376d70f9e4439895dedc370dea6e7 | |
parent | 064c79aa87c541063ec15f6a98dfa84e863eedbf (diff) | |
download | jdk8u_jdk-ee12937a3c769f1627f271b6256a5f60ed7699d3.tar.gz |
8227662: freetype seeks to index at the end of the font data
Reviewed-by: serb, psadhukhan
-rw-r--r-- | src/share/native/sun/font/freetypeScaler.c | 2 | ||||
-rw-r--r-- | test/java/awt/FontMetrics/SpaceAdvance.java | 49 |
2 files changed, 50 insertions, 1 deletions
diff --git a/src/share/native/sun/font/freetypeScaler.c b/src/share/native/sun/font/freetypeScaler.c index 548560465a..a931c18c57 100644 --- a/src/share/native/sun/font/freetypeScaler.c +++ b/src/share/native/sun/font/freetypeScaler.c @@ -385,7 +385,7 @@ static unsigned long ReadTTFontFileFunc(FT_Stream stream, */ if (numBytes == 0) { - if (offset >= scalerInfo->fileSize) { + if (offset > scalerInfo->fileSize) { return -1; } else { return 0; diff --git a/test/java/awt/FontMetrics/SpaceAdvance.java b/test/java/awt/FontMetrics/SpaceAdvance.java new file mode 100644 index 0000000000..e2c7acb6f9 --- /dev/null +++ b/test/java/awt/FontMetrics/SpaceAdvance.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2019, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8227662 + */ + +import java.awt.Font; +import java.awt.FontMetrics ; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; + +public class SpaceAdvance { + public static void main(String[] args) throws Exception { + + BufferedImage bi = new BufferedImage(1,1,1); + Graphics2D g2d = bi.createGraphics(); + Font font = new Font(Font.DIALOG, Font.PLAIN, 12); + if (!font.canDisplay(' ')) { + return; + } + g2d.setFont(font); + FontMetrics fm = g2d.getFontMetrics(); + if (fm.charWidth(' ') == 0) { + throw new RuntimeException("Space has char width of 0"); + } + } +} |