Fix crash in Database::GetSharedBank

Deawin · #1 07-28-2003, 06:25 AM

Code:

void Database::GetSharedBank(int32 account_id,Shared_Bank_Struct* sharedbank){
	char errbuf[MYSQL_ERRMSG_SIZE];
    char *query = 0;
    MYSQL_RES *result;
    MYSQL_ROW row;
	unsigned long* lengths;
	if (RunQuery(query, MakeAnyLenString(&amp;query, "SELECT sharedbank from account WHERE id=%i", account_id), errbuf, &amp;result)) {
		safe_delete_array(query);
		if (mysql_num_rows(result) == 1) {	
			row = mysql_fetch_row(result);
			lengths = mysql_fetch_lengths(result);
			if (lengths[0] == sizeof(Shared_Bank_Struct)) {
				memcpy(sharedbank, row[0], sizeof(Shared_Bank_Struct));
				mysql_free_result(result);
				return;
			}
			else{
				cerr &lt;&lt; "Length error in GetSharedBank.  Expected: " &lt;&lt; sizeof(Shared_Bank_Struct) &lt;&lt; ", Got: " &lt;&lt; lengths[0] &lt;&lt; endl;
				mysql_free_result(result);
				return;
			}


		}
	}
	else
	{
		cerr &lt;&lt; "Err in Database::GetSharedBank(int32 account_id): " &lt;&lt; errbuf &lt;&lt; endl;
		mysql_free_result(result);   // &lt;- HERE
	}
}

At the very end of this function, mysql_free_result(result) should not be called if RunQuery() returned false.
This crashed on my machine because my DB layout was a little wrong but could crash on other occasions as well.

Maybe DBcore::RunQuery should set *result to NULL at the beginning of the function so that you can check if it needs to be freed in the code elsewhere (like above):

Code:

if(result) mysql_free_result(result);

or build a macro around it, or whatever.

Hope that helps and please to ignore if I am totally wrong :P
Markus

Edgar1898 · #2 07-28-2003, 07:56 AM

K Thanks, Ill fix it
I wasnt aware there was a bug with my function :P