147418 2015-07-29 13:53:23 -0700 Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange 2015-07-29 14:36:12 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson aestes cdumez commit-queue ddkilzer japhet oldest_to_newest 1113158 0 beidson 2015-07-29 13:53:23 -0700 Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange There's a few different ways into this crash, but the tops of the stacks look like: Thread 0 Crashed: 0 WebCore 0x000000019588607c WebCore::DocumentLoader::stopLoadingForPolicyChange() + 40 (DocumentLoader.cpp:769) 1 WebCore 0x00000001958877b4 std::__1::__function::__func<WebCore::DocumentLoader::willSendRequest(WebCore::ResourceRequest&, WebCore::ResourceResponse const&)::$_0, std::__1::allocator<WebCore::DocumentLoader::willSendRequest(WebCore::ResourceRequest&, WebCore::ResourceResponse const&)::$_0>, void (WebCore::ResourceRequest const&, WTF::PassRefPtr<WebCore::FormState>, bool)>::operator()(WebCore::ResourceRequest const&, WTF::PassRefPtr<WebCore::FormState>&&, bool&&) + 40 (DocumentLoader.cpp:564) 2 WebCore 0x00000001958877b4 std::__1::__function::__func<WebCore::DocumentLoader::willSendRequest(WebCore::ResourceRequest&, WebCore::ResourceResponse const&)::$_0, std::__1::allocator<WebCore::DocumentLoader::willSendRequest(WebCore::ResourceRequest&, WebCore::ResourceResponse const&)::$_0>, void (WebCore::ResourceRequest const&, WTF::PassRefPtr<WebCore::FormState>, bool)>::operator()(WebCore::ResourceRequest const&, WTF::PassRefPtr<WebCore::FormState>&&, bool&&) + 40 (DocumentLoader.cpp:564) 3 WebCore 0x000000019558e5a4 WebCore::PolicyCallback::cancel() + 164 (functional:1793) 4 WebCore 0x000000019558e06c WebCore::PolicyChecker::stopCheck() + 84 (PolicyChecker.cpp:161) 5 WebCore 0x00000001959a26e8 WebCore::FrameLoader::loadWithDocumentLoader(WebCore::DocumentLoader*, ... In stopLoadingForPolicyChange, frameLoader() is null. This can only happen when m_frame is null. That can only happen if the DocumentLoader has been detached from its Frame. No known reproducibility. We need to make absolutely sure that once the Frame is detached there are no outstanding policy callbacks. In Radar - <rdar://problem/21412186> 1113160 1 257765 beidson 2015-07-29 13:57:25 -0700 Created attachment 257765 Patch v1 - Speculative fix. 1113163 2 257765 cdumez 2015-07-29 14:11:40 -0700 Comment on attachment 257765 Patch v1 - Speculative fix. View in context: https://bugs.webkit.org/attachment.cgi?id=257765&action=review Good safety net, and seems safe besides my comment > Source/WebCore/loader/DocumentLoader.cpp:954 > + cancelPolicyCheckIfNeeded(); Based on the comment and the null check below, I am slightly worried we introduce crashes due to dereferencing frameLoader() without check in this method. How about we null check frameLoader() in cancelPolicyCheckIfNeeded() and reset m_waitingForContentPolicy to false no matter what? 1113164 3 257765 cdumez 2015-07-29 14:12:50 -0700 Comment on attachment 257765 Patch v1 - Speculative fix. View in context: https://bugs.webkit.org/attachment.cgi?id=257765&action=review > Source/WebCore/loader/DocumentLoader.cpp:956 > // Even though we ASSERT at the top of this method that we have an m_frame, we're seeing crashes where m_frame is null. I was referring to this comment and the m_frame null check right after. 1113165 4 beidson 2015-07-29 14:19:58 -0700 (In reply to comment #2) > Comment on attachment 257765 [details] > Patch v1 - Speculative fix. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257765&action=review > > Good safety net, and seems safe besides my comment > > > Source/WebCore/loader/DocumentLoader.cpp:954 > > + cancelPolicyCheckIfNeeded(); > > Based on the comment and the null check below, I am slightly worried we > introduce crashes due to dereferencing frameLoader() without check in this > method. How about we null check frameLoader() in cancelPolicyCheckIfNeeded() > and reset m_waitingForContentPolicy to false no matter what? I think that's reasonable. I actually also hope to make the ASSERT(frameLoader()) be a RELEASE_ASSERT in a separate patch so that's the status quo for trunk. We need to figure this out. :) (In reply to comment #3) > Comment on attachment 257765 [details] > Patch v1 - Speculative fix. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257765&action=review > > > Source/WebCore/loader/DocumentLoader.cpp:956 > > // Even though we ASSERT at the top of this method that we have an m_frame, we're seeing crashes where m_frame is null. > > I was referring to this comment and the m_frame null check right after. Hell, you should've been referring to the remaining comment that has an if (m_frame) check. We'd already known this was happening. 1113166 5 257766 beidson 2015-07-29 14:21:39 -0700 Created attachment 257766 Patch v2 1113169 6 257766 cdumez 2015-07-29 14:24:30 -0700 Comment on attachment 257766 Patch v2 r=me 1113173 7 beidson 2015-07-29 14:28:36 -0700 https://trac.webkit.org/changeset/187557 1113176 8 257770 beidson 2015-07-29 14:30:44 -0700 Created attachment 257770 RELEASE_ASSERT followup 1113180 9 257770 cdumez 2015-07-29 14:33:20 -0700 Comment on attachment 257770 RELEASE_ASSERT followup View in context: https://bugs.webkit.org/attachment.cgi?id=257770&action=review r=me > Source/WebCore/loader/DocumentLoader.cpp:1479 > m_waitingForContentPolicy = false; nit: Now, I'd move this back inside the if scope. 1113181 10 beidson 2015-07-29 14:34:47 -0700 https://trac.webkit.org/changeset/187558 1113182 11 beidson 2015-07-29 14:36:12 -0700 (In reply to comment #9) > Comment on attachment 257770 [details] > RELEASE_ASSERT followup > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257770&action=review > > r=me > > > Source/WebCore/loader/DocumentLoader.cpp:1479 > > m_waitingForContentPolicy = false; > > nit: Now, I'd move this back inside the if scope. Whoops. https://trac.webkit.org/changeset/187559 257765 2015-07-29 13:57:25 -0700 2015-07-29 14:21:39 -0700 Patch v1 - Speculative fix. patch text/plain 3935 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNGUwN2EwLi40Y2ZhNWFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTUtMDctMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIENyYXNoIGluIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpzdG9wTG9hZGluZ0ZvclBvbGlj eUNoYW5nZS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxNDEyMTg2PiBhbmQgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzQxOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8ga25vd24gcmVw cm9kdWNpYmlsaXR5KQorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpyZXNwb25zZVJlY2VpdmVkKTogV2hlbiBz ZXR0aW5nIHRvIG1fd2FpdGluZ0ZvckNvbnRlbnRQb2xpY3kgdHJ1ZSwgbWFrZSBzdXJlIHdlIGhh dmUgYSBGcmFtZUxvYWRlci4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpkZXRh Y2hGcm9tRnJhbWUpOiBBbHdheXMgZXhwbGljaXRseSBjYWxsIGNhbmNlbFBvbGljeUNoZWNrSWZO ZWVkZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpjYW5jZWxQb2xpY3lD aGVja0lmTmVlZGVkKTogQ2FuY2VsIHRoZSBwb2xpY3kgY2hlY2sgaWYgdGhlcmUgaXMgb25lLgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmNhbmNlbE1haW5SZXNvdXJjZUxvYWQp OiBVc2UgY2FuY2VsUG9saWN5Q2hlY2tJZk5lZWRlZCgpLgorICAgICAgICAqIGxvYWRlci9Eb2N1 bWVudExvYWRlci5oOgorCiAyMDE1LTA3LTI4ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KIAogICAgICAgICBIYW5kbGUgbnVsbCBDRkFycmF5UmVmIHJldHVybmluZyBmcm9tIF9D RkhUVFBQYXJzZWRDb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggYzAyNmRlOS4uZmJjOWMxMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC02NTIsNiArNjUyLDcgQEAg dm9pZCBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2VSZWNlaXZlZChDYWNoZWRSZXNvdXJjZSogcmVz b3VyY2UsIGNvbnN0IFJlc291cmNlUmUKICAgICB9CiAKICAgICBBU1NFUlQoIW1fd2FpdGluZ0Zv ckNvbnRlbnRQb2xpY3kpOworICAgIEFTU0VSVChmcmFtZUxvYWRlcigpKTsKICAgICBtX3dhaXRp bmdGb3JDb250ZW50UG9saWN5ID0gdHJ1ZTsKIAogICAgIC8vIEFsd2F5cyBzaG93IGNvbnRlbnQg d2l0aCB2YWxpZCBzdWJzdGl0dXRlIGRhdGEuCkBAIC05NTAsNiArOTUxLDggQEAgdm9pZCBEb2N1 bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lKCkKIAogICAgIG1fYXBwbGljYXRpb25DYWNoZUhv c3QtPnNldERPTUFwcGxpY2F0aW9uQ2FjaGUobnVsbHB0cik7CiAKKyAgICBjYW5jZWxQb2xpY3lD aGVja0lmTmVlZGVkKCk7CisKICAgICAvLyBFdmVuIHRob3VnaCB3ZSBBU1NFUlQgYXQgdGhlIHRv cCBvZiB0aGlzIG1ldGhvZCB0aGF0IHdlIGhhdmUgYW4gbV9mcmFtZSwgd2UncmUgc2VlaW5nIGNy YXNoZXMgd2hlcmUgbV9mcmFtZSBpcyBudWxsLgogICAgIC8vIFRoaXMgbWVhbnMgZWl0aGVyIHRo YXQgYSBEb2N1bWVudExvYWRlciBpcyBkZXRhY2hpbmcgdHdpY2UsIG9yIGlzIGRldGFjaGluZyBi ZWZvcmUgZXZlciBoYXZpbmcgYXR0YWNoZWQuCiAgICAgLy8gVW50aWwgd2UgZmlndXJlIG91dCBo b3cgdGhhdCBpcyBoYXBwZW5pbmcsIG51bGwgY2hlY2sgbV9mcmFtZSBiZWZvcmUgZGVyZWZlcmVu Y2luZyBpdCBoZXJlLgpAQCAtOTU4LDggKzk2MSw2IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmRl dGFjaEZyb21GcmFtZSgpCiAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6bG9hZGVy RGV0YWNoZWRGcm9tRnJhbWUoKm1fZnJhbWUsICp0aGlzKTsKIAogICAgIG1fZnJhbWUgPSBudWxs cHRyOwotICAgIC8vIFRoZSBjYWxsIHRvIHN0b3BMb2FkaW5nKCkgYWJvdmUgc2hvdWxkIGhhdmUg Y2FuY2VsZWQgYW55IHBlbmRpbmcgY29udGVudCBwb2xpY3kgY2hlY2suCi0gICAgQVNTRVJUX1dJ VEhfTUVTU0FHRSghbV93YWl0aW5nRm9yQ29udGVudFBvbGljeSwgIlRoZSBjb250ZW50IHBvbGlj eSBjYWxsYmFjayBuZWVkcyBhIHZhbGlkIGZyYW1lLiIpOwogfQogCiB2b2lkIERvY3VtZW50TG9h ZGVyOjpjbGVhck1haW5SZXNvdXJjZUxvYWRlcigpCkBAIC0xNDY4LDE3ICsxNDY5LDIzIEBAIHZv aWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpCiAgICAgc2V0UmVx dWVzdChyZXF1ZXN0KTsKIH0KIAordm9pZCBEb2N1bWVudExvYWRlcjo6Y2FuY2VsUG9saWN5Q2hl Y2tJZk5lZWRlZCgpCit7CisgICAgaWYgKG1fd2FpdGluZ0ZvckNvbnRlbnRQb2xpY3kpIHsKKyAg ICAgICAgQVNTRVJUKGZyYW1lTG9hZGVyKCkpOworICAgICAgICBmcmFtZUxvYWRlcigpLT5wb2xp Y3lDaGVja2VyKCkuY2FuY2VsQ2hlY2soKTsKKyAgICAgICAgbV93YWl0aW5nRm9yQ29udGVudFBv bGljeSA9IGZhbHNlOworICAgIH0KK30KKwogdm9pZCBEb2N1bWVudExvYWRlcjo6Y2FuY2VsTWFp blJlc291cmNlTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJiByZXNvdXJjZUVycm9yKQogewogICAg IFJlZjxEb2N1bWVudExvYWRlcj4gcHJvdGVjdCgqdGhpcyk7CiAgICAgUmVzb3VyY2VFcnJvciBl cnJvciA9IHJlc291cmNlRXJyb3IuaXNOdWxsKCkgPyBmcmFtZUxvYWRlcigpLT5jYW5jZWxsZWRF cnJvcihtX3JlcXVlc3QpIDogcmVzb3VyY2VFcnJvcjsKIAogICAgIG1fZGF0YUxvYWRUaW1lci5z dG9wKCk7Ci0gICAgaWYgKG1fd2FpdGluZ0ZvckNvbnRlbnRQb2xpY3kpIHsKLSAgICAgICAgZnJh bWVMb2FkZXIoKS0+cG9saWN5Q2hlY2tlcigpLmNhbmNlbENoZWNrKCk7Ci0gICAgICAgIEFTU0VS VChtX3dhaXRpbmdGb3JDb250ZW50UG9saWN5KTsKLSAgICAgICAgbV93YWl0aW5nRm9yQ29udGVu dFBvbGljeSA9IGZhbHNlOwotICAgIH0KKworICAgIGNhbmNlbFBvbGljeUNoZWNrSWZOZWVkZWQo KTsKIAogICAgIGlmIChtYWluUmVzb3VyY2VMb2FkZXIoKSkKICAgICAgICAgbWFpblJlc291cmNl TG9hZGVyKCktPmNhbmNlbChlcnJvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5oCmluZGV4IDU3ZTU0ZjguLjE2YTc4OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudExvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5oCkBAIC0zMzYsNiArMzM2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgIHZvaWQgY2xlYXJNYWluUmVzb3VyY2UoKTsKIAorICAgICAgICB2b2lkIGNhbmNlbFBvbGlj eUNoZWNrSWZOZWVkZWQoKTsKKwogI2lmIEVOQUJMRShDT05URU5UX0ZJTFRFUklORykKICAgICAg ICAgdm9pZCBiZWNvbWVNYWluUmVzb3VyY2VDbGllbnRJZkZpbHRlckFsbG93cygpOwogICAgICAg ICB2b2lkIGluc3RhbGxDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIoQ29udGVudEZpbHRlciYp Owo= 257766 2015-07-29 14:21:39 -0700 2015-07-29 14:24:30 -0700 Patch v2 patch text/plain 3990 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyN2M5Njc3Li5mOGI0MTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTUtMDctMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIENyYXNoIGluIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpzdG9wTG9hZGluZ0ZvclBvbGlj eUNoYW5nZS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxNDEyMTg2PiBhbmQgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzQxOAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8ga25vd24gcmVw cm9kdWNpYmlsaXR5KQorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpyZXNwb25zZVJlY2VpdmVkKTogV2hlbiBz ZXR0aW5nIHRvIG1fd2FpdGluZ0ZvckNvbnRlbnRQb2xpY3kgdHJ1ZSwgbWFrZSBzdXJlIHdlIGhh dmUgYSBGcmFtZUxvYWRlci4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpkZXRh Y2hGcm9tRnJhbWUpOiBBbHdheXMgZXhwbGljaXRseSBjYWxsIGNhbmNlbFBvbGljeUNoZWNrSWZO ZWVkZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpjYW5jZWxQb2xpY3lD aGVja0lmTmVlZGVkKTogQ2FuY2VsIHRoZSBwb2xpY3kgY2hlY2sgaWYgdGhlcmUgaXMgb25lLgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OmNhbmNlbE1haW5SZXNvdXJjZUxvYWQp OiBVc2UgY2FuY2VsUG9saWN5Q2hlY2tJZk5lZWRlZCgpLgorICAgICAgICAqIGxvYWRlci9Eb2N1 bWVudExvYWRlci5oOgorCisyMDE1LTA3LTI5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KKwogICAgICAgICBDcmFzaCBjYWxsaW5nIHdlYlNvY2tldC5jbG9zZSgpIGZyb20gb25F cnJvciBoYW5kbGVyIGZvciBibG9ja2VkIHdlYiBzb2NrZXQuCiAgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yMTc3MTYyMD4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDc0MTEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXgg YzAyNmRlOS4uYmM5NjAxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIu Y3BwCkBAIC02NTIsNiArNjUyLDcgQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6cmVzcG9uc2VSZWNl aXZlZChDYWNoZWRSZXNvdXJjZSogcmVzb3VyY2UsIGNvbnN0IFJlc291cmNlUmUKICAgICB9CiAK ICAgICBBU1NFUlQoIW1fd2FpdGluZ0ZvckNvbnRlbnRQb2xpY3kpOworICAgIEFTU0VSVChmcmFt ZUxvYWRlcigpKTsKICAgICBtX3dhaXRpbmdGb3JDb250ZW50UG9saWN5ID0gdHJ1ZTsKIAogICAg IC8vIEFsd2F5cyBzaG93IGNvbnRlbnQgd2l0aCB2YWxpZCBzdWJzdGl0dXRlIGRhdGEuCkBAIC05 NTAsNiArOTUxLDggQEAgdm9pZCBEb2N1bWVudExvYWRlcjo6ZGV0YWNoRnJvbUZyYW1lKCkKIAog ICAgIG1fYXBwbGljYXRpb25DYWNoZUhvc3QtPnNldERPTUFwcGxpY2F0aW9uQ2FjaGUobnVsbHB0 cik7CiAKKyAgICBjYW5jZWxQb2xpY3lDaGVja0lmTmVlZGVkKCk7CisKICAgICAvLyBFdmVuIHRo b3VnaCB3ZSBBU1NFUlQgYXQgdGhlIHRvcCBvZiB0aGlzIG1ldGhvZCB0aGF0IHdlIGhhdmUgYW4g bV9mcmFtZSwgd2UncmUgc2VlaW5nIGNyYXNoZXMgd2hlcmUgbV9mcmFtZSBpcyBudWxsLgogICAg IC8vIFRoaXMgbWVhbnMgZWl0aGVyIHRoYXQgYSBEb2N1bWVudExvYWRlciBpcyBkZXRhY2hpbmcg dHdpY2UsIG9yIGlzIGRldGFjaGluZyBiZWZvcmUgZXZlciBoYXZpbmcgYXR0YWNoZWQuCiAgICAg Ly8gVW50aWwgd2UgZmlndXJlIG91dCBob3cgdGhhdCBpcyBoYXBwZW5pbmcsIG51bGwgY2hlY2sg bV9mcmFtZSBiZWZvcmUgZGVyZWZlcmVuY2luZyBpdCBoZXJlLgpAQCAtOTU4LDggKzk2MSw2IEBA IHZvaWQgRG9jdW1lbnRMb2FkZXI6OmRldGFjaEZyb21GcmFtZSgpCiAgICAgICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6bG9hZGVyRGV0YWNoZWRGcm9tRnJhbWUoKm1fZnJhbWUsICp0aGlz KTsKIAogICAgIG1fZnJhbWUgPSBudWxscHRyOwotICAgIC8vIFRoZSBjYWxsIHRvIHN0b3BMb2Fk aW5nKCkgYWJvdmUgc2hvdWxkIGhhdmUgY2FuY2VsZWQgYW55IHBlbmRpbmcgY29udGVudCBwb2xp Y3kgY2hlY2suCi0gICAgQVNTRVJUX1dJVEhfTUVTU0FHRSghbV93YWl0aW5nRm9yQ29udGVudFBv bGljeSwgIlRoZSBjb250ZW50IHBvbGljeSBjYWxsYmFjayBuZWVkcyBhIHZhbGlkIGZyYW1lLiIp OwogfQogCiB2b2lkIERvY3VtZW50TG9hZGVyOjpjbGVhck1haW5SZXNvdXJjZUxvYWRlcigpCkBA IC0xNDY4LDE3ICsxNDY5LDIyIEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01h aW5SZXNvdXJjZSgpCiAgICAgc2V0UmVxdWVzdChyZXF1ZXN0KTsKIH0KIAordm9pZCBEb2N1bWVu dExvYWRlcjo6Y2FuY2VsUG9saWN5Q2hlY2tJZk5lZWRlZCgpCit7CisgICAgaWYgKG1fd2FpdGlu Z0ZvckNvbnRlbnRQb2xpY3kgJiYgZnJhbWVMb2FkZXIoKSkKKyAgICAgICAgZnJhbWVMb2FkZXIo KS0+cG9saWN5Q2hlY2tlcigpLmNhbmNlbENoZWNrKCk7CisKKyAgICBtX3dhaXRpbmdGb3JDb250 ZW50UG9saWN5ID0gZmFsc2U7Cit9CisKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNhbmNlbE1haW5S ZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvcikKIHsKICAgICBS ZWY8RG9jdW1lbnRMb2FkZXI+IHByb3RlY3QoKnRoaXMpOwogICAgIFJlc291cmNlRXJyb3IgZXJy b3IgPSByZXNvdXJjZUVycm9yLmlzTnVsbCgpID8gZnJhbWVMb2FkZXIoKS0+Y2FuY2VsbGVkRXJy b3IobV9yZXF1ZXN0KSA6IHJlc291cmNlRXJyb3I7CiAKICAgICBtX2RhdGFMb2FkVGltZXIuc3Rv cCgpOwotICAgIGlmIChtX3dhaXRpbmdGb3JDb250ZW50UG9saWN5KSB7Ci0gICAgICAgIGZyYW1l TG9hZGVyKCktPnBvbGljeUNoZWNrZXIoKS5jYW5jZWxDaGVjaygpOwotICAgICAgICBBU1NFUlQo bV93YWl0aW5nRm9yQ29udGVudFBvbGljeSk7Ci0gICAgICAgIG1fd2FpdGluZ0ZvckNvbnRlbnRQ b2xpY3kgPSBmYWxzZTsKLSAgICB9CisKKyAgICBjYW5jZWxQb2xpY3lDaGVja0lmTmVlZGVkKCk7 CiAKICAgICBpZiAobWFpblJlc291cmNlTG9hZGVyKCkpCiAgICAgICAgIG1haW5SZXNvdXJjZUxv YWRlcigpLT5jYW5jZWwoZXJyb3IpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0RvY3VtZW50TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIu aAppbmRleCA1N2U1NGY4Li4xNmE3ODhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRM b2FkZXIuaApAQCAtMzM2LDYgKzMzNiw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAg ICB2b2lkIGNsZWFyTWFpblJlc291cmNlKCk7CiAKKyAgICAgICAgdm9pZCBjYW5jZWxQb2xpY3lD aGVja0lmTmVlZGVkKCk7CisKICNpZiBFTkFCTEUoQ09OVEVOVF9GSUxURVJJTkcpCiAgICAgICAg IHZvaWQgYmVjb21lTWFpblJlc291cmNlQ2xpZW50SWZGaWx0ZXJBbGxvd3MoKTsKICAgICAgICAg dm9pZCBpbnN0YWxsQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyKENvbnRlbnRGaWx0ZXImKTsK 257770 2015-07-29 14:30:44 -0700 2015-07-29 14:33:20 -0700 RELEASE_ASSERT followup patch text/plain 1411 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NThhMzJiLi5jZjk4MzMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYg QEAKIDIwMTUtMDctMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIFJFTEVBU0VfQVNTRVJUIGZvbGxvd3VwIHRvOiBDcmFzaCBpbiBXZWJDb3JlOjpEb2N1bWVu dExvYWRlcjo6c3RvcExvYWRpbmdGb3JQb2xpY3lDaGFuZ2UuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc0MTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpjYW5jZWxQb2xpY3lD aGVja0lmTmVlZGVkKTogUkVMRUFTRV9BU1NFUlQgd2UgaGF2ZSBhIEZyYW1lTG9hZGVyIGhlcmUu CisgICAgICAgICAgV2Ugd2FudCB0byBrbm93IGlmIHdlIGV2ZXIgZ2V0IGhlcmUgd2l0aG91dCBv bmUuCisKKzIwMTUtMDctMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCiAg ICAgICAgIENyYXNoIGluIFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpzdG9wTG9hZGluZ0ZvclBv bGljeUNoYW5nZS4KICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxNDEyMTg2PiBhbmQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzQxOAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCBiYzk2MDE0Li41Nzg5OGVjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTE0NzEsNyArMTQ3MSw5IEBA IHZvaWQgRG9jdW1lbnRMb2FkZXI6OnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpCiAKIHZvaWQg RG9jdW1lbnRMb2FkZXI6OmNhbmNlbFBvbGljeUNoZWNrSWZOZWVkZWQoKQogewotICAgIGlmICht X3dhaXRpbmdGb3JDb250ZW50UG9saWN5ICYmIGZyYW1lTG9hZGVyKCkpCisgICAgUkVMRUFTRV9B U1NFUlQoZnJhbWVMb2FkZXIoKSk7CisKKyAgICBpZiAobV93YWl0aW5nRm9yQ29udGVudFBvbGlj eSkKICAgICAgICAgZnJhbWVMb2FkZXIoKS0+cG9saWN5Q2hlY2tlcigpLmNhbmNlbENoZWNrKCk7 CiAKICAgICBtX3dhaXRpbmdGb3JDb250ZW50UG9saWN5ID0gZmFsc2U7Cg==