Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6612488 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

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

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into nyc-dev am: 69d20eab am: d098c42e am: a5affd07 am: 236e162b
am: 877e8b60

Change-Id: Ic712133bed222d14bf7823cf61fbce5ccb9d50b1
parents 40d3de36 877e8b60

core/jni/android_database_CursorWindow.cpp

+8 −0
Original line number Diff line number Diff line
@@ -205,6 +205,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();
@@ -240,6 +244,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;

        }