205869 2020-01-07 10:35:54 -0800 Reformat WebFrameLoaderClient logging 2020-01-07 12:39:02 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=205679 InRadar P2 Normal --- 1 krollin krollin bfulgham cdumez commit-queue webkit-bug-importer zalan oldest_to_newest 1603641 0 krollin 2020-01-07 10:35:54 -0800 Update the format used by WebFrameLoaderClient in its RELEASE_LOG logging. Use the format used by WebPageProxy and NetworkResourceLoader, which is generally of the form: <object-address> - [<values that help thread together operations>] <class>::<method>: <message and other useful values> So, for example: 0x4a1d7c310 - WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition, page = 0x7f83ba009208 becomes: 0x4a1d7c310 - [webFrame=0x7ff703f03b68, webFrameID=3, webPage=0x7ff704831808, webPageID=15] WebFrameLoaderClient::dispatchDidReachLayoutMilestone: dispatching didCompletePageTransition 1603642 1 webkit-bug-importer 2020-01-07 10:36:09 -0800 <rdar://problem/58379240> 1603646 2 386992 krollin 2020-01-07 10:38:19 -0800 Created attachment 386992 Patch 1603698 3 386992 bfulgham 2020-01-07 11:54:28 -0800 Comment on attachment 386992 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386992&action=review r=me > Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:339 > + WEBFRAMELOADERCLIENT_RELEASE_LOG_FAULT(Loading, "dispatchDidReceiveServerRedirectForProvisionalLoad: Called with no provisional DocumentLoader (frameState=%i, stateForDebugging=%i)", m_frame->coreFrame()->loader().state(), m_frame->coreFrame()->loader().stateMachine().stateForDebugging()); This seems a little wordy, but I can't think of a better naming scheme. 1603737 4 386992 commit-queue 2020-01-07 12:39:00 -0800 Comment on attachment 386992 Patch Clearing flags on attachment: 386992 Committed r254147: <https://trac.webkit.org/changeset/254147> 1603738 5 commit-queue 2020-01-07 12:39:02 -0800 All reviewed patches have been landed. Closing bug. 386992 2020-01-07 10:38:19 -0800 2020-01-07 12:39:00 -0800 Patch bug-205869-20200107103817.patch text/plain 8925 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA0MjliMWFjNmFlMDNhYzNk YTMyMTljMTY4NjY3Mzg3M2QxOGZkZDQuLjZmNWQyMzM1YWJlMGI0YTQ1YWIzYTIyNDdkYWZkYTMx Mzc0ZjdkZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMjAtMDEtMDcgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlZm9ybWF0IFdlYkZyYW1lTG9h ZGVyQ2xpZW50IGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNTg2OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgzNzkyNDA+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSBm b3JtYXQgdXNlZCBieSBXZWJGcmFtZUxvYWRlckNsaWVudCBpbiBpdHMgUkVMRUFTRV9MT0cKKyAg ICAgICAgbG9nZ2luZy4gVXNlIHRoZSBmb3JtYXQgdXNlZCBieSBXZWJQYWdlUHJveHkgYW5kCisg ICAgICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRlciwgd2hpY2ggaXMgZ2VuZXJhbGx5IG9mIHRoZSBm b3JtOgorCisgICAgICAgICAgICA8b2JqZWN0LWFkZHJlc3M+IC0gWzx2YWx1ZXMgdGhhdCBoZWxw IHRocmVhZCB0b2dldGhlciBvcGVyYXRpb25zPl0gPGNsYXNzPjo6PG1ldGhvZD46IDxtZXNzYWdl IGFuZCBvdGhlciB1c2VmdWwgdmFsdWVzPgorCisgICAgICAgIFNvLCBmb3IgZXhhbXBsZToKKwor ICAgICAgICAgICAgMHg0YTFkN2MzMTAgLSBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hE aWRSZWFjaExheW91dE1pbGVzdG9uZTogZGlzcGF0Y2hpbmcgZGlkQ29tcGxldGVQYWdlVHJhbnNp dGlvbiwgcGFnZSA9IDB4N2Y4M2JhMDA5MjA4CisKKyAgICAgICAgYmVjb21lczoKKworICAgICAg ICAgICAgMHg0YTFkN2MzMTAgLSBbd2ViRnJhbWU9MHg3ZmY3MDNmMDNiNjgsIHdlYkZyYW1lSUQ9 Mywgd2ViUGFnZT0weDdmZjcwNDgzMTgwOCwgd2ViUGFnZUlEPTE1XSBXZWJGcmFtZUxvYWRlckNs aWVudDo6ZGlzcGF0Y2hEaWRSZWFjaExheW91dE1pbGVzdG9uZTogZGlzcGF0Y2hpbmcgZGlkQ29t cGxldGVQYWdlVHJhbnNpdGlvbgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtIG5vIGFkZGVkIG9y IGNoYW5nZWQgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hEaWRGYWlsUHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbExvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWFjaExheW91dE1pbGVzdG9uZSk6CisKIDIwMjAt MDEtMDUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAg RHVtcFJlbmRlclRyZWUgZG9lc24ndCBhbHdheXMgY2FsbCB1cGRhdGVSZW5kZXJpbmcoKSB3aGVu IGEgdGVzdCBjb21wbGV0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4IGFk MWI4NTM5ZTc1NjlmZTBjMTg2NWM3Y2RiZmNhYmE4ZjFlOWQ4M2UuLmUwMWU4MmNjMzQ3NmVhN2Jl OThhMGIzNjYxYzhhY2RlNmQ2M2YyY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNw cApAQCAtOTYsNiArOTYsMTYgQEAKICNpbmNsdWRlIDx3dGYvUHJvY2Vzc0lELmg+CiAjaW5jbHVk ZSA8d3RmL1Byb2Nlc3NQcml2aWxlZ2UuaD4KIAorI2RlZmluZSBQUkVGSVhfUEFSQU1FVEVSUyAi JXAgLSBbd2ViRnJhbWU9JXAsIHdlYkZyYW1lSUQ9JSIgUFJJdTY0ICIsIHdlYlBhZ2U9JXAsIHdl YlBhZ2VJRD0lIiBQUkl1NjQgIl0gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OiIKKyNkZWZpbmUgV0VC RlJBTUUgKHdlYkZyYW1lKCkpCisjZGVmaW5lIFdFQkZSQU1FSUQgKFdFQkZSQU1FID8gV0VCRlJB TUUtPmZyYW1lSUQoKS50b1VJbnQ2NCgpIDogMCkKKyNkZWZpbmUgV0VCUEFHRSAoV0VCRlJBTUUg PyBXRUJGUkFNRS0+cGFnZSgpIDogbnVsbHB0cikKKyNkZWZpbmUgV0VCUEFHRUlEIChXRUJQQUdF ID8gV0VCUEFHRS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkgOiAwKQorCisjZGVmaW5lIFdFQkZS QU1FTE9BREVSQ0xJRU5UX1JFTEVBU0VfTE9HKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xP RyhjaGFubmVsLCBQUkVGSVhfUEFSQU1FVEVSUyBmbXQsIHRoaXMsIFdFQkZSQU1FLCBXRUJGUkFN RUlELCBXRUJQQUdFLCBXRUJQQUdFSUQsICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFdFQkZSQU1F TE9BREVSQ0xJRU5UX1JFTEVBU0VfTE9HX0VSUk9SKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNF X0xPR19FUlJPUihjaGFubmVsLCBQUkVGSVhfUEFSQU1FVEVSUyBmbXQsIHRoaXMsIFdFQkZSQU1F LCBXRUJGUkFNRUlELCBXRUJQQUdFLCBXRUJQQUdFSUQsICMjX19WQV9BUkdTX18pCisjZGVmaW5l IFdFQkZSQU1FTE9BREVSQ0xJRU5UX1JFTEVBU0VfTE9HX0ZBVUxUKGNoYW5uZWwsIGZtdCwgLi4u KSBSRUxFQVNFX0xPR19GQVVMVChjaGFubmVsLCBQUkVGSVhfUEFSQU1FVEVSUyBmbXQsIHRoaXMs IFdFQkZSQU1FLCBXRUJGUkFNRUlELCBXRUJQQUdFLCBXRUJQQUdFSUQsICMjX19WQV9BUkdTX18p CisKIG5hbWVzcGFjZSBXZWJLaXQgewogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTMy Niw3ICszMzYsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2Vp dmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZCgpCiAKICAgICBXZWJEb2N1bWVudExv YWRlciogZG9jdW1lbnRMb2FkZXIgPSBzdGF0aWNfY2FzdDxXZWJEb2N1bWVudExvYWRlcio+KG1f ZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5wcm92aXNpb25hbERvY3VtZW50TG9hZGVyKCkp OwogICAgIGlmICghZG9jdW1lbnRMb2FkZXIpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfRkFVTFQo TG9hZGluZywgIldlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlY2VpdmVTZXJ2ZXJS ZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZCBjYWxsZWQgd2l0aCBubyBwcm92aXNpb25hbCBEb2N1 bWVudExvYWRlci4gRnJhbWVTdGF0ZSBpcyAlaS4gRnJhbWVMb2FkZXJTdGF0ZU1hY2hpbmUgc3Rh dGVGb3JEZWJ1Z2dpbmcgLSAlaSIsIG1fZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5zdGF0 ZSgpLCBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc3RhdGVNYWNoaW5lKCkuc3RhdGVG b3JEZWJ1Z2dpbmcoKSk7CisgICAgICAgIFdFQkZSQU1FTE9BREVSQ0xJRU5UX1JFTEVBU0VfTE9H X0ZBVUxUKExvYWRpbmcsICJkaXNwYXRjaERpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zp c2lvbmFsTG9hZDogQ2FsbGVkIHdpdGggbm8gcHJvdmlzaW9uYWwgRG9jdW1lbnRMb2FkZXIgKGZy YW1lU3RhdGU9JWksIHN0YXRlRm9yRGVidWdnaW5nPSVpKSIsIG1fZnJhbWUtPmNvcmVGcmFtZSgp LT5sb2FkZXIoKS5zdGF0ZSgpLCBtX2ZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkuc3RhdGVN YWNoaW5lKCkuc3RhdGVGb3JEZWJ1Z2dpbmcoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK QEAgLTU2MCw3ICs1NzAsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERp ZEZhaWxQcm92aXNpb25hbExvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZQogICAgIGlmICghd2Vi UGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUkVMRUFTRV9MT0coTmV0d29yaywgIiVwIC0g V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmFpbFByb3Zpc2lvbmFsTG9hZDogKHdl YlBhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIikiLCB0aGlzLCB3ZWJQYWdl LT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbV9mcmFtZS0+ZnJhbWVJRCgpLnRvVUludDY0KCkp OworICAgIFdFQkZSQU1FTE9BREVSQ0xJRU5UX1JFTEVBU0VfTE9HKE5ldHdvcmssICJkaXNwYXRj aERpZEZhaWxQcm92aXNpb25hbExvYWQ6Iik7CiAKICAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IHVz ZXJEYXRhOwogCkBAIC01OTYsNyArNjA2LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEaWRGYWlsTG9hZChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICBpZiAo IXdlYlBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJFTEVBU0VfTE9HKE5ldHdvcmssICIl cCAtIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZEZhaWxMb2FkOiAod2ViUGFnZUlE PSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiKSIsIHRoaXMsIHdlYlBhZ2UtPmlkZW50 aWZpZXIoKS50b1VJbnQ2NCgpLCBtX2ZyYW1lLT5mcmFtZUlEKCkudG9VSW50NjQoKSk7CisgICAg V0VCRlJBTUVMT0FERVJDTElFTlRfUkVMRUFTRV9MT0coTmV0d29yaywgImRpc3BhdGNoRGlkRmFp bExvYWQ6Iik7CiAKICAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IHVzZXJEYXRhOwogCkBAIC02Nzcs NyArNjg3LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWFjaExh eW91dE1pbGVzdG9uZShPcHRpb25TZXQ8V2ViQ29yZTo6TGEKICAgICBSZWZQdHI8QVBJOjpPYmpl Y3Q+IHVzZXJEYXRhOwogCiAgICAgaWYgKG1pbGVzdG9uZXMgJiBEaWRGaXJzdExheW91dCkgewot ICAgICAgICBSRUxFQVNFX0xPRyhMYXlvdXQsICIlcCAtIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpk aXNwYXRjaERpZFJlYWNoTGF5b3V0TWlsZXN0b25lOiBkaXNwYXRjaGluZyBEaWRGaXJzdExheW91 dEZvckZyYW1lLCBwYWdlID0gJXAiLCB0aGlzLCB3ZWJQYWdlKTsKKyAgICAgICAgV0VCRlJBTUVM T0FERVJDTElFTlRfUkVMRUFTRV9MT0coTGF5b3V0LCAiZGlzcGF0Y2hEaWRSZWFjaExheW91dE1p bGVzdG9uZTogZGlzcGF0Y2hpbmcgRGlkRmlyc3RMYXlvdXRGb3JGcmFtZSIpOwogCiAgICAgICAg IC8vIEZJWE1FOiBXZSBzaG91bGQgY29uc2lkZXIgcmVtb3ZpbmcgdGhlIG9sZCBkaWRGaXJzdExh eW91dCBBUEkgc2luY2UgdGhpcyBpcyBkb2luZyBkb3VibGUgZHV0eSB3aXRoIHRoZQogICAgICAg ICAvLyBuZXcgZGlkTGF5b3V0IEFQSS4KQEAgLTY4Nyw3ICs2OTcsNyBAQCB2b2lkIFdlYkZyYW1l TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlYWNoTGF5b3V0TWlsZXN0b25lKE9wdGlvblNldDxX ZWJDb3JlOjpMYQogI2lmIFBMQVRGT1JNKE1BQykKICAgICAgICAgLy8gRklYTUU6IERvIHRoaXMg b24gRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0IHdoZW4gTWFjIFNhZmFyaSBpcyBhYmxl IHRvIGhhbmRsZSBpdCAoPHJkYXI6Ly9wcm9ibGVtLzE3NTgwMDIxPikKICAgICAgICAgaWYgKG1f ZnJhbWUtPmlzTWFpbkZyYW1lKCkgJiYgIW1fZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbiAmJiAh d2ViUGFnZS0+Y29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5zdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5k ZXJpbmcoKSkgewotICAgICAgICAgICAgUkVMRUFTRV9MT0coTGF5b3V0LCAiJXAgLSBXZWJGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRSZWFjaExheW91dE1pbGVzdG9uZTogZGlzcGF0Y2hp bmcgZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbiwgcGFnZSA9ICVwIiwgdGhpcywgd2ViUGFnZSk7 CisgICAgICAgICAgICBXRUJGUkFNRUxPQURFUkNMSUVOVF9SRUxFQVNFX0xPRyhMYXlvdXQsICJk aXNwYXRjaERpZFJlYWNoTGF5b3V0TWlsZXN0b25lOiBkaXNwYXRjaGluZyBkaWRDb21wbGV0ZVBh Z2VUcmFuc2l0aW9uIik7CiAgICAgICAgICAgICB3ZWJQYWdlLT5kaWRDb21wbGV0ZVBhZ2VUcmFu c2l0aW9uKCk7CiAgICAgICAgICAgICBtX2RpZENvbXBsZXRlUGFnZVRyYW5zaXRpb24gPSB0cnVl OwogICAgICAgICB9CkBAIC03MTksNyArNzI5LDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRSZWFjaExheW91dE1pbGVzdG9uZShPcHRpb25TZXQ8V2ViQ29yZTo6TGEK ICAgICBhZGRJZlNldChEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4dCwgIkRpZFJlbmRl clNpZ25pZmljYW50QW1vdW50T2ZUZXh0Il9zKTsKICAgICBhZGRJZlNldChEaWRGaXJzdE1lYW5p bmdmdWxQYWludCwgIkRpZEZpcnN0TWVhbmluZ2Z1bFBhaW50Il9zKTsKIAotICAgIFJFTEVBU0Vf TE9HKExheW91dCwgIiVwIC0gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkUmVhY2hM YXlvdXRNaWxlc3RvbmU6IGRpc3BhdGNoaW5nIERpZFJlYWNoTGF5b3V0TWlsZXN0b25lLCBwYWdl ID0gJXAsIG1pbGVzdG9uZXMgPSAle3B1YmxpY31zIiwgdGhpcywgd2ViUGFnZSwgYnVpbGRlci50 b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIFdFQkZSQU1FTE9BREVSQ0xJRU5UX1JFTEVB U0VfTE9HKExheW91dCwgImRpc3BhdGNoRGlkUmVhY2hMYXlvdXRNaWxlc3RvbmU6IGRpc3BhdGNo aW5nIERpZFJlYWNoTGF5b3V0TWlsZXN0b25lIChtaWxlc3RvbmVzPSV7cHVibGljfXMpIiwgYnVp bGRlci50b1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogI2VuZGlmCiAKICAgICAvLyBTZW5kIHRo aXMgYWZ0ZXIgRGlkRmlyc3RMYXlvdXQtc3BlY2lmaWMgY2FsbHMgc2luY2Ugc29tZSBjbGllbnRz IGV4cGVjdCB0byBnZXQgdGhvc2UgbWVzc2FnZXMgZmlyc3QuCkBAIC03MjcsMTQgKzczNywxNCBA QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZFJlYWNoTGF5b3V0TWlsZXN0 b25lKE9wdGlvblNldDxXZWJDb3JlOjpMYQogCiAgICAgaWYgKG1pbGVzdG9uZXMgJiBEaWRGaXJz dFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpIHsKICAgICAgICAgaWYgKG1fZnJhbWUtPmlzTWFpbkZy YW1lKCkgJiYgIW1fZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbiAmJiAhd2ViUGFnZS0+Y29yZVBh Z2UoKS0+c2V0dGluZ3MoKS5zdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5kZXJpbmcoKSkgewotICAg ICAgICAgICAgUkVMRUFTRV9MT0coTGF5b3V0LCAiJXAgLSBXZWJGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEaWRSZWFjaExheW91dE1pbGVzdG9uZTogZGlzcGF0Y2hpbmcgZGlkQ29tcGxldGVQ YWdlVHJhbnNpdGlvbiwgcGFnZSA9ICVwIiwgdGhpcywgd2ViUGFnZSk7CisgICAgICAgICAgICBX RUJGUkFNRUxPQURFUkNMSUVOVF9SRUxFQVNFX0xPRyhMYXlvdXQsICJkaXNwYXRjaERpZFJlYWNo TGF5b3V0TWlsZXN0b25lOiBkaXNwYXRjaGluZyBkaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uIik7 CiAgICAgICAgICAgICB3ZWJQYWdlLT5kaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uKCk7CiAgICAg ICAgICAgICBtX2RpZENvbXBsZXRlUGFnZVRyYW5zaXRpb24gPSB0cnVlOwogICAgICAgICB9CiAK ICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBjb25zaWRlciByZW1vdmluZyB0aGUgb2xkIGRp ZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lIEFQSSBzaW5jZSB0aGlzIGlzIGRv aW5nCiAgICAgICAgIC8vIGRvdWJsZSBkdXR5IHdpdGggdGhlIG5ldyBkaWRMYXlvdXQgQVBJLgot ICAgICAgICBSRUxFQVNFX0xPRyhMYXlvdXQsICIlcCAtIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojpk aXNwYXRjaERpZFJlYWNoTGF5b3V0TWlsZXN0b25lOiBkaXNwYXRjaGluZyBEaWRGaXJzdFZpc3Vh bGx5Tm9uRW1wdHlMYXlvdXRGb3JGcmFtZSwgcGFnZSA9ICVwIiwgdGhpcywgd2ViUGFnZSk7Cisg ICAgICAgIFdFQkZSQU1FTE9BREVSQ0xJRU5UX1JFTEVBU0VfTE9HKExheW91dCwgImRpc3BhdGNo RGlkUmVhY2hMYXlvdXRNaWxlc3RvbmU6IGRpc3BhdGNoaW5nIERpZEZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dEZvckZyYW1lIik7CiAgICAgICAgIHdlYlBhZ2UtPmluamVjdGVkQnVuZGxlTG9h ZGVyQ2xpZW50KCkuZGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUoKndlYlBh Z2UsICptX2ZyYW1lLCB1c2VyRGF0YSk7CiAgICAgICAgIHdlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6RGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0Rm9yRnJhbWUobV9m cmFtZS0+ZnJhbWVJRCgpLCBVc2VyRGF0YShXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS50cmFuc2Zv cm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhLmdldCgpKS5nZXQoKSkpKTsKICAgICB9CkBAIC0x OTIzLDMgKzE5MzMsOSBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpmaW5pc2hlZExvYWRp bmdBcHBsaWNhdGlvbk1hbmlmZXN0KHVpbnQ2NF90IGNhbGxiYWNrSQogI2VuZGlmIC8vIEVOQUJM RShBUFBMSUNBVElPTl9NQU5JRkVTVCkKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyN1bmRl ZiBQUkVGSVhfUEFSQU1FVEVSUworI3VuZGVmIFdFQkZSQU1FCisjdW5kZWYgV0VCRlJBTUVJRAor I3VuZGVmIFdFQlBBR0UKKyN1bmRlZiBXRUJQQUdFSUQK