commit 34ed4d4d74ce45e58e3934d472f28617d9b34296
author Siarhei Vishniakou <svv@google.com> Thu Jun 18 00:43:02 2020 +0000
committer Siarhei Vishniakou <svv@google.com> Mon Jun 22 16:00:37 2020 -0700
tree 4eadb5c37e4c614912dfa2333197953b80d153db
parent c8f2d9717489bb64955dd7ea809bc9e6e2814d0a

Ensure connection is non-null

The function getConnectionLocked can return null. We must check the
result for null to prevent dereferencing null.

Bug: 143459140
Test: none
Change-Id: I43991ea2ac9e23b5d5fc198a0ac8622d83696d31

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 3865f29..f011992 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -717,7 +717,7 @@
         for (TouchedMonitor& gestureMonitor : gestureMonitors) {
             sp<Connection> connection =
                     getConnectionLocked(gestureMonitor.monitor.inputChannel->getConnectionToken());
-            if (connection->responsive) {
+            if (connection != nullptr && connection->responsive) {
                 // This monitor could take more input. Drop all events preceding this
                 // event, so that gesture monitor could get a chance to receive the stream
                 ALOGW("Pruning the input queue because %s is unresponsive, but we have a "