summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-29 01:55:05 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-29 01:55:05 +0000
commitb5633db9744bff512eef665054a2622780a7ab6c (patch)
treeed32034ecfcdc3d7f69a39a152738222c11f19aa /src/char
parent296cc8b832aeed7932327017c4489874725f82f1 (diff)
downloadhercules-b5633db9744bff512eef665054a2622780a7ab6c.tar.gz
hercules-b5633db9744bff512eef665054a2622780a7ab6c.tar.bz2
hercules-b5633db9744bff512eef665054a2622780a7ab6c.tar.xz
hercules-b5633db9744bff512eef665054a2622780a7ab6c.zip
* Fixed char-server making assumptions about RFIFO data length in character deletion packet (since r10909).
* Fixed login-server discarding RFIFO data, when the length is 1 byte; minimum packet size is 2 bytes (since r5027). - Fixed login-server not skipping packet 0x2728's data on failure (since r12043). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14637 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 6dd131976..314bfcdac 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3550,7 +3550,7 @@ int parse_char(int fd)
ShowInfo(CL_RED"Request Char Deletion: "CL_GREEN"%d (%d)"CL_RESET"\n", sd->account_id, cid);
memcpy(email, RFIFOP(fd,6), 40);
- RFIFOSKIP(fd,RFIFOREST(fd)); // hack to make the other deletion packet work
+ RFIFOSKIP(fd,( cmd == 0x68 ) ? 46 : 56);
if (e_mail_check(email) == 0)
safestrncpy(email, "a@a.com", sizeof(email)); // default e-mail