Changeset 5841 for trunk/src/kernel32/ccollection.cpp

Timestamp:

May 30, 2001, 8:33:00 PM (24 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/kernel32/ccollection.cpp (modified) (9 diffs)

trunk/src/kernel32/ccollection.cpp

@@ -1 @@
-/* $Id: ccollection.cpp,v 1.4 2001-05-30 13:02:55 phaller Exp $ */
+/* $Id: ccollection.cpp,v 1.5 2001-05-30 18:29:59 phaller Exp $ */
 
 /*
@@ -87 +87 @@
     // shrink the index array to the absolutely necessary size only
 
+    if (iInitialized == 0)
+    {
+        // if no elements were allocated, simple remove all data memory
+        if (pEntries)
+        {
+            free(pEntries);
+            pEntries = NULL;
+        }
+
+        return 1;
+    }
+
     // verify if shrink can do anything good
     if ( (iOffset < iUsedOffset) ||
@@ -106 +118 @@
             int iRelative = iUsedOffset - iOffset;
 
-            memcpy(pNewData,
-                   pEntries + (iRelative * sizeof(INDEXLOOKUPENTRY)),
-                   iRequiredSize * sizeof(INDEXLOOKUPENTRY));
+            // Note: due to C++ pointer arithmetic,
+            // (pEntries + iRelative) should automatically
+            // increase pEntries by iRelative-times the
+            // sizeof(INDEXLOOKUPENTRY) byte positions!
+            memmove(pNewData,
+                    pEntries + iRelative,
+                    iRequiredSize * sizeof(INDEXLOOKUPENTRY));
     
             // deferred delete ensures we've always got a valid array
@@ -153 +169 @@
     {
         // copy the data, array cannot overlap
-        memmove(pNewData,
+        memmove(pNewData + (iShift * sizeof(INDEXLOOKUPENTRY)),
                 pEntries,
-                iSize);
+                iSize * sizeof(INDEXLOOKUPENTRY));
 
         // zero out at the beginning or at the end
@@ -214 +230 @@
             PINDEXLOOKUPENTRY pTemp = pEntries;
             pEntries = pNewData;
-            free(pTemp);
+            if (pTemp)
+                free(pTemp);
 
             iSize = iRequiredSize;
@@ -236 +253 @@
                 PINDEXLOOKUPENTRY pTemp = pEntries;
                 pEntries = pNewData;
-                free(pTemp);
-
+                if (pTemp)
+                    free(pTemp);
+                
                 iSize = iRequiredSize;
                 iHigh = iIndex;
@@ -261 +279 @@
         if (iIndex > iUsedHigh)
             iUsedHigh = iIndex;
+
+        // used limits are not initialized
+        iInitialized = 1;
 
         // insert entry and quit
@@ -302 +323 @@
     iUsedOffset = INT_MAX;
     iUsedHigh = INT_MIN;
+    iInitialized = 0;
 }
 
@@ -318 +340 @@
     }
 }
-