Loading...
--- xnu/xnu-344/iokit/Kernel/IOMultiMemoryDescriptor.cpp
+++ xnu/xnu-792/iokit/Kernel/IOMultiMemoryDescriptor.cpp
@@ -87,7 +87,7 @@
IOMemoryDescriptor ** descriptors,
UInt32 withCount,
IODirection withDirection,
- bool asReference = false )
+ bool asReference )
{
//
// Create a new IOMultiMemoryDescriptor. The "buffer" is made up of several
@@ -118,7 +118,7 @@
IOMemoryDescriptor ** descriptors,
UInt32 withCount,
IODirection withDirection,
- bool asReference = false )
+ bool asReference )
{
//
// Initialize an IOMultiMemoryDescriptor. The "buffer" is made up of several
@@ -131,10 +131,19 @@
assert(descriptors);
assert(withCount);
- // Ask our superclass' opinion.
-
- if ( super::init() == false ) return false;
-
+ // Release existing descriptors, if any
+ if ( _descriptors )
+ {
+ for ( unsigned index = 0; index < _descriptorsCount; index++ )
+ _descriptors[index]->release();
+
+ if ( _descriptorsIsAllocated )
+ IODelete(_descriptors, IOMemoryDescriptor *, _descriptorsCount);
+ } else {
+ // Ask our superclass' opinion.
+ if ( super::init() == false ) return false;
+ }
+
// Initialize our minimal state.
_descriptors = 0;