Bug 741131 - Clamp negative geolocation timeout values to 0. r=jdm

This commit is contained in:
Veeraya Pupatwibul 2012-04-02 08:14:00 -04:00
parent 26f2157d3f
commit 0f30f59711

View File

@ -419,11 +419,13 @@ nsGeolocationRequest::SetTimeoutTimer()
mTimeoutTimer = nsnull;
}
PRInt32 timeout;
if (mOptions && NS_SUCCEEDED(mOptions->GetTimeout(&timeout)) && timeout > 0) {
if (mOptions && NS_SUCCEEDED(mOptions->GetTimeout(&timeout))) {
if (timeout < 10)
if (timeout < 0)
timeout = 0;
else if (timeout < 10)
timeout = 10;
mTimeoutTimer = do_CreateInstance("@mozilla.org/timer;1");
mTimeoutTimer->InitWithCallback(this, timeout, nsITimer::TYPE_ONE_SHOT);
}