From 916ef5748992216710f01d91c330e52042b279f1 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 20 Jul 2023 20:50:50 +0800 Subject: [PATCH] Update Android port * exec/trace.c (handle_readlinkat): Adjust commentary to match behavior. * src/android.c (android_get_keysym_name): NULL terminate *name_return. --- exec/trace.c | 6 +++--- src/android.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/exec/trace.c b/exec/trace.c index 23db8ebcbc7..3b384792d0a 100644 --- a/exec/trace.c +++ b/exec/trace.c @@ -899,10 +899,10 @@ handle_exec (struct exec_tracee *tracee, USER_REGS_STRUCT *regs) CALLNO is the system call number, and REGS are the current user registers of the TRACEE. - If the first argument of a `readlinkat' system call is AT_FDCWD, - and the file name specified in either a `readlink' or `readlinkat' + If the file name specified in either a `readlink' or `readlinkat' system call is `/proc/self/exe', write the name of the executable - being run into the buffer specified in the system call. + being run into the buffer specified in the system call. Do not + handle relative file names at the moment. Return the number of bytes written to the tracee's buffer in *RESULT. diff --git a/src/android.c b/src/android.c index 1662160bdd9..048773a511d 100644 --- a/src/android.c +++ b/src/android.c @@ -6151,6 +6151,7 @@ android_get_keysym_name (int keysym, char *name_return, size_t size) NULL); android_exception_check_nonnull ((void *) buffer, string); strncpy (name_return, buffer, size - 1); + name_return[size] = '\0'; (*android_java_env)->ReleaseStringUTFChars (android_java_env, (jstring) string, -- 2.39.2