diff options
| author | Haru <haru@dotalux.com> | 2020-07-26 16:06:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 16:06:44 +0200 |
| commit | ee767bdd8dda20366451590a8c8a4af054d21b94 (patch) | |
| tree | 4ca1144e6b4d3513991d5f9168b3e2a31fc08844 | |
| parent | 060133ec08ed597cfcf105b5180ee77e8b89ea7a (diff) | |
| parent | 45c296988f59b4030e5721c665e521378fd1e049 (diff) | |
| download | hercules-ee767bdd8dda20366451590a8c8a4af054d21b94.tar.gz hercules-ee767bdd8dda20366451590a8c8a4af054d21b94.tar.bz2 hercules-ee767bdd8dda20366451590a8c8a4af054d21b94.tar.xz hercules-ee767bdd8dda20366451590a8c8a4af054d21b94.zip | |
Merge pull request #2791 from Kenpachi2k13/gettimetick
Prevent overflow when using gettimetick(0)
| -rw-r--r-- | doc/script_commands.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt index db37ef284..a48c9c78a 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3626,7 +3626,7 @@ If the player is not found, returns -1. *gettimetick(<type>) Valid types are : - 0 - server's tick (milleseconds), unsigned int, loops every ~50 days + 0 - server's tick (milleseconds), unsigned int, loops every ~25 days 1 - time since the start of the current day in seconds 2 - UNIX epoch time (number of seconds elapsed since 1st of January 1970) diff --git a/src/map/script.c b/src/map/script.c index b49844320..75582d72f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11272,7 +11272,8 @@ static BUILDIN(gettimetick) case 0: default: //type 0:(System Ticks) - script_pushint(st,(int)timer->gettick()); // TODO: change this to int64 when we'll support 64 bit script values + // Conjunction with INT_MAX is done to prevent overflow. (Script variables are signed integers.) + script_pushint(st, timer->gettick() & INT_MAX); // TODO: change this to int64 when we'll support 64 bit script values break; } return true; |