summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2015-02-27 19:03:13 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-02-27 19:03:13 +0000
commitbbef7cf3bbf778dd8ae3b91b140bf4542241093b (patch)
tree01368b7f73de945424b87003b21192a6008d411e
parentd85224b6bd9b14e50163fc05b9ad90ccb9e79ee1 (diff)
parent012c3b723a8e73012444b7f839b363f698725a01 (diff)
am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"
* commit '012c3b723a8e73012444b7f839b363f698725a01': jni: Add paranoia regarding android_logger_list_read
-rw-r--r--core/jni/android_util_EventLog.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 6c95b8a5eb9b..5cb8b2e9e5f4 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -188,6 +188,10 @@ static void android_util_EventLog_readEvents(JNIEnv* env, jobject clazz UNUSED,
break;
}
+ if (log_msg.id() != LOG_ID_EVENTS) {
+ continue;
+ }
+
int32_t tag = * (int32_t *) log_msg.msg();
int found = 0;