Loading...
--- xnu/xnu-792/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-2782.30.5/libkern/c++/OSDictionary.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@
*/
/* OSDictionary.m created by rsulack on Fri 12-Sep-1997 */
/* OSDictionary.cpp converted to C++ by gvdl on Fri 1998-10-30 */
@@ -60,7 +66,11 @@
if (!super::init())
return false;
- int size = inCapacity * sizeof(dictEntry);
+ if (inCapacity > (UINT_MAX / sizeof(dictEntry)))
+ return false;
+
+ unsigned int size = inCapacity * sizeof(dictEntry);
+//fOptions |= kSort;
dictionary = (dictEntry *) kalloc(size);
if (!dictionary)
@@ -81,7 +91,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int capacity = theCount;
+ unsigned int newCapacity = theCount;
if (!objects || !keys)
return false;
@@ -90,10 +100,10 @@
if (theCount > theCapacity)
return false;
- capacity = theCapacity;
- }
-
- if (!initWithCapacity(capacity))
+ newCapacity = theCapacity;
+ }
+
+ if (!initWithCapacity(newCapacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -111,7 +121,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int capacity = theCount;
+ unsigned int newCapacity = theCount;
if (!objects || !keys)
return false;
@@ -120,10 +130,10 @@
if (theCount > theCapacity)
return false;
- capacity = theCapacity;
- }
-
- if (!initWithCapacity(capacity))
+ newCapacity = theCapacity;
+ }
+
+ if (!initWithCapacity(newCapacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -147,22 +157,31 @@
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
unsigned int theCapacity)
{
- unsigned int capacity;
+ unsigned int newCapacity;
if ( !dict )
return false;
- capacity = dict->count;
+ newCapacity = dict->count;
if ( theCapacity ) {
if ( dict->count > theCapacity )
return false;
- capacity = theCapacity;
- }
-
- if (!initWithCapacity(capacity))
- return false;
+ newCapacity = theCapacity;
+ }
+
+ if (!initWithCapacity(newCapacity))
+ return false;
+
+ if ((kSort & fOptions) && !(kSort & dict->fOptions)) {
+ for (unsigned int i = 0; i < dict->count; i++) {
+ if (!setObject(dict->dictionary[i].key, dict->dictionary[i].value)) {
+ return false;
+ }
+ }
+ return true;
+ }
count = dict->count;
bcopy(dict->dictionary, dictionary, count * sizeof(dictEntry));
@@ -234,7 +253,7 @@
(void) super::setOptions(0, kImmutable);
flushCollection();
if (dictionary) {
- kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
+ kfree(dictionary, capacity * sizeof(dictEntry));
ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
}
@@ -259,15 +278,20 @@
unsigned int OSDictionary::ensureCapacity(unsigned int newCapacity)
{
dictEntry *newDict;
- int oldSize, newSize;
+ unsigned int finalCapacity, oldSize, newSize;
if (newCapacity <= capacity)
return capacity;
// round up
- newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
- newSize = sizeof(dictEntry) * newCapacity;
+
+ // integer overflow check
+ if (finalCapacity < newCapacity || (finalCapacity > (UINT_MAX / sizeof(dictEntry))))
+ return capacity;
+
+ newSize = sizeof(dictEntry) * finalCapacity;
newDict = (dictEntry *) kalloc(newSize);
if (newDict) {
@@ -277,10 +301,10 @@
bzero(&newDict[capacity], newSize - oldSize);
ACCUMSIZE(newSize - oldSize);
- kfree((vm_offset_t)dictionary, oldSize);
+ kfree(dictionary, oldSize);
dictionary = newDict;
- capacity = newCapacity;
+ capacity = finalCapacity;
}
return capacity;
@@ -300,34 +324,45 @@
bool OSDictionary::
setObject(const OSSymbol *aKey, const OSMetaClassBase *anObject)
{
+ unsigned int i;
+ bool exists;
+
if (!anObject || !aKey)
return false;
// if the key exists, replace the object
- for (unsigned int i = 0; i < count; i++) {
- if (aKey == dictionary[i].key) {
- const OSMetaClassBase *oldObject = dictionary[i].value;
-
- haveUpdated();
-
- anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].value = anObject;
-
- oldObject->taggedRelease(OSTypeID(OSCollection));
- return true;
- }
+
+ if (fOptions & kSort) {
+ i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
+ exists = (i < count) && (aKey == dictionary[i].key);
+ } else for (exists = false, i = 0; i < count; i++) {
+ if ((exists = (aKey == dictionary[i].key))) break;
+ }
+
+ if (exists) {
+ const OSMetaClassBase *oldObject = dictionary[i].value;
+
+ haveUpdated();
+
+ anObject->taggedRetain(OSTypeID(OSCollection));
+ dictionary[i].value = anObject;
+
+ oldObject->taggedRelease(OSTypeID(OSCollection));
+ return true;
}
// add new key, possibly extending our capacity
if (count >= capacity && count >= ensureCapacity(count+1))
- return 0;
+ return false;
haveUpdated();
+
+ bcopy(&dictionary[i], &dictionary[i+1], (count - i) * sizeof(dictionary[0]));
aKey->taggedRetain(OSTypeID(OSCollection));
anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[count].key = aKey;
- dictionary[count].value = anObject;
+ dictionary[i].key = aKey;
+ dictionary[i].value = anObject;
count++;
return true;
@@ -335,24 +370,33 @@
void OSDictionary::removeObject(const OSSymbol *aKey)
{
+ unsigned int i;
+ bool exists;
+
if (!aKey)
return;
// if the key exists, remove the object
- for (unsigned int i = 0; i < count; i++)
- if (aKey == dictionary[i].key) {
- dictEntry oldEntry = dictionary[i];
-
- haveUpdated();
-
- count--;
- for (; i < count; i++)
- dictionary[i] = dictionary[i+1];
-
- oldEntry.key->taggedRelease(OSTypeID(OSCollection));
- oldEntry.value->taggedRelease(OSTypeID(OSCollection));
- return;
- }
+
+ if (fOptions & kSort) {
+ i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
+ exists = (i < count) && (aKey == dictionary[i].key);
+ } else for (exists = false, i = 0; i < count; i++) {
+ if ((exists = (aKey == dictionary[i].key))) break;
+ }
+
+ if (exists) {
+ dictEntry oldEntry = dictionary[i];
+
+ haveUpdated();
+
+ count--;
+ bcopy(&dictionary[i+1], &dictionary[i], (count - i) * sizeof(dictionary[0]));
+
+ oldEntry.key->taggedRelease(OSTypeID(OSCollection));
+ oldEntry.value->taggedRelease(OSTypeID(OSCollection));
+ return;
+ }
}
@@ -365,7 +409,7 @@
if ( !OSDynamicCast(OSDictionary, srcDict) )
return false;
- iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
+ iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
if ( !iter )
return false;
@@ -385,13 +429,24 @@
OSObject *OSDictionary::getObject(const OSSymbol *aKey) const
{
+ unsigned int i;
+ bool exists;
+
if (!aKey)
return 0;
- // if the key exists, remove the object
- for (unsigned int i = 0; i < count; i++)
- if (aKey == dictionary[i].key)
- return (OSObject *) dictionary[i].value;
+ // if the key exists, return the object
+
+ if (fOptions & kSort) {
+ i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
+ exists = (i < count) && (aKey == dictionary[i].key);
+ } else for (exists = false, i = 0; i < count; i++) {
+ if ((exists = (aKey == dictionary[i].key))) break;
+ }
+
+ if (exists) {
+ return (const_cast<OSObject *> ((const OSObject *)dictionary[i].value));
+ }
return 0;
}