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.

diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java
index 01a1695f3850f4399ab56e3fcc846a52fec27705..c008300dd3a2750db086cf603e5163ec6979085a 100644 (file)
--- a/java/org/gnu/emacs/EmacsService.java
+++ b/java/org/gnu/emacs/EmacsService.java
@@ -304,7 +304,9 @@ public class EmacsService extends Service
     array = new short[windowList.size () + 1];
     i = 1;
 
-    array[0] = window.parent != null ? 0 : window.parent.handle;
+    array[0] = (window == null
+               ? 0 : (window.parent != null
+                      ? window.parent.handle : 0));
 
     for (EmacsWindow treeWindow : windowList)
       array[i++] = treeWindow.handle;

diff --git a/src/android.c b/src/android.c
index eab18dc615258343726fb0d7dbe0af0a600334d8..fba43129ee3e37ec65a90b6a8be2d7c55ed0887d 100644 (file)
--- a/src/android.c
+++ b/src/android.c
@@ -3148,6 +3148,7 @@ android_query_tree (android_window handle, android_window *root_return,
   *root_return = 0;
   *parent_return = shorts[0];
   *children_return = children;
+  *nchildren_return = nelements - 1;
 
   /* Release the array contents.  */
   (*android_java_env)->ReleaseShortArrayElements (android_java_env, array,