commit 7111fd83f91cefa3b8db18bb2bb8fd3f7eaa7a13
author android-build-team Robot <android-build-team-robot@google.com> Fri Jul 27 18:48:17 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 27 18:48:17 2018 +0000
tree 8b7f907f1d4556f9a75c1e612dc7b7335f37bb61
parent 409ae3271a77ab26a4f3038c8bb117870f84e36e
parent 86a561f79f97baa38e240f6296fe1192fa4a5c9c

Merge cherrypicks of [4647037, 4647038, 4647883, 4647039, 4647933, 4648530, 4648550, 4648551, 4648552, 4648553, 4646931, 4646932, 4646933, 4646934, 4648391, 4647976, 4647977, 4647978, 4647526, 4646972, 4646935, 4646936, 4646937, 4646938, 4646939, 4646940, 4646941, 4648392, 4647509, 4648630, 4648631, 4647934] into pi-release-2

Change-Id: Idbf101318613fdd4e050a9f3f9ea20b3e3b3cca6

Embedded/common/src/b_BitFeatureEm/Scanner.c

diff --git a/Embedded/common/src/b_BitFeatureEm/Scanner.c b/Embedded/common/src/b_BitFeatureEm/Scanner.c
index 327e714..1a0ae2a 100644
--- a/Embedded/common/src/b_BitFeatureEm/Scanner.c
+++ b/Embedded/common/src/b_BitFeatureEm/Scanner.c
@@ -1064,7 +1064,7 @@
 							uint32 scaleA, 
 							int32 actA )
 {
-	if( ( ptrA->outCountE * 4 ) < ptrA->outArrE.sizeE )
+	if( ( ptrA->outCountE * 4 + 3 ) < ptrA->outArrE.sizeE )
 	{
         ptrA->outArrE.arrPtrE[ ptrA->outCountE * 4 + 0 ] = xA;
         ptrA->outArrE.arrPtrE[ ptrA->outCountE * 4 + 1 ] = yA;