UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(merging from branch) fixed amb1583 - MySQL string fetch from prepared queries returned corrupted data.

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402217
This commit is contained in:
David Anderson 2008-05-29 04:47:42 +00:00
parent ca9b2784bd
commit 3b4c800baa
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/mysql/mysql/MyBoundResults.cpp
View File

@ -89,6 +89,8 @@ MyBoundResults::MyBoundResults(MYSQL_STMT *stmt, MYSQL_RES *res)
/* Zero data */ /* Zero data */
memset(m_bind, 0, sizeof(MYSQL_BIND) * m_ColCount); memset(m_bind, 0, sizeof(MYSQL_BIND) * m_ColCount);
memset(m_pull, 0, sizeof(ResultBind) * m_ColCount); memset(m_pull, 0, sizeof(ResultBind) * m_ColCount);
m_bUpdatedBinds = false;
} }
MyBoundResults::~MyBoundResults() MyBoundResults::~MyBoundResults()
@ -211,6 +213,15 @@ IResultRow *MyBoundResults::FetchRow()
m_CurRow++; m_CurRow++;
if (m_bUpdatedBinds)
{
if (mysql_stmt_bind_result(m_stmt, m_bind) != 0)
{
return false;
}
m_bUpdatedBinds = false;
}
/* We should be able to get another row */ /* We should be able to get another row */
int err = mysql_stmt_fetch(m_stmt); int err = mysql_stmt_fetch(m_stmt);
if (err == 0 || err == MYSQL_DATA_TRUNCATED) if (err == 0 || err == MYSQL_DATA_TRUNCATED)
@ -266,22 +277,29 @@ void ResizeBuffer(ResultBind *bind, size_t len)
{ {
bind->blob = new unsigned char[len]; bind->blob = new unsigned char[len];
bind->length = len; bind->length = len;
} else if (bind->length < len) { }
else if (bind->length < len)
{
delete [] bind->blob; delete [] bind->blob;
bind->blob = new unsigned char[len]; bind->blob = new unsigned char[len];
bind->length = len; bind->length = len;
} }
} }
bool RefetchField(MYSQL_STMT *stmt, bool MyBoundResults::RefetchField(MYSQL_STMT *stmt,
ResultBind *rbind,
unsigned int id, unsigned int id,
size_t initSize, size_t initSize,
enum_field_types type) enum_field_types type)
{ {
ResultBind *rbind = &m_pull[id];
/* Make sure there is a buffer to pull into */ /* Make sure there is a buffer to pull into */
ResizeBuffer(rbind, initSize); ResizeBuffer(rbind, initSize);
/* Update the bind with the buffer size */
m_bind[id].buffer_length = (unsigned long)rbind->length;
m_bUpdatedBinds = true;
MYSQL_BIND bind; MYSQL_BIND bind;
/* Initialize bind info */ /* Initialize bind info */
@ -397,7 +415,7 @@ DBResult MyBoundResults::GetString(unsigned int id, const char **pString, size_t
} }
/* Attempt to refetch the string */ /* Attempt to refetch the string */
if (!RefetchField(m_stmt, &m_pull[id], id, 128, MYSQL_TYPE_STRING)) if (!RefetchField(m_stmt, id, 128, MYSQL_TYPE_STRING))
{ {
return DBVal_TypeMismatch; return DBVal_TypeMismatch;
} }
@ -418,7 +436,7 @@ DBResult MyBoundResults::GetString(unsigned int id, const char **pString, size_t
if ((size_t)(m_pull[id].my_length) >= m_pull[id].length) if ((size_t)(m_pull[id].my_length) >= m_pull[id].length)
{ {
/* Yes, we need to refetch. */ /* Yes, we need to refetch. */
if (!RefetchField(m_stmt, &m_pull[id], id, m_pull[id].my_length + 1, MYSQL_TYPE_STRING)) if (!RefetchField(m_stmt, id, m_pull[id].my_length + 1, MYSQL_TYPE_STRING))
{ {
return DBVal_Error; return DBVal_Error;
} }
@ -591,7 +609,7 @@ DBResult MyBoundResults::GetBlob(unsigned int id, const void **pData, size_t *le
if ((size_t)m_pull[id].my_length > m_pull[id].length) if ((size_t)m_pull[id].my_length > m_pull[id].length)
{ {
if (!RefetchField(m_stmt, &m_pull[id], id, m_pull[id].my_length, MYSQL_TYPE_BLOB)) if (!RefetchField(m_stmt, id, m_pull[id].my_length, MYSQL_TYPE_BLOB))
{ {
return DBVal_TypeMismatch; return DBVal_TypeMismatch;
} }

8
extensions/mysql/mysql/MyBoundResults.h
View File

@ -2,7 +2,7 @@
* vim: set ts=4 : * vim: set ts=4 :
* ============================================================================= * =============================================================================
* SourceMod MySQL Extension * SourceMod MySQL Extension
* Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * Copyright (C) 2004-2007 AlliedModders LLC. All rights reserved.
* ============================================================================= * =============================================================================
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
@ -83,6 +83,11 @@ public: //IResultRow
public: public:
bool Initialize(); bool Initialize();
void Update(); void Update();
private:
bool RefetchField(MYSQL_STMT *stmt,
unsigned int id,
size_t initSize,
enum_field_types type);
private: private:
MYSQL_STMT *m_stmt; MYSQL_STMT *m_stmt;
MYSQL_RES *m_pRes; MYSQL_RES *m_pRes;
@ -92,6 +97,7 @@ private:
bool m_Initialized; bool m_Initialized;
unsigned int m_RowCount; unsigned int m_RowCount;
unsigned int m_CurRow; unsigned int m_CurRow;
bool m_bUpdatedBinds;
}; };
#endif //_INCLUDE_SM_MYSQL_BOUND_RESULTS_H_ #endif //_INCLUDE_SM_MYSQL_BOUND_RESULTS_H_