From 6100a558f35207e958628344fea0579a668e6bca Mon Sep 17 00:00:00 2001 From: Noah Cylich Date: Tue, 9 Jun 2026 19:51:12 -0700 Subject: [PATCH] bindings: JNI & React-Native FFI memory-safety cactus_jni.cpp: clear pending Java exceptions after token/log callback dispatch so the next native->Java transition doesn't run with one pending; on batched index_add/query, handle null array elements by releasing the partially-acquired refs (tracked via 'acquired') and bailing instead of dereferencing null. Cactus.swift: validate equal ids/documents/embeddings/metadatas lengths and uniform embedding-row widths before calling native index_add to prevent out-of-bounds reads. Signed-off-by: Noah Cylich --- android/cactus_jni.cpp | 101 +++++++++++++++++------ bindings/react-native/apple/Cactus.swift | 10 ++- 2 files changed, 85 insertions(+), 26 deletions(-) diff --git a/android/cactus_jni.cpp b/android/cactus_jni.cpp index 90a8be6d5..31371807a 100644 --- a/android/cactus_jni.cpp +++ b/android/cactus_jni.cpp @@ -29,6 +29,7 @@ static void token_callback_bridge(const char* token, uint32_t token_id, void* us if (!env) return; jstring jtoken = token ? env->NewStringUTF(token) : nullptr; env->CallVoidMethod(ctx->callback, ctx->method, jtoken, static_cast(token_id)); + if (env->ExceptionCheck()) { env->ExceptionDescribe(); env->ExceptionClear(); } if (jtoken) env->DeleteLocalRef(jtoken); if (attached) ctx->jvm->DetachCurrentThread(); } @@ -46,6 +47,7 @@ static void log_callback_bridge(int level, const char* component, const char* me jstring jcomponent = component ? env->NewStringUTF(component) : nullptr; jstring jmessage = message ? env->NewStringUTF(message) : nullptr; env->CallVoidMethod(ctx->callback, ctx->method, static_cast(level), jcomponent, jmessage); + if (env->ExceptionCheck()) { env->ExceptionDescribe(); env->ExceptionClear(); } if (jcomponent) env->DeleteLocalRef(jcomponent); if (jmessage) env->DeleteLocalRef(jmessage); if (attached) ctx->jvm->DetachCurrentThread(); @@ -374,12 +376,15 @@ Java_com_cactus_CactusJNI_nativeIndexAdd(JNIEnv* env, jobject, jlong handle, jstring* metaStrings = new jstring[count]; jfloatArray* embArrays = new jfloatArray[count]; + jsize acquired = 0; for (jsize i = 0; i < count; i++) { docStrings[i] = static_cast(env->GetObjectArrayElement(documents, i)); + if (!docStrings[i]) break; docPtrs[i] = env->GetStringUTFChars(docStrings[i], nullptr); if (metadatas) { metaStrings[i] = static_cast(env->GetObjectArrayElement(metadatas, i)); + if (!metaStrings[i]) { env->ReleaseStringUTFChars(docStrings[i], docPtrs[i]); env->DeleteLocalRef(docStrings[i]); break; } metaPtrs[i] = env->GetStringUTFChars(metaStrings[i], nullptr); } else { metaStrings[i] = nullptr; @@ -387,17 +392,29 @@ Java_com_cactus_CactusJNI_nativeIndexAdd(JNIEnv* env, jobject, jlong handle, } embArrays[i] = static_cast(env->GetObjectArrayElement(embeddings, i)); + if (!embArrays[i]) { + env->ReleaseStringUTFChars(docStrings[i], docPtrs[i]); env->DeleteLocalRef(docStrings[i]); + if (metaStrings[i]) { env->ReleaseStringUTFChars(metaStrings[i], metaPtrs[i]); env->DeleteLocalRef(metaStrings[i]); } + break; + } embPtrs[i] = env->GetFloatArrayElements(embArrays[i], nullptr); + acquired = i + 1; } - int result = cactus_index_add( - reinterpret_cast(handle), - reinterpret_cast(idData), - docPtrs, metadatas ? metaPtrs : nullptr, embPtrs, - static_cast(count), static_cast(embeddingDim) - ); + int result; + if (acquired < count) { + if (env->ExceptionCheck()) env->ExceptionClear(); + result = -1; + } else { + result = cactus_index_add( + reinterpret_cast(handle), + reinterpret_cast(idData), + docPtrs, metadatas ? metaPtrs : nullptr, embPtrs, + static_cast(count), static_cast(embeddingDim) + ); + } - for (jsize i = 0; i < count; i++) { + for (jsize i = 0; i < acquired; i++) { env->ReleaseStringUTFChars(docStrings[i], docPtrs[i]); env->DeleteLocalRef(docStrings[i]); if (metaStrings[i]) { env->ReleaseStringUTFChars(metaStrings[i], metaPtrs[i]); env->DeleteLocalRef(metaStrings[i]); } @@ -455,28 +472,46 @@ Java_com_cactus_CactusJNI_nativeIndexGet(JNIEnv* env, jobject, jlong handle, jlong* metaSizesIn = env->GetLongArrayElements(metadataBufferSizes, nullptr); jlong* embSizesIn = env->GetLongArrayElements(embeddingBufferSizes, nullptr); + jsize acquired = 0; for (jsize i = 0; i < count; i++) { docArrays[i] = static_cast(env->GetObjectArrayElement(documentBuffers, i)); + if (!docArrays[i]) break; docBufs[i] = reinterpret_cast(env->GetByteArrayElements(docArrays[i], nullptr)); docSizes[i] = static_cast(docSizesIn[i]); metaArrays[i] = static_cast(env->GetObjectArrayElement(metadataBuffers, i)); + if (!metaArrays[i]) { + env->ReleaseByteArrayElements(docArrays[i], reinterpret_cast(docBufs[i]), JNI_ABORT); env->DeleteLocalRef(docArrays[i]); + break; + } metaBufs[i] = reinterpret_cast(env->GetByteArrayElements(metaArrays[i], nullptr)); metaSizes[i] = static_cast(metaSizesIn[i]); embArrays[i] = static_cast(env->GetObjectArrayElement(embeddingBuffers, i)); + if (!embArrays[i]) { + env->ReleaseByteArrayElements(docArrays[i], reinterpret_cast(docBufs[i]), JNI_ABORT); env->DeleteLocalRef(docArrays[i]); + env->ReleaseByteArrayElements(metaArrays[i], reinterpret_cast(metaBufs[i]), JNI_ABORT); env->DeleteLocalRef(metaArrays[i]); + break; + } embBufs[i] = env->GetFloatArrayElements(embArrays[i], nullptr); embSizes[i] = static_cast(embSizesIn[i]); + acquired = i + 1; } - int result = cactus_index_get( - reinterpret_cast(handle), - reinterpret_cast(idData), - static_cast(count), - docBufs, docSizes, metaBufs, metaSizes, embBufs, embSizes - ); + int result; + if (acquired < count) { + if (env->ExceptionCheck()) env->ExceptionClear(); + result = -1; + } else { + result = cactus_index_get( + reinterpret_cast(handle), + reinterpret_cast(idData), + static_cast(count), + docBufs, docSizes, metaBufs, metaSizes, embBufs, embSizes + ); + } - for (jsize i = 0; i < count; i++) { + for (jsize i = 0; i < acquired; i++) { env->ReleaseByteArrayElements(docArrays[i], reinterpret_cast(docBufs[i]), 0); env->DeleteLocalRef(docArrays[i]); env->ReleaseByteArrayElements(metaArrays[i], reinterpret_cast(metaBufs[i]), 0); @@ -518,11 +553,6 @@ Java_com_cactus_CactusJNI_nativeIndexQuery(JNIEnv* env, jobject, jlong handle, const float** embPtrs = new const float*[embCount]; jfloatArray* embArrays = new jfloatArray[embCount]; - for (jsize i = 0; i < embCount; i++) { - embArrays[i] = static_cast(env->GetObjectArrayElement(embeddings, i)); - embPtrs[i] = env->GetFloatArrayElements(embArrays[i], nullptr); - } - int** idPtrs = new int*[embCount]; size_t* idSizes = new size_t[embCount]; float** scorePtrs = new float*[embCount]; @@ -534,23 +564,44 @@ Java_com_cactus_CactusJNI_nativeIndexQuery(JNIEnv* env, jobject, jlong handle, jlong* idSizesIn = env->GetLongArrayElements(idBufferSizes, nullptr); jlong* scoreSizesIn = env->GetLongArrayElements(scoreBufferSizes, nullptr); + jsize acquired = 0; for (jsize i = 0; i < embCount; i++) { + embArrays[i] = static_cast(env->GetObjectArrayElement(embeddings, i)); + if (!embArrays[i]) break; + embPtrs[i] = env->GetFloatArrayElements(embArrays[i], nullptr); + idJArrays[i] = static_cast(env->GetObjectArrayElement(idBuffers, i)); + if (!idJArrays[i]) { + env->ReleaseFloatArrayElements(embArrays[i], const_cast(embPtrs[i]), JNI_ABORT); env->DeleteLocalRef(embArrays[i]); + break; + } idPtrs[i] = env->GetIntArrayElements(idJArrays[i], nullptr); idSizes[i] = static_cast(idSizesIn[i]); scoreJArrays[i] = static_cast(env->GetObjectArrayElement(scoreBuffers, i)); + if (!scoreJArrays[i]) { + env->ReleaseFloatArrayElements(embArrays[i], const_cast(embPtrs[i]), JNI_ABORT); env->DeleteLocalRef(embArrays[i]); + env->ReleaseIntArrayElements(idJArrays[i], idPtrs[i], JNI_ABORT); env->DeleteLocalRef(idJArrays[i]); + break; + } scorePtrs[i] = env->GetFloatArrayElements(scoreJArrays[i], nullptr); scoreSizes[i] = static_cast(scoreSizesIn[i]); + acquired = i + 1; } - int result = cactus_index_query( - reinterpret_cast(handle), - embPtrs, static_cast(embCount), static_cast(embeddingDim), - options, idPtrs, idSizes, scorePtrs, scoreSizes - ); + int result; + if (acquired < embCount) { + if (env->ExceptionCheck()) env->ExceptionClear(); + result = -1; + } else { + result = cactus_index_query( + reinterpret_cast(handle), + embPtrs, static_cast(embCount), static_cast(embeddingDim), + options, idPtrs, idSizes, scorePtrs, scoreSizes + ); + } - for (jsize i = 0; i < embCount; i++) { + for (jsize i = 0; i < acquired; i++) { env->ReleaseFloatArrayElements(embArrays[i], const_cast(embPtrs[i]), JNI_ABORT); env->DeleteLocalRef(embArrays[i]); env->ReleaseIntArrayElements(idJArrays[i], idPtrs[i], 0); diff --git a/bindings/react-native/apple/Cactus.swift b/bindings/react-native/apple/Cactus.swift index bdb61da46..5a43119e2 100644 --- a/bindings/react-native/apple/Cactus.swift +++ b/bindings/react-native/apple/Cactus.swift @@ -312,11 +312,19 @@ final class Cactus: RCTEventEmitter { return } var idValues = ids.map { Int32(truncating: $0) } + guard documents.count == idValues.count, embeddings.count == idValues.count, metadatas == nil || metadatas!.count == idValues.count else { + self.reject(reject, "ids, documents, embeddings and metadatas must have equal length") + return + } + let embeddingDim = embeddings.first?.count ?? 0 + guard embeddings.allSatisfy({ $0.count == embeddingDim }) else { + self.reject(reject, "Embedding rows must all have the same length") + return + } var docStrings = documents.map { strdup($0) } var docPointers = docStrings.map { UnsafePointer($0) } var metaStrings = metadatas?.map { strdup($0) } var metaPointers = metaStrings?.map { UnsafePointer($0) } - let embeddingDim = embeddings.first?.count ?? 0 var embeddingPointers = embeddings.map { row -> UnsafeMutablePointer in let ptr = UnsafeMutablePointer.allocate(capacity: row.count) for (index, value) in row.enumerated() {