WebKit Bugzilla
Attachment 361929 Details for
Bug 194604
: Do not add a caches to its engine if the salt cannot be initialized
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194604-20190213114349.patch (text/plain), 2.20 KB, created by
youenn fablet
on 2019-02-13 11:43:49 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
youenn fablet
Created:
2019-02-13 11:43:49 PST
Size:
2.20 KB
patch
obsolete
>Subversion Revision: 241123 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 2dd5e61442800b61c9f977b322de147d7603392d..604e91851bfc7bfe78caa54e5a6234da5db8232f 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,16 @@ >+2019-02-13 Youenn Fablet <youenn@apple.com> >+ >+ Do not add a caches to its engine if the salt cannot be initialized >+ https://bugs.webkit.org/show_bug.cgi?id=194604 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ This is a follow-up to https://bugs.webkit.org/show_bug.cgi?id=194588. >+ We should return early if initialize fails. >+ >+ * NetworkProcess/cache/CacheStorageEngine.cpp: >+ (WebKit::CacheStorage::Engine::readCachesFromDisk): >+ > 2019-02-13 Antti Koivisto <antti@apple.com> > > Crash in WebKit::CacheStorage::Engine::cachesRootPath >diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp >index c5d137286486ae512bfaf883a7e0d19735df6dc8..1d2754e27d0cfb79dd2b7d3d49fb7d82a0d78687 100644 >--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp >+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp >@@ -310,6 +310,11 @@ void Engine::initialize(CompletionCallback&& callback) > void Engine::readCachesFromDisk(const WebCore::ClientOrigin& origin, CachesCallback&& callback) > { > initialize([this, origin, callback = WTFMove(callback)](Optional<Error>&& error) mutable { >+ if (error) { >+ callback(makeUnexpected(error.value())); >+ return; >+ } >+ > auto& caches = m_caches.ensure(origin, [&origin, this] { > auto path = cachesRootPath(origin); > return Caches::create(*this, WebCore::ClientOrigin { origin }, WTFMove(path), m_quota); >@@ -320,11 +325,6 @@ void Engine::readCachesFromDisk(const WebCore::ClientOrigin& origin, CachesCallb > return; > } > >- if (error) { >- callback(makeUnexpected(error.value())); >- return; >- } >- > caches->initialize([callback = WTFMove(callback), caches = caches.copyRef()](Optional<Error>&& error) mutable { > if (error) { > callback(makeUnexpected(error.value()));
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194604
: 361929