Merge pull request #23283 from vrabaud:5_overflow

Fix signed integer overflow.
2 years ago · a792252b55
parent 23dec329b4 f7ce715596
commit a792252b55
1 changed files with 4 additions and 1 deletions
--- a/modules/imgproc/src/stb_truetype.cpp
+++ b/modules/imgproc/src/stb_truetype.cpp
@ -3530,11 +3530,14 @@ STBTT_DEF unsigned char* stbtt_GetGlyphBitmapSubpixelRealloc(const stbtt_fontinf
                 iy1 = STBTT_max(iy1, y);
             }
         }
-         int w = ix1 - ix0 + 1, h = iy1 - iy0 + 1;
+         int w, h;
         if (ix0 == INT_MAX || iy0 == INT_MAX || ix1 == INT_MIN || iy1 == INT_MIN ) {
             w = h = 0;
             ix0 = pad_x;
             iy0 = pad_y;
+         } else {
+             w = ix1 - ix0 + 1;
+             h = iy1 - iy0 + 1;
         }
         if (width) *width = w;
         if (height) *height = h;