Skip to content

fix(cpp): switch BLOB buffers to array shared_ptr #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ospfranco merged 1 commit into from
May 18, 2026
+12 −12
Merged

fix(cpp): switch BLOB buffers to array shared_ptr #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cpp/bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@
// always copy the data
memcpy(data, blob, blob_size);
row.values.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(blob_size)});
break;
}
Expand Down Expand Up @@ -310,7 +310,7 @@
if (isFailed) {
throw std::runtime_error(
"[op-sqlite] SQLite code: " + std::to_string(result) +
" execution error: " + std::string(errorMessage));

Check warning on line 313 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-sqlcipher 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 313 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 313 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-embedded 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 313 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-embedded 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]
}

int changedRowCount = sqlite3_changes(db);
Expand Down Expand Up @@ -430,7 +430,7 @@
auto *data = new uint8_t[blob_size];
memcpy(data, blob, blob_size);
row.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(blob_size)});
break;
}
Expand Down Expand Up @@ -570,7 +570,7 @@
// always copy the data
memcpy(data, blob, blob_size);
row.values.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(blob_size)});
break;
}
Expand Down Expand Up @@ -624,7 +624,7 @@
if (isFailed) {
throw std::runtime_error(
"[op-sqlite] SQLite error code: " + std::to_string(result) +
", description: " + std::string(errorMessage));

Check warning on line 627 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-sqlcipher 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 627 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 627 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-embedded 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 627 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-embedded 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]
}

int changedRowCount = sqlite3_changes(db);
Expand Down Expand Up @@ -719,7 +719,7 @@
auto *data = new uint8_t[blob_size];
memcpy(data, blob, blob_size);
row.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(blob_size)});
break;
}
Expand Down Expand Up @@ -756,7 +756,7 @@
if (isFailed) {
throw std::runtime_error(
"[op-sqlite] SQLite error code: " + std::to_string(step) +
", description: " + std::string(errorMessage));

Check warning on line 759 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-sqlcipher 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 759 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 759 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-embedded 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]

Check warning on line 759 in cpp/bridge.cpp

View workflow job for this annotation

GitHub Actions / ios-embedded 

variable 'errorMessage' may be uninitialized when used here [-Wconditional-uninitialized]
}

int changedRowCount = sqlite3_changes(db);
Expand Down
8 changes: 4 additions & 4 deletions cpp/libsql/bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ BridgeResult opsqlite_libsql_execute_prepared_statement(
memcpy(data, value_blob.ptr, value_blob.len);
libsql_free_blob(value_blob);
row_host_object.values.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(value_blob.len)});
break;
}
Expand Down Expand Up @@ -466,7 +466,7 @@ BridgeResult opsqlite_libsql_execute(DB const &db, std::string const &query,
memcpy(data, blob_value.ptr, blob_value.len);
libsql_free_blob(blob_value);
out_row.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(blob_value.len)});
break;
}
Expand Down Expand Up @@ -571,7 +571,7 @@ BridgeResult opsqlite_libsql_execute_with_host_objects(
memcpy(data, value_blob.ptr, value_blob.len);
libsql_free_blob(value_blob);
row_host_object.values.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(value_blob.len)});
break;
}
Expand Down Expand Up @@ -698,7 +698,7 @@ opsqlite_libsql_execute_raw(DB const &db, std::string const &query,
memcpy(data, value_blob.ptr, value_blob.len);
libsql_free_blob(value_blob);
row_vector.emplace_back(
ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(value_blob.len)});
break;
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/turso_bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ BridgeResult opsqlite_execute_prepared_statement(
auto ptr = turso_statement_row_value_bytes_ptr(stmt->statement, i);
auto *data = new uint8_t[static_cast<size_t>(size)];
memcpy(data, ptr, static_cast<size_t>(size));
row.values.emplace_back(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
row.values.emplace_back(ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(size)});
break;
}
Expand Down Expand Up @@ -787,7 +787,7 @@ BridgeResult opsqlite_execute(sqlite3 *db, std::string const &query,
auto ptr = turso_statement_row_value_bytes_ptr(statement, i);
auto *data = new uint8_t[static_cast<size_t>(size)];
memcpy(data, ptr, static_cast<size_t>(size));
row.emplace_back(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
row.emplace_back(ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = static_cast<size_t>(size)});
break;
}
Expand Down
2 changes: 1 addition & 1 deletion cpp/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern std::shared_ptr<facebook::react::CallInvoker> invoker;
extern bool invalidated;

struct ArrayBuffer {
std::shared_ptr<uint8_t> data;
std::shared_ptr<uint8_t[]> data;
size_t size;
};

Expand Down
2 changes: 1 addition & 1 deletion cpp/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ inline JSVariant to_variant(jsi::Runtime &rt, const jsi::Value &value) {
uint8_t *data = new uint8_t[byteLength];
memcpy(data, sourceData, byteLength);

return JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t>{data},
return JSVariant(ArrayBuffer{.data = std::shared_ptr<uint8_t[]>{data},
.size = byteLength});
}

Expand Down
Loading