diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-21 15:44:39 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-21 15:44:39 +0000 |
| commit | aed45db088c1ab5a283e732fac743cf7eef945db (patch) | |
| tree | fc96b8db7983052940690829fd951a7891151fc0 | |
| parent | 9a850a659b05bbd8be0c51027bda20493d875431 (diff) | |
| download | hercules-aed45db088c1ab5a283e732fac743cf7eef945db.tar.gz hercules-aed45db088c1ab5a283e732fac743cf7eef945db.tar.bz2 hercules-aed45db088c1ab5a283e732fac743cf7eef945db.tar.xz hercules-aed45db088c1ab5a283e732fac743cf7eef945db.zip | |
- Changed a certain snprintf to strncpy, you really really really REALLY shouldn't use snprintf with a format argument that may contain unpredictable string sequences!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9550 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1aa09400b..2ad9e9ae0 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ 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. 2006/12/21 + * Changed a certain snprintf to strncpy, which should fix the problems with + parsing switches in the script engine. * Added back cropping the attack delay to attack motion for those weird mobs that have a aDelay less than their aMotion time. [Skotlex] * Added a 1-node cache to db. Removed party_cache and guild_cache since diff --git a/src/map/script.c b/src/map/script.c index e8aea1fd7..a493322cc 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -1025,7 +1025,7 @@ const char* parse_syntax(const char* p) { if(*p != ':') disp_error_message("parse_syntax: expect ':'",p); memcpy(label,"if(",3); - snprintf(label+3,len,p2); + strncpy(label+3,p2,len); sprintf(label+3+len," != $@__SW%x_VAL) goto __SW%x_%x;", syntax.curly[pos].index,syntax.curly[pos].index,syntax.curly[pos].count+1); syntax.curly[syntax.curly_count++].type = TYPE_NULL; |