Changeset 106224 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 7, 2024 10:07:57 AM (6 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165012

Message:

3D: Replacing memcpy with memmove to workaround possible Src and Dst buffers overlapping. bugref:10580

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp

@@ -8364 +8364 @@
             if (pbDst - pbSrc < cbSrcPitch * cHeight)
             {
-                LogRelMax(4, ("Src buffer 0x%p overlaps Dst buffer 0x%p\n", pbSrc, pbDst));
-                return VERR_INVALID_PARAMETER;
+                LogRelMax(8, ("Src buffer 0x%p overlaps Dst buffer 0x%p, cbSrcPitch %d, cbDstPitch %d, cbWidth %u, cHeight %u\n",
+                    pbSrc, pbDst, cbSrcPitch, cbDstPitch, cbWidth, cHeight));
             }
         }
@@ -8372 +8372 @@
             if (pbSrc - pbDst < cbDstPitch * cHeight)
             {
-                LogRelMax(4, ("Dst buffer 0x%p overlaps Src buffer 0x%p\n", pbDst, pbSrc));
-                return VERR_INVALID_PARAMETER;
+                LogRelMax(8, ("Dst buffer 0x%p overlaps Src buffer 0x%p, cbSrcPitch %d, cbDstPitch %d, cbWidth %u, cHeight %u\n",
+                    pbDst, pbSrc, cbSrcPitch, cbDstPitch, cbWidth, cHeight));
             }
         }
         else
         {
-            LogRelMax(4, ("Dst and Src buffers are both start at 0x%p\n", pbDst));
-            return VERR_INVALID_PARAMETER;
+            LogRelMax(8, ("Src and Dst buffers are both start at 0x%p, cbSrcPitch %d, cbDstPitch %d, cbWidth %u, cHeight %u\n",
+                pbSrc, cbSrcPitch, cbDstPitch, cbWidth, cHeight));
         }
 
@@ -8386 +8386 @@
         {
             /* Entire scanlines, positive pitch. */
-            memcpy(pbDst, pbSrc, cbWidth * cHeight);
+            memmove(pbDst, pbSrc, cbWidth * cHeight);
         }
         else
@@ -8392 +8392 @@
             for (uint32_t i = 0; i < cHeight; ++i)
             {
-                memcpy(pbDst, pbSrc, cbWidth);
+                memmove(pbDst, pbSrc, cbWidth);
 
                 pbDst += cbDstPitch;