From 43cc92d6e41804cf1034e1d6e3cdf35e299bd196 Mon Sep 17 00:00:00 2001
From: Po Lu
Date: Fri, 11 Aug 2023 14:55:21 +0800
Subject: Minor adjustments to Android port

* java/org/gnu/emacs/EmacsService.java (readDirectoryEntry):
Also refrain from returning NULL or file names containing
non-representable NULL bytes.
* src/callproc.c (get_current_directory): Clean up by employing
android_is_special_directory.
---
 java/org/gnu/emacs/EmacsService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 379b1d30eda..cee823abc83 100644
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -1503,9 +1503,13 @@ public final class EmacsService extends Service
 	    return entry;
 	  }
 
-	/* Skip this entry if its name cannot be represented.  */
+	/* Skip this entry if its name cannot be represented.  NAME
+	   can still be null here, since some Cursors are permitted to
+	   return NULL if INDEX is not a string.  */
 
-	if (name.equals ("..") || name.equals (".") || name.contains ("/"))
+	if (name == null || name.equals ("..")
+	    || name.equals (".") || name.contains ("/")
+	    || name.contains ("\0"))
 	  continue;
 
 	/* Now, look for its type.  */
-- 
cgit v1.2.1