diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-18 20:35:14 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-18 20:35:14 +0000 |
| commit | 3fffd37b5c8c579ffd540ac60c97a047f2d6eda1 (patch) | |
| tree | 7431afbf222f08190e7e640a2d301ebc6982255d | |
| parent | 9931cc22ecf92962c9a3218d075b55a44152862a (diff) | |
| download | hercules-3fffd37b5c8c579ffd540ac60c97a047f2d6eda1.tar.gz hercules-3fffd37b5c8c579ffd540ac60c97a047f2d6eda1.tar.bz2 hercules-3fffd37b5c8c579ffd540ac60c97a047f2d6eda1.tar.xz hercules-3fffd37b5c8c579ffd540ac60c97a047f2d6eda1.zip | |
- Fixed a sad crash in the login-txt server. Thanks to Flavio JS for pointing it out.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8352 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/login/login.c | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/login/login.c b/src/login/login.c index 8dd82cffb..f76bd44cf 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -3337,7 +3337,7 @@ int parse_login(int fd) { case 0x7530: // Request of the server version
login_log("Sending of the server version (ip: %s)" RETCODE, ip);
- WFIFOHEAD(fd, 10);
+ WFIFOHEAD(fd, 10);
WFIFOW(fd,0) = 0x7531;
WFIFOB(fd,2) = ATHENA_MAJOR_VERSION;
WFIFOB(fd,3) = ATHENA_MINOR_VERSION;
@@ -3365,7 +3365,7 @@ int parse_login(int fd) { } else {
struct login_session_data *ld = (struct login_session_data*)session[fd]->session_data;
if (RFIFOW(fd,2) == 0) { // non encrypted password
- char* password="";
+ char password[25];
memcpy(password, RFIFOP(fd,4), 24);
password[24] = '\0';
remove_control_chars((unsigned char *)password);
diff --git a/src/map/skill.c b/src/map/skill.c index af6a337ca..e1aff8f85 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8265,7 +8265,7 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t case GD_REGENERATION: case GD_RESTORE: //Emergency Recall is handled on skill_notok - if (skill != GD_EMERGENCYCALL && !agit_flag) { + if (!agit_flag) { clif_skill_fail(sd,skill,0,0); return 0; } |