aboutsummaryrefslogtreecommitdiffstats
path: root/src/android.c
diff options
context:
space:
mode:
authorPo Lu2023-10-16 09:00:45 +0800
committerPo Lu2023-10-16 09:00:45 +0800
commit36656ff70e3d8971117b0d25b2afd2727b09b098 (patch)
tree7b969b8d9d2870d36c33e5b33b03cd66aa2f15b3 /src/android.c
parent4c9f9dbd5014eaade2c57b4a78b60528f08efed4 (diff)
downloademacs-36656ff70e3d8971117b0d25b2afd2727b09b098.tar.gz
emacs-36656ff70e3d8971117b0d25b2afd2727b09b098.zip
Properly initialize argment list supplied to android_init_emacs
* src/android.c (initEmacs): NULL-terminate c_argv.
Diffstat (limited to 'src/android.c')
-rw-r--r--src/android.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android.c b/src/android.c
index 8c4748cccf6..9f0e966a602 100644
--- a/src/android.c
+++ b/src/android.c
@@ -1826,7 +1826,7 @@ NATIVE_NAME (initEmacs) (JNIEnv *env, jobject object, jarray argv,
1826 android_java_env = env; 1826 android_java_env = env;
1827 1827
1828 nelements = (*env)->GetArrayLength (env, argv); 1828 nelements = (*env)->GetArrayLength (env, argv);
1829 c_argv = alloca (sizeof *c_argv * nelements); 1829 c_argv = alloca (sizeof *c_argv * (nelements + 1));
1830 1830
1831 for (i = 0; i < nelements; ++i) 1831 for (i = 0; i < nelements; ++i)
1832 { 1832 {
@@ -1844,6 +1844,8 @@ NATIVE_NAME (initEmacs) (JNIEnv *env, jobject object, jarray argv,
1844 (*env)->ReleaseStringUTFChars (env, (jstring) argument, c_argument); 1844 (*env)->ReleaseStringUTFChars (env, (jstring) argument, c_argument);
1845 } 1845 }
1846 1846
1847 c_argv[nelements] = NULL;
1848
1847 android_init_emacs_service (); 1849 android_init_emacs_service ();
1848 android_init_emacs_pixmap (); 1850 android_init_emacs_pixmap ();
1849 android_init_graphics_point (); 1851 android_init_graphics_point ();