From 15d6fd1634fd8e1523c52ee5c541a611719694c4 Mon Sep 17 00:00:00 2001 From: "dino@apple.com" Date: Mon, 3 Dec 2018 17:48:59 +0000 Subject: [PATCH] Fix iOS Simulator Release test crashes. * platform/network/ios/WebCoreURLResponseIOS.mm: (WebCore::adjustMIMETypeIfNecessary): Check for null before using the new MIME type. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238801 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 8 ++++++++ Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 953a769..9a8fa60 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2018-12-03 Dean Jackson + + Fix iOS Simulator Release test crashes. + + * platform/network/ios/WebCoreURLResponseIOS.mm: + (WebCore::adjustMIMETypeIfNecessary): Check for null before using the + new MIME type. + 2018-12-03 Eric Carlson [MediaStream] 'devicechange' event when more capture device information are revealed. diff --git a/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm b/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm index 0509ed6..00b5ab2 100644 --- a/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm +++ b/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm @@ -71,7 +71,8 @@ void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse, bool isMainResourceL CFMutableStringRef mutableExtension = CFStringCreateMutableCopy(kCFAllocatorDefault, 0, extension.get()); CFStringLowercase(mutableExtension, NULL); extension = adoptCF(mutableExtension); - updatedMIMEType = (CFStringRef)CFDictionaryGetValue(extensionMap, extension.get()); + if (auto newMIMEType = (CFStringRef)CFDictionaryGetValue(extensionMap, extension.get())) + updatedMIMEType = newMIMEType; } } } -- 1.8.3.1