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

Commit 7042613c authored by Alex Sakhartchouk's avatar Alex Sakhartchouk Committed by Android (Google) Code Review
Browse files

Merge "Fix an incorrect assert that doesn't account for element array size."

parents 229e25d4 bf3c3f2a

graphics/java/android/renderscript/Allocation.java

+1 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ public class Allocation extends BaseObj { 


        final byte[] data = fp.getData();

        int eSize = mType.mElement.mElements[component_number].getSizeBytes();

        eSize *= mType.mElement.mArraySizes[component_number];



        if (data.length != eSize) {

            throw new RSIllegalArgumentException("Field packer sizelength " + data.length +

libs/rs/rsAllocation.cpp

+4 −3
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ void Allocation::elementData(Context *rsc, uint32_t x, const void *data, 
    }



    const Element * e = mHal.state.type->getElement()->getField(cIdx);

    if (sizeBytes != e->getSizeBytes()) {

    uint32_t elemArraySize = mHal.state.type->getElement()->getFieldArraySize(cIdx);

    if (sizeBytes != e->getSizeBytes() * elemArraySize) {

        ALOGE("Error Allocation::subElementData data size %zu does not match field size %zu.", sizeBytes, e->getSizeBytes());

        rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size.");

        return;
@@ -157,8 +158,8 @@ void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y, 
    }



    const Element * e = mHal.state.type->getElement()->getField(cIdx);



    if (sizeBytes != e->getSizeBytes()) {

    uint32_t elemArraySize = mHal.state.type->getElement()->getFieldArraySize(cIdx);

    if (sizeBytes != e->getSizeBytes() * elemArraySize) {

        ALOGE("Error Allocation::subElementData data size %zu does not match field size %zu.", sizeBytes, e->getSizeBytes());

        rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size.");

        return;