Skip to content
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

Jump to bottom

Return out_of_memory error tuple if row alloc fails #304

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Return out_of_memory error tuple if row alloc fails #304

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f5167e
return errors if row alloc fails
ruslandoga Oct 13, 2024
6795fcc
Update c_src/sqlite3_nif.c
ruslandoga Oct 14, 2024
f9029d7
Update c_src/sqlite3_nif.c
ruslandoga Oct 14, 2024
6e79342
Update c_src/sqlite3_nif.c
ruslandoga Oct 14, 2024
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
57 changes: 37 additions & 20 deletions c_src/sqlite3_nif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,29 +570,16 @@ make_cell(ErlNifEnv* env, sqlite3_stmt* statement, unsigned int i)
}

static ERL_NIF_TERM
make_row(ErlNifEnv* env, sqlite3_stmt* statement)
make_row(ErlNifEnv* env, int column_count, ERL_NIF_TERM* cells, sqlite3_stmt* statement)
{
assert(env);
assert(statement);

ERL_NIF_TERM* columns = NULL;
ERL_NIF_TERM row;
unsigned int count = sqlite3_column_count(statement);

columns = enif_alloc(sizeof(ERL_NIF_TERM) * count);
if (!columns) {
return make_error_tuple(env, am_out_of_memory);
}

for (unsigned int i = 0; i < count; i++) {
columns[i] = make_cell(env, statement, i);
for (unsigned int i = 0; i < column_count; i++) {
cells[i] = make_cell(env, statement, i);
}

row = enif_make_list_from_array(env, columns, count);

enif_free(columns);

return row;
return enif_make_list_from_array(env, cells, column_count);
}

static ERL_NIF_TERM
Expand Down Expand Up @@ -628,30 +615,49 @@ exqlite_multi_step(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
return make_error_tuple(env, am_invalid_chunk_size);
}

int column_count = sqlite3_column_count(statement->statement);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can return 0

https://www.sqlite.org/c3ref/column_count.html

We should handle this. I don't think an error is appropriate here. I'm not 100% certain.


ERL_NIF_TERM* cells = NULL;
cells = enif_alloc(sizeof(ERL_NIF_TERM) * column_count);

if (!cells) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!cells) {
if (!cells && column_count > 0) {

Something like this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea I think that would work. It would be safe because the list of results returned would be an empty array.

return make_error_tuple(env, am_out_of_memory);
}

ERL_NIF_TERM rows = enif_make_list_from_array(env, NULL, 0);
for (int i = 0; i < chunk_size; i++) {
ERL_NIF_TERM row;

int rc = sqlite3_step(statement->statement);
switch (rc) {
case SQLITE_BUSY:
enif_free(cells);
cells = NULL;
sqlite3_reset(statement->statement);
return am_busy;

case SQLITE_DONE:
enif_free(cells);
cells = NULL;
return enif_make_tuple2(env, am_done, rows);

case SQLITE_ROW:
row = make_row(env, statement->statement);
row = make_row(env, column_count, cells, statement->statement);
rows = enif_make_list_cell(env, row, rows);
break;

default:
enif_free(cells);
cells = NULL;
sqlite3_reset(statement->statement);
return make_sqlite3_error_tuple(env, rc, conn->db);
}
}

if (cells) {
enif_free(cells);
}

return enif_make_tuple2(env, am_rows, rows);
}

Expand All @@ -677,11 +683,22 @@ exqlite_step(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])

int rc = sqlite3_step(statement->statement);
switch (rc) {
case SQLITE_ROW:
case SQLITE_ROW: {
int column_count = sqlite3_column_count(statement->statement);

ERL_NIF_TERM* cells = NULL;
cells = enif_alloc(sizeof(ERL_NIF_TERM) * column_count);

if (!cells) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!cells) {
if (!cells && column_count > 0) {

return make_error_tuple(env, am_out_of_memory);
}

return enif_make_tuple2(
env,
am_row,
make_row(env, statement->statement));
make_row(env, column_count, cells, statement->statement));
}

case SQLITE_BUSY:
return am_busy;
case SQLITE_DONE:
Expand Down
Loading