fixed edge case bug when binding buffers and using .each()

Author: Joshua Wise

src/binder/bind-buffer.cc

@@ -5,7 +5,7 @@
 void Binder::BindBuffer(v8::Local<v8::Object> value, int index) {
 	if (!index) {index = NextAnonIndex();}
 
-	int status = sqlite3_bind_blob(handle, index, (void*)node::Buffer::Data(value), node::Buffer::Length(value), bind_type);
+	int status = sqlite3_bind_blob(handle, index, (void*)node::Buffer::Data(value), node::Buffer::Length(value), transient_buffers ? SQLITE_TRANSIENT : bind_type);
 
 	SetBindingError(status);
 }

src/binder/binder.cc

@@ -25,14 +25,15 @@
 #include "bind-object.cc"
 #include "bind.cc"
 
-Binder::Binder(sqlite3_stmt* handle, sqlite3_destructor_type bind_type)
+Binder::Binder(sqlite3_stmt* handle, sqlite3_destructor_type bind_type, bool transient_buffers)
 	: handle(handle)
 	, param_count(sqlite3_bind_parameter_count(handle))
 	, anon_index(0)
 	, error(NULL)
 	, error_extra(NULL)
 	, error_full(NULL)
-	, bind_type(bind_type) {}
+	, bind_type(bind_type)
+	, transient_buffers(transient_buffers) {}
 
 Binder::~Binder() {
 	delete[] error_extra;

src/binder/binder.h

@@ -8,7 +8,7 @@ class Int64;
 
 class Binder {
 	public:
-		Binder(sqlite3_stmt*, sqlite3_destructor_type);
+		Binder(sqlite3_stmt*, sqlite3_destructor_type, bool = false);
 		~Binder();
 		virtual void Bind(Nan::NAN_METHOD_ARGS_TYPE, int, Query*);
 		const char* GetError();
@@ -39,6 +39,7 @@ class Binder {
 		const char* error_full;
 
 		sqlite3_destructor_type bind_type;
+		bool transient_buffers;
 };
 
 #endif

src/objects/statement/each.cc

@@ -6,7 +6,7 @@ NAN_METHOD(Statement::Each) {
 		return Nan::ThrowTypeError("This statement is not read-only. Use run() instead.");
 	}
 	REQUIRE_LAST_ARGUMENT_FUNCTION(func_index, callback);
-	QUERY_START(stmt, statement, STATEMENT_BIND, info, func_index);
+	QUERY_START(stmt, statement, STATEMENT_BIND_T_BUFFERS, info, func_index);
 	stmt->db->in_each = true;
 
 

src/util/macros.h

@@ -160,7 +160,7 @@ inline bool IS_32BIT_INT(double num) {
 		sqlite3_clear_bindings(trans->handles[i]);                             \
 	}
 
-// Common bind logic for statements.
+// Common bind logic for statements (must match STATEMENT_BIND_T_BUFFERS).
 #define STATEMENT_BIND(stmt, info, info_length, bind_type)                     \
 	if (info_length > 0) {                                                     \
 		Binder _binder(stmt->st_handle, bind_type);                            \
@@ -172,6 +172,18 @@ inline bool IS_32BIT_INT(double num) {
 		}                                                                      \
 	}
 
+// Should be the same as STATEMENT_BIND, but uses the transient_buffers option.
+#define STATEMENT_BIND_T_BUFFERS(stmt, info, info_length, bind_type)           \
+	if (info_length > 0) {                                                     \
+		Binder _binder(stmt->st_handle, bind_type, true);                      \
+		_binder.Bind(info, info_length, stmt);                                 \
+		const char* _err = _binder.GetError();                                 \
+		if (_err) {                                                            \
+			STATEMENT_CLEAR_BINDINGS(stmt);                                    \
+			return Nan::ThrowError(_err);                                      \
+		}                                                                      \
+	}
+
 // Common bind logic for transactions.
 #define TRANSACTION_BIND(trans, info, info_length, bind_type)                  \
 	if (info_length > 0) {                                                     \