removed use of variable-length arrays

Author: JoshuaWise

src/objects/database/checkpoint.cc

@@ -22,7 +22,7 @@ NAN_METHOD(Database::Checkpoint) {
 
 	if (status != SQLITE_OK) {
 		CONCAT2(message, "SQLite: ", sqlite3_errmsg(db->db_handle));
-		return Nan::ThrowError(message);
+		return Nan::ThrowError(message.c_str());
 	}
 
 	if (checkpointed_frames < 0 || total_frames < 0) {

src/objects/database/create-statement.cc

@@ -31,7 +31,7 @@ NAN_METHOD(Database::CreateStatement) {
 	// Validates the newly created statement.
 	if (status != SQLITE_OK) {
 		CONCAT3(message, "Failed to construct SQL statement (", sqlite3_errmsg(db->db_handle), ").");
-		return Nan::ThrowError(message);
+		return Nan::ThrowError(message.c_str());
 	}
 	if (stmt->st_handle == NULL) {
 		return Nan::ThrowTypeError("The supplied SQL string contains no statements.");

src/objects/database/create-transaction.cc

@@ -67,7 +67,7 @@ NAN_METHOD(Database::CreateTransaction) {
 		// Validates the newly created statement.
 		if (status != SQLITE_OK) {
 			CONCAT3(message, "Failed to construct SQL statement (", sqlite3_errmsg(db->db_handle), ").");
-			return Nan::ThrowError(message);
+			return Nan::ThrowError(message.c_str());
 		}
 		if (trans->handles[i] == NULL) {
 			return Nan::ThrowTypeError("One of the supplied SQL strings contains no statements.");

src/objects/database/pragma.cc

@@ -48,7 +48,7 @@ NAN_METHOD(Database::Pragma) {
 	if (err != NULL) {
 		CONCAT2(message, "SQLite: ", err);
 		sqlite3_free(err);
-		return Nan::ThrowError(message);
+		return Nan::ThrowError(message.c_str());
 	}
 	sqlite3_free(err);
 

src/util/macros.h

@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 #include <cmath>
-#include <cstring>
+#include <string>
 #include <sqlite3.h>
 #include <nan.h>
 #include "strlcpy.h"
@@ -33,20 +33,18 @@ inline bool IS_32BIT_INT(double num) {
 	return floor(num) == num && num < 2147483648 && num >= -2147483648;
 }
 
-// Creates a stack-allocated buffer of the concatenation of 2 well-formed
+// Creates a stack-allocated std:string of the concatenation of 2 well-formed
 // C-strings.
 #define CONCAT2(result, a, b)                                                  \
-	char result[strlen(a) + strlen(b) + 1];                                    \
-	strcpy(result, a);                                                         \
-	strcat(result, b);
+	std::string result(a);                                                     \
+	result += b;
 
-// Creates a stack-allocated buffer of the concatenation of 3 well-formed
+// Creates a stack-allocated std:string of the concatenation of 3 well-formed
 // C-strings.
 #define CONCAT3(result, a, b, c)                                               \
-	char result[strlen(a) + strlen(b) + strlen(c) + 1];                        \
-	strcpy(result, a);                                                         \
-	strcat(result, b);                                                         \
-	strcat(result, c);
+	std::string result(a);                                                     \
+	result += b;                                                               \
+	result += c;
 
 // Given a v8::Object and a C-string method name, retrieves the v8::Function
 // representing that method. If the getter throws, or if the property is not a
@@ -203,7 +201,7 @@ inline bool IS_32BIT_INT(double num) {
 #define QUERY_THROW_STAY(obj, UNBIND_MACRO, error_out)                         \
 	CONCAT2(_error_message, "SQLite: ", error_out);                            \
 	QUERY_CLEANUP(obj, UNBIND_MACRO);                                          \
-	Nan::ThrowError(_error_message);
+	Nan::ThrowError(_error_message.c_str());
 
 // The macro-instruction that runs after a failed SQLite request.
 #define QUERY_THROW(obj, UNBIND_MACRO, error_out)                              \

src/workers/close.cc

@@ -37,7 +37,7 @@ void CloseWorker::HandleErrorCallback() {
 	CONCAT2(message, "SQLite: ", ErrorMessage());
 	v8::Local<v8::Value> args[2] = {
 		NEW_INTERNAL_STRING_FAST("close"),
-		Nan::Error(message)
+		Nan::Error(message.c_str())
 	};
 
 	EMIT_EVENT(database, 2, args);

src/workers/open.cc

@@ -27,7 +27,7 @@ void OpenWorker::Execute() {
 
 	assert(sqlite3_db_mutex(db->db_handle) == NULL);
 	sqlite3_busy_timeout(db->db_handle, 5000);
-	sqlite3_limit(db->db_handle, SQLITE_LIMIT_LENGTH, std::min(max_buffer_size, max_string_size));
+	sqlite3_limit(db->db_handle, SQLITE_LIMIT_LENGTH, (std::min)(max_buffer_size, max_string_size));
 	sqlite3_limit(db->db_handle, SQLITE_LIMIT_SQL_LENGTH, max_string_size);
 	sqlite3_limit(db->db_handle, SQLITE_LIMIT_COLUMN, 0x7fffffff);
 	sqlite3_limit(db->db_handle, SQLITE_LIMIT_COMPOUND_SELECT, 0x7fffffff);
@@ -66,7 +66,7 @@ void OpenWorker::HandleErrorCallback() {
 		CONCAT2(message, "SQLite: ", ErrorMessage());
 		v8::Local<v8::Value> args[2] = {
 			NEW_INTERNAL_STRING_FAST("close"),
-			Nan::Error(message)
+			Nan::Error(message.c_str())
 		};
 
 		EMIT_EVENT(database, 2, args);