From 5e48be89d5cb3eb15e41fb0120e5ee979de73271 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 13 May 2010 14:22:00 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20a=20crash=20in=20SqlAsyncTask::call=20cau?= =?UTF-8?q?sed=20by=20the=20fact=20that=20the=20SQLOperation=20to=20be=20c?= =?UTF-8?q?alled=20was=20a=20NULL=20pointer.=20The=20crash=20was=20mostly?= =?UTF-8?q?=20noticable=20on=20servers=20with=20relatively=20high=20MapUpd?= =?UTF-8?q?ate=20Threads,=20since=20the=20window=20between=20SqlAsyncTask:?= =?UTF-8?q?:call()=C2=B4s=20NULLpointer=20check=20for=20m=5Fop=20and=20the?= =?UTF-8?q?=20usage=20of=20this=20pointer=20was=20larger=20when=20more=20m?= =?UTF-8?q?ap=20threads=20are=20calling=20Database::CommitTransaction()?= =?UTF-8?q?=C2=B4s=20and=20NULLing=20this=20pointer.=20Fixes=20crash=20spe?= =?UTF-8?q?cified=20in=20comment=20#24=20in=20issue=20#1259,=20and=20most?= =?UTF-8?q?=20likely=20will=20affect=20other=20crashes=20specified=20there?= =?UTF-8?q?=20as=20well.=20Courtesy=20of=20click=20and=20myself,=20and=20o?= =?UTF-8?q?ur=20lengthy=20and=20deep=20brainstorming=20session.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : trunk --- src/shared/Database/Database.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index bc4e863132e..d03f8704896 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -591,7 +591,6 @@ bool Database::CommitTransaction() if (i != m_tranQueues.end() && i->second != NULL) { m_threadBody->Delay(i->second); - i->second = NULL; return true; } else