summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-10-16 18:30:22 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-10-16 18:30:22 +0800
commit9fdcce3c9b2398487c17a6fe3fef60229ef0ef86 (patch)
treefd823a4fccc35baa7a2fb50ea2e2a2f0dd1abd3d /src
parentead2a831bc960b77a5ff6cbe4f9c883a07e91d37 (diff)
parentcee30749f018d1018878cf55b1f4550a95bd9ff7 (diff)
downloadhercules-9fdcce3c9b2398487c17a6fe3fef60229ef0ef86.tar.gz
hercules-9fdcce3c9b2398487c17a6fe3fef60229ef0ef86.tar.bz2
hercules-9fdcce3c9b2398487c17a6fe3fef60229ef0ef86.tar.xz
hercules-9fdcce3c9b2398487c17a6fe3fef60229ef0ef86.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-rw-r--r--src/login/login.c2
-rw-r--r--src/map/script.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/login/login.c b/src/login/login.c
index f81ee30c7..7de5dbb76 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1404,7 +1404,7 @@ int parse_login(int fd)
}
safestrncpy(username, accname, NAME_LENGTH);
- safestrncpy(password, token, PASSWD_LEN);
+ safestrncpy(password, token, min(uTokenLen+1, PASSWD_LEN)); // Variable-length field, don't copy more than necessary
clienttype = RFIFOB(fd, 8);
}
else
diff --git a/src/map/script.c b/src/map/script.c
index 5b8d459b4..612ca8688 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -610,16 +610,16 @@ const char* parse_callfunc(const char* p, int require_paren, int is_custom)
{
const char *p2;
char *arg = NULL;
+ char null_arg = '\0';
int func;
func = script->add_word(p);
if( script->str_data[func].type == C_FUNC ){
- char argT = 0;
// buildin function
script->addl(func);
script->addc(C_ARG);
arg = script->buildin[script->str_data[func].val];
- if( !arg ) arg = &argT;
+ if( !arg ) arg = &null_arg; // Use a dummy, null string
} else if( script->str_data[func].type == C_USERFUNC || script->str_data[func].type == C_USERFUNC_POS ){
// script defined function
script->addl(script->buildin_callsub_ref);