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

Commit 37c9b49a authored by Thomas Tafertshofer's avatar Thomas Tafertshofer
Browse files

New bindings generated by glgen 

Fixes crash of methods when NULL was used as a
(valid) parameter for a nio.buffer argument.

Bug: 6845189
Change-Id: Iae379d607bbca15d6d23e74e852f94c7f68637f9
parent 16a4003b

core/jni/android_opengl_GLES10.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3679,7 +3679,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2 
    if (pixels_buf) {

        pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);

    }

    if (pixels == NULL) {

    if (pixels_buf && pixels == NULL) {

        char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        pixels = (GLvoid *) (_pixelsBase + _bufferOffset);

    }
@@ -3733,7 +3733,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2 
    if (pixels_buf) {

        pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);

    }

    if (pixels == NULL) {

    if (pixels_buf && pixels == NULL) {

        char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        pixels = (GLvoid *) (_pixelsBase + _bufferOffset);

    }

core/jni/android_opengl_GLES11.cpp

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ android_glBufferData__IILjava_nio_Buffer_2I 
            goto exit;

        }

    }

    if (data == NULL) {

    if (data_buf && data == NULL) {

        char * _dataBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        data = (GLvoid *) (_dataBase + _bufferOffset);

    }

core/jni/android_opengl_GLES20.cpp

+3 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ android_glBufferData__IILjava_nio_Buffer_2I 
            goto exit;

        }

    }

    if (data == NULL) {

    if (data_buf && data == NULL) {

        char * _dataBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        data = (GLvoid *) (_dataBase + _bufferOffset);

    }
@@ -4536,7 +4536,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2 
    if (pixels_buf) {

        pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);

    }

    if (pixels == NULL) {

    if (pixels_buf && pixels == NULL) {

        char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        pixels = (GLvoid *) (_pixelsBase + _bufferOffset);

    }
@@ -4766,7 +4766,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2 
    if (pixels_buf) {

        pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);

    }

    if (pixels == NULL) {

    if (pixels_buf && pixels == NULL) {

        char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        pixels = (GLvoid *) (_pixelsBase + _bufferOffset);

    }

core/jni/com_google_android_gles_jni_GLImpl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -3807,7 +3807,7 @@ android_glTexImage2D__IIIIIIIILjava_nio_Buffer_2 
    if (pixels_buf) {

        pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);

    }

    if (pixels == NULL) {

    if (pixels_buf && pixels == NULL) {

        char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        pixels = (GLvoid *) (_pixelsBase + _bufferOffset);

    }
@@ -3861,7 +3861,7 @@ android_glTexSubImage2D__IIIIIIIILjava_nio_Buffer_2 
    if (pixels_buf) {

        pixels = (GLvoid *)getPointer(_env, pixels_buf, &_array, &_remaining, &_bufferOffset);

    }

    if (pixels == NULL) {

    if (pixels_buf && pixels == NULL) {

        char * _pixelsBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        pixels = (GLvoid *) (_pixelsBase + _bufferOffset);

    }
@@ -4108,7 +4108,7 @@ android_glBufferData__IILjava_nio_Buffer_2I 
            goto exit;

        }

    }

    if (data == NULL) {

    if (data_buf && data == NULL) {

        char * _dataBase = (char *)_env->GetPrimitiveArrayCritical(_array, (jboolean *) 0);

        data = (GLvoid *) (_dataBase + _bufferOffset);

    }