Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev (105b0ff3) · Commits · e / os / android_frameworks_base

core/jni/android_database_CursorWindow.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,10 @@ static jbyteArray nativeGetBlob(JNIEnv* env, jclass clazz, jlong windowPtr,
		if (type == CursorWindow::FIELD_TYPE_BLOB \|\| type == CursorWindow::FIELD_TYPE_STRING) {
		size_t size;
		const void* value = window->getFieldSlotValueBlob(fieldSlot, &size);
		if (!value) {
		throw_sqlite3_exception(env, "Native could not read blob slot");
		return NULL;
		}
		jbyteArray byteArray = env->NewByteArray(size);
		if (!byteArray) {
		env->ExceptionClear();
		@@ -215,6 +219,10 @@ static jstring nativeGetString(JNIEnv* env, jclass clazz, jlong windowPtr,
		if (type == CursorWindow::FIELD_TYPE_STRING) {
		size_t sizeIncludingNull;
		const char* value = window->getFieldSlotValueString(fieldSlot, &sizeIncludingNull);
		if (!value) {
		throw_sqlite3_exception(env, "Native could not read string slot");
		return NULL;
		}
		if (sizeIncludingNull <= 1) {
		return gEmptyString;
		}