summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 19:10:41 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 19:10:41 +0000
commit83f992986e30d3e64ef62d90fda9299609c39f95 (patch)
tree00bbcc2a881e5cd4fef0c3f14ad08ebfa15df48b
parentbdd10b430d4d949d5cdd97295ffb0c9887a7c211 (diff)
downloadhercules-83f992986e30d3e64ef62d90fda9299609c39f95.tar.gz
hercules-83f992986e30d3e64ef62d90fda9299609c39f95.tar.bz2
hercules-83f992986e30d3e64ef62d90fda9299609c39f95.tar.xz
hercules-83f992986e30d3e64ef62d90fda9299609c39f95.zip
- Fixed char-server crash on @changegm use.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10126 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/int_guild.c2
-rw-r--r--src/char_sql/int_guild.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7b88b37fc..e74a697a2 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/04/03
+ * Fixed char-server crash on @changegm use.
* Cleaned up mmo_auth, this function wasn't only poorly coded, it also had
a SQL-related memory leak in it!
* Corrected the attack_attr_none check being backwards (ie: this config was
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 84c5839d1..14297712f 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -879,7 +879,7 @@ int mapif_guild_emblem(struct guild *g) {
int mapif_guild_master_changed(struct guild *g, int aid, int cid)
{
- unsigned char buf[12];
+ unsigned char buf[14];
WBUFW(buf,0)=0x3843;
WBUFL(buf,2)=g->guild_id;
WBUFL(buf,6)=aid;
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 9b29befb3..7e688d6cf 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -1201,7 +1201,7 @@ int mapif_guild_emblem(struct guild *g)
int mapif_guild_master_changed(struct guild *g, int aid, int cid)
{
- unsigned char buf[10];
+ unsigned char buf[14];
WBUFW(buf,0)=0x3843;
WBUFL(buf,2)=g->guild_id;
WBUFL(buf,6)=aid;