Loading...
--- xnu/xnu-344.2/libkern/c++/OSData.cpp
+++ xnu/xnu-3248.50.21/libkern/c++/OSData.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@
*/
/* IOData.m created by rsulack on Thu 25-Sep-1997 */
@@ -32,7 +38,7 @@
#define super OSObject
OSDefineMetaClassAndStructors(OSData, OSObject)
-OSMetaClassDefineReservedUnused(OSData, 0);
+OSMetaClassDefineReservedUsed(OSData, 0); // setDeallocFunction
OSMetaClassDefineReservedUnused(OSData, 1);
OSMetaClassDefineReservedUnused(OSData, 2);
OSMetaClassDefineReservedUnused(OSData, 3);
@@ -43,33 +49,36 @@
#define EXTERNAL ((unsigned int) -1)
-#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
-
bool OSData::initWithCapacity(unsigned int inCapacity)
{
+ if (data)
+ {
+ OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
+ if (!inCapacity || (capacity < inCapacity))
+ {
+ // clean out old data's storage if it isn't big enough
+ kfree(data, capacity);
+ data = 0;
+ capacity = 0;
+ }
+ }
+
if (!super::init())
return false;
- if(inCapacity) {
- data = (void *) kalloc(inCapacity);
+ if (inCapacity && !data) {
+ data = (void *) kalloc_container(inCapacity);
if (!data)
return false;
- }
+ capacity = inCapacity;
+ }
+ OSCONTAINER_ACCUMSIZE(capacity);
length = 0;
- capacity = inCapacity;
- capacityIncrement = capacity;
- if(!capacityIncrement)
+ if (inCapacity < 16)
capacityIncrement = 16;
-
- ACCUMSIZE(capacity);
+ else
+ capacityIncrement = inCapacity;
return true;
}
@@ -79,7 +88,8 @@
if ((inLength && !bytes) || !initWithCapacity(inLength))
return false;
- bcopy(bytes, data, inLength);
+ if (bytes != data)
+ bcopy(bytes, data, inLength);
length = inLength;
return true;
@@ -118,7 +128,7 @@
OSData *me = new OSData;
if (me && !me->initWithCapacity(inCapacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -130,7 +140,7 @@
OSData *me = new OSData;
if (me && !me->initWithBytes(bytes, inLength)) {
- me->free();
+ me->release();
return 0;
}
return me;
@@ -141,7 +151,7 @@
OSData *me = new OSData;
if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
- me->free();
+ me->release();
return 0;
}
@@ -153,7 +163,7 @@
OSData *me = new OSData;
if (me && !me->initWithData(inData)) {
- me->free();
+ me->release();
return 0;
}
@@ -166,7 +176,7 @@
OSData *me = new OSData;
if (me && !me->initWithData(inData, start, inLength)) {
- me->free();
+ me->release();
return 0;
}
@@ -176,9 +186,15 @@
void OSData::free()
{
if (capacity != EXTERNAL && data && capacity) {
- kfree((vm_offset_t)data, capacity);
- ACCUMSIZE( -capacity );
- }
+ kfree(data, capacity);
+ OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
+ } else if (capacity == EXTERNAL) {
+ DeallocFunction freemem = reserved ? reserved->deallocFunction : NULL;
+ if (freemem && data && length) {
+ freemem(data, length);
+ }
+ }
+ if (reserved) kfree(reserved, sizeof(ExpansionData));
super::free();
}
@@ -195,27 +211,34 @@
return capacityIncrement = increment;
}
+// xx-review: does not check for capacity == EXTERNAL
+
unsigned int OSData::ensureCapacity(unsigned int newCapacity)
{
unsigned char * newData;
+ unsigned int finalCapacity;
if (newCapacity <= capacity)
return capacity;
- newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
- newData = (unsigned char *) kalloc(newCapacity);
-
+ // integer overflow check
+ if (finalCapacity < newCapacity)
+ return capacity;
+
+ newData = (unsigned char *) kalloc_container(finalCapacity);
+
if ( newData ) {
- bzero(newData + capacity, newCapacity - capacity);
+ bzero(newData + capacity, finalCapacity - capacity);
if (data) {
bcopy(data, newData, capacity);
- kfree((vm_offset_t)data, capacity);
+ kfree(data, capacity);
}
- ACCUMSIZE( newCapacity - capacity );
+ OSCONTAINER_ACCUMSIZE( ((size_t)finalCapacity) - ((size_t)capacity) );
data = (void *) newData;
- capacity = newCapacity;
+ capacity = finalCapacity;
}
return capacity;
@@ -225,7 +248,7 @@
{
unsigned int newSize;
- if (inLength == 0)
+ if (!inLength)
return true;
if (capacity == EXTERNAL)
@@ -235,7 +258,11 @@
if ( (newSize > capacity) && newSize > ensureCapacity(newSize) )
return false;
- bcopy(bytes, &((unsigned char *)data)[length], inLength);
+ if (bytes)
+ bcopy(bytes, &((unsigned char *)data)[length], inLength);
+ else
+ bzero(&((unsigned char *)data)[length], inLength);
+
length = newSize;
return true;
@@ -245,7 +272,7 @@
{
unsigned int newSize;
- if (inLength == 0)
+ if (!inLength)
return true;
if (capacity == EXTERNAL)
@@ -268,7 +295,7 @@
const void *OSData::getBytesNoCopy() const
{
- if (length == 0)
+ if (!length)
return 0;
else
return data;
@@ -305,11 +332,11 @@
bool OSData::isEqualTo(const OSMetaClassBase *obj) const
{
- OSData * data;
+ OSData * otherData;
OSString * str;
- if ((data = OSDynamicCast(OSData, obj)))
- return isEqualTo(data);
+ if ((otherData = OSDynamicCast(OSData, obj)))
+ return isEqualTo(otherData);
else if ((str = OSDynamicCast (OSString, obj)))
return isEqualTo(str);
else
@@ -323,7 +350,7 @@
unsigned int checkLen = length;
unsigned int stringLen;
- if (NULL == obj)
+ if (!obj)
return false;
stringLen = obj->getLength ();
@@ -365,12 +392,16 @@
unsigned int i;
const unsigned char *p;
unsigned char c;
+ unsigned int serializeLength;
if (s->previouslySerialized(this)) return true;
if (!s->addXMLStartTag(this, "data")) return false;
- for (i = 0, p = (unsigned char *)data; i < length; i++, p++) {
+ serializeLength = length;
+ if (reserved && reserved->disableSerialization) serializeLength = 0;
+
+ for (i = 0, p = (unsigned char *)data; i < serializeLength; i++, p++) {
/* 3 bytes are encoded as 4 */
switch (i % 3) {
case 0:
@@ -407,3 +438,25 @@
return s->addXMLEndTag("data");
}
+
+void OSData::setDeallocFunction(DeallocFunction func)
+{
+ if (!reserved)
+ {
+ reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
+ if (!reserved) return;
+ bzero(reserved, sizeof(ExpansionData));
+ }
+ reserved->deallocFunction = func;
+}
+
+void OSData::setSerializable(bool serializable)
+{
+ if (!reserved)
+ {
+ reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
+ if (!reserved) return;
+ bzero(reserved, sizeof(ExpansionData));
+ }
+ reserved->disableSerialization = (!serializable);
+}