commit 8381914faef76b6f67380b9ab64f673397c7de5d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 12 01:38:59 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 12 01:38:59 2019 +0000
tree 0655fda464bd9979bdf11913b0573b230a8c188a
parent d71fd1892037f076f3e9e83f130c2e2af722fa0a
parent f2320abad7787cf57830bf6ace932954c107f176

Merge "Fix use after free in InputClassifier"

services/inputflinger/InputClassifier.cpp

diff --git a/services/inputflinger/InputClassifier.cpp b/services/inputflinger/InputClassifier.cpp
index 09a004c..3905ed0 100644
--- a/services/inputflinger/InputClassifier.cpp
+++ b/services/inputflinger/InputClassifier.cpp
@@ -705,13 +705,12 @@
 }
 
 void InputClassifier::notifyMotion(const NotifyMotionArgs* args) {
+    NotifyMotionArgs copyArgs = NotifyMotionArgs(*args);
     if (mMotionClassifier && isTouchEvent(*args)) {
         // We only cover touch events, for now.
-        NotifyMotionArgs newArgs = NotifyMotionArgs(*args);
-        newArgs.classification = mMotionClassifier->classify(newArgs);
-        args = &newArgs;
+        copyArgs.classification = mMotionClassifier->classify(copyArgs);
     }
-    mListener->notifyMotion(args);
+    mListener->notifyMotion(&copyArgs);
 }
 
 void InputClassifier::notifySwitch(const NotifySwitchArgs* args) {