Changeset 29542 in vbox

Timestamp:

May 17, 2010 1:41:20 PM (15 years ago)

Author:

vboxsync

Message:

Main: better handle null shapes

Location:

trunk/src/VBox

Files:

• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (2 diffs)
• Main/DisplayImpl.cpp (modified) (1 diff)
• Main/VMMDevInterface.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -107 +107 @@
         com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
         size_t cbShapeSize = aShape.size();
-        shape.resize(cbShapeSize);
-        ::memcpy(shape.raw(), aShape.raw(), cbShapeSize);
+        if (cbShapeSize > 0)
+        {
+            shape.resize(cbShapeSize);
+            ::memcpy(shape.raw(), aShape.raw(), cbShapeSize);
+        }
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -216 +216 @@
         com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
         size_t cbShapeSize = aShape.size();
-        shape.resize(cbShapeSize);
-        ::memcpy(shape.raw(), aShape.raw(), cbShapeSize);
+        if (cbShapeSize > 0)
+        {
+            shape.resize(cbShapeSize);
+            ::memcpy(shape.raw(), aShape.raw(), cbShapeSize);
+        }
     }
     ~MousePointerChangeEvent()
@@ -228 +231 @@
     uint width() const { return w; }
     uint height() const { return h; }
-    const uchar *shapeData() const { return shape.raw(); }
+    const uchar *shapeData() const { return shape.size() > 0 ? shape.raw() : NULL; }
 private:
     bool vis, alph;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -60 +60 @@
     {
         com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
-        size_t cbShapeSize = aShape.size();
-        m_shape.resize(cbShapeSize);
-        ::memcpy(m_shape.raw(), aShape.raw(), cbShapeSize);
+        size_t cbShapeSize = aShape.size();        
+        if (cbShapeSize > 0)
+        {
+            m_shape.resize(cbShapeSize);
+            ::memcpy(m_shape.raw(), aShape.raw(), cbShapeSize);
+        }
     }
 
@@ -75 +78 @@
     uint width() const { return m_uWidth; }
     uint height() const { return m_uHeight; }
-    const uchar *shapeData() const { return m_shape.raw(); }
+    const uchar *shapeData() const { return m_shape.size() > 0 ? m_shape.raw() : NULL; }
 
 private:

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -3829 +3829 @@
     Display *pThis = pDrv->pDisplay;
 
-    size_t cbShapeSize = (cx + 7) / 8 * cy; /* size of the AND mask */
-    cbShapeSize = ((cbShapeSize + 3) & ~3) + cx * 4 * cy; /* + gap + size of the XOR mask */
+    size_t cbShapeSize = 0;
+
+    if (pvShape)
+    {
+        cbShapeSize = (cx + 7) / 8 * cy; /* size of the AND mask */
+        cbShapeSize = ((cbShapeSize + 3) & ~3) + cx * 4 * cy; /* + gap + size of the XOR mask */
+    }
     com::SafeArray<BYTE> shapeData(cbShapeSize);
-    ::memcpy(shapeData.raw(), pvShape, cbShapeSize);
+
+    if (pvShape)
+        ::memcpy(shapeData.raw(), pvShape, cbShapeSize);
 
     /* Tell the console about it */

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -284 +284 @@
 
     /* tell the console about it */
-    size_t cbShapeSize = (width + 7) / 8 * height; /* size of the AND mask */
-    cbShapeSize = ((cbShapeSize + 3) & ~3) + width * 4 * height; /* + gap + size of the XOR mask */
+    size_t cbShapeSize = 0;
+
+    if (pShape)
+    {
+        cbShapeSize = (width + 7) / 8 * height; /* size of the AND mask */
+        cbShapeSize = ((cbShapeSize + 3) & ~3) + width * 4 * height; /* + gap + size of the XOR mask */
+    }
     com::SafeArray<BYTE> shapeData(cbShapeSize);
-    ::memcpy(shapeData.raw(), pShape, cbShapeSize);
+    if (pShape)
+        ::memcpy(shapeData.raw(), pShape, cbShapeSize);
     pDrv->pVMMDev->getParent()->onMousePointerShapeChange(fVisible, fAlpha,
                                                           xHot, yHot, width, height, ComSafeArrayAsInParam(shapeData));