am 2549ce27: am df2fed2b: Merge "Fix a bug that would end up in memory corruption" into ics-mr0
* commit '2549ce275a272d552c28121ea58742e54b640e54':
Fix a bug that would end up in memory corruption
diff --git a/native/src/proximity_info.cpp b/native/src/proximity_info.cpp
index 2f989e3..d635588 100644
--- a/native/src/proximity_info.cpp
+++ b/native/src/proximity_info.cpp
@@ -49,14 +49,17 @@
&& sweetSpotCenterYs && sweetSpotRadii),
mInputXCoordinates(0), mInputYCoordinates(0),
mTouchPositionCorrectionEnabled(false) {
- const int len = GRID_WIDTH * GRID_HEIGHT * MAX_PROXIMITY_CHARS_SIZE;
- mProximityCharsArray = new uint32_t[len];
- mNormalizedSquaredDistances = new int[len];
+ const int proximityGridLength = GRID_WIDTH * GRID_HEIGHT * MAX_PROXIMITY_CHARS_SIZE;
+ mProximityCharsArray = new uint32_t[proximityGridLength];
if (DEBUG_PROXIMITY_INFO) {
- LOGI("Create proximity info array %d", len);
+ LOGI("Create proximity info array %d", proximityGridLength);
}
- memcpy(mProximityCharsArray, proximityCharsArray, len * sizeof(mProximityCharsArray[0]));
- for (int i = 0; i < len; ++i) {
+ memcpy(mProximityCharsArray, proximityCharsArray,
+ proximityGridLength * sizeof(mProximityCharsArray[0]));
+ const int normalizedSquaredDistancesLength =
+ MAX_PROXIMITY_CHARS_SIZE * MAX_WORD_LENGTH_INTERNAL;
+ mNormalizedSquaredDistances = new int[normalizedSquaredDistancesLength];
+ for (int i = 0; i < normalizedSquaredDistancesLength; ++i) {
mNormalizedSquaredDistances[i] = NOT_A_DISTANCE;
}