Fix the potential leak of chunk iterator used for ICC Profile colorSpace check

This commit is contained in:
DreamPiggy 2019-01-22 15:17:02 +08:00
parent 18c620ab63
commit 3e0e45d313
1 changed files with 9 additions and 5 deletions

View File

@ -422,13 +422,17 @@
// WebP contains ICC Profile should use the desired colorspace, instead of default device colorspace // WebP contains ICC Profile should use the desired colorspace, instead of default device colorspace
// See: https://developers.google.com/speed/webp/docs/riff_container#color_profile // See: https://developers.google.com/speed/webp/docs/riff_container#color_profile
WebPChunkIterator chunk_iter;
CGColorSpaceRef colorSpaceRef = NULL; CGColorSpaceRef colorSpaceRef = NULL;
uint32_t flags = WebPDemuxGetI(demuxer, WEBP_FF_FORMAT_FLAGS);
int result = WebPDemuxGetChunk(demuxer, "ICCP", 1, &chunk_iter); if (flags & ICCP_FLAG) {
if (result) { WebPChunkIterator chunk_iter;
NSData *profileData = [NSData dataWithBytes:chunk_iter.chunk.bytes length:chunk_iter.chunk.size]; int result = WebPDemuxGetChunk(demuxer, "ICCP", 1, &chunk_iter);
colorSpaceRef = CGColorSpaceCreateWithICCProfile((__bridge CFDataRef)profileData); if (result) {
NSData *profileData = [NSData dataWithBytesNoCopy:(void *)chunk_iter.chunk.bytes length:chunk_iter.chunk.size freeWhenDone:NO];
colorSpaceRef = CGColorSpaceCreateWithICCProfile((__bridge CFDataRef)profileData);
WebPDemuxReleaseChunkIterator(&chunk_iter);
}
} }
if (!colorSpaceRef) { if (!colorSpaceRef) {