230603 2021-09-22 01:32:27 -0700 DOMPromiseDeferred should be able to handle Ref/RefPtr resolution values for interface types 2021-09-24 00:12:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf cdumez eric.carlson ews-watchlist glenn hta jer.noble philipj sam sergio sihui_liu tommyw webkit-bug-importer oldest_to_newest 1795989 0 youennf 2021-09-22 01:32:27 -0700 DOMPromiseDeferred should be able to handle Ref/RefPtr resolution values for interface types 1795990 1 438934 youennf 2021-09-22 01:50:31 -0700 Created attachment 438934 Patch 1796020 2 438934 youennf 2021-09-22 05:17:28 -0700 Comment on attachment 438934 Patch win failure seems unrelated 1796511 3 438934 sihui_liu 2021-09-23 08:47:06 -0700 Comment on attachment 438934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438934&action=review Nice, r=me with nits. > Source/WebCore/ChangeLog:10 > + Small refactring to use reject instead of settle in ApplePaySetup. refactoring > Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCCertificateGenerator.cpp:90 > + Function<void(ExceptionOr<Ref<RTCCertificate>>&&)> m_resultCallback; Do we want Function or CompletionHandler (is this function called multiple times)? If we use Function, can we use std::exchange instead of WTFMove? 1796586 4 438934 youennf 2021-09-23 11:30:02 -0700 Comment on attachment 438934 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438934&action=review >> Source/WebCore/ChangeLog:10 >> + Small refactring to use reject instead of settle in ApplePaySetup. > > refactoring Will change >> Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCCertificateGenerator.cpp:90 >> + Function<void(ExceptionOr<Ref<RTCCertificate>>&&)> m_resultCallback; > > Do we want Function or CompletionHandler (is this function called multiple times)? > If we use Function, can we use std::exchange instead of WTFMove? Function is fine, it will only be called once but there is no guarantee that it will always be called. We could use exchange but, given we do not reuse RTCCertificateGeneratorCallback, it is equivalent but more verbose than WTFMove. 1796589 5 439072 youennf 2021-09-23 11:31:02 -0700 Created attachment 439072 Patch for landing 1796800 6 ews-feeder 2021-09-24 00:11:53 -0700 Committed r283028 (242088@main): <https://commits.webkit.org/242088@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439072. 1796801 7 webkit-bug-importer 2021-09-24 00:12:17 -0700 <rdar://problem/83483186> 438934 2021-09-22 01:50:31 -0700 2021-09-23 11:30:55 -0700 Patch bug-230603-20210922105029.patch text/plain 12568 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDVhYWVlZTQxMmZiOTBi NjVjZTk2NmU3ZTFlZDdlYmFmNzY3MzM2MC4uZGExNDU4NTAzMWY2NDliMTUxNGM3NjUwYjZiZDg5 ZThkY2ZiNWQ4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA5LTIyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBET01Qcm9taXNlRGVmZXJy ZWQgc2hvdWxkIGJlIGFibGUgdG8gaGFuZGxlIFJlZi9SZWZQdHIgcmVzb2x1dGlvbiB2YWx1ZXMg Zm9yIGludGVyZmFjZSB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMwNjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVmYWN0b3JpbmcgdG8gYWxsb3cgRE9NUHJvbWlzZURlZmVycmVkPElETElu dGVyZmFjZTxUPj4gdG8gYmUgYWJsZSB0byBjYWxsIHNldHRsZSBvbiBFeGNlcHRpb25PcjxSZWY8 VD4+JiYuCisgICAgICAgIEFwcGx5IG5ldyBzdXBwb3J0IG9uIFBlZXJDb25uZWN0aW9uQmFja2Vu ZDo6Z2VuZXJhdGVDZXJ0aWZpY2F0ZS4KKyAgICAgICAgU21hbGwgcmVmYWN0cmluZyB0byB1c2Ug cmVqZWN0IGluc3RlYWQgb2Ygc2V0dGxlIGluIEFwcGxlUGF5U2V0dXAuCisgICAgICAgIE5vIGV4 cGVjdGVkIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAgICAgICAqIE1vZHVsZXMvYXBwbGVwYXkv QXBwbGVQYXlTZXR1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsZVBheVNldHVwOjpnZXRT ZXR1cEZlYXR1cmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxlUGF5U2V0dXA6OmJlZ2luKToK KyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OmdlbmVyYXRlQ2VydGlm aWNhdGUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJU Q0NlcnRpZmljYXRlR2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ0Nl cnRpZmljYXRlR2VuZXJhdG9yOjpSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxiYWNrOjpSVEND ZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkxpYldlYlJU Q0NlcnRpZmljYXRlR2VuZXJhdG9yOjpnZW5lcmF0ZUNlcnRpZmljYXRlKToKKyAgICAgICAgKiBN b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRv ci5oOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZURlZmVycmVkLmg6CisgICAg ICAgIChXZWJDb3JlOjpET01Qcm9taXNlRGVmZXJyZWQ6OnJlc29sdmUpOgorICAgICAgICAoV2Vi Q29yZTo6RE9NUHJvbWlzZURlZmVycmVkOjpzZXR0bGUpOgorICAgICAgICAoV2ViQ29yZTo6RE9N UHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxUPj46OnJlc29sdmUpOgorICAgICAgICAoV2Vi Q29yZTo6RE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxUPj46OnNldHRsZSk6CisgICAg ICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxz OjpzZW5kSDJQaW5nKToKKwogMjAyMS0wOS0yMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBs ZS5jb20+CiAKICAgICAgICAgTWFrZSBzdXJlIHRvIGNsZWFyIHRyYW5zZmVycmVkIGNoYW5uZWwg aGFuZGxlcnMgd2hlbiBSVENEYXRhQ2hhbm5lbCBnZXRzIHN0b3BwZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTZXR1cC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2V0dXAuY3BwCmluZGV4IDhhMmEwYjlh MzNlZWQ0YmYxYjc4NGYzZjVkZjFhYzBiOGU1MGU3ZTMuLmUxZjQ4NDFiMGM3OTVmY2E2ZTk5OWYz NDYwMWM3OTIwNjVlZjdiOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBw bGVwYXkvQXBwbGVQYXlTZXR1cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBs ZXBheS9BcHBsZVBheVNldHVwLmNwcApAQCAtNTksMTIgKzU5LDEyIEBAIHZvaWQgQXBwbGVQYXlT ZXR1cDo6Z2V0U2V0dXBGZWF0dXJlcyhEb2N1bWVudCYgZG9jdW1lbnQsIFNldHVwRmVhdHVyZXNQ cm9taXNlJiYKIAogICAgIGF1dG8gcGFnZSA9IGRvY3VtZW50LnBhZ2UoKTsKICAgICBpZiAoIXBh Z2UpIHsKLSAgICAgICAgcHJvbWlzZS5zZXR0bGUoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJy b3IgfSk7CisgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IEludmFsaWRTdGF0ZUVy cm9yIH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fc2V0dXBGZWF0dXJl c1Byb21pc2UpIHsKLSAgICAgICAgcHJvbWlzZS5zZXR0bGUoRXhjZXB0aW9uIHsgSW52YWxpZFN0 YXRlRXJyb3IgfSk7CisgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IEludmFsaWRT dGF0ZUVycm9yIH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC05MSwxOCArOTEsMTgg QEAgdm9pZCBBcHBsZVBheVNldHVwOjpiZWdpbihEb2N1bWVudCYgZG9jdW1lbnQsIFZlY3RvcjxS ZWZQdHI8QXBwbGVQYXlTZXR1cEZlYXR1cmUKICAgICB9CiAKICAgICBpZiAoIVVzZXJHZXN0dXJl SW5kaWNhdG9yOjpwcm9jZXNzaW5nVXNlckdlc3R1cmUoKSkgewotICAgICAgICBwcm9taXNlLnNl dHRsZShFeGNlcHRpb24geyBJbnZhbGlkQWNjZXNzRXJyb3IsICJNdXN0IGNhbGwgQXBwbGVQYXlT ZXR1cC5iZWdpbiBmcm9tIGEgdXNlciBnZXN0dXJlIGhhbmRsZXIuIiB9KTsKKyAgICAgICAgcHJv bWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZEFjY2Vzc0Vycm9yLCAiTXVzdCBjYWxsIEFw cGxlUGF5U2V0dXAuYmVnaW4gZnJvbSBhIHVzZXIgZ2VzdHVyZSBoYW5kbGVyLiIgfSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKICAgICBhdXRvIHBhZ2UgPSBkb2N1bWVudC5wYWdlKCk7CiAg ICAgaWYgKCFwYWdlKSB7Ci0gICAgICAgIHByb21pc2Uuc2V0dGxlKEV4Y2VwdGlvbiB7IEludmFs aWRTdGF0ZUVycm9yIH0pOworICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBJbnZh bGlkU3RhdGVFcnJvciB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmIChtX2Jl Z2luUHJvbWlzZSkgewotICAgICAgICBwcm9taXNlLnNldHRsZShFeGNlcHRpb24geyBJbnZhbGlk U3RhdGVFcnJvciB9KTsKKyAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxp ZFN0YXRlRXJyb3IgfSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNw cCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb25CYWNr ZW5kLmNwcAppbmRleCAxNDAwZTExOTE1M2ZhZWFkM2JjYjk0M2Q5MDk0NzNiZjU0NjA2NDJiLi44 YjI0ZjhhMGQ4ZDdmYzRlZWQwYjQ0YjEwMWM1ZjM3N2E4ZmMwNGQ4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJh Y2tlbmQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAjaWYgRU5BQkxFKFdFQl9SVEMpCiAKICNpbmNs dWRlICJFdmVudE5hbWVzLmgiCisjaW5jbHVkZSAiSlNSVENDZXJ0aWZpY2F0ZS5oIgogI2luY2x1 ZGUgIkxpYldlYlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5o IgogI2luY2x1ZGUgIlBhZ2UuaCIKQEAgLTQzNSw3ICs0MzYsOSBAQCB2b2lkIFBlZXJDb25uZWN0 aW9uQmFja2VuZDo6Z2VuZXJhdGVDZXJ0aWZpY2F0ZShEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0 IENlcnRpZgogICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkU3RhdGVFcnJvcik7CiAgICAg ICAgIHJldHVybjsKICAgICB9Ci0gICAgTGliV2ViUlRDQ2VydGlmaWNhdGVHZW5lcmF0b3I6Omdl bmVyYXRlQ2VydGlmaWNhdGUoZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSwgcGFnZS0+bGliV2Vi UlRDUHJvdmlkZXIoKSwgaW5mbywgV1RGTW92ZShwcm9taXNlKSk7CisgICAgTGliV2ViUlRDQ2Vy dGlmaWNhdGVHZW5lcmF0b3I6OmdlbmVyYXRlQ2VydGlmaWNhdGUoZG9jdW1lbnQuc2VjdXJpdHlP cmlnaW4oKSwgcGFnZS0+bGliV2ViUlRDUHJvdmlkZXIoKSwgaW5mbywgW3Byb21pc2UgPSBXVEZN b3ZlKHByb21pc2UpXShhdXRvJiYgcmVzdWx0KSBtdXRhYmxlIHsKKyAgICAgICAgcHJvbWlzZS5z ZXR0bGUoV1RGTW92ZShyZXN1bHQpKTsKKyAgICB9KTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFN KGRvY3VtZW50KTsKICAgICBVTlVTRURfUEFSQU0oZXhwaXJlcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENDZXJ0aWZp Y2F0ZUdlbmVyYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xp YndlYnJ0Yy9MaWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvci5jcHAKaW5kZXggZjhmZTY4ZTg1 NTRlZTk4MWI4MDcxMjEyYTdhNDI1ZGUwMWJhNmU1NC4uODY0NTM2NjdmMmRhNTQzNWMxNzM3ZGRl OTdiNTQxNDQzYmRkZDViYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDQ2VydGlmaWNhdGVHZW5lcmF0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0Nl cnRpZmljYXRlR2VuZXJhdG9yLmNwcApAQCAtMjcsOCArMjcsNiBAQAogCiAjaWYgVVNFKExJQldF QlJUQykKIAotI2luY2x1ZGUgIkpTRE9NUHJvbWlzZURlZmVycmVkLmgiCi0jaW5jbHVkZSAiSlNS VENDZXJ0aWZpY2F0ZS5oIgogI2luY2x1ZGUgIkxpYldlYlJUQ01hY3Jvcy5oIgogI2luY2x1ZGUg IlJUQ0NlcnRpZmljYXRlLmgiCiAKQEAgLTQ5LDkgKzQ3LDkgQEAgc3RhdGljIGlubGluZSBTdHJp bmcgZnJvbVN0ZFN0cmluZyhjb25zdCBzdGQ6OnN0cmluZyYgdmFsdWUpCiAKIGNsYXNzIFJUQ0Nl cnRpZmljYXRlR2VuZXJhdG9yQ2FsbGJhY2sgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8 UlRDQ2VydGlmaWNhdGVHZW5lcmF0b3JDYWxsYmFjaywgV1RGOjpEZXN0cnVjdGlvblRocmVhZDo6 TWFpbj4sIHB1YmxpYyBydGM6OlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yQ2FsbGJhY2sgewogcHVi bGljOgotICAgIFJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yQ2FsbGJhY2soUmVmPFNlY3VyaXR5T3Jp Z2luPiYmIG9yaWdpbiwgRE9NUHJvbWlzZURlZmVycmVkPElETEludGVyZmFjZTxSVENDZXJ0aWZp Y2F0ZT4+JiYgcHJvbWlzZSkKKyAgICBSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxiYWNrKFJl ZjxTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4sIEZ1bmN0aW9uPHZvaWQoRXhjZXB0aW9uT3I8UmVm PFJUQ0NlcnRpZmljYXRlPj4mJik+JiYgcmVzdWx0Q2FsbGJhY2spCiAgICAgICAgIDogbV9vcmln aW4oV1RGTW92ZShvcmlnaW4pKQotICAgICAgICAsIG1fcHJvbWlzZShXVEZNb3ZlKHByb21pc2Up KQorICAgICAgICAsIG1fcmVzdWx0Q2FsbGJhY2soV1RGTW92ZShyZXN1bHRDYWxsYmFjaykpCiAg ICAgewogICAgIH0KIApAQCAtNjYsNyArNjQsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZv aWQgT25TdWNjZXNzKGNvbnN0IHJ0Yzo6c2NvcGVkX3JlZnB0cjxydGM6OlJUQ0NlcnRpZmljYXRl PiYgY2VydGlmaWNhdGUpIGZpbmFsCiAgICAgewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtv cmlnaW4gPSBtX29yaWdpbi5yZWxlYXNlTm9uTnVsbCgpLCBwcm9taXNlID0gV1RGTW92ZShtX3By b21pc2UudmFsdWUoKSksIGNlcnRpZmljYXRlXSgpIG11dGFibGUgeworICAgICAgICBjYWxsT25N YWluVGhyZWFkKFtvcmlnaW4gPSBtX29yaWdpbi5yZWxlYXNlTm9uTnVsbCgpLCBjYWxsYmFjayA9 IFdURk1vdmUobV9yZXN1bHRDYWxsYmFjayksIGNlcnRpZmljYXRlXSgpIG11dGFibGUgewogICAg ICAgICAgICAgVmVjdG9yPFJUQ0NlcnRpZmljYXRlOjpEdGxzRmluZ2VycHJpbnQ+IGZpbmdlcnBy aW50czsKICAgICAgICAgICAgIGF1dG8gc3RhdHMgPSBjZXJ0aWZpY2F0ZS0+c3NsX2NlcnRpZmlj YXRlKCkuR2V0U3RhdHMoKTsKICAgICAgICAgICAgIGF1dG8qIGluZm8gPSBzdGF0cy5nZXQoKTsK QEAgLTc3LDE5ICs3NSwxOSBAQCBwcml2YXRlOgogICAgICAgICAgICAgfTsKIAogICAgICAgICAg ICAgYXV0byBwZW0gPSBjZXJ0aWZpY2F0ZS0+VG9QRU0oKTsKLSAgICAgICAgICAgIHByb21pc2Uu cmVzb2x2ZShSVENDZXJ0aWZpY2F0ZTo6Y3JlYXRlKFdURk1vdmUob3JpZ2luKSwgY2VydGlmaWNh dGUtPkV4cGlyZXMoKSwgV1RGTW92ZShmaW5nZXJwcmludHMpLCBmcm9tU3RkU3RyaW5nKHBlbS5j ZXJ0aWZpY2F0ZSgpKSwgZnJvbVN0ZFN0cmluZyhwZW0ucHJpdmF0ZV9rZXkoKSkpKTsKKyAgICAg ICAgICAgIGNhbGxiYWNrKFJUQ0NlcnRpZmljYXRlOjpjcmVhdGUoV1RGTW92ZShvcmlnaW4pLCBj ZXJ0aWZpY2F0ZS0+RXhwaXJlcygpLCBXVEZNb3ZlKGZpbmdlcnByaW50cyksIGZyb21TdGRTdHJp bmcocGVtLmNlcnRpZmljYXRlKCkpLCBmcm9tU3RkU3RyaW5nKHBlbS5wcml2YXRlX2tleSgpKSkp OwogICAgICAgICB9KTsKICAgICB9CiAKICAgICB2b2lkIE9uRmFpbHVyZSgpIGZpbmFsCiAgICAg ewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwcm9taXNlID0gV1RGTW92ZShtX3Byb21pc2Uu dmFsdWUoKSldKCkgbXV0YWJsZSB7Ci0gICAgICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRp b24geyBUeXBlRXJyb3IsICJVbmFibGUgdG8gY3JlYXRlIGEgY2VydGlmaWNhdGUiX3N9KTsKKyAg ICAgICAgY2FsbE9uTWFpblRocmVhZChbY2FsbGJhY2sgPSBXVEZNb3ZlKG1fcmVzdWx0Q2FsbGJh Y2spXSgpIG11dGFibGUgeworICAgICAgICAgICAgY2FsbGJhY2soRXhjZXB0aW9uIHsgVHlwZUVy cm9yLCAiVW5hYmxlIHRvIGNyZWF0ZSBhIGNlcnRpZmljYXRlIl9zfSk7CiAgICAgICAgIH0pOwog ICAgIH0KIAogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gbV9vcmlnaW47Ci0gICAgc3RkOjpv cHRpb25hbDxET01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPFJUQ0NlcnRpZmljYXRlPj4+ IG1fcHJvbWlzZTsKKyAgICBGdW5jdGlvbjx2b2lkKEV4Y2VwdGlvbk9yPFJlZjxSVENDZXJ0aWZp Y2F0ZT4+JiYpPiBtX3Jlc3VsdENhbGxiYWNrOwogfTsKIAogc3RhdGljIGlubGluZSBydGM6Oktl eVBhcmFtcyBrZXlQYXJhbXNGcm9tQ2VydGlmaWNhdGVUeXBlKGNvbnN0IFBlZXJDb25uZWN0aW9u QmFja2VuZDo6Q2VydGlmaWNhdGVJbmZvcm1hdGlvbiYgaW5mbykKQEAgLTEwNiw5ICsxMDQsOSBA QCBzdGF0aWMgaW5saW5lIHJ0Yzo6S2V5UGFyYW1zIGtleVBhcmFtc0Zyb21DZXJ0aWZpY2F0ZVR5 cGUoY29uc3QgUGVlckNvbm5lY3Rpb25CYQogICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVE KCk7CiB9CiAKLXZvaWQgZ2VuZXJhdGVDZXJ0aWZpY2F0ZShSZWY8U2VjdXJpdHlPcmlnaW4+JiYg b3JpZ2luLCBMaWJXZWJSVENQcm92aWRlciYgcHJvdmlkZXIsIGNvbnN0IFBlZXJDb25uZWN0aW9u QmFja2VuZDo6Q2VydGlmaWNhdGVJbmZvcm1hdGlvbiYgaW5mbywgRE9NUHJvbWlzZURlZmVycmVk PElETEludGVyZmFjZTxSVENDZXJ0aWZpY2F0ZT4+JiYgcHJvbWlzZSkKK3ZvaWQgZ2VuZXJhdGVD ZXJ0aWZpY2F0ZShSZWY8U2VjdXJpdHlPcmlnaW4+JiYgb3JpZ2luLCBMaWJXZWJSVENQcm92aWRl ciYgcHJvdmlkZXIsIGNvbnN0IFBlZXJDb25uZWN0aW9uQmFja2VuZDo6Q2VydGlmaWNhdGVJbmZv cm1hdGlvbiYgaW5mbywgRnVuY3Rpb248dm9pZChFeGNlcHRpb25PcjxSZWY8UlRDQ2VydGlmaWNh dGU+PiYmKT4mJiByZXN1bHRDYWxsYmFjaykKIHsKLSAgICBydGM6OnNjb3BlZF9yZWZwdHI8UlRD Q2VydGlmaWNhdGVHZW5lcmF0b3JDYWxsYmFjaz4gY2FsbGJhY2sobmV3IHJ0Yzo6UmVmQ291bnRl ZE9iamVjdDxSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxiYWNrPihXVEZNb3ZlKG9yaWdpbiks IFdURk1vdmUocHJvbWlzZSkpKTsKKyAgICBydGM6OnNjb3BlZF9yZWZwdHI8UlRDQ2VydGlmaWNh dGVHZW5lcmF0b3JDYWxsYmFjaz4gY2FsbGJhY2sobmV3IHJ0Yzo6UmVmQ291bnRlZE9iamVjdDxS VENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxiYWNrPihXVEZNb3ZlKG9yaWdpbiksIFdURk1vdmUo cmVzdWx0Q2FsbGJhY2spKSk7CiAKICAgICBhYnNsOjpvcHRpb25hbDx1aW50NjRfdD4gZXhwaXJl c01zOwogICAgIGlmIChpbmZvLmV4cGlyZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRv ci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2Vi UlRDQ2VydGlmaWNhdGVHZW5lcmF0b3IuaAppbmRleCBhMmI5ZjM4OWYwZTVlYjhiNGQwNjQ1Yzdk NGNjYTIyYTg3Y2IxOWY3Li5hOTJhMmJlYjU4NTU1NjU4OGEwMTEzYTk4ZWFiMTM5YzE4YTJjNGI1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0 Yy9MaWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9y LmgKQEAgLTM1LDcgKzM1LDcgQEAgY2xhc3MgU2VjdXJpdHlPcmlnaW47CiAKIG5hbWVzcGFjZSBM aWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvciB7CiAKLXZvaWQgZ2VuZXJhdGVDZXJ0aWZpY2F0 ZShSZWY8U2VjdXJpdHlPcmlnaW4+JiYsIExpYldlYlJUQ1Byb3ZpZGVyJiwgY29uc3QgUGVlckNv bm5lY3Rpb25CYWNrZW5kOjpDZXJ0aWZpY2F0ZUluZm9ybWF0aW9uJiwgRE9NUHJvbWlzZURlZmVy cmVkPElETEludGVyZmFjZTxSVENDZXJ0aWZpY2F0ZT4+JiYpOwordm9pZCBnZW5lcmF0ZUNlcnRp ZmljYXRlKFJlZjxTZWN1cml0eU9yaWdpbj4mJiwgTGliV2ViUlRDUHJvdmlkZXImLCBjb25zdCBQ ZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OkNlcnRpZmljYXRlSW5mb3JtYXRpb24mLCBGdW5jdGlvbjx2 b2lkKEV4Y2VwdGlvbk9yPFJlZjxSVENDZXJ0aWZpY2F0ZT4+JiYpPiYmKTsKIAogfSAvLyBuYW1l c3BhY2UgTGliV2ViUlRDQ2VydGlmaWNhdGVHZW5lcmF0b3IKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Qcm9taXNlRGVmZXJyZWQuaCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZURlZmVycmVkLmgKaW5kZXggZWI5MDRjOWNkNTI5 YTk0Njk4NjIwMDMwZjRlN2M1NzE1ODgyOGMzYy4uMTY0MmVmNDRhNWQ5YmQ0Y2VlMDg2Nzc3MjE4 MTMyYzJlNzhhOWVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNE T01Qcm9taXNlRGVmZXJyZWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RP TVByb21pc2VEZWZlcnJlZC5oCkBAIC0yNjEsNyArMjYxLDcgQEAgcHJvdGVjdGVkOgogICAgIFJl ZjxEZWZlcnJlZFByb21pc2U+IG1fcHJvbWlzZTsKIH07CiAKLXRlbXBsYXRlPHR5cGVuYW1lIElE TFR5cGU+IAordGVtcGxhdGU8dHlwZW5hbWUgSURMVHlwZT4KIGNsYXNzIERPTVByb21pc2VEZWZl cnJlZCA6IHB1YmxpYyBET01Qcm9taXNlRGVmZXJyZWRCYXNlIHsKIHB1YmxpYzoKICAgICB1c2lu ZyBET01Qcm9taXNlRGVmZXJyZWRCYXNlOjpET01Qcm9taXNlRGVmZXJyZWRCYXNlOwpAQCAtMjcw LDEwICsyNzAsNDMgQEAgcHVibGljOgogICAgIHVzaW5nIERPTVByb21pc2VEZWZlcnJlZEJhc2U6 OnJlamVjdDsKIAogICAgIHZvaWQgcmVzb2x2ZSh0eXBlbmFtZSBJRExUeXBlOjpQYXJhbWV0ZXJU eXBlIHZhbHVlKQotICAgIHsgCisgICAgeworICAgICAgICBtX3Byb21pc2UtPnJlc29sdmU8SURM VHlwZT4oc3RkOjpmb3J3YXJkPHR5cGVuYW1lIElETFR5cGU6OlBhcmFtZXRlclR5cGU+KHZhbHVl KSk7CisgICAgfQorCisgICAgdm9pZCBzZXR0bGUoRXhjZXB0aW9uT3I8dHlwZW5hbWUgSURMVHlw ZTo6UGFyYW1ldGVyVHlwZT4mJiByZXN1bHQpCisgICAgeworICAgICAgICBpZiAocmVzdWx0Lmhh c0V4Y2VwdGlvbigpKSB7CisgICAgICAgICAgICByZWplY3QocmVzdWx0LnJlbGVhc2VFeGNlcHRp b24oKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgcmVzb2x2ZShy ZXN1bHQucmVsZWFzZVJldHVyblZhbHVlKCkpOworICAgIH0KK307CisKK3RlbXBsYXRlPHR5cGVu YW1lIFQ+CitjbGFzcyBET01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPFQ+PiA6IHB1Ymxp YyBET01Qcm9taXNlRGVmZXJyZWRCYXNlIHsKK3B1YmxpYzoKKyAgICB1c2luZyBET01Qcm9taXNl RGVmZXJyZWRCYXNlOjpET01Qcm9taXNlRGVmZXJyZWRCYXNlOworICAgIHVzaW5nIERPTVByb21p c2VEZWZlcnJlZEJhc2U6Om9wZXJhdG9yPTsKKyAgICB1c2luZyBET01Qcm9taXNlRGVmZXJyZWRC YXNlOjpwcm9taXNlOworICAgIHVzaW5nIERPTVByb21pc2VEZWZlcnJlZEJhc2U6OnJlamVjdDsK KyAgICB1c2luZyBJRExUeXBlID0gSURMSW50ZXJmYWNlPFQ+OworCisgICAgdm9pZCByZXNvbHZl KHR5cGVuYW1lIElETFR5cGU6OklubmVyUGFyYW1ldGVyVHlwZSB2YWx1ZSkKKyAgICB7CiAgICAg ICAgIG1fcHJvbWlzZS0+cmVzb2x2ZTxJRExUeXBlPihzdGQ6OmZvcndhcmQ8dHlwZW5hbWUgSURM VHlwZTo6UGFyYW1ldGVyVHlwZT4odmFsdWUpKTsKICAgICB9CiAKKyAgICB2b2lkIHNldHRsZShF eGNlcHRpb25Pcjx0eXBlbmFtZSBJRExUeXBlOjpJbm5lclBhcmFtZXRlclR5cGU+JiYgcmVzdWx0 KQorICAgIHsKKyAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgeworICAgICAgICAg ICAgcmVqZWN0KHJlc3VsdC5yZWxlYXNlRXhjZXB0aW9uKCkpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisgICAgICAgIHJlc29sdmUocmVzdWx0LnJlbGVhc2VSZXR1cm5WYWx1ZSgp KTsKKyAgICB9CisKICAgICB2b2lkIHNldHRsZShFeGNlcHRpb25Pcjx0eXBlbmFtZSBJRExUeXBl OjpQYXJhbWV0ZXJUeXBlPiYmIHJlc3VsdCkKICAgICB7CiAgICAgICAgIGlmIChyZXN1bHQuaGFz RXhjZXB0aW9uKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCA2Y2Vh OTA4MWFhZGM1NmNmMDU2MzEyM2I2YzkwNDM4MzU3NDVjMTNkLi5lYTQ1Yzc2ZTg0ODcyMTkwYjNh MmJhNGJjZGY0ZjIxN2Q5NWRiNTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFscy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3Bw CkBAIC01NjAzLDEzICs1NjAzLDEzIEBAIHZvaWQgSW50ZXJuYWxzOjpzZW5kSDJQaW5nKFN0cmlu ZyB1cmwsIERPTVByb21pc2VEZWZlcnJlZDxJRExEb3VibGU+JiYgcHJvbWlzZSkKIHsKICAgICBh dXRvKiBkb2N1bWVudCA9IGNvbnRleHREb2N1bWVudCgpOwogICAgIGlmICghZG9jdW1lbnQpIHsK LSAgICAgICAgcHJvbWlzZS5zZXR0bGUoSW52YWxpZFN0YXRlRXJyb3IpOworICAgICAgICBwcm9t aXNlLnJlamVjdChJbnZhbGlkU3RhdGVFcnJvcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK ICAgICBhdXRvKiBmcmFtZSA9IGRvY3VtZW50LT5mcmFtZSgpOwogICAgIGlmICghZnJhbWUpIHsK LSAgICAgICAgcHJvbWlzZS5zZXR0bGUoSW52YWxpZFN0YXRlRXJyb3IpOworICAgICAgICBwcm9t aXNlLnJlamVjdChJbnZhbGlkU3RhdGVFcnJvcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAK QEAgLTU2MTcsNyArNTYxNyw3IEBAIHZvaWQgSW50ZXJuYWxzOjpzZW5kSDJQaW5nKFN0cmluZyB1 cmwsIERPTVByb21pc2VEZWZlcnJlZDxJRExEb3VibGU+JiYgcHJvbWlzZSkKICAgICAgICAgaWYg KHJlc3VsdC5oYXNfdmFsdWUoKSkKICAgICAgICAgICAgIHByb21pc2UucmVzb2x2ZShyZXN1bHQu dmFsdWUoKS52YWx1ZSgpKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcHJvbWlzZS5zZXR0 bGUoSW52YWxpZFN0YXRlRXJyb3IpOworICAgICAgICAgICAgcHJvbWlzZS5yZWplY3QoSW52YWxp ZFN0YXRlRXJyb3IpOwogICAgIH0pOwogfQogCg== 439072 2021-09-23 11:31:02 -0700 2021-09-24 00:11:56 -0700 Patch for landing bug-230603-20210923203100.patch text/plain 12543 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA1NDhkNGM5YjdjNWUw YzQ2OTk3Y2NiMzdlMjJjYjk5ZDIzNzNmOC4uMWZjZTllZGY4ZDVhNzE2YWNlOGEzZjE0NmZiNWI5 ZmEzNGU0NjcxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA5LTIzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBET01Qcm9taXNlRGVmZXJy ZWQgc2hvdWxkIGJlIGFibGUgdG8gaGFuZGxlIFJlZi9SZWZQdHIgcmVzb2x1dGlvbiB2YWx1ZXMg Zm9yIGludGVyZmFjZSB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjMwNjAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lodWkgTGl1LgorCisg ICAgICAgIFJlZmFjdG9yaW5nIHRvIGFsbG93IERPTVByb21pc2VEZWZlcnJlZDxJRExJbnRlcmZh Y2U8VD4+IHRvIGJlIGFibGUgdG8gY2FsbCBzZXR0bGUgb24gRXhjZXB0aW9uT3I8UmVmPFQ+PiYm LgorICAgICAgICBBcHBseSBuZXcgc3VwcG9ydCBvbiBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6Omdl bmVyYXRlQ2VydGlmaWNhdGUuCisgICAgICAgIFNtYWxsIHJlZmFjdG9yaW5nIHRvIHVzZSByZWpl Y3QgaW5zdGVhZCBvZiBzZXR0bGUgaW4gQXBwbGVQYXlTZXR1cC4KKyAgICAgICAgTm8gZXhwZWN0 ZWQgY2hhbmdlIG9mIGJlaGF2aW9yLgorCisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9BcHBs ZVBheVNldHVwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxlUGF5U2V0dXA6OmdldFNldHVw RmVhdHVyZXMpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGVQYXlTZXR1cDo6YmVnaW4pOgorICAg ICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBlZXJDb25uZWN0aW9uQmFja2VuZDo6Z2VuZXJhdGVDZXJ0aWZpY2F0 ZSk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDQ2Vy dGlmaWNhdGVHZW5lcmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDQ2VydGlm aWNhdGVHZW5lcmF0b3I6OlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yQ2FsbGJhY2s6OlJUQ0NlcnRp ZmljYXRlR2VuZXJhdG9yQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TGliV2ViUlRDQ2Vy dGlmaWNhdGVHZW5lcmF0b3I6OmdlbmVyYXRlQ2VydGlmaWNhdGUpOgorICAgICAgICAqIE1vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yLmg6 CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01Qcm9taXNlRGVmZXJyZWQuaDoKKyAgICAgICAg KFdlYkNvcmU6OkRPTVByb21pc2VEZWZlcnJlZDo6cmVzb2x2ZSk6CisgICAgICAgIChXZWJDb3Jl OjpET01Qcm9taXNlRGVmZXJyZWQ6OnNldHRsZSk6CisgICAgICAgIChXZWJDb3JlOjpET01Qcm9t aXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPFQ+Pjo6cmVzb2x2ZSk6CisgICAgICAgIChXZWJDb3Jl OjpET01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPFQ+Pjo6c2V0dGxlKToKKyAgICAgICAg KiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNl bmRIMlBpbmcpOgorCiAyMDIxLTA5LTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBSVENEYXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQgZG9lcyBub3QgbmVlZCB0 byBiZSByZWYgY291bnRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBs ZXBheS9BcHBsZVBheVNldHVwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkv QXBwbGVQYXlTZXR1cC5jcHAKaW5kZXggOGEyYTBiOWEzM2VlZDRiZjFiNzg0ZjNmNWRmMWFjMGI4 ZTUwZTdlMy4uZTFmNDg0MWIwYzc5NWZjYTZlOTk5ZjM0NjAxYzc5MjA2NWVmN2I5MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNldHVwLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2V0dXAuY3BwCkBA IC01OSwxMiArNTksMTIgQEAgdm9pZCBBcHBsZVBheVNldHVwOjpnZXRTZXR1cEZlYXR1cmVzKERv Y3VtZW50JiBkb2N1bWVudCwgU2V0dXBGZWF0dXJlc1Byb21pc2UmJgogCiAgICAgYXV0byBwYWdl ID0gZG9jdW1lbnQucGFnZSgpOwogICAgIGlmICghcGFnZSkgewotICAgICAgICBwcm9taXNlLnNl dHRsZShFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciB9KTsKKyAgICAgICAgcHJvbWlzZS5y ZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IgfSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKICAgICBpZiAobV9zZXR1cEZlYXR1cmVzUHJvbWlzZSkgewotICAgICAgICBwcm9t aXNlLnNldHRsZShFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciB9KTsKKyAgICAgICAgcHJv bWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IgfSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKQEAgLTkxLDE4ICs5MSwxOCBAQCB2b2lkIEFwcGxlUGF5U2V0dXA6OmJl Z2luKERvY3VtZW50JiBkb2N1bWVudCwgVmVjdG9yPFJlZlB0cjxBcHBsZVBheVNldHVwRmVhdHVy ZQogICAgIH0KIAogICAgIGlmICghVXNlckdlc3R1cmVJbmRpY2F0b3I6OnByb2Nlc3NpbmdVc2Vy R2VzdHVyZSgpKSB7Ci0gICAgICAgIHByb21pc2Uuc2V0dGxlKEV4Y2VwdGlvbiB7IEludmFsaWRB Y2Nlc3NFcnJvciwgIk11c3QgY2FsbCBBcHBsZVBheVNldHVwLmJlZ2luIGZyb20gYSB1c2VyIGdl c3R1cmUgaGFuZGxlci4iIH0pOworICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBJ bnZhbGlkQWNjZXNzRXJyb3IsICJNdXN0IGNhbGwgQXBwbGVQYXlTZXR1cC5iZWdpbiBmcm9tIGEg dXNlciBnZXN0dXJlIGhhbmRsZXIuIiB9KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAg IGF1dG8gcGFnZSA9IGRvY3VtZW50LnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpIHsKLSAgICAgICAg cHJvbWlzZS5zZXR0bGUoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IgfSk7CisgICAgICAg IHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IEludmFsaWRTdGF0ZUVycm9yIH0pOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCiAgICAgaWYgKG1fYmVnaW5Qcm9taXNlKSB7Ci0gICAgICAgIHBy b21pc2Uuc2V0dGxlKEV4Y2VwdGlvbiB7IEludmFsaWRTdGF0ZUVycm9yIH0pOworICAgICAgICBw cm9taXNlLnJlamVjdChFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciB9KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9QZWVyQ29ubmVjdGlvbkJhY2tlbmQuY3BwCmluZGV4IDE0MDBlMTE5MTUz ZmFlYWQzYmNiOTQzZDkwOTQ3M2JmNTQ2MDY0MmIuLjhiMjRmOGEwZDhkN2ZjNGVlZDBiNDRiMTAx YzVmMzc3YThmYzA0ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vUGVlckNvbm5lY3Rpb25CYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL1BlZXJDb25uZWN0aW9uQmFja2VuZC5jcHAKQEAgLTM1LDYgKzM1LDcg QEAKICNpZiBFTkFCTEUoV0VCX1JUQykKIAogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKKyNpbmNs dWRlICJKU1JUQ0NlcnRpZmljYXRlLmgiCiAjaW5jbHVkZSAiTGliV2ViUlRDQ2VydGlmaWNhdGVH ZW5lcmF0b3IuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUGFnZS5oIgpAQCAt NDM1LDcgKzQzNiw5IEBAIHZvaWQgUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpnZW5lcmF0ZUNlcnRp ZmljYXRlKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgQ2VydGlmCiAgICAgICAgIHByb21pc2Uu cmVqZWN0KEludmFsaWRTdGF0ZUVycm9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBM aWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvcjo6Z2VuZXJhdGVDZXJ0aWZpY2F0ZShkb2N1bWVu dC5zZWN1cml0eU9yaWdpbigpLCBwYWdlLT5saWJXZWJSVENQcm92aWRlcigpLCBpbmZvLCBXVEZN b3ZlKHByb21pc2UpKTsKKyAgICBMaWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvcjo6Z2VuZXJh dGVDZXJ0aWZpY2F0ZShkb2N1bWVudC5zZWN1cml0eU9yaWdpbigpLCBwYWdlLT5saWJXZWJSVENQ cm92aWRlcigpLCBpbmZvLCBbcHJvbWlzZSA9IFdURk1vdmUocHJvbWlzZSldKGF1dG8mJiByZXN1 bHQpIG11dGFibGUgeworICAgICAgICBwcm9taXNlLnNldHRsZShXVEZNb3ZlKHJlc3VsdCkpOwor ICAgIH0pOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oZG9jdW1lbnQpOwogICAgIFVOVVNFRF9Q QVJBTShleHBpcmVzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0NlcnRpZmlj YXRlR2VuZXJhdG9yLmNwcAppbmRleCBmOGZlNjhlODU1NGVlOTgxYjgwNzEyMTJhN2E0MjVkZTAx YmE2ZTU0Li44NjQ1MzY2N2YyZGE1NDM1YzE3MzdkZGU5N2I1NDE0NDNiZGRkNWJhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENDZXJ0aWZpY2F0ZUdlbmVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDQ2VydGlmaWNhdGVHZW5lcmF0b3IuY3BwCkBA IC0yNyw4ICsyNyw2IEBACiAKICNpZiBVU0UoTElCV0VCUlRDKQogCi0jaW5jbHVkZSAiSlNET01Q cm9taXNlRGVmZXJyZWQuaCIKLSNpbmNsdWRlICJKU1JUQ0NlcnRpZmljYXRlLmgiCiAjaW5jbHVk ZSAiTGliV2ViUlRDTWFjcm9zLmgiCiAjaW5jbHVkZSAiUlRDQ2VydGlmaWNhdGUuaCIKIApAQCAt NDksOSArNDcsOSBAQCBzdGF0aWMgaW5saW5lIFN0cmluZyBmcm9tU3RkU3RyaW5nKGNvbnN0IHN0 ZDo6c3RyaW5nJiB2YWx1ZSkKIAogY2xhc3MgUlRDQ2VydGlmaWNhdGVHZW5lcmF0b3JDYWxsYmFj ayA6IHB1YmxpYyBUaHJlYWRTYWZlUmVmQ291bnRlZDxSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNh bGxiYWNrLCBXVEY6OkRlc3RydWN0aW9uVGhyZWFkOjpNYWluPiwgcHVibGljIHJ0Yzo6UlRDQ2Vy dGlmaWNhdGVHZW5lcmF0b3JDYWxsYmFjayB7CiBwdWJsaWM6Ci0gICAgUlRDQ2VydGlmaWNhdGVH ZW5lcmF0b3JDYWxsYmFjayhSZWY8U2VjdXJpdHlPcmlnaW4+JiYgb3JpZ2luLCBET01Qcm9taXNl RGVmZXJyZWQ8SURMSW50ZXJmYWNlPFJUQ0NlcnRpZmljYXRlPj4mJiBwcm9taXNlKQorICAgIFJU Q0NlcnRpZmljYXRlR2VuZXJhdG9yQ2FsbGJhY2soUmVmPFNlY3VyaXR5T3JpZ2luPiYmIG9yaWdp biwgRnVuY3Rpb248dm9pZChFeGNlcHRpb25PcjxSZWY8UlRDQ2VydGlmaWNhdGU+PiYmKT4mJiBy ZXN1bHRDYWxsYmFjaykKICAgICAgICAgOiBtX29yaWdpbihXVEZNb3ZlKG9yaWdpbikpCi0gICAg ICAgICwgbV9wcm9taXNlKFdURk1vdmUocHJvbWlzZSkpCisgICAgICAgICwgbV9yZXN1bHRDYWxs YmFjayhXVEZNb3ZlKHJlc3VsdENhbGxiYWNrKSkKICAgICB7CiAgICAgfQogCkBAIC02Niw3ICs2 NCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgdm9pZCBPblN1Y2Nlc3MoY29uc3QgcnRjOjpz Y29wZWRfcmVmcHRyPHJ0Yzo6UlRDQ2VydGlmaWNhdGU+JiBjZXJ0aWZpY2F0ZSkgZmluYWwKICAg ICB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW29yaWdpbiA9IG1fb3JpZ2luLnJlbGVhc2VO b25OdWxsKCksIHByb21pc2UgPSBXVEZNb3ZlKG1fcHJvbWlzZS52YWx1ZSgpKSwgY2VydGlmaWNh dGVdKCkgbXV0YWJsZSB7CisgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW29yaWdpbiA9IG1fb3Jp Z2luLnJlbGVhc2VOb25OdWxsKCksIGNhbGxiYWNrID0gV1RGTW92ZShtX3Jlc3VsdENhbGxiYWNr KSwgY2VydGlmaWNhdGVdKCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBWZWN0b3I8UlRDQ2VydGlm aWNhdGU6OkR0bHNGaW5nZXJwcmludD4gZmluZ2VycHJpbnRzOwogICAgICAgICAgICAgYXV0byBz dGF0cyA9IGNlcnRpZmljYXRlLT5zc2xfY2VydGlmaWNhdGUoKS5HZXRTdGF0cygpOwogICAgICAg ICAgICAgYXV0byogaW5mbyA9IHN0YXRzLmdldCgpOwpAQCAtNzcsMTkgKzc1LDE5IEBAIHByaXZh dGU6CiAgICAgICAgICAgICB9OwogCiAgICAgICAgICAgICBhdXRvIHBlbSA9IGNlcnRpZmljYXRl LT5Ub1BFTSgpOwotICAgICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKFJUQ0NlcnRpZmljYXRlOjpj cmVhdGUoV1RGTW92ZShvcmlnaW4pLCBjZXJ0aWZpY2F0ZS0+RXhwaXJlcygpLCBXVEZNb3ZlKGZp bmdlcnByaW50cyksIGZyb21TdGRTdHJpbmcocGVtLmNlcnRpZmljYXRlKCkpLCBmcm9tU3RkU3Ry aW5nKHBlbS5wcml2YXRlX2tleSgpKSkpOworICAgICAgICAgICAgY2FsbGJhY2soUlRDQ2VydGlm aWNhdGU6OmNyZWF0ZShXVEZNb3ZlKG9yaWdpbiksIGNlcnRpZmljYXRlLT5FeHBpcmVzKCksIFdU Rk1vdmUoZmluZ2VycHJpbnRzKSwgZnJvbVN0ZFN0cmluZyhwZW0uY2VydGlmaWNhdGUoKSksIGZy b21TdGRTdHJpbmcocGVtLnByaXZhdGVfa2V5KCkpKSk7CiAgICAgICAgIH0pOwogICAgIH0KIAog ICAgIHZvaWQgT25GYWlsdXJlKCkgZmluYWwKICAgICB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJl YWQoW3Byb21pc2UgPSBXVEZNb3ZlKG1fcHJvbWlzZS52YWx1ZSgpKV0oKSBtdXRhYmxlIHsKLSAg ICAgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlvbiB7IFR5cGVFcnJvciwgIlVuYWJsZSB0 byBjcmVhdGUgYSBjZXJ0aWZpY2F0ZSJfc30pOworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtj YWxsYmFjayA9IFdURk1vdmUobV9yZXN1bHRDYWxsYmFjayldKCkgbXV0YWJsZSB7CisgICAgICAg ICAgICBjYWxsYmFjayhFeGNlcHRpb24geyBUeXBlRXJyb3IsICJVbmFibGUgdG8gY3JlYXRlIGEg Y2VydGlmaWNhdGUiX3N9KTsKICAgICAgICAgfSk7CiAgICAgfQogCiAgICAgUmVmUHRyPFNlY3Vy aXR5T3JpZ2luPiBtX29yaWdpbjsKLSAgICBzdGQ6Om9wdGlvbmFsPERPTVByb21pc2VEZWZlcnJl ZDxJRExJbnRlcmZhY2U8UlRDQ2VydGlmaWNhdGU+Pj4gbV9wcm9taXNlOworICAgIEZ1bmN0aW9u PHZvaWQoRXhjZXB0aW9uT3I8UmVmPFJUQ0NlcnRpZmljYXRlPj4mJik+IG1fcmVzdWx0Q2FsbGJh Y2s7CiB9OwogCiBzdGF0aWMgaW5saW5lIHJ0Yzo6S2V5UGFyYW1zIGtleVBhcmFtc0Zyb21DZXJ0 aWZpY2F0ZVR5cGUoY29uc3QgUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpDZXJ0aWZpY2F0ZUluZm9y bWF0aW9uJiBpbmZvKQpAQCAtMTA2LDkgKzEwNCw5IEBAIHN0YXRpYyBpbmxpbmUgcnRjOjpLZXlQ YXJhbXMga2V5UGFyYW1zRnJvbUNlcnRpZmljYXRlVHlwZShjb25zdCBQZWVyQ29ubmVjdGlvbkJh CiAgICAgUkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBnZW5lcmF0ZUNl cnRpZmljYXRlKFJlZjxTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4sIExpYldlYlJUQ1Byb3ZpZGVy JiBwcm92aWRlciwgY29uc3QgUGVlckNvbm5lY3Rpb25CYWNrZW5kOjpDZXJ0aWZpY2F0ZUluZm9y bWF0aW9uJiBpbmZvLCBET01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPFJUQ0NlcnRpZmlj YXRlPj4mJiBwcm9taXNlKQordm9pZCBnZW5lcmF0ZUNlcnRpZmljYXRlKFJlZjxTZWN1cml0eU9y aWdpbj4mJiBvcmlnaW4sIExpYldlYlJUQ1Byb3ZpZGVyJiBwcm92aWRlciwgY29uc3QgUGVlckNv bm5lY3Rpb25CYWNrZW5kOjpDZXJ0aWZpY2F0ZUluZm9ybWF0aW9uJiBpbmZvLCBGdW5jdGlvbjx2 b2lkKEV4Y2VwdGlvbk9yPFJlZjxSVENDZXJ0aWZpY2F0ZT4+JiYpPiYmIHJlc3VsdENhbGxiYWNr KQogewotICAgIHJ0Yzo6c2NvcGVkX3JlZnB0cjxSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxi YWNrPiBjYWxsYmFjayhuZXcgcnRjOjpSZWZDb3VudGVkT2JqZWN0PFJUQ0NlcnRpZmljYXRlR2Vu ZXJhdG9yQ2FsbGJhY2s+KFdURk1vdmUob3JpZ2luKSwgV1RGTW92ZShwcm9taXNlKSkpOworICAg IHJ0Yzo6c2NvcGVkX3JlZnB0cjxSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvckNhbGxiYWNrPiBjYWxs YmFjayhuZXcgcnRjOjpSZWZDb3VudGVkT2JqZWN0PFJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yQ2Fs bGJhY2s+KFdURk1vdmUob3JpZ2luKSwgV1RGTW92ZShyZXN1bHRDYWxsYmFjaykpKTsKIAogICAg IGFic2w6Om9wdGlvbmFsPHVpbnQ2NF90PiBleHBpcmVzTXM7CiAgICAgaWYgKGluZm8uZXhwaXJl cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2Vi cnRjL0xpYldlYlJUQ0NlcnRpZmljYXRlR2VuZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENDZXJ0aWZpY2F0ZUdlbmVyYXRvci5o CmluZGV4IGEyYjlmMzg5ZjBlNWViOGI0ZDA2NDVjN2Q0Y2NhMjJhODdjYjE5ZjcuLmE5MmEyYmVi NTg1NTU2NTg4YTAxMTNhOThlYWIxMzljMThhMmM0YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0NlcnRpZmljYXRlR2Vu ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJy dGMvTGliV2ViUlRDQ2VydGlmaWNhdGVHZW5lcmF0b3IuaApAQCAtMzUsNyArMzUsNyBAQCBjbGFz cyBTZWN1cml0eU9yaWdpbjsKIAogbmFtZXNwYWNlIExpYldlYlJUQ0NlcnRpZmljYXRlR2VuZXJh dG9yIHsKIAotdm9pZCBnZW5lcmF0ZUNlcnRpZmljYXRlKFJlZjxTZWN1cml0eU9yaWdpbj4mJiwg TGliV2ViUlRDUHJvdmlkZXImLCBjb25zdCBQZWVyQ29ubmVjdGlvbkJhY2tlbmQ6OkNlcnRpZmlj YXRlSW5mb3JtYXRpb24mLCBET01Qcm9taXNlRGVmZXJyZWQ8SURMSW50ZXJmYWNlPFJUQ0NlcnRp ZmljYXRlPj4mJik7Cit2b2lkIGdlbmVyYXRlQ2VydGlmaWNhdGUoUmVmPFNlY3VyaXR5T3JpZ2lu PiYmLCBMaWJXZWJSVENQcm92aWRlciYsIGNvbnN0IFBlZXJDb25uZWN0aW9uQmFja2VuZDo6Q2Vy dGlmaWNhdGVJbmZvcm1hdGlvbiYsIEZ1bmN0aW9uPHZvaWQoRXhjZXB0aW9uT3I8UmVmPFJUQ0Nl cnRpZmljYXRlPj4mJik+JiYpOwogCiB9IC8vIG5hbWVzcGFjZSBMaWJXZWJSVENDZXJ0aWZpY2F0 ZUdlbmVyYXRvcgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RP TVByb21pc2VEZWZlcnJlZC5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01Qcm9t aXNlRGVmZXJyZWQuaAppbmRleCBlYjkwNGM5Y2Q1MjlhOTQ2OTg2MjAwMzBmNGU3YzU3MTU4ODI4 YzNjLi4xNjQyZWY0NGE1ZDliZDRjZWUwODY3NzcyMTgxMzJjMmU3OGE5ZWUxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVByb21pc2VEZWZlcnJlZC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NUHJvbWlzZURlZmVycmVkLmgKQEAgLTI2 MSw3ICsyNjEsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgUmVmPERlZmVycmVkUHJvbWlzZT4gbV9wcm9t aXNlOwogfTsKIAotdGVtcGxhdGU8dHlwZW5hbWUgSURMVHlwZT4gCit0ZW1wbGF0ZTx0eXBlbmFt ZSBJRExUeXBlPgogY2xhc3MgRE9NUHJvbWlzZURlZmVycmVkIDogcHVibGljIERPTVByb21pc2VE ZWZlcnJlZEJhc2UgewogcHVibGljOgogICAgIHVzaW5nIERPTVByb21pc2VEZWZlcnJlZEJhc2U6 OkRPTVByb21pc2VEZWZlcnJlZEJhc2U7CkBAIC0yNzAsMTAgKzI3MCw0MyBAQCBwdWJsaWM6CiAg ICAgdXNpbmcgRE9NUHJvbWlzZURlZmVycmVkQmFzZTo6cmVqZWN0OwogCiAgICAgdm9pZCByZXNv bHZlKHR5cGVuYW1lIElETFR5cGU6OlBhcmFtZXRlclR5cGUgdmFsdWUpCi0gICAgeyAKKyAgICB7 CisgICAgICAgIG1fcHJvbWlzZS0+cmVzb2x2ZTxJRExUeXBlPihzdGQ6OmZvcndhcmQ8dHlwZW5h bWUgSURMVHlwZTo6UGFyYW1ldGVyVHlwZT4odmFsdWUpKTsKKyAgICB9CisKKyAgICB2b2lkIHNl dHRsZShFeGNlcHRpb25Pcjx0eXBlbmFtZSBJRExUeXBlOjpQYXJhbWV0ZXJUeXBlPiYmIHJlc3Vs dCkKKyAgICB7CisgICAgICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpIHsKKyAgICAgICAg ICAgIHJlamVjdChyZXN1bHQucmVsZWFzZUV4Y2VwdGlvbigpKTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorICAgICAgICByZXNvbHZlKHJlc3VsdC5yZWxlYXNlUmV0dXJuVmFsdWUo KSk7CisgICAgfQorfTsKKwordGVtcGxhdGU8dHlwZW5hbWUgVD4KK2NsYXNzIERPTVByb21pc2VE ZWZlcnJlZDxJRExJbnRlcmZhY2U8VD4+IDogcHVibGljIERPTVByb21pc2VEZWZlcnJlZEJhc2Ug eworcHVibGljOgorICAgIHVzaW5nIERPTVByb21pc2VEZWZlcnJlZEJhc2U6OkRPTVByb21pc2VE ZWZlcnJlZEJhc2U7CisgICAgdXNpbmcgRE9NUHJvbWlzZURlZmVycmVkQmFzZTo6b3BlcmF0b3I9 OworICAgIHVzaW5nIERPTVByb21pc2VEZWZlcnJlZEJhc2U6OnByb21pc2U7CisgICAgdXNpbmcg RE9NUHJvbWlzZURlZmVycmVkQmFzZTo6cmVqZWN0OworICAgIHVzaW5nIElETFR5cGUgPSBJRExJ bnRlcmZhY2U8VD47CisKKyAgICB2b2lkIHJlc29sdmUodHlwZW5hbWUgSURMVHlwZTo6SW5uZXJQ YXJhbWV0ZXJUeXBlIHZhbHVlKQorICAgIHsKICAgICAgICAgbV9wcm9taXNlLT5yZXNvbHZlPElE TFR5cGU+KHN0ZDo6Zm9yd2FyZDx0eXBlbmFtZSBJRExUeXBlOjpQYXJhbWV0ZXJUeXBlPih2YWx1 ZSkpOwogICAgIH0KIAorICAgIHZvaWQgc2V0dGxlKEV4Y2VwdGlvbk9yPHR5cGVuYW1lIElETFR5 cGU6OklubmVyUGFyYW1ldGVyVHlwZT4mJiByZXN1bHQpCisgICAgeworICAgICAgICBpZiAocmVz dWx0Lmhhc0V4Y2VwdGlvbigpKSB7CisgICAgICAgICAgICByZWplY3QocmVzdWx0LnJlbGVhc2VF eGNlcHRpb24oKSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgcmVz b2x2ZShyZXN1bHQucmVsZWFzZVJldHVyblZhbHVlKCkpOworICAgIH0KKwogICAgIHZvaWQgc2V0 dGxlKEV4Y2VwdGlvbk9yPHR5cGVuYW1lIElETFR5cGU6OlBhcmFtZXRlclR5cGU+JiYgcmVzdWx0 KQogICAgIHsKICAgICAgICAgaWYgKHJlc3VsdC5oYXNFeGNlcHRpb24oKSkgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUv dGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IGJmMmQyZTBiNWM0ZGYyYjBjMTYyZjk4M2M4YTY2 ZWRkMzk2MDYxNGEuLjhmNzI0YTJmMjg5ZjA2NDM4ZGIxNDdkOGUzM2U5ZjQyYzA0MGI5ODkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTU1ODcsMTMgKzU1ODcsMTMgQEAg dm9pZCBJbnRlcm5hbHM6OnNlbmRIMlBpbmcoU3RyaW5nIHVybCwgRE9NUHJvbWlzZURlZmVycmVk PElETERvdWJsZT4mJiBwcm9taXNlKQogewogICAgIGF1dG8qIGRvY3VtZW50ID0gY29udGV4dERv Y3VtZW50KCk7CiAgICAgaWYgKCFkb2N1bWVudCkgewotICAgICAgICBwcm9taXNlLnNldHRsZShJ bnZhbGlkU3RhdGVFcnJvcik7CisgICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRTdGF0ZUVy cm9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGF1dG8qIGZyYW1lID0gZG9jdW1l bnQtPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkgewotICAgICAgICBwcm9taXNlLnNldHRsZShJ bnZhbGlkU3RhdGVFcnJvcik7CisgICAgICAgIHByb21pc2UucmVqZWN0KEludmFsaWRTdGF0ZUVy cm9yKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTYwMSw3ICs1NjAxLDcgQEAgdm9p ZCBJbnRlcm5hbHM6OnNlbmRIMlBpbmcoU3RyaW5nIHVybCwgRE9NUHJvbWlzZURlZmVycmVkPElE TERvdWJsZT4mJiBwcm9taXNlKQogICAgICAgICBpZiAocmVzdWx0Lmhhc192YWx1ZSgpKQogICAg ICAgICAgICAgcHJvbWlzZS5yZXNvbHZlKHJlc3VsdC52YWx1ZSgpLnZhbHVlKCkpOwogICAgICAg ICBlbHNlCi0gICAgICAgICAgICBwcm9taXNlLnNldHRsZShJbnZhbGlkU3RhdGVFcnJvcik7Cisg ICAgICAgICAgICBwcm9taXNlLnJlamVjdChJbnZhbGlkU3RhdGVFcnJvcik7CiAgICAgfSk7CiB9 CiAK