From da384f1319ca03b3bb9cfdd7ee818ef59d87d802 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 26 Apr 2011 13:42:24 +0000 Subject: QPID-3222: Prevent ttl overflow; also adds equality operators for qpid::messaging::Duration. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1096751 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Message.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/broker/Message.cpp') diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp index 812d856416..763dc55e40 100644 --- a/cpp/src/qpid/broker/Message.cpp +++ b/cpp/src/qpid/broker/Message.cpp @@ -374,7 +374,8 @@ void Message::setTimestamp(const boost::intrusive_ptr& e) props->setExpiration(now + (props->getTtl()/1000)); } // Use higher resolution time for the internal expiry calculation. - expiration = AbsTime(AbsTime::now(), Duration(props->getTtl() * TIME_MSEC)); + Duration ttl(std::min(props->getTtl() * TIME_MSEC, (uint64_t) std::numeric_limits::max()));//Prevent overflow + expiration = AbsTime(AbsTime::now(), ttl); setExpiryPolicy(e); } } @@ -384,8 +385,10 @@ void Message::adjustTtl() DeliveryProperties* props = getProperties(); if (props->getTtl()) { sys::Mutex::ScopedLock l(lock); - sys::Duration d(sys::AbsTime::now(), getExpiration()); - props->setTtl(int64_t(d) > 0 ? int64_t(d)/1000000 : 1); // convert from ns to ms; set to 1 if expired + if (expiration < FAR_FUTURE) { + sys::Duration d(sys::AbsTime::now(), getExpiration()); + props->setTtl(int64_t(d) > 0 ? int64_t(d)/1000000 : 1); // convert from ns to ms; set to 1 if expired + } } } -- cgit v1.2.1