diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-03 19:20:27 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-03 19:20:27 +0000 |
| commit | 7e203802ed2aa12220f5f4af7457a0653da79478 (patch) | |
| tree | 4cf86fc10656ed1820118f37318d1a16569dfd01 | |
| parent | 646a0338720a183c74de524277fbb542c53ff449 (diff) | |
| parent | d5a028050cbe89e9fecfe7be469f0f77555fa506 (diff) | |
| download | neven-android-8.1.0_r60.tar.gz | |
Merge cherrypicks of [4691111, 4689862, 4690575, 4690576, 4690577, 4690578, 4689866, 4689868, 4689869, 4689870, 4691132, 4689456, 4689963, 4691133, 4691134, 4691156, 4691157, 4691159, 4691161, 4690581, 4689964, 4689460, 4691112, 4690582, 4690583, 4691165, 4691166, 4691167, 4691168, 4691169, 4691170, 4691211, 4691212, 4691213, 4691214, 4691215, 4691216, 4691217, 4691218, 4691219, 4691232, 4691233, 4691234, 4691235, 4691236, 4691237, 4691238, 4691239, 4691240, 4691241, 4691243, 4691245, 4691247, 4691249, 4691250, 4691291, 4691292, 4691293, 4691294, 4691295, 4691296, 4691255, 4689476, 4689477, 4689478, 4691223, 4691224, 4691136, 4689479, 4689480, 4691137, 4691225, 4691226, 4691227, 4691371, 4691228, 4691328, 4689967, 4691138, 4691139, 4691140, 4691433, 4689968, 4689969, 4691395, 4691230, 4691297, 4691298, 4691299, 4691300, 4691396, 4691397, 4691398, 4691399, 4691400, 4691401, 4691402, 4691403, 4691404, 4691405, 4691406, 4691407, 4691408, 4691409, 4691410, 4691471, 4691472, 4691473, 4691474, 4691475, 4691476, 4691477, 4691478, 4691479, 4691480, 4691481, 4691482, 4691483, 4691484, 4691485, 4691486, 4691487, 4691488, 4691143, 4691144, 4691511, 4691113, 4689482, 4691533, 4691145, 4691146, 4691147, 4691148, 4691536] into sparse-4732991-L01200000196794104android-8.1.0_r67android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r53android-8.1.0_r51android-8.1.0_r48android-8.1.0_r45oreo-m8-releaseoreo-m4-s12-release
Change-Id: Ide62f03c185cfff63bd1081d6c57b4382a1f8e4e
| -rw-r--r-- | Embedded/common/src/b_BitFeatureEm/Scanner.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ void bbf_Scanner_addOutPos( struct bbs_Context* cpA, 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; |