Title: [160663] trunk/Source/WebCore
- Revision
- 160663
- Author
- jp...@apple.com
- Date
- 2013-12-16 14:41:56 -0800 (Mon, 16 Dec 2013)
Log Message
[Mac] Cache partitioning asserts when associated NSURLRequest is nil
https://bugs.webkit.org/show_bug.cgi?id=125716
Reviewed by Darin Adler.
* platform/network/mac/ResourceRequestMac.mm:
(WebCore::ResourceRequest::doUpdateResourceRequest):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160662 => 160663)
--- trunk/Source/WebCore/ChangeLog 2013-12-16 22:17:24 UTC (rev 160662)
+++ trunk/Source/WebCore/ChangeLog 2013-12-16 22:41:56 UTC (rev 160663)
@@ -1,3 +1,13 @@
+2013-12-13 Jeffrey Pfau <jp...@apple.com>
+
+ [Mac] Cache partitioning asserts when associated NSURLRequest is nil
+ https://bugs.webkit.org/show_bug.cgi?id=125716
+
+ Reviewed by Darin Adler.
+
+ * platform/network/mac/ResourceRequestMac.mm:
+ (WebCore::ResourceRequest::doUpdateResourceRequest):
+
2013-12-16 Brady Eidson <beid...@apple.com>
DatabaseProcess: Fix a few bugs with opening an IDB connection
Modified: trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm (160662 => 160663)
--- trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2013-12-16 22:17:24 UTC (rev 160662)
+++ trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2013-12-16 22:41:56 UTC (rev 160663)
@@ -108,9 +108,11 @@
}
#if ENABLE(CACHE_PARTITIONING)
- NSString* cachePartition = [NSURLProtocol propertyForKey:(NSString *)wkCachePartitionKey() inRequest:m_nsRequest.get()];
- if (cachePartition)
- m_cachePartition = cachePartition;
+ if (m_nsRequest) {
+ NSString* cachePartition = [NSURLProtocol propertyForKey:(NSString *)wkCachePartitionKey() inRequest:m_nsRequest.get()];
+ if (cachePartition)
+ m_cachePartition = cachePartition;
+ }
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
