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

Commit 063c3e21 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Fix memset() bugs 

Change-Id: Icf4341c0a62e782cf8c2a863408591df4e6f07cb
parent f3850e55

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+4 −4
Original line number Diff line number Diff line
@@ -170,10 +170,10 @@ static int latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jobject object, 
    int spaceIndices[spaceIndicesLength];

    const jsize outputTypesLength = env->GetArrayLength(outputTypesArray);

    int outputTypes[outputTypesLength];

    memset(outputChars, 0, outputCharsLength);

    memset(scores, 0, scoresLength);

    memset(spaceIndices, 0, spaceIndicesLength);

    memset(outputTypes, 0, outputTypesLength);

    memset(outputChars, 0, outputCharsLength * sizeof(outputChars[0]));

    memset(scores, 0, scoresLength * sizeof(scores[0]));

    memset(spaceIndices, 0, spaceIndicesLength * sizeof(spaceIndices[0]));

    memset(outputTypes, 0, outputTypesLength * sizeof(outputTypes[0]));



    int count;

    if (isGesture || arraySize > 1) {

native/jni/src/proximity_info.cpp

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline void safeGetOrFillZeroIntArrayRegion(JNIEnv *env, jintArray jArray 
    if (jArray && buffer) {

        env->GetIntArrayRegion(jArray, 0, len, buffer);

    } else if (buffer) {

        memset(buffer, 0, len);

        memset(buffer, 0, len * sizeof(jint));

    }

}
@@ -43,7 +43,7 @@ static inline void safeGetOrFillZeroFloatArrayRegion(JNIEnv *env, jfloatArray jA 
    if (jArray && buffer) {

        env->GetFloatArrayRegion(jArray, 0, len, buffer);

    } else if (buffer) {

        memset(buffer, 0, len);

        memset(buffer, 0, len * sizeof(jfloat));

    }

}