Merge pull request #26776 from vrabaud:ub_warp

asmorkalov · web-flow · commit 1d701d1690b8 · 2025-01-15T15:19:19.000+03:00
Don't overflow pointer addition
diff --git a/modules/imgproc/src/imgwarp.cpp b/modules/imgproc/src/imgwarp.cpp
@@ -955,7 +955,7 @@ static void remapBicubic( const Mat& _src, Mat& _dst, const Mat& _xy,
                     sum += S[0]*w[8] + S[cn]*w[9] + S[cn*2]*w[10] + S[cn*3]*w[11];
                     S += sstep;
                     sum += S[0]*w[12] + S[cn]*w[13] + S[cn*2]*w[14] + S[cn*3]*w[15];
-                    S += 1 - sstep*3;
+                    S -= sstep * 3 - 1;
                     D[k] = castOp(sum);
                 }
             }
@@ -988,9 +988,9 @@ static void remapBicubic( const Mat& _src, Mat& _dst, const Mat& _xy,
                     for(int i = 0; i < 4; i++, w += 4 )
                     {
                         int yi = y[i];
-                        const T* S = S0 + yi*sstep;
                         if( yi < 0 )
                             continue;
+                        const T* S = S0 + yi*sstep;
                         if( x[0] >= 0 )
                             sum += (S[x[0]] - cv)*w[0];
                         if( x[1] >= 0 )

Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ static void remapBicubic( const Mat& _src, Mat& _dst, const Mat& _xy,`
`955`	`955`	`sum += S[0]w[8] + S[cn]w[9] + S[cn2]w[10] + S[cn3]w[11];`
`956`	`956`	`S += sstep;`
`957`	`957`	`sum += S[0]w[12] + S[cn]w[13] + S[cn2]w[14] + S[cn3]w[15];`
`958`		`- S += 1 - sstep*3;`
	`958`	`+ S -= sstep * 3 - 1;`
`959`	`959`	`D[k] = castOp(sum);`
`960`	`960`	`}`
`961`	`961`	`}`
`@@ -988,9 +988,9 @@ static void remapBicubic( const Mat& _src, Mat& _dst, const Mat& _xy,`
`988`	`988`	`for(int i = 0; i < 4; i++, w += 4 )`
`989`	`989`	`{`
`990`	`990`	`int yi = y[i];`
`991`		`- const T* S = S0 + yi*sstep;`
`992`	`991`	`if( yi < 0 )`
`993`	`992`	`continue;`
	`993`	`+ const T* S = S0 + yi*sstep;`
`994`	`994`	`if( x[0] >= 0 )`
`995`	`995`	`sum += (S[x[0]] - cv)*w[0];`
`996`	`996`	`if( x[1] >= 0 )`