diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-28 17:42:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-28 17:42:48 +0100 |
commit | 2b4ffd8e333dee31ee7df58f693d8eff9ec5a93e (patch) | |
tree | ef0d8efe9bcaf6d71e31aed9574f86479c56c730 | |
parent | acd62e055ee71f330b1d48c3c3c83aaa5ceca29a (diff) |
Fix -fsanitize=signed-integer-overflow (when long int is 32-bit)
Change-Id: Ia6f1b60108784660c4a2dfd311592207e6bf5d88
-rw-r--r-- | vcl/headless/svpinst.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 3f20e1909921..3bb44e0c161a 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -311,8 +311,8 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) timeval Timeout; // determine remaining timeout. gettimeofday (&Timeout, 0); - nTimeoutMS = m_aTimeout.tv_sec*1000 + m_aTimeout.tv_usec/1000 - - Timeout.tv_sec*1000 - Timeout.tv_usec/1000; + nTimeoutMS = (m_aTimeout.tv_sec - Timeout.tv_sec) * 1000 + + m_aTimeout.tv_usec/1000 - Timeout.tv_usec/1000; if( nTimeoutMS < 0 ) nTimeoutMS = 0; } |