diff options
| author | yhirano <yhirano@chromium.org> | 2016-01-06 01:33:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 09:35:12 +0000 |
| commit | 843010ff7eeda6e9e87347aaaa6365efecd1161d (patch) | |
| tree | 54efd5e6c2c3f816190e376435af1b7ef5cfcc5b /third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp | |
| parent | 09d753e000961eef751a720ff4195041c9a6eaf9 (diff) | |
| download | chromium_src-843010ff7eeda6e9e87347aaaa6365efecd1161d.zip chromium_src-843010ff7eeda6e9e87347aaaa6365efecd1161d.tar.gz chromium_src-843010ff7eeda6e9e87347aaaa6365efecd1161d.tar.bz2 | |
Fix null dereference on MemoryCache.
Usually a valid MemoryCacheEntry holds a non-null Resource as |m_resource|. But
when we hold a valid MemoryCacheEntry beyond destructive statements, it may be
evicted from the cache and get stale. That means |m_resource| can be null in
such cases. This CL checks it in order to avoid null dereference.
BUG=488373
Committed: https://crrev.com/5de01d904d77ba5e5beaf4776e45e6eecd47a87b
Cr-Commit-Position: refs/heads/master@{#367779}
Review URL: https://codereview.chromium.org/1537343002
Cr-Commit-Position: refs/heads/master@{#367802}
Diffstat (limited to 'third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp')
| -rw-r--r-- | third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp b/third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp index f1abd0c..53fc85d 100644 --- a/third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp +++ b/third_party/WebKit/Source/core/fetch/CSSStyleSheetResource.cpp @@ -44,6 +44,11 @@ ResourcePtr<CSSStyleSheetResource> CSSStyleSheetResource::fetch(FetchRequest& re return toCSSStyleSheetResource(fetcher->requestResource(request, CSSStyleSheetResourceFactory())); } +ResourcePtr<CSSStyleSheetResource> CSSStyleSheetResource::createForTest(const ResourceRequest& request, const String& charset) +{ + return new CSSStyleSheetResource(request, charset); +} + CSSStyleSheetResource::CSSStyleSheetResource(const ResourceRequest& resourceRequest, const String& charset) : StyleSheetResource(resourceRequest, CSSStyleSheet, "text/css", charset) { |