Fix leak of image data in CGImageGetDataProvider (#1710)

CGImageGetDataProvider was copying the CFData rather than accessing it directly, and would leak the data for consumers expecting a +0 reference. Fixes #1709
microsoft · Jan 18, 2017 · deb99af · deb99af
1 parent fb59f7c
commit deb99af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Frameworks/CoreGraphics/CGImage.mm b/Frameworks/CoreGraphics/CGImage.mm
@@ -490,9 +490,8 @@ - (NSUInteger)length {
 CGDataProviderRef CGImageGetDataProvider(CGImageRef img) {
     const UInt8* pPtr = (const UInt8*)img->Backing()->LockImageData();
     CFIndex length = img->Backing()->Height() * img->Backing()->BytesPerRow();
-    woc::unique_cf<CFDataRef> data{ CFDataCreateWithBytesNoCopy(nullptr, pPtr, length, kCFAllocatorNull) };
-    CGDataProviderRef dataProvider = CGDataProviderCreateWithCFData(data.get());
-    return dataProvider;
+    CGDataProviderRef dataProvider = CGDataProviderCreateWithData(nullptr, pPtr, length, nullptr);
+    return (CGDataProviderRef)CFAutorelease(dataProvider);
 }
 
 void* _CGImageGetData(CGImageRef img) {

diff --git a/Frameworks/ImageIO/CGImageDestination.mm b/Frameworks/ImageIO/CGImageDestination.mm
@@ -1031,7 +1031,6 @@ void CGImageDestinationAddImage(CGImageDestinationRef idst, CGImageRef image, CF
                                                   (unsigned char*)[imageByteData bytes],
                                                   &inputImage);
     [imageByteData release];
-    CGDataProviderRelease(provider);
     if (!SUCCEEDED(status)) {
         NSTraceInfo(TAG, @"CreateBitmapFromMemory failed with status=%x\n", status);
         return;