Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c8ca59d authored by Jean Chalard's avatar Jean Chalard
Browse files

Fix a bug that would end up in memory corruption 

Square distances array was not the right size. Copying long words
into it would result in fandango on core.

Bug: 5508337
Bug: 5591925
Change-Id: I7598081b3cfcd1975b206dada1baf8da9be35641
parent fe2d9079

native/src/proximity_info.cpp

+9 −6
Original line number Diff line number Diff line
@@ -49,14 +49,17 @@ ProximityInfo::ProximityInfo(const int maxProximityCharsSize, const int keyboard 
                  && sweetSpotCenterYs && sweetSpotRadii),

          mInputXCoordinates(NULL), mInputYCoordinates(NULL),

          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);

    }

    memcpy(mProximityCharsArray, proximityCharsArray, len * sizeof(mProximityCharsArray[0]));

    for (int i = 0; i < len; ++i) {

        LOGI("Create proximity info array %d", proximityGridLength);

    }

    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;

    }