X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=159a0b8b2318b1b336300a243da7e00c2c848cc8;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=86d9273c3bc99f1d5d6b4990fed3fca984723026;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 86d9273c3..159a0b8b2 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -27,10 +27,8 @@
 #include <mysql.h>
 #include "sql.h"
 
-#ifdef WINDOWS
-# pragma comment(lib, "mysqlclient.lib")
-# pragma comment(lib, "advapi32.lib")
-# pragma comment(linker, "/NODEFAULTLIB:LIBCMT")
+#ifdef _WIN32
+# pragma comment(lib, "libmysql.lib")
 #endif
 
 /* VERSION 3 API: With nonblocking (threaded) requests */
@@ -69,8 +67,6 @@
  * if a module is ever put in a re-enterant state (stack corruption could occur, crashes, data
  * corruption, and worse, so DONT think about it until the day comes when InspIRCd is 100%
  * gauranteed threadsafe!)
- *
- * For a diagram of this system please see http://wiki.inspircd.org/Mysql2
  */
 
 class SQLConnection;
@@ -180,7 +176,6 @@ class MySQLresult : public SQLResult
 				rows++;
 			}
 			mysql_free_result(res);
-			res = NULL;
 		}
 	}
 
@@ -291,7 +286,7 @@ class SQLConnection : public SQLProvider
 		{
 			/* XXX: See /usr/include/mysql/mysqld_error.h for a list of
 			 * possible error numbers and error messages */
-			SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + std::string(": ") + mysql_error(connection));
+			SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + ": " + mysql_error(connection));
 			return new MySQLresult(e);
 		}
 	}
@@ -333,10 +328,15 @@ class SQLConnection : public SQLProvider
 				if (param < p.size())
 				{
 					std::string parm = p[param++];
-					char buffer[MAXBUF];
-					mysql_escape_string(buffer, parm.c_str(), parm.length());
+					// In the worst case, each character may need to be encoded as using two bytes,
+					// and one byte is the terminating null
+					std::vector<char> buffer(parm.length() * 2 + 1);
+
+					// The return value of mysql_escape_string() is the length of the encoded string,
+					// not including the terminating null
+					unsigned long escapedsize = mysql_escape_string(&buffer[0], parm.c_str(), parm.length());
 //					mysql_real_escape_string(connection, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length());
-					res.append(buffer);
+					res.append(&buffer[0], escapedsize);
 				}
 			}
 		}
@@ -362,9 +362,10 @@ class SQLConnection : public SQLProvider
 				if (it != p.end())
 				{
 					std::string parm = it->second;
-					char buffer[MAXBUF];
-					mysql_escape_string(buffer, parm.c_str(), parm.length());
-					res.append(buffer);
+					// NOTE: See above
+					std::vector<char> buffer(parm.length() * 2 + 1);
+					unsigned long escapedsize = mysql_escape_string(&buffer[0], parm.c_str(), parm.length());
+					res.append(&buffer[0], escapedsize);
 				}
 			}
 		}
@@ -383,7 +384,7 @@ void ModuleSQL::init()
 	ServerInstance->Threads->Start(Dispatcher);
 
 	Implementation eventlist[] = { I_OnRehash, I_OnUnloadModule };
-	ServerInstance->Modules->Attach(eventlist, this, 2);
+	ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 	OnRehash(NULL);
 }
@@ -435,13 +436,14 @@ void ModuleSQL::OnRehash(User* user)
 		i->second->lock.Lock();
 		i->second->lock.Unlock();
 		// now remove all active queries to this DB
-		for(unsigned int j = qq.size() - 1; j >= 0; j--)
+		for (size_t j = qq.size(); j > 0; j--)
 		{
-			if (qq[j].c == i->second)
+			size_t k = j - 1;
+			if (qq[k].c == i->second)
 			{
-				qq[j].q->OnError(err);
-				delete qq[j].q;
-				qq.erase(qq.begin() + j);
+				qq[k].q->OnError(err);
+				delete qq[k].q;
+				qq.erase(qq.begin() + k);
 			}
 		}
 		// finally, nuke the connection
@@ -503,7 +505,7 @@ void DispatcherThread::Run()
 			 */
 
 			this->LockQueue();
-			if (Parent->qq.front().q == i.q)
+			if (!Parent->qq.empty() && Parent->qq.front().q == i.q)
 			{
 				Parent->qq.pop_front();
 				Parent->rq.push_back(RQueueItem(i.q, res));