Loading...
--- xnu/xnu-792/libkern/c++/OSOrderedSet.cpp
+++ xnu/xnu-4570.51.1/libkern/c++/OSOrderedSet.cpp
@@ -1,23 +1,29 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
#include <libkern/c++/OSDictionary.h>
@@ -36,14 +42,6 @@
OSMetaClassDefineReservedUnused(OSOrderedSet, 6);
OSMetaClassDefineReservedUnused(OSOrderedSet, 7);
-#if OSALLOCDEBUG
-extern "C" {
- extern int debug_container_malloc_size;
-};
-#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
-#else
-#define ACCUMSIZE(s)
-#endif
struct _Element {
const OSMetaClassBase * obj;
@@ -57,13 +55,16 @@
initWithCapacity(unsigned int inCapacity,
OSOrderFunction inOrdering, void *inOrderingRef)
{
- int size;
+ unsigned int size;
if (!super::init())
return false;
+ if (inCapacity > (UINT_MAX / sizeof(_Element)))
+ return false;
+
size = sizeof(_Element) * inCapacity;
- array = (_Element *) kalloc(size);
+ array = (_Element *) kalloc_container(size);
if (!array)
return false;
@@ -74,9 +75,9 @@
orderingRef = inOrderingRef;
bzero(array, size);
- ACCUMSIZE(size);
-
- return this;
+ OSCONTAINER_ACCUMSIZE(size);
+
+ return true;
}
OSOrderedSet * OSOrderedSet::
@@ -99,8 +100,8 @@
flushCollection();
if (array) {
- kfree((vm_offset_t)array, sizeof(_Element) * capacity);
- ACCUMSIZE( -(sizeof(_Element) * capacity) );
+ kfree(array, sizeof(_Element) * capacity);
+ OSCONTAINER_ACCUMSIZE( -(sizeof(_Element) * capacity) );
}
super::free();
@@ -119,27 +120,35 @@
unsigned int OSOrderedSet::ensureCapacity(unsigned int newCapacity)
{
_Element *newArray;
- int oldSize, newSize;
+ unsigned int finalCapacity;
+ vm_size_t oldSize, newSize;
if (newCapacity <= capacity)
return capacity;
// round up
- newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
- newSize = sizeof(_Element) * newCapacity;
-
- newArray = (_Element *) kalloc(newSize);
+ if ((finalCapacity < newCapacity) ||
+ (finalCapacity > (UINT_MAX / sizeof(_Element)))) {
+ return capacity;
+ }
+ newSize = sizeof(_Element) * finalCapacity;
+
+ newArray = (_Element *) kallocp_container(&newSize);
if (newArray) {
+ // use all of the actual allocation size
+ finalCapacity = newSize / sizeof(_Element);
+
oldSize = sizeof(_Element) * capacity;
- ACCUMSIZE(newSize - oldSize);
+ OSCONTAINER_ACCUMSIZE(((size_t)newSize) - ((size_t)oldSize));
bcopy(array, newArray, oldSize);
bzero(&newArray[capacity], newSize - oldSize);
- kfree((vm_offset_t)array, oldSize);
+ kfree(array, oldSize);
array = newArray;
- capacity = newCapacity;
+ capacity = finalCapacity;
}
return capacity;
@@ -199,7 +208,7 @@
#define ORDER(obj1,obj2) \
- (ordering ? ((*ordering)( (OSObject *) obj1, (OSObject *) obj2, orderingRef)) : 0)
+ (ordering ? ((*ordering)( (const OSObject *) obj1, (const OSObject *) obj2, orderingRef)) : 0)
bool OSOrderedSet::setObject(const OSMetaClassBase *anObject )
{
@@ -220,9 +229,9 @@
for (i = 0; i < count; i++) {
- if( deleted)
+ if (deleted)
array[i-1] = array[i];
- else if( (array[i].obj == anObject)) {
+ else if (array[i].obj == anObject) {
deleted = true;
haveUpdated(); // Pity we can't flush the log
array[i].obj->taggedRelease(OSTypeID(OSCollection));
@@ -258,13 +267,13 @@
// if( pri)
// *pri = array[index].pri;
- return( (OSObject *) array[index].obj );
+ return( const_cast<OSObject *>((const OSObject *) array[index].obj) );
}
OSObject *OSOrderedSet::getFirstObject() const
{
if( count)
- return( (OSObject *) array[0].obj );
+ return( const_cast<OSObject *>((const OSObject *) array[0].obj) );
else
return( 0 );
}
@@ -272,7 +281,7 @@
OSObject *OSOrderedSet::getLastObject() const
{
if( count)
- return( (OSObject *) array[count-1].obj );
+ return( const_cast<OSObject *>((const OSObject *) array[count-1].obj) );
else
return( 0 );
}
@@ -336,7 +345,7 @@
unsigned int index = (*iteratorP)++;
if (index < count)
- *ret = (OSObject *) array[index].obj;
+ *ret = const_cast<OSObject *>((const OSObject *) array[index].obj);
else
*ret = 0;