ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a helper template for checking MySQL errors.

Browse Source
This commit is contained in:
Sadie Powell 2024-08-06 09:51:19 +01:00
parent 2206a44270
commit 424b5f6bf3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/extra/m_mysql.cpp
View File

@ -85,6 +85,16 @@ class SQLConnection;
class MySQLresult;
class DispatcherThread;
namespace
{
template<typename Numeric>
bool IsMySQLError(Numeric num)
{
// MySQL regularly returns -1 on error in unsigned fields.
return num == static_cast<Numeric>(-1);
}
}
struct QueryQueueItem final
{
// An SQL database which this query is executed on.
@ -170,8 +180,7 @@ public:
MySQLresult(MYSQL_RES* res, unsigned long affected_rows)
: err(SQL::SUCCESS)
{
// mysql returns -1 on error even though the return type is unsigned
if (affected_rows >= 1 && affected_rows != (unsigned long)-1)
if (affected_rows >= 1 && !IsMySQLError(affected_rows))
{
rows = int(affected_rows);
fieldlists.resize(rows);
@ -285,7 +294,7 @@ private:
// unsigned type even though -1 is returned on error so checking whether an error
// happened is a bit cursed.
unsigned long escapedsize = mysql_escape_string(buffer.data(), in.c_str(), in.length());
if (escapedsize == static_cast<unsigned long>(-1))
if (IsMySQLError(escapedsize))
{
SQL::Error err(SQL::QSEND_FAIL, INSP_FORMAT("{}: {}", mysql_errno(connection), mysql_error(connection)));
query->OnError(err);