commit 37c9b49ab5eb5a676370fd7081db0967c38e97a6
author Thomas Tafertshofer <tafertth@google.com> Mon Jul 23 16:56:04 2012 -0700
committer Thomas Tafertshofer <tafertth@google.com> Mon Jul 23 17:09:36 2012 -0700
tree e1e339185d703922101bed9b879d32ccecbc239e
parent 16a4003b11bd8fcc2b4c065f85de1464b1e21fe7

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

core/jni/android_opengl_GLES10.cpp

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 @@
     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 @@
     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);
     }