From 7d4b0125f5e20c445bcecbdd67a2b4400000ab4e Mon Sep 17 00:00:00 2001 From: Martin Pecka Date: Thu, 25 Apr 2024 20:00:14 +0200 Subject: [PATCH] Fixed integer underflow in OgreDistortionPass (#994) Signed-off-by: Martin Pecka --- ogre/src/OgreDistortionPass.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ogre/src/OgreDistortionPass.cc b/ogre/src/OgreDistortionPass.cc index 7c97c471d..774759e8e 100644 --- a/ogre/src/OgreDistortionPass.cc +++ b/ogre/src/OgreDistortionPass.cc @@ -196,8 +196,8 @@ void OgreDistortionPass::CreateRenderPass() distortedLocation, newDistortedCoordinates, currDistortedCoordinates; - unsigned int distortedIdx, - distortedCol, + unsigned int distortedIdx; + int distortedCol, distortedRow; double normalizedColLocation, normalizedRowLocation; @@ -223,9 +223,9 @@ void OgreDistortionPass::CreateRenderPass() focalLength); // compute the index in the distortion map - distortedCol = static_cast(round(distortedLocation.X() * + distortedCol = static_cast(round(distortedLocation.X() * this->dataPtr->distortionTexWidth)); - distortedRow = static_cast(round(distortedLocation.Y() * + distortedRow = static_cast(round(distortedLocation.Y() * this->dataPtr->distortionTexHeight)); // Note that the following makes sure that, for significant distortions, @@ -235,8 +235,11 @@ void OgreDistortionPass::CreateRenderPass() // nonlegacy distortion modes. // Make sure the distorted pixel is within the texture dimensions - if (distortedCol < this->dataPtr->distortionTexWidth && - distortedRow < this->dataPtr->distortionTexHeight) + if (distortedCol >= 0 && distortedRow >= 0 && + static_cast(distortedCol) < + this->dataPtr->distortionTexWidth && + static_cast(distortedRow) < + this->dataPtr->distortionTexHeight) { distortedIdx = distortedRow * this->dataPtr->distortionTexWidth + distortedCol;