summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-19 22:57:01 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-19 22:57:01 +0000
commit48e5a2ac537ed4753fdf22f5cdea6bca9ae683cc (patch)
treea93f0ad2025b0adb837224bd9295580d68193001
parent713f5f9e00d052b350475cc670796a4a4defdd9f (diff)
downloadhercules-48e5a2ac537ed4753fdf22f5cdea6bca9ae683cc.tar.gz
hercules-48e5a2ac537ed4753fdf22f5cdea6bca9ae683cc.tar.bz2
hercules-48e5a2ac537ed4753fdf22f5cdea6bca9ae683cc.tar.xz
hercules-48e5a2ac537ed4753fdf22f5cdea6bca9ae683cc.zip
* Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14468 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Renewal.txt1
-rw-r--r--src/char/char.c2
-rw-r--r--src/char_sql/char.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt
index 479034a4f..8b4f90dbe 100644
--- a/Changelog-Renewal.txt
+++ b/Changelog-Renewal.txt
@@ -8,6 +8,7 @@ Date Added
- Made strtoull default to base 10 and actually process base 8, to match the normal behavior of this function (bugreport:4059, follow up to r14245).
- Fixed functions in db.c not being returned as pointer, causing warnings on VC6.
* Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei]
+ * Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei]
2010/11/16
* Added a missing argument to a warning containing a format specifier. [Paradox924X]
2010/11/15
diff --git a/src/char/char.c b/src/char/char.c
index 98a213316..91ad7d33d 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3893,7 +3893,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data)
memcpy(WFIFOP(login_fd,26), passwd, 24);
WFIFOL(login_fd,50) = 0;
WFIFOL(login_fd,54) = htonl(char_ip);
- WFIFOL(login_fd,58) = htons(char_port);
+ WFIFOW(login_fd,58) = htons(char_port);
memcpy(WFIFOP(login_fd,60), server_name, 20);
WFIFOW(login_fd,80) = 0;
WFIFOW(login_fd,82) = char_maintenance;
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index be94c920f..36944cd35 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3624,7 +3624,7 @@ int check_connect_login_server(int tid, unsigned int tick, int id, intptr data)
memcpy(WFIFOP(login_fd,26), passwd, 24);
WFIFOL(login_fd,50) = 0;
WFIFOL(login_fd,54) = htonl(char_ip);
- WFIFOL(login_fd,58) = htons(char_port);
+ WFIFOW(login_fd,58) = htons(char_port);
memcpy(WFIFOP(login_fd,60), server_name, 20);
WFIFOW(login_fd,80) = 0;
WFIFOW(login_fd,82) = char_maintenance;