diff options
| author | Po Lu | 2023-08-06 21:53:13 +0800 |
|---|---|---|
| committer | Po Lu | 2023-08-06 21:53:13 +0800 |
| commit | e4f3a96709052731cc75de19cf7cab94d892bcea (patch) | |
| tree | e0497d61ae68d7f32d9c4c32bb29552156a36784 /java | |
| parent | 7ffc5f86e4636f9837a46ea75bee7475caaf5c04 (diff) | |
| download | emacs-e4f3a96709052731cc75de19cf7cab94d892bcea.tar.gz emacs-e4f3a96709052731cc75de19cf7cab94d892bcea.zip | |
Update Android port
* java/org/gnu/emacs/EmacsService.java (readDirectoryEntry): Fix
potential NULL dereference.
Diffstat (limited to 'java')
| -rw-r--r-- | java/org/gnu/emacs/EmacsService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java index 036bc9cf098..d91d8f66009 100644 --- a/java/org/gnu/emacs/EmacsService.java +++ b/java/org/gnu/emacs/EmacsService.java | |||
| @@ -1522,7 +1522,8 @@ public final class EmacsService extends Service | |||
| 1522 | return entry; | 1522 | return entry; |
| 1523 | } | 1523 | } |
| 1524 | 1524 | ||
| 1525 | if (type.equals (Document.MIME_TYPE_DIR)) | 1525 | if (type != null |
| 1526 | && type.equals (Document.MIME_TYPE_DIR)) | ||
| 1526 | entry.d_type = 1; | 1527 | entry.d_type = 1; |
| 1527 | entry.d_name = name; | 1528 | entry.d_name = name; |
| 1528 | return entry; | 1529 | return entry; |