From 0c8c3928a85b3ef5c3b822e8616d567f3e19fa16 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 22 Feb 2021 18:34:28 -0600
Subject: [PATCH] Check for string type in db escape util

---
 scripts/server/database.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/server/database.js b/scripts/server/database.js
index 93cbf5c0..2b609b49 100644
--- a/scripts/server/database.js
+++ b/scripts/server/database.js
@@ -60,11 +60,15 @@ function queryDatabase(dbConnection, queryString) {
 
 // -------------------------------------------------------------------------
 
-function escapeDatabaseString(dbConnection, unsafeString) {
+function escapeDatabaseString(dbConnection, unsafeString = "") {
 	if(!dbConnection) {
 		dbConnection = connectToDatabase();
 	}
-	return dbConnection.escapeString(unsafeString);
+
+	if(typeof unsafeString == "string") {
+		return dbConnection.escapeString(unsafeString);
+	}
+	return unsafeString;
 }
 
 // -------------------------------------------------------------------------
@@ -88,7 +92,9 @@ function getDatabaseError(dbConnection) {
 // -------------------------------------------------------------------------
 
 function freeDatabaseQuery(dbQuery) {
-	dbQuery.free();
+	if(dbQuery != null) {
+		dbQuery.free();
+	}
 	return;
 }