commit 53873df5fe1f586ac1a68c7590abb2e0abb4cb71
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 01 07:09:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 01 07:09:51 2017 +0000
tree f05f7eb1515ac551256f71e9bf480fcdbd9c08cc
parent 2ac992fcad6deeee91b46f066cda192a8dded3dc
parent 974403a2c5465bd68be379f41213cc1aa56b983e

Merge "Fix a use-of-uninitialized-value warning"

core/jni/com_google_android_gles_jni_GLImpl.cpp

diff --git a/core/jni/com_google_android_gles_jni_GLImpl.cpp b/core/jni/com_google_android_gles_jni_GLImpl.cpp
index ad7d744..3e74d1c 100644
--- a/core/jni/com_google_android_gles_jni_GLImpl.cpp
+++ b/core/jni/com_google_android_gles_jni_GLImpl.cpp
@@ -132,6 +132,7 @@
     pointer = _env->CallStaticLongMethod(nioAccessClass,
             getBasePointerID, buffer);
     if (pointer != 0L) {
+        *offset = 0;
         *array = NULL;
         return reinterpret_cast<void *>(pointer);
     }
@@ -139,6 +140,7 @@
     *array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,
             getBaseArrayID, buffer);
     if (*array == NULL) {
+        *offset = 0;
         return (void*) NULL;
     }
     *offset = _env->CallStaticIntMethod(nioAccessClass,