diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-05-08 15:34:37 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-05-08 15:34:37 -0400 |
commit | 4d6c79d1de5e242c000f28a71c706734d1a2da0b (patch) | |
tree | 65630c986788b35029d2345a0942e15a8fff2803 /src/or/channelpadding.c | |
parent | fb97f76e71ab06abe4b4927f743f6683e7aaedab (diff) | |
download | tor-4d6c79d1de5e242c000f28a71c706734d1a2da0b.tar.gz tor-4d6c79d1de5e242c000f28a71c706734d1a2da0b.zip |
Fix some clang-i386 warnings in master.
Diffstat (limited to 'src/or/channelpadding.c')
-rw-r--r-- | src/or/channelpadding.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index e57408ad5c..481d937423 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -727,13 +727,16 @@ channelpadding_decide_to_pad_channel(channel_t *chan) chan->currently_padding = 1; return CHANNELPADDING_PADLATER; } else { + if (BUG(pad_time_ms > INT_MAX)) { + pad_time_ms = INT_MAX; + } /* We have to schedule a callback because we're called exactly once per * second, but we don't want padding packets to go out exactly on an * integer multiple of seconds. This callback will only be scheduled * if we're within 1.1 seconds of the padding time. */ chan->currently_padding = 1; - return channelpadding_schedule_padding(chan, pad_time_ms); + return channelpadding_schedule_padding(chan, (int)pad_time_ms); } } else { chan->currently_padding = 0; |