[FIX] Fixed heap corruption when copying a discontinuous cv::mat matrix

lagadic · Jan 22, 2025 · 75b9a00 · 75b9a00
1 parent e3dfc17
commit 75b9a00
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/modules/core/src/image/vpImageConvert_opencv.cpp b/modules/core/src/image/vpImageConvert_opencv.cpp
@@ -222,12 +222,12 @@ void vpImageConvert::convert(const cv::Mat &src, vpImage<unsigned char> &dest, b
     else {
       if (flip) {
         for (unsigned int i = 0; i < destRows; ++i) {
-          memcpy(dest.bitmap + (i * destCols), src.data + ((destRows - i - 1) * src.step1()), static_cast<size_t>(src.step));
+          memcpy(dest.bitmap + (i * destCols), src.data + ((destRows - i - 1) * src.step1()), static_cast<size_t>(destCols * sizeof(unsigned char)));
         }
       }
       else {
         for (unsigned int i = 0; i < destRows; ++i) {
-          memcpy(dest.bitmap + (i * destCols), src.data + (i * src.step1()), static_cast<size_t>(src.step));
+          memcpy(dest.bitmap + (i * destCols), src.data + (i * src.step1()), static_cast<size_t>(destCols * sizeof(unsigned char)));
         }
       }
     }
@@ -365,12 +365,12 @@ void vpImageConvert::convert(const cv::Mat &src, vpImage<uint16_t> &dest, bool f
     else {
       if (flip) {
         for (unsigned int i = 0; i < destRows; ++i) {
-          memcpy(dest.bitmap + (i * destCols), src.data + ((destRows - i - 1) * src.step1() * sizeof(uint16_t)), static_cast<size_t>(src.step));
+          memcpy(dest.bitmap + (i * destCols), src.data + ((destRows - i - 1) * src.step1() * sizeof(uint16_t)), static_cast<size_t>(destCols * sizeof(uint16_t)));
         }
       }
       else {
         for (unsigned int i = 0; i < destRows; ++i) {
-          memcpy(dest.bitmap + (i * destCols), src.data + (i * src.step1() * sizeof(uint16_t)), static_cast<size_t>(src.step));
+          memcpy(dest.bitmap + (i * destCols), src.data + (i * src.step1() * sizeof(uint16_t)), static_cast<size_t>(destCols * sizeof(uint16_t)));
         }
       }
     }