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

Keep a reference to the connection before the prepare statement is put on the command queue.

Browse Source 
This should fix a race condition when a prepare is called right before the
db connection is garbage collected.
This commit is contained in:
Maas-Maarten Zeeman
2017-02-22 22:03:26 +01:00
parent 3d546ff8a4
commit 785903ae6d
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
c_src/esqlite3_nif.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2011, 2012, 2013 Maas-Maarten Zeeman * Copyright 2011 - 2017 Maas-Maarten Zeeman
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -346,12 +346,12 @@ do_prepare(ErlNifEnv *env, esqlite_connection *conn, const ERL_NIF_TERM arg)
return make_error_tuple(env, "no_memory"); return make_error_tuple(env, "no_memory");
rc = sqlite3_prepare_v2(conn->db, (char *) bin.data, bin.size, &(stmt->statement), &tail); rc = sqlite3_prepare_v2(conn->db, (char *) bin.data, bin.size, &(stmt->statement), &tail);
if(rc != SQLITE_OK) if(rc != SQLITE_OK) {
return make_sqlite3_error_tuple(env, rc, conn->db); enif_release_resource(conn);
return make_sqlite3_error_tuple(env, rc, conn->db);
}
enif_keep_resource(conn);
stmt->connection = conn; stmt->connection = conn;
esqlite_stmt = enif_make_resource(env, stmt); esqlite_stmt = enif_make_resource(env, stmt);
enif_release_resource(stmt); enif_release_resource(stmt);
@@ -871,6 +871,11 @@ esqlite_prepare(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
if(!cmd) if(!cmd)
return make_error_tuple(env, "command_create_failed"); return make_error_tuple(env, "command_create_failed");
/* Keep a reference to the connection to prevent it from being taken down
* while the prepare statement is waiting on the queue.
*/
enif_keep_resource(conn);
cmd->type = cmd_prepare; cmd->type = cmd_prepare;
cmd->ref = enif_make_copy(cmd->env, argv[1]); cmd->ref = enif_make_copy(cmd->env, argv[1]);
cmd->pid = pid; cmd->pid = pid;

4
src/esqlite3.erl
View File

@@ -1,9 +1,9 @@
%% @author Maas-Maarten Zeeman <mmzeeman@xs4all.nl> %% @author Maas-Maarten Zeeman <mmzeeman@xs4all.nl>
%% @copyright 2011, 2012, 2013 Maas-Maarten Zeeman %% @copyright 2011 - 2017 Maas-Maarten Zeeman
%% @doc Erlang API for sqlite3 databases %% @doc Erlang API for sqlite3 databases
%% Copyright 2011, 2012 Maas-Maarten Zeeman %% Copyright 2011 - 2017 Maas-Maarten Zeeman
%% %%
%% Licensed under the Apache License, Version 2.0 (the "License"); %% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License. %% you may not use this file except in compliance with the License.

4
src/esqlite3_nif.erl
View File

@@ -1,9 +1,9 @@
%% @author Maas-Maarten Zeeman <mmzeeman@xs4all.nl> %% @author Maas-Maarten Zeeman <mmzeeman@xs4all.nl>
%% @copyright 2011, 2012, 2013 Maas-Maarten Zeeman %% @copyright 2011 - 2017 Maas-Maarten Zeeman
%% @doc Low level erlang API for sqlite3 databases %% @doc Low level erlang API for sqlite3 databases
%% Copyright 2011, 2012, 2013, 2014 Maas-Maarten Zeeman %% Copyright 2011 - 2017 Maas-Maarten Zeeman
%% %%
%% Licensed under the Apache License, Version 2.0 (the "License"); %% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License. %% you may not use this file except in compliance with the License.