Changeset 167 for trunk/orca

Timestamp:

06/04/06 04:58:45 (2 years ago)

Author:

krobillard

Message:

Fixed a couple cases where reading beyond end of buffer.
Optimized ur_arrayErase() when elemSize == 16 and WORDSIZE == 64.

Files:

• trunk/orca/array.c (modified) (3 diffs)

trunk/orca/array.c

@@ -127 +127 @@
     else if( elemSize == 16 )
     {
+#if __WORDSIZE == 64
+        uint64_t* buf;
+        uint64_t* src;
+        uint64_t* end;
+
+        buf = ((uint64_t*) arr->buf) + (index * 2);
+        src = buf + (count * 2);
+        end = ((uint64_t*) arr->buf) + (arr->used * 2);
+
+        while( src != end )
+        {
+            *buf++ = *src++;
+            *buf++ = *src++;
+        }
+#else
         uint32_t* buf;
         uint32_t* src;
@@ -142 +157 @@
             *buf++ = *src++;
         }
+#endif
     }
     else
@@ -147 +163 @@
         char* buf; 
         buf = arr->charArray + (elemSize * index);
-        memMove( buf, buf + elemSize, elemSize * (arr->used - index) );
+        memMove( buf, buf + (elemSize * count),
+                 elemSize * (arr->used - index - count) );
     }