Changeset 85936 in vbox

Timestamp:

Aug 28, 2020 4:54:48 PM (4 years ago)

Author:

vboxsync

Message:

VBoxManage/createmedium: gcc 4.x build fix. Use RTMemDup instead of RTMemAlloc+memcpy. bugref:9224

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -254 +254 @@
 };
 
+class MediumProperty
+{
+public:
+    const char *m_pszKey;
+    const char *m_pszValue; /**< Can be binary too. */
+    size_t      m_cbValue;
+    char       *m_pszFreeValue;
+    MediumProperty() : m_pszKey(NULL), m_pszValue(NULL), m_cbValue(0), m_pszFreeValue(NULL) { }
+    MediumProperty(MediumProperty const &a_rThat)
+        : m_pszKey(a_rThat.m_pszKey)
+        , m_pszValue(a_rThat.m_pszValue)
+        , m_cbValue(a_rThat.m_cbValue)
+        , m_pszFreeValue(NULL)
+    {
+        Assert(a_rThat.m_pszFreeValue == NULL); /* not expected here! */
+    }
+    ~MediumProperty()
+    {
+        RTMemFree(m_pszFreeValue);
+        m_pszFreeValue = NULL;
+    }
+
+private:
+    MediumProperty &operator=(MediumProperty const &a_rThat)
+    {
+        m_pszKey = a_rThat.m_pszKey;
+        m_pszValue = a_rThat.m_pszValue;
+        m_cbValue = a_rThat.m_cbValue;
+        m_pszFreeValue = a_rThat.m_pszFreeValue;
+        if (a_rThat.m_pszFreeValue != NULL)
+        {
+            m_pszFreeValue = (char *)RTMemDup(m_pszValue, m_cbValue + 1);
+            if (!m_pszFreeValue)
+            {
+                RTMsgError("Out of memory copying '%s'", m_pszValue);
+                throw std::bad_alloc();
+            }
+        }
+        return *this;
+    }
+};
+
 RTEXITCODE handleCreateMedium(HandlerArg *a)
 {
-    class MediumProperty
-    {
-    public:
-        const char *m_pszKey;
-        const char *m_pszValue; /**< Can be binary too. */
-        size_t      m_cbValue;
-        char       *m_pszFreeValue;
-        MediumProperty() : m_pszKey(NULL), m_pszValue(NULL), m_cbValue(0), m_pszFreeValue(NULL) { }
-        MediumProperty(MediumProperty const &a_rThat)
-            : m_pszKey(a_rThat.m_pszKey)
-            , m_pszValue(a_rThat.m_pszValue)
-            , m_cbValue(a_rThat.m_cbValue)
-            , m_pszFreeValue(NULL)
-        {
-            Assert(a_rThat.m_pszFreeValue == NULL); /* not expected here! */
-        }
-        ~MediumProperty()
-        {
-            RTMemFree(m_pszFreeValue);
-            m_pszFreeValue = NULL;
-        }
-
-    private:
-        MediumProperty &operator=(MediumProperty const &a_rThat)
-        {
-            m_pszKey = a_rThat.m_pszKey;
-            m_pszValue = a_rThat.m_pszValue;
-            m_cbValue = a_rThat.m_cbValue;
-            m_pszFreeValue = a_rThat.m_pszFreeValue;
-            if (a_rThat.m_pszFreeValue != NULL)
-            {
-                m_pszFreeValue = (char *)RTMemAlloc(m_cbValue + 1);
-                if (m_pszFreeValue)
-                {
-                    memcpy(m_pszFreeValue, m_pszValue, m_cbValue + 1);
-                    m_pszValue = m_pszFreeValue;
-                }
-                else
-                    RTMsgError("Out of memory copying '%s'", m_pszValue);
-            }
-            return *this;
-        }
-    };
     std::list<MediumProperty> lstProperties;