Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev

Browse Source 
am: e1766acb41

Change-Id: I5bfc6d7e47772f0aabcc0567e52c6534ba6815c9
This commit is contained in:
Fyodor Kupolov
2017-03-10 01:56:58 +00:00
committed by android-build-merger
parent b50794ec65 e1766acb41
commit 105b0ff30c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_database_CursorWindow.cpp
View File

@@ -180,6 +180,10 @@ static jbyteArray nativeGetBlob(JNIEnv* env, jclass clazz, jlong windowPtr,
if (type == CursorWindow::FIELD_TYPE_BLOB || type == CursorWindow::FIELD_TYPE_STRING) { if (type == CursorWindow::FIELD_TYPE_BLOB || type == CursorWindow::FIELD_TYPE_STRING) {
size_t size; size_t size;
const void* value = window->getFieldSlotValueBlob(fieldSlot, &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); jbyteArray byteArray = env->NewByteArray(size);
if (!byteArray) { if (!byteArray) {
env->ExceptionClear(); env->ExceptionClear();
@@ -215,6 +219,10 @@ static jstring nativeGetString(JNIEnv* env, jclass clazz, jlong windowPtr,
if (type == CursorWindow::FIELD_TYPE_STRING) { if (type == CursorWindow::FIELD_TYPE_STRING) {
size_t sizeIncludingNull; size_t sizeIncludingNull;
const char* value = window->getFieldSlotValueString(fieldSlot, &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) { if (sizeIncludingNull <= 1) {
return gEmptyString; return gEmptyString;
} }