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

[DO NOT MERGE] Throw exception if slot has invalid offset

Browse Source 
Previously the process would crash, which is OK, but complicates testing.

Test: cts-tradefed run cts --module CtsContentTestCases
      --test android.content.cts.ContentProviderCursorWindowTest
Bug: 34128677

Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit eb6de6f5f1)
This commit is contained in:
Fyodor Kupolov
2017-02-22 14:12:50 -08:00
parent 8cdc04957a
commit 589796a57e
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

@@ -179,6 +179,10 @@ static jbyteArray nativeGetBlob(JNIEnv* env, jclass clazz, jint 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();
@@ -214,6 +218,10 @@ static jstring nativeGetString(JNIEnv* env, jclass clazz, jint 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;
}