summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Keith Mok <keithmok@google.com> 2022-04-13 01:08:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-13 01:08:18 +0000
commit89abace1c58361fd123464d90a559de0d2f4042e (patch)
tree7f915a315942ee579c8eb78284d17cfbed886a1d
parent632070aa96904413fc1c25b6d416ac6abad7fe4b (diff)
parentb8b8a01c830c80a703e65c2a09ff638f154c40c4 (diff)
Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 am: 43567ad451 am: 00c2754219 am: 39eb41b554 am: b8b8a01c83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779 Change-Id: I2977a21b759316be5de9477310fa3897b883a6f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/jni/android_util_Process.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index a6fbf094a030..b9d5ee4b3015 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -913,7 +913,7 @@ jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,
end = i;
i++;
} else if ((mode&PROC_QUOTES) != 0) {
- while (buffer[i] != '"' && i < endIndex) {
+ while (i < endIndex && buffer[i] != '"') {
i++;
}
end = i;