diff options
| author | Thomas Tafertshofer <tafertth@google.com> | 2012-07-23 16:56:04 -0700 |
|---|---|---|
| committer | Thomas Tafertshofer <tafertth@google.com> | 2012-07-23 17:09:36 -0700 |
| commit | 37c9b49ab5eb5a676370fd7081db0967c38e97a6 (patch) | |
| tree | e1e339185d703922101bed9b879d32ccecbc239e /core/jni/android_opengl_GLES10.cpp | |
| parent | 16a4003b11bd8fcc2b4c065f85de1464b1e21fe7 (diff) | |
| download | frameworks_base-37c9b49ab5eb5a676370fd7081db0967c38e97a6.zip frameworks_base-37c9b49ab5eb5a676370fd7081db0967c38e97a6.tar.gz frameworks_base-37c9b49ab5eb5a676370fd7081db0967c38e97a6.tar.bz2 | |
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
Diffstat (limited to 'core/jni/android_opengl_GLES10.cpp')
| -rw-r--r-- | core/jni/android_opengl_GLES10.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_opengl_GLES10.cpp b/core/jni/android_opengl_GLES10.cpp index d8a15df..571f579 100644 --- a/core/jni/android_opengl_GLES10.cpp +++ b/core/jni/android_opengl_GLES10.cpp @@ -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); } |