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

Commit 2bb39d7a authored by Ashok Bhat's avatar Ashok Bhat Committed by Narayan Kamath
Browse files

Pass int32_t for JNI calls to java Input/Output streams. 



Passing size_t is problematic on 64 bit platforms where
it's 8 bytes in size. Conversion to int32_t is safe because
the size argument is always clamped to fCapacity, which is
4 bytes wide.

Signed-off-by: default avatarAshok Bhat <ashok.bhat@arm.com>
Change-Id: I58558561a4f56451485f1a5fc6cdeda677247071
parent d93e7b24

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp

+16 −7
Original line number Diff line number Diff line
@@ -63,9 +63,14 @@ private: 
        size_t bytesRead = 0;

        // read the bytes

        do {

            size_t requested = size;

            if (requested > fCapacity)

            jint requested = 0;

            if (size > static_cast<size_t>(fCapacity)) {

                requested = fCapacity;

            } else {

                // This is safe because requested is clamped to (jint)

                // fCapacity.

                requested = static_cast<jint>(size);

            }



            jint n = env->CallIntMethod(fJavaInputStream,

                                        gInputStream_readMethodID, fJavaByteArray, 0, requested);
@@ -120,7 +125,7 @@ private: 
    JNIEnv*     fEnv;

    jobject     fJavaInputStream;   // the caller owns this object

    jbyteArray  fJavaByteArray;     // the caller owns this object

    size_t      fCapacity;

    jint        fCapacity;

    size_t      fBytesRead;

    bool        fIsAtEnd;

};
@@ -179,9 +184,13 @@ public: 
        jbyteArray storage = fJavaByteArray;



        while (size > 0) {

            size_t requested = size;

            if (requested > fCapacity) {

            jint requested = 0;

            if (size > static_cast<size_t>(fCapacity)) {

                requested = fCapacity;

            } else {

                // This is safe because requested is clamped to (jint)

                // fCapacity.

                requested = static_cast<jint>(size);

            }



            env->SetByteArrayRegion(storage, 0, requested,
@@ -216,7 +225,7 @@ private: 
    JNIEnv*     fEnv;

    jobject     fJavaOutputStream;  // the caller owns this object

    jbyteArray  fJavaByteArray;     // the caller owns this object

    size_t      fCapacity;

    jint        fCapacity;

};



SkWStream* CreateJavaOutputStreamAdaptor(JNIEnv* env, jobject stream,