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

This commit is contained in:
Treehugger Robot
2017-02-01 07:09:50 +00:00
committed by Gerrit Code Review

View File

@@ -132,6 +132,7 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o
pointer = _env->CallStaticLongMethod(nioAccessClass, pointer = _env->CallStaticLongMethod(nioAccessClass,
getBasePointerID, buffer); getBasePointerID, buffer);
if (pointer != 0L) { if (pointer != 0L) {
*offset = 0;
*array = NULL; *array = NULL;
return reinterpret_cast<void *>(pointer); return reinterpret_cast<void *>(pointer);
} }
@@ -139,6 +140,7 @@ getPointer(JNIEnv *_env, jobject buffer, jarray *array, jint *remaining, jint *o
*array = (jarray) _env->CallStaticObjectMethod(nioAccessClass, *array = (jarray) _env->CallStaticObjectMethod(nioAccessClass,
getBaseArrayID, buffer); getBaseArrayID, buffer);
if (*array == NULL) { if (*array == NULL) {
*offset = 0;
return (void*) NULL; return (void*) NULL;
} }
*offset = _env->CallStaticIntMethod(nioAccessClass, *offset = _env->CallStaticIntMethod(nioAccessClass,