commit bc51e4a76fc8c45dff1e86ec8043aab6d5c2c29c
author Yingjie Wang <yingjiewang@codeaurora.org> Thu May 21 12:02:39 2020 +0800
committer Wayne Lin <waynewhlin@google.com> Sun Jul 19 03:30:57 2020 +0000
tree 8fc9c34eb1e70609bc2da7e40cc804ed32490091
parent 996b9cf5a55a3f9ae7bcf4f1fddb456b970e0d7c

[B5R3] Check NetworkHandle against OutOfBound access

In corner case, the lastValidIndex could be the out of
range of mAllNetworkHandles.

Bug: 158528640
Test: Build pass and basic function verify pass
Change-Id: Id15add603307f1bae82dcf2c0013fe0305ba1a0c
CRs-fixed: 2690874

core/SystemStatus.h

diff --git a/core/SystemStatus.h b/core/SystemStatus.h
index fe6c6c6..8d5d9ac 100644
--- a/core/SystemStatus.h
+++ b/core/SystemStatus.h
@@ -551,6 +551,9 @@
                     typeCount--;
                 }
             }
+            if (MAX_NETWORK_HANDLES == lastValidIndex) {
+                --lastValidIndex;
+            }
 
             if (MAX_NETWORK_HANDLES != deletedIndex) {
                 LOC_LOGD("deletedIndex:%u, lastValidIndex:%u, typeCount:%u",