mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[6915] Fixed use uninitialized petition type variable in petition signing code.

Browse source
This commit is contained in:
VladimirMangos 2008-12-17 01:46:34 +03:00
parent 34bef19e63
commit 29b37f4b6c
2 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/game/PetitionsHandler.cpp
View file

@ -318,7 +318,7 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid)
QueryResult *result = CharacterDatabase.PQuery( QueryResult *result = CharacterDatabase.PQuery(
"SELECT ownerguid, name, " "SELECT ownerguid, name, "
" (SELECT COUNT(playerguid) FROM petition_sign WHERE petition_sign.petitionguid = '%u') AS signs, " " (SELECT COUNT(playerguid) FROM petition_sign WHERE petition_sign.petitionguid = '%u') AS signs, "
"type " " type "
"FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid), GUID_LOPART(petitionguid)); "FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid), GUID_LOPART(petitionguid));
if(result) if(result)
@ -449,17 +449,14 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
Field *fields; Field *fields;
uint64 petitionguid; uint64 petitionguid;
uint32 type;
uint8 unk; uint8 unk;
uint64 ownerguid;
recv_data >> petitionguid; // petition guid recv_data >> petitionguid; // petition guid
recv_data >> unk; recv_data >> unk;
uint8 signs = 0;
QueryResult *result = CharacterDatabase.PQuery( QueryResult *result = CharacterDatabase.PQuery(
"SELECT ownerguid, " "SELECT ownerguid, "
" (SELECT COUNT(playerguid) FROM petition_sign WHERE petition_sign.petitionguid = '%u') AS signs " " (SELECT COUNT(playerguid) FROM petition_sign WHERE petition_sign.petitionguid = '%u') AS signs, "
" type "
"FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid), GUID_LOPART(petitionguid)); "FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid), GUID_LOPART(petitionguid));
if(!result) if(!result)
@ -469,8 +466,9 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
} }
fields = result->Fetch(); fields = result->Fetch();
ownerguid = MAKE_NEW_GUID(fields[0].GetUInt32(), 0, HIGHGUID_PLAYER); uint64 ownerguid = MAKE_NEW_GUID(fields[0].GetUInt32(), 0, HIGHGUID_PLAYER);
signs = fields[1].GetUInt8(); uint8 signs = fields[1].GetUInt8();
uint32 type = fields[2].GetUInt32();
delete result; delete result;
@ -488,20 +486,6 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
return; return;
} }
QueryResult *result2 = CharacterDatabase.PQuery("SELECT type FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
if(result2)
{
Field* fields = result2->Fetch();
type = fields[0].GetUInt32();
delete result2;
}
else
{
sLog.outDebug("CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionguid));
return;
}
if(type != 9) if(type != 9)
{ {
if(_player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)) if(_player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "6914" #define REVISION_NR "6915"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__