mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 08:11:05 -08:00
Code Issues Projects Releases Wiki Activity

Improve consistency of content file name handling

Browse source 
* java/org/gnu/emacs/EmacsService.java (getDisplayNameHash):
Always encode file names as modified UTF-8, as insurance against
future changes to undocumented behavior of the JVM.
This commit is contained in:
Po Lu 2024-03-24 10:59:54 +08:00
parent a496378c94
commit 2be41da38e
1 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

46
java/org/gnu/emacs/EmacsService.java
View file

@ -19,6 +19,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
package org.gnu.emacs;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@ -1041,17 +1042,46 @@ public final class EmacsService extends Service
getDisplayNameHash (String string)
{
byte[] encoded;
ByteArrayOutputStream stream;
int i, ch;
try
/* Much of the VFS code expects file names to be encoded as modified
UTF-8 data, but Android's JNI implementation produces (while not
accepting!) regular UTF-8 sequences for all characters, even
non-Emoji ones. With no documentation to this effect, save for
two comments nestled in the source code of the Java virtual
machine, it is not sound to assume that this behavior will not be
revised in future or modified releases of Android, and as such,
encode STRING into modified UTF-8 by hand, to protect against
future changes in this respect. */
stream = new ByteArrayOutputStream ();
for (i = 0; i < string.length (); ++i)
{
encoded = string.getBytes ("UTF-8");
return EmacsNative.displayNameHash (encoded);
}
catch (UnsupportedEncodingException exception)
{
/* This should be impossible. */
return "error";
ch = string.charAt (i);
if (ch != 0 && ch <= 127)
stream.write (ch);
else if (ch <= 2047)
{
stream.write (0xc0 | (0x1f & (ch >> 6)));
stream.write (0x80 | (0x3f & ch));
}
else
{
stream.write (0xe0 | (0x0f & (ch >> 12)));
stream.write (0x80 | (0x3f & (ch >> 6)));
stream.write (0x80 | (0x3f & ch));
}
}
encoded = stream.toByteArray ();
/* Closing a ByteArrayOutputStream has no effect.
encoded.close (); */
return EmacsNative.displayNameHash (encoded);
}
/* Build a content file name for URI.