forks/esqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing check for inspect_iodata

Browse Source
This commit is contained in:
Maas-Maarten Zeeman
2022-01-29 18:11:02 +01:00
parent 685469874e
commit 86800f3f17
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
c_src/esqlite3_nif.c
View File

@@ -360,7 +360,9 @@ do_exec(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
int rc; int rc;
ERL_NIF_TERM eos = enif_make_int(env, 0); ERL_NIF_TERM eos = enif_make_int(env, 0);
enif_inspect_iolist_as_binary(env, enif_make_list2(env, arg, eos), &bin); if(!enif_inspect_iolist_as_binary(env, enif_make_list2(env, arg, eos), &bin)) {
return make_error_tuple(env, "no_iodata");
}
rc = sqlite3_exec(conn->db, (char *) bin.data, NULL, NULL, NULL); rc = sqlite3_exec(conn->db, (char *) bin.data, NULL, NULL, NULL);
if(rc != SQLITE_OK) if(rc != SQLITE_OK)
@@ -395,8 +397,9 @@ do_insert(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
int rc; int rc;
ERL_NIF_TERM eos = enif_make_int(env, 0); ERL_NIF_TERM eos = enif_make_int(env, 0);
enif_inspect_iolist_as_binary(env, if(!enif_inspect_iolist_as_binary(env, enif_make_list2(env, arg, eos), &bin)) {
enif_make_list2(env, arg, eos), &bin); return make_error_tuple(env, "no_iodata");
}
rc = sqlite3_exec(conn->db, (char *) bin.data, NULL, NULL, NULL); rc = sqlite3_exec(conn->db, (char *) bin.data, NULL, NULL, NULL);
if(rc != SQLITE_OK) if(rc != SQLITE_OK)
@@ -435,8 +438,9 @@ do_prepare(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
int rc; int rc;
ERL_NIF_TERM eos = enif_make_int(env, 0); ERL_NIF_TERM eos = enif_make_int(env, 0);
if(!enif_inspect_iolist_as_binary(env, enif_make_list2(env, arg, eos), &bin)) if(!enif_inspect_iolist_as_binary(env, enif_make_list2(env, arg, eos), &bin)) {
return make_error_tuple(env, "not an iolist"); return make_error_tuple(env, "no_iodata");
}
stmt = enif_alloc_resource(esqlite_statement_type, sizeof(esqlite_statement)); stmt = enif_alloc_resource(esqlite_statement_type, sizeof(esqlite_statement));
if(!stmt) if(!stmt)
@@ -487,8 +491,9 @@ bind_cell(ErlNifEnv *env, const ERL_NIF_TERM cell, sqlite3_stmt *stmt, unsigned
} }
/* Bind as text assume it is utf-8 encoded text */ /* Bind as text assume it is utf-8 encoded text */
if(enif_inspect_iolist_as_binary(env, cell, &the_blob)) if(enif_inspect_iolist_as_binary(env, cell, &the_blob)) {
return sqlite3_bind_text(stmt, i, (char *) the_blob.data, the_blob.size, SQLITE_TRANSIENT); return sqlite3_bind_text(stmt, i, (char *) the_blob.data, the_blob.size, SQLITE_TRANSIENT);
}
/* Check for blob tuple */ /* Check for blob tuple */
if(enif_get_tuple(env, cell, &arity, &tuple)) { if(enif_get_tuple(env, cell, &arity, &tuple)) {

8
test/esqlite_test.erl
View File

@@ -29,6 +29,14 @@ close_test() ->
ok. ok.
iodata_test() ->
{ok, C} = esqlite3:open(":memory:"),
{error, no_iodata} = esqlite3:exec(1000, C),
{error, no_iodata} = esqlite3:insert(1000, C),
ok.
open_multiple_same_databases_test() -> open_multiple_same_databases_test() ->
cleanup(), cleanup(),