Changeset 21156 in vbox for trunk

Timestamp:

Jul 2, 2009 12:25:07 PM (16 years ago)

Author:

vboxsync

Message:

IPRT: fix valgrind warnings about ministring + self assignment

File:

• trunk/include/iprt/ministring_cpp.h (modified) (6 diffs)

trunk/include/iprt/ministring_cpp.h

@@ -61 +61 @@
 
     ministring(const ministring &s)
-        : m_psz(NULL)
     {
         copyFrom(s);
@@ -67 +66 @@
 
     ministring(const char *pcsz)
-        : m_psz(NULL)
     {
         copyFrom(pcsz);
@@ -150 +148 @@
     ministring& operator=(const char *pcsz)
     {
-        cleanup();
-        copyFrom(pcsz);
+        if (m_psz != pcsz)
+        {
+            cleanup();
+            copyFrom(pcsz);
+        }
         return *this;
     }
@@ -157 +158 @@
     ministring& operator=(const ministring &s)
     {
-        cleanup();
-        copyFrom(s);
+        if (this != &s)
+        {
+            cleanup();
+            copyFrom(s);
+        }
         return *this;
     }
@@ -272 +276 @@
     void copyFrom(const ministring &s)
     {
-        if (&s != this)
-        {
-            m_cbLength = s.m_cbLength;
-            m_cbAllocated = m_cbLength + 1;
-            m_psz = (char*)RTMemAlloc(m_cbAllocated);
-            memcpy(m_psz, s.m_psz, m_cbAllocated);      // include 0 terminator
-        }
+        m_cbLength = s.m_cbLength;
+        m_cbAllocated = m_cbLength + 1;
+        m_psz = (char*)RTMemAlloc(m_cbAllocated);
+        memcpy(m_psz, s.m_psz, m_cbAllocated);      // include 0 terminator
     }
 
@@ -291 +292 @@
     void copyFrom(const char *pcsz)
     {
-        if (pcsz != m_psz)  // leaves NULL as NULL also
-        {
-            if (pcsz)
-            {
-                m_cbLength = strlen(pcsz);
-                m_cbAllocated = m_cbLength + 1;
-                m_psz = (char*)RTMemAlloc(m_cbAllocated);
-                memcpy(m_psz, pcsz, m_cbAllocated);      // include 0 terminator
-            }
-            else
-            {
-                m_cbLength = 0;
-                m_cbAllocated = 0;
-                m_psz = NULL;
-            }
+        if (pcsz)
+        {
+            m_cbLength = strlen(pcsz);
+            m_cbAllocated = m_cbLength + 1;
+            m_psz = (char*)RTMemAlloc(m_cbAllocated);
+            memcpy(m_psz, pcsz, m_cbAllocated);      // include 0 terminator
+        }
+        else
+        {
+            m_cbLength = 0;
+            m_cbAllocated = 0;
+            m_psz = NULL;
         }
     }