Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-19 00:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement QueryResult_AutoPtr type which is ACE's reference counted auto_ptr(ACE_Refcounted_Auto_Ptr) for QueryResult pointers.

Browse Source 
Use this auto_ptr for every DB queries(except QueryNamedResult yet).

This patch guarantees NO memory leaks from QueryResult pointers.

Thanks to raczman for the idea and for the helping to make this patch.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2010-01-23 14:45:58 +01:00
parent c784110d87
commit d9cb070215
76 changed files with 458 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/WaypointManager.cpp
View File

@@ -34,7 +34,7 @@ void WaypointStore::Free()
void WaypointStore::Load()
{
QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(id) FROM waypoint_data");
QueryResult_AutoPtr result = WorldDatabase.PQuery("SELECT COUNT(id) FROM waypoint_data");
if (!result)
{
sLog.outError("an error occured while loading the table `waypoint_data` (maybe it doesn't exist ?)");
@@ -42,7 +42,6 @@ void WaypointStore::Load()
}
records = (*result)[0].GetUInt32();
delete result;
result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point");
if(!result)
@@ -96,7 +95,6 @@ void WaypointStore::Load()
} while(result->NextRow()) ;
delete result;
sLog.outString();
sLog.outString(">> Loaded %u waypoints", count);
}
@@ -106,7 +104,7 @@ void WaypointStore::UpdatePath(uint32 id)
if(waypoint_map.find(id)!= waypoint_map.end())
waypoint_map[id]->clear();
QueryResult *result;
QueryResult_AutoPtr result;
result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id);
@@ -147,7 +145,5 @@ void WaypointStore::UpdatePath(uint32 id)
while (result->NextRow());
waypoint_map[id] = path_data;
delete result;
}