| commit | 43567ad45130bb3e8f201e1a99a03ceb4c577211 | [log] [tgz] |
|---|---|---|
| author | Keith Mok <keithmok@google.com> | Tue Apr 12 20:42:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 12 20:42:46 2022 +0000 |
| tree | 418af00c33267d707d6f9bf8fe5db9f5d936748b | |
| parent | fc4d75a14915dbbd07e3d98b1b64c1e2dd05fdf1 [diff] | |
| parent | b1fb01e8b5d0b6e3cf9c806c387c934c959cd783 [diff] |
Merge "android_util_Process: fix length checking logic" am: b1fb01e8b5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959779 Change-Id: I3793c1faa5c520835ae196ec027242803c5ff11b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 4d8d4db..71b51ff 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp
@@ -991,7 +991,7 @@ end = i; i++; } else if ((mode&PROC_QUOTES) != 0) { - while (buffer[i] != '"' && i < endIndex) { + while (i < endIndex && buffer[i] != '"') { i++; } end = i;