mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-14 23:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Avert a crash in the Android last resort font driver

Browse source 
* java/org/gnu/emacs/EmacsFontDriver.java (FONT_INVALID_CODE):
New constant.
(hasChar, encodeChar): Accept a jint character code rather than
a jchar.

* java/org/gnu/emacs/EmacsSdk23FontDriver.java (hasChar)
(encodeChar): Return 0 or FONT_INVALID_CODE if the character is
not representable in a Java char.

* java/org/gnu/emacs/EmacsSdk7FontDriver.java (hasChar): Ditto.

* src/androidfont.c (android_init_font_driver): Adjust signature
to match.
This commit is contained in:
Po Lu 2023-09-14 16:53:04 +08:00
parent f13b08be11
commit 6ffb0a1719
4 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/org/gnu/emacs/EmacsSdk7FontDriver.java
View file

@ -291,13 +291,18 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver
@Override
public int
hasChar (FontSpec font, char charCode)
hasChar (FontSpec font, int charCode)
{
float missingGlyphWidth, width;
Rect rect1, rect2;
Paint paint;
Sdk7FontObject fontObject;
/* Ignore characters outside the BMP. */
if (charCode > 65535)
return 0;
if (font instanceof Sdk7FontObject)
{
fontObject = (Sdk7FontObject) font;
@ -308,7 +313,7 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver
paint.setTextSize (10);
if (Character.isWhitespace (charCode))
if (Character.isWhitespace ((char) charCode))
return 1;
missingGlyphWidth = paint.measureText (TOFU_STRING);
@ -325,7 +330,7 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver
paint.getTextBounds (TOFU_STRING, 0, TOFU_STRING.length (),
rect1);
paint.getTextBounds ("" + charCode, 0, 1, rect2);
paint.getTextBounds ("" + (char) charCode, 0, 1, rect2);
return rect1.equals (rect2) ? 0 : 1;
}
@ -410,8 +415,11 @@ public class EmacsSdk7FontDriver extends EmacsFontDriver
@Override
public int
encodeChar (FontObject fontObject, char charCode)
encodeChar (FontObject fontObject, int charCode)
{
if (charCode > 65535)
return FONT_INVALID_CODE;
return charCode;
}