diff options
| author | Po Lu | 2023-01-13 16:08:11 +0800 |
|---|---|---|
| committer | Po Lu | 2023-01-13 16:08:11 +0800 |
| commit | 24910d3f375a11360c66b742e1054b55e9e25ccc (patch) | |
| tree | 88cc15c4ad64a3619ee36a1553dfbb9ea5332864 /java | |
| parent | 7e35af1a10c3b2b9084f8e2e1250babdefa4b51a (diff) | |
| download | emacs-24910d3f375a11360c66b742e1054b55e9e25ccc.tar.gz emacs-24910d3f375a11360c66b742e1054b55e9e25ccc.zip | |
Fix crashes in Android port
* java/org/gnu/emacs/EmacsService.java (queryTree): Fix NULL
pointer dereference.
* src/android.c (android_query_tree): Set *nchildren_return.
Diffstat (limited to 'java')
| -rw-r--r-- | java/org/gnu/emacs/EmacsService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java index 01a1695f385..c008300dd3a 100644 --- a/java/org/gnu/emacs/EmacsService.java +++ b/java/org/gnu/emacs/EmacsService.java | |||
| @@ -304,7 +304,9 @@ public class EmacsService extends Service | |||
| 304 | array = new short[windowList.size () + 1]; | 304 | array = new short[windowList.size () + 1]; |
| 305 | i = 1; | 305 | i = 1; |
| 306 | 306 | ||
| 307 | array[0] = window.parent != null ? 0 : window.parent.handle; | 307 | array[0] = (window == null |
| 308 | ? 0 : (window.parent != null | ||
| 309 | ? window.parent.handle : 0)); | ||
| 308 | 310 | ||
| 309 | for (EmacsWindow treeWindow : windowList) | 311 | for (EmacsWindow treeWindow : windowList) |
| 310 | array[i++] = treeWindow.handle; | 312 | array[i++] = treeWindow.handle; |