201514 2019-09-05 13:58:09 -0700 Web Inspector: Crashes when intercept response is a 404 2019-09-06 01:24:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck achristensen inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1568240 0 joepeck 2019-09-05 13:58:09 -0700 Web Inspector: Crashes when intercept response is a 404 Seems like the WebResourceLoader can sometimes go away and m_coreLoader may have gone away if the response is 400s. 1568241 1 378117 joepeck 2019-09-05 13:59:21 -0700 Created attachment 378117 [PATCH] Proposed Fix 1568322 2 378117 achristensen 2019-09-05 16:48:07 -0700 Comment on attachment 378117 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=378117&action=review > Source/WebKit/WebProcess/Network/WebResourceLoader.cpp:147 > + Ref<WebResourceLoader> interceptProtectedThis(*this); Please just call it protectedThis, and do it in the lambda capture: protectedThis = makeRef(*this) 1568367 3 joepeck 2019-09-05 19:54:04 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 378117 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=378117&action=review > > > Source/WebKit/WebProcess/Network/WebResourceLoader.cpp:147 > > + Ref<WebResourceLoader> interceptProtectedThis(*this); > > Please just call it protectedThis, and do it in the lambda capture: > protectedThis = makeRef(*this) There is already a `protectedThis` that may or may not be moved, which is why this is named separately. 1568368 4 joepeck 2019-09-05 19:54:49 -0700 > > Please just call it protectedThis, and do it in the lambda capture: > > protectedThis = makeRef(*this) > > There is already a `protectedThis` that may or may not be moved, which is > why this is named separately. But I should be able to use that name again in the new lambdas. 1568433 5 joepeck 2019-09-06 01:23:21 -0700 https://trac.webkit.org/changeset/249567/webkit 1568434 6 webkit-bug-importer 2019-09-06 01:24:16 -0700 <rdar://problem/55104293> 378117 2019-09-05 13:59:21 -0700 2019-09-05 16:48:07 -0700 [PATCH] Proposed Fix 404-1.patch text/plain 7930 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkNjczY2MwZmI1Zi4uNDBmNGI1NGM2MjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOS0wOS0wNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IENyYXNoZXMgd2hlbiBpbnRlcmNlcHQgcmVzcG9uc2UgaXMgYSA0 MDQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTUx NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0 cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9sb2NhbC1yZXNvdXJjZS1vdmVycmlkZS1iYXNpYy1l eHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9sb2Nh bC1yZXNvdXJjZS1vdmVycmlkZS1iYXNpYy5odG1sOgorICAgICAgICBBZGQgYSB0ZXN0IGZvciBh IDQwNCByZXNwb25zZSBvdmVycmlkZS4KKwogMjAxOS0wOS0wNCAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IExvY2FsIE92ZXJy aWRlcyAtIFByb3ZpZGUgc3Vic3RpdHV0aW9uIGNvbnRlbnQgZm9yIHJlc291cmNlIGxvYWRzIChV UkwgYmFzZWQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL2xvY2FsLXJlc291cmNlLW92ZXJyaWRlLWJhc2ljLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbG9jYWwtcmVzb3VyY2Utb3ZlcnJp ZGUtYmFzaWMtZXhwZWN0ZWQudHh0CmluZGV4IGY0NTYzZDhiYjczLi5kODk3OGU5OGJjZCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9sb2NhbC1y ZXNvdXJjZS1vdmVycmlkZS1iYXNpYy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9sb2NhbC1yZXNvdXJjZS1vdmVycmlkZS1iYXNpYy1l eHBlY3RlZC50eHQKQEAgLTg4LDYgKzg4LDE5IEBAIFJlc3BvbnNlIEhlYWRlcnM6CiAgIFgtRXhw ZWN0ZWQ6IFBBU1MKIENvbnRlbnQ6IFBBU1MKIAorLS0gUnVubmluZyB0ZXN0IGNhc2U6IExvY2Fs UmVzb3VyY2VPdmVycmlkZS40MDQKK0NyZWF0aW5nIExvY2FsIFJlc291cmNlIE92ZXJyaWRlIGZv cjogaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9uZXR3b3JrL3Jlc291cmNlcy9vdmVy cmlkZS50eHQKK1RyaWdnZXJpbmcgbG9hZC4uLgorUmVzb3VyY2UgTG9hZGVkOgorVVJMOiBodHRw Oi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL292ZXJyaWRlLnR4 dAorTUlNRSBUeXBlOiB0ZXh0L3BsYWluCitTdGF0dXM6IDQwNCBOb3QgRm91bmQKK1Jlc3BvbnNl IFNvdXJjZTogU3ltYm9sKGluc3BlY3Rvci1vdmVycmlkZSkKK1Jlc3BvbnNlIEhlYWRlcnM6Cisg IENvbnRlbnQtVHlwZTogdGV4dC9wbGFpbgorICBYLUV4cGVjdGVkOiBQQVNTCitDb250ZW50OiBQ QVNTCisKIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBMb2NhbFJlc291cmNlT3ZlcnJpZGUuRW5hYmxl ZAogQ3JlYXRpbmcgTG9jYWwgUmVzb3VyY2UgT3ZlcnJpZGUgZm9yOiBodHRwOi8vMTI3LjAuMC4x OjgwMDAvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL292ZXJyaWRlLnR4dAogVHJpZ2dlcmlu ZyBsb2FkLi4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL2xvY2FsLXJlc291cmNlLW92ZXJyaWRlLWJhc2ljLmh0bWwgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL2xvY2FsLXJlc291cmNlLW92ZXJyaWRlLWJhc2lj Lmh0bWwKaW5kZXggZjc2MmMxYzQ0ZTkuLjcwOGU5OTdkYjU3IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL2xvY2FsLXJlc291cmNlLW92ZXJyaWRl LWJhc2ljLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29y ay9sb2NhbC1yZXNvdXJjZS1vdmVycmlkZS1iYXNpYy5odG1sCkBAIC0xNjQsNiArMTY0LDIyIEBA IGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICB9XQogICAgIH0pOwogCisgICAgYWRkVGVzdENhc2Uo eworICAgICAgICBuYW1lOiAiTG9jYWxSZXNvdXJjZU92ZXJyaWRlLjQwNCIsCisgICAgICAgIGRl c2NyaXB0aW9uOiAiVGVzdCBmb3IgYSA0MDQgb3ZlcnJpZGUuIiwKKyAgICAgICAgZXhwcmVzc2lv bjogYHRyaWdnZXJPdmVycmlkZUxvYWQoKWAsCisgICAgICAgIG92ZXJyaWRlczogW3sKKyAgICAg ICAgICAgIHVybDogImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvbmV0d29yay9yZXNv dXJjZXMvb3ZlcnJpZGUudHh0IiwKKyAgICAgICAgICAgIG1pbWVUeXBlOiAidGV4dC9wbGFpbiIs CisgICAgICAgICAgICBjb250ZW50OiAiUEFTUyIsCisgICAgICAgICAgICBiYXNlNjRFbmNvZGVk OiBmYWxzZSwKKyAgICAgICAgICAgIHN0YXR1c0NvZGU6IDQwNCwKKyAgICAgICAgICAgIHN0YXR1 c1RleHQ6ICJOb3QgRm91bmQiLAorICAgICAgICAgICAgaGVhZGVyczogeyJYLUV4cGVjdGVkIjog IlBBU1MifSwKKyAgICAgICAgICAgIGRpc2FibGVkOiBmYWxzZSwKKyAgICAgICAgfV0KKyAgICB9 KTsKKwogICAgIGFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIkxvY2FsUmVzb3VyY2VPdmVy cmlkZS5FbmFibGVkIiwKICAgICAgICAgZGVzY3JpcHRpb246ICJUZXN0IGZvciBhbiBlbmFibGVk IG92ZXJyaWRlLiIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY4M2E3YmQzYTczLi4xZjkxYTZhYTA3MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAxOS0wOS0wNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENyYXNoZXMgd2hlbiBpbnRl cmNlcHQgcmVzcG9uc2UgaXMgYSA0MDQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMTUxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25z ZSk6CisgICAgICAgIEVuc3VyZSB0aGUgV2ViUmVzb3VyY2VMb2FkZXIgc3RheXMgYXJvdW5kIGR1 cmluZyBpbnRlcmNlcHRzLgorCisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZGVyOjpk aWRSZWNlaXZlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZGVyOjpkaWRG aW5pc2hSZXNvdXJjZUxvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRlcjo6 ZGlkRmFpbFJlc291cmNlTG9hZCk6CisgICAgICAgIE9ubHkgcGVyZm9ybSB0aGUgd29yayBpZiB0 aGUgbV9jb3JlTG9hZGVyIGlzIHN0aWxsIGFsaXZlLgorCiAyMDE5LTA5LTA0ICBKb3NlcGggUGVj b3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTG9j YWwgT3ZlcnJpZGVzIC0gUHJvdmlkZSBzdWJzdGl0dXRpb24gY29udGVudCBmb3IgcmVzb3VyY2Ug bG9hZHMgKFVSTCBiYXNlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcAppbmRleCAwZDE4OWE2Y2MwOC4uN2IzM2M5Y2Uz MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291 cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJS ZXNvdXJjZUxvYWRlci5jcHAKQEAgLTE0NCwxNCArMTQ0LDE1IEBAIHZvaWQgV2ViUmVzb3VyY2VM b2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25z ZSwgYm9vCiAgICAgaWYgKEluc3BlY3Rvckluc3RydW1lbnRhdGlvbldlYktpdDo6c2hvdWxkSW50 ZXJjZXB0UmVzcG9uc2UobV9jb3JlTG9hZGVyLT5mcmFtZSgpLCByZXNwb25zZSkpIHsKICAgICAg ICAgdW5zaWduZWQgbG9uZyBpbnRlcmNlcHRlZFJlcXVlc3RJZGVudGlmaWVyID0gbV9jb3JlTG9h ZGVyLT5pZGVudGlmaWVyKCk7CiAgICAgICAgIG1faW50ZXJjZXB0Q29udHJvbGxlci5iZWdpbklu dGVyY2VwdGluZ1Jlc3BvbnNlKGludGVyY2VwdGVkUmVxdWVzdElkZW50aWZpZXIpOwotICAgICAg ICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25XZWJLaXQ6OmludGVyY2VwdFJlc3BvbnNlKG1fY29y ZUxvYWRlci0+ZnJhbWUoKSwgcmVzcG9uc2UsIGludGVyY2VwdGVkUmVxdWVzdElkZW50aWZpZXIs IFt0aGlzLCBpbnRlcmNlcHRlZFJlcXVlc3RJZGVudGlmaWVyLCBwb2xpY3lEZWNpc2lvbkNvbXBs ZXRpb25IYW5kbGVyID0gV1RGTW92ZShwb2xpY3lEZWNpc2lvbkNvbXBsZXRpb25IYW5kbGVyKV0o Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgaW5zcGVjdG9yUmVzcG9uc2UsIFJlZlB0cjxTaGFyZWRC dWZmZXI+IG92ZXJyaWRlRGF0YSkgbXV0YWJsZSB7CisgICAgICAgIFJlZjxXZWJSZXNvdXJjZUxv YWRlcj4gaW50ZXJjZXB0UHJvdGVjdGVkVGhpcygqdGhpcyk7CisgICAgICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbldlYktpdDo6aW50ZXJjZXB0UmVzcG9uc2UobV9jb3JlTG9hZGVyLT5mcmFt ZSgpLCByZXNwb25zZSwgaW50ZXJjZXB0ZWRSZXF1ZXN0SWRlbnRpZmllciwgW3RoaXMsIGludGVy Y2VwdFByb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKGludGVyY2VwdFByb3RlY3RlZFRoaXMpLCBpbnRl cmNlcHRlZFJlcXVlc3RJZGVudGlmaWVyLCBwb2xpY3lEZWNpc2lvbkNvbXBsZXRpb25IYW5kbGVy ID0gV1RGTW92ZShwb2xpY3lEZWNpc2lvbkNvbXBsZXRpb25IYW5kbGVyKV0oY29uc3QgUmVzb3Vy Y2VSZXNwb25zZSYgaW5zcGVjdG9yUmVzcG9uc2UsIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG92ZXJy aWRlRGF0YSkgbXV0YWJsZSB7CiAgICAgICAgICAgICBpZiAoIW1fY29yZUxvYWRlciB8fCAhbV9j b3JlTG9hZGVyLT5pZGVudGlmaWVyKCkpIHsKICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IG5vdCBjb250aW51aW5nIGludGVyY2VwdCBs b2FkIGJlY2F1c2Ugbm8gY29yZUxvYWRlciBvciBubyBJRCAocGFnZUlEID0gJSIgUFJJdTY0ICIs IGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIG1fdHJh Y2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRC50b1VJbnQ2NCgpLCBtX3RyYWNraW5nUGFyYW1ldGVycy5m cmFtZUlELnRvVUludDY0KCksIG1fdHJhY2tpbmdQYXJhbWV0ZXJzLnJlc291cmNlSUQpOwogICAg ICAgICAgICAgICAgIG1faW50ZXJjZXB0Q29udHJvbGxlci5jb250aW51ZVJlc3BvbnNlKGludGVy Y2VwdGVkUmVxdWVzdElkZW50aWZpZXIpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgbV9jb3JlTG9hZGVyLT5kaWRSZWNlaXZlUmVzcG9uc2Uo aW5zcGVjdG9yUmVzcG9uc2UsIFt0aGlzLCBpbnRlcmNlcHRlZFJlcXVlc3RJZGVudGlmaWVyLCBw b2xpY3lEZWNpc2lvbkNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShwb2xpY3lEZWNpc2lvbkNv bXBsZXRpb25IYW5kbGVyKSwgb3ZlcnJpZGVEYXRhID0gV1RGTW92ZShvdmVycmlkZURhdGEpXSgp IG11dGFibGUgeworICAgICAgICAgICAgbV9jb3JlTG9hZGVyLT5kaWRSZWNlaXZlUmVzcG9uc2Uo aW5zcGVjdG9yUmVzcG9uc2UsIFt0aGlzLCBpbnRlcmNlcHRQcm90ZWN0ZWRUaGlzID0gV1RGTW92 ZShpbnRlcmNlcHRQcm90ZWN0ZWRUaGlzKSwgaW50ZXJjZXB0ZWRSZXF1ZXN0SWRlbnRpZmllciwg cG9saWN5RGVjaXNpb25Db21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUocG9saWN5RGVjaXNpb25D b21wbGV0aW9uSGFuZGxlciksIG92ZXJyaWRlRGF0YSA9IFdURk1vdmUob3ZlcnJpZGVEYXRhKV0o KSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBpZiAocG9saWN5RGVjaXNpb25Db21wbGV0aW9u SGFuZGxlcikKICAgICAgICAgICAgICAgICAgICAgcG9saWN5RGVjaXNpb25Db21wbGV0aW9uSGFu ZGxlcigpOwogCkBAIC0xODUsNyArMTg2LDggQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRlcjo6ZGlk UmVjZWl2ZURhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBpbnQ2NF90IGUKIAog ICAgIGlmIChVTkxJS0VMWShtX2ludGVyY2VwdENvbnRyb2xsZXIuaXNJbnRlcmNlcHRpbmcobV9j b3JlTG9hZGVyLT5pZGVudGlmaWVyKCkpKSkgewogICAgICAgICBtX2ludGVyY2VwdENvbnRyb2xs ZXIuZGVmZXIobV9jb3JlTG9hZGVyLT5pZGVudGlmaWVyKCksIFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIGRhdGEsIGVuY29kZWREYXRhTGVuZ3RoXSgpIG11dGFibGUgewot ICAgICAgICAgICAgZGlkUmVjZWl2ZURhdGEoZGF0YSwgZW5jb2RlZERhdGFMZW5ndGgpOworICAg ICAgICAgICAgaWYgKG1fY29yZUxvYWRlcikKKyAgICAgICAgICAgICAgICBkaWRSZWNlaXZlRGF0 YShkYXRhLCBlbmNvZGVkRGF0YUxlbmd0aCk7CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm47 CiAgICAgfQpAQCAtMjA1LDcgKzIwNyw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZEZp bmlzaFJlc291cmNlTG9hZChjb25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmIG5ldHdvcmtMCiAKICAg ICBpZiAoVU5MSUtFTFkobV9pbnRlcmNlcHRDb250cm9sbGVyLmlzSW50ZXJjZXB0aW5nKG1fY29y ZUxvYWRlci0+aWRlbnRpZmllcigpKSkpIHsKICAgICAgICAgbV9pbnRlcmNlcHRDb250cm9sbGVy LmRlZmVyKG1fY29yZUxvYWRlci0+aWRlbnRpZmllcigpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9 IG1ha2VSZWYoKnRoaXMpLCBuZXR3b3JrTG9hZE1ldHJpY3NdKCkgbXV0YWJsZSB7Ci0gICAgICAg ICAgICBkaWRGaW5pc2hSZXNvdXJjZUxvYWQobmV0d29ya0xvYWRNZXRyaWNzKTsKKyAgICAgICAg ICAgIGlmIChtX2NvcmVMb2FkZXIpCisgICAgICAgICAgICAgICAgZGlkRmluaXNoUmVzb3VyY2VM b2FkKG5ldHdvcmtMb2FkTWV0cmljcyk7CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm47CiAg ICAgfQpAQCAtMjIxLDcgKzIyNCw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZEZhaWxS ZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiAKICAgICBpZiAoVU5MSUtF TFkobV9pbnRlcmNlcHRDb250cm9sbGVyLmlzSW50ZXJjZXB0aW5nKG1fY29yZUxvYWRlci0+aWRl bnRpZmllcigpKSkpIHsKICAgICAgICAgbV9pbnRlcmNlcHRDb250cm9sbGVyLmRlZmVyKG1fY29y ZUxvYWRlci0+aWRlbnRpZmllcigpLCBbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRo aXMpLCBlcnJvcl0oKSBtdXRhYmxlIHsKLSAgICAgICAgICAgIGRpZEZhaWxSZXNvdXJjZUxvYWQo ZXJyb3IpOworICAgICAgICAgICAgaWYgKG1fY29yZUxvYWRlcikKKyAgICAgICAgICAgICAgICBk aWRGYWlsUmVzb3VyY2VMb2FkKGVycm9yKTsKICAgICAgICAgfSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9Cg==