Fixing possible invalid memory access in validateDisparity

e0cea92f · sbokov · ff1687d3 · e0cea92f
Commit e0cea92f authored Jul 13, 2015 by sbokov
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

stereosgbm.cpp modules/calib3d/src/stereosgbm.cpp +9 -1

No files found.
--- a/modules/calib3d/src/stereosgbm.cpp
+++ b/modules/calib3d/src/stereosgbm.cpp
@@ -1157,6 +1157,10 @@ void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDis
            for( x = minX1; x < maxX1; x++ )
            {
                int d = dptr[x], c = cptr[x];
+
+                if( d == INVALID_DISP_SCALED )
+                    continue;
+
                int x2 = x - ((d + DISP_SCALE/2) >> DISP_SHIFT);

                if( disp2cost[x2] > c )
@@ -1173,9 +1177,13 @@ void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDis
            for( x = minX1; x < maxX1; x++ )
            {
                int d = dptr[x], c = cptr[x];
+
+                if( d == INVALID_DISP_SCALED )
+                    continue;
+
                int x2 = x - ((d + DISP_SCALE/2) >> DISP_SHIFT);

-                if( disp2cost[x2] < c )
+                if( disp2cost[x2] > c )
                {
                    disp2cost[x2] = c;
                    disp2buf[x2] = d;