diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-04-04 11:17:10 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-04 11:17:10 +0900 |
| commit | bdeb803f04b6bd919202b078a52df7abb0af73ee (patch) | |
| tree | 70c52c0978e27f98e45574a0d6e56185a4e62ce9 | |
| parent | e2e2edae51f33ef5ff164c60ed57e1466d1edaea (diff) | |
| parent | dc4fba28c5f5d3783f37b9761cf4074302fcb690 (diff) | |
| download | mruby-bdeb803f04b6bd919202b078a52df7abb0af73ee.tar.gz mruby-bdeb803f04b6bd919202b078a52df7abb0af73ee.zip | |
Merge pull request #3579 from clayton-shopify/fix-time-alloc-usec
Correctly handle large negative usec value.
| -rw-r--r-- | mrbgems/mruby-time/src/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index aae1e2626..ce99a5a65 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -245,7 +245,7 @@ time_alloc(mrb_state *mrb, double sec, double usec, enum mrb_timezone timezone) tm->usec -= sec2 * 1000000; tm->sec += sec2; } - if (tm->usec >= 1000000) { + else if (tm->usec >= 1000000) { long sec2 = usec / 1000000; tm->usec -= sec2 * 1000000; tm->sec += sec2; |