218294 2020-10-28 10:48:46 -0700 [MSE] Handle trackId changing across Initialization Segments 2020-10-28 19:14:52 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218317 InRadar P2 Normal --- 1 jer.noble jer.noble calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1702378 0 jer.noble 2020-10-28 10:48:46 -0700 [MSE] Handle trackId changing across Initialization Segments 1702388 1 webkit-bug-importer 2020-10-28 11:02:41 -0700 <rdar://problem/70771306> 1702389 2 412546 jer.noble 2020-10-28 11:02:53 -0700 Created attachment 412546 Patch 1702402 3 412546 peng.liu6 2020-10-28 11:25:23 -0700 Comment on attachment 412546 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412546&action=review > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1166 > + } Nit. There seems to be some duplicated code snippets, can we define a function for them? > LayoutTests/media/media-source/media-source-trackid-change.html:66 > + consoleWrite('Modify an Media Segment to have a different trackID'); Nit. s/an Media/a Media/ 1702422 4 jer.noble 2020-10-28 11:43:26 -0700 (In reply to Peng Liu from comment #3) > Comment on attachment 412546 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=412546&action=review > > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1166 > > + } > > Nit. There seems to be some duplicated code snippets, can we define a > function for them? Not really as they're all different types. > > LayoutTests/media/media-source/media-source-trackid-change.html:66 > > + consoleWrite('Modify an Media Segment to have a different trackID'); > > Nit. s/an Media/a Media/ Will change. 1702456 5 412546 eric.carlson 2020-10-28 12:46:28 -0700 Comment on attachment 412546 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412546&action=review > Source/WebCore/ChangeLog:5 > + Nit: <rdar://problem/????> 1702459 6 412563 jer.noble 2020-10-28 12:54:33 -0700 Created attachment 412563 Patch for landing 1702475 7 ews-feeder 2020-10-28 13:43:12 -0700 Committed r269121: <https://trac.webkit.org/changeset/269121> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412563. 412546 2020-10-28 11:02:53 -0700 2020-10-28 12:54:30 -0700 Patch bug-218294-20201028110253.patch text/plain 13892 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE0YTY1YWI5NGRlNTE3 ZDY3M2Q3MTI4ZWViODQzZWIxNTI5YTA1My4uZTA1YmRiZTExZTljN2MxMmRkYmRlYjhkMDBlMGU0 M2JmMTBiMTJkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTEwLTI4ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIEhhbmRsZSB0cmFj a0lkIGNoYW5naW5nIGFjcm9zcyBJbml0aWFsaXphdGlvbiBTZWdtZW50cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4Mjk0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogbWVkaWEvbWVkaWEtc291 cmNlL21lZGlhLXNvdXJjZS10cmFja2lkLWNoYW5nZS5odG1sCisKKyAgICAgICAgV2hlbiBhcHBl bmRpbmcgYW4gaW5pdGlhbGl6YXRpb24gc2VnbWVudCBhZnRlciB0aGUgcmVjZWl2ZWRGaXJzdElu aXRpYWxpemF0aW9uU2VnbWVudCBmbGFnIGlzCisgICAgICAgIHRydWUsIGFuZCB3aGVuIHRoZSBu dW1iZXIgb2YgdmlkZW8gb3IgYXVkaW8gdHJhY2tzIGlzIDEsIHRoZSB0cmFja0lkIGlzIGFsbG93 ZWQgdG8gY2hhbmdlIGFjcm9zcworICAgICAgICBpbml0aWFsaWF6dGlvbiBzZWdtZW50cy4gV2hl biB0aGlzIG9jY3VycywgbW92ZSB0aGUgVHJhY2tCdWZmZXIgaW5zaWRlIHRoZSB0cmFja0J1ZmZl ck1hcCB0bworICAgICAgICByZWZlciB0byB0aGUgbmV3IHRyYWNrSWQsIHNvIHRoYXQgd2hlbiBN ZWRpYVNhbXBsZXMgYXJlIHBhcnNlZCwgdGhleSdyZSBwdXQgaW50byB0aGUgY29ycmVjdAorICAg ICAgICBUcmFja0J1ZmZlci4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNl QnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVy UHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQpOgorICAgICAgICAqIGh0bWwv dHJhY2svQXVkaW9UcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBdWRpb1RyYWNrOjpzZXRQ cml2YXRlKToKKyAgICAgICAgKiBodG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0VHJhY2s6OnNldFByaXZhdGUpOgorICAgICAgICAqIGh0 bWwvdHJhY2svVmlkZW9UcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaWRlb1RyYWNrOjpz ZXRQcml2YXRlKToKKwogMjAyMC0xMC0yNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNv bT4KIAogICAgICAgICBbTWFjXSBBdWRpbyBhbmQgVmlkZW8gZWxlbWVudCBjcmVhdGlvbiB1cCB0 byAzMDB4IHNsb3dlciB0aGFuIG90aGVyIGJyb3dzZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKaW5kZXggN2ZlYjdjNjY4ZjUy MWIxMTdjYWY0YjM1M2ZiMTQ4MGU2ZWJjMzZkNS4uYjE2YzJkZjVlZDRhNjBlMjA3ZjkxMThlMmRj N2RkMzllOWM5MTBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNv dXJjZS9Tb3VyY2VCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz b3VyY2UvU291cmNlQnVmZmVyLmNwcApAQCAtMTExMSwxMSArMTExMSwyMSBAQCB2b2lkIFNvdXJj ZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21l bnQoY29uc3QgSW5pdAogICAgICAgICAgICAgYXBwZW5kRXJyb3IodHJ1ZSk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KKworICAgICAgICBWZWN0b3I8c3RkOjpwYWlyPEF0b21TdHJp bmcsIFRyYWNrQnVmZmVyPj4gbmV3VHJhY2tCdWZmZXJzOworCiAgICAgICAgIC8vIDMuMiBBZGQg dGhlIGFwcHJvcHJpYXRlIHRyYWNrIGRlc2NyaXB0aW9ucyBmcm9tIHRoaXMgaW5pdGlhbGl6YXRp b24gc2VnbWVudCB0byBlYWNoIG9mIHRoZSB0cmFjayBidWZmZXJzLgogICAgICAgICBBU1NFUlQo c2VnbWVudC5hdWRpb1RyYWNrcy5zaXplKCkgPT0gYXVkaW9UcmFja3MoKS5sZW5ndGgoKSk7CiAg ICAgICAgIGZvciAoYXV0byYgYXVkaW9UcmFja0luZm8gOiBzZWdtZW50LmF1ZGlvVHJhY2tzKSB7 CiAgICAgICAgICAgICBpZiAoYXVkaW9UcmFja3MoKS5sZW5ndGgoKSA9PSAxKSB7Ci0gICAgICAg ICAgICAgICAgYXVkaW9UcmFja3MoKS5pdGVtKDApLT5zZXRQcml2YXRlKCphdWRpb1RyYWNrSW5m by50cmFjayk7CisgICAgICAgICAgICAgICAgYXV0byogdHJhY2sgPSBhdWRpb1RyYWNrcygpLml0 ZW0oMCk7CisgICAgICAgICAgICAgICAgYXV0byBvbGRJZCA9IHRyYWNrLT5pZCgpOworICAgICAg ICAgICAgICAgIGF1dG8gbmV3SWQgPSBhdWRpb1RyYWNrSW5mby50cmFjay0+aWQoKTsKKyAgICAg ICAgICAgICAgICB0cmFjay0+c2V0UHJpdmF0ZSgqYXVkaW9UcmFja0luZm8udHJhY2spOworICAg ICAgICAgICAgICAgIGlmIChuZXdJZCAhPSBvbGRJZCkgeworICAgICAgICAgICAgICAgICAgICBh dXRvIHRyYWNrQnVmZmVyID0gbV90cmFja0J1ZmZlck1hcC50YWtlKG9sZElkKTsKKyAgICAgICAg ICAgICAgICAgICAgbmV3VHJhY2tCdWZmZXJzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihuZXdJZCwg V1RGTW92ZSh0cmFja0J1ZmZlcikpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAKQEAgLTExMjcsNyArMTEzNywxNCBAQCB2b2lkIFNv dXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNl Z21lbnQoY29uc3QgSW5pdAogICAgICAgICBBU1NFUlQoc2VnbWVudC52aWRlb1RyYWNrcy5zaXpl KCkgPT0gdmlkZW9UcmFja3MoKS5sZW5ndGgoKSk7CiAgICAgICAgIGZvciAoYXV0byYgdmlkZW9U cmFja0luZm8gOiBzZWdtZW50LnZpZGVvVHJhY2tzKSB7CiAgICAgICAgICAgICBpZiAodmlkZW9U cmFja3MoKS5sZW5ndGgoKSA9PSAxKSB7Ci0gICAgICAgICAgICAgICAgdmlkZW9UcmFja3MoKS5p dGVtKDApLT5zZXRQcml2YXRlKCp2aWRlb1RyYWNrSW5mby50cmFjayk7CisgICAgICAgICAgICAg ICAgYXV0byogdHJhY2sgPSB2aWRlb1RyYWNrcygpLml0ZW0oMCk7CisgICAgICAgICAgICAgICAg YXV0byBvbGRJZCA9IHRyYWNrLT5pZCgpOworICAgICAgICAgICAgICAgIGF1dG8gbmV3SWQgPSB2 aWRlb1RyYWNrSW5mby50cmFjay0+aWQoKTsKKyAgICAgICAgICAgICAgICB0cmFjay0+c2V0UHJp dmF0ZSgqdmlkZW9UcmFja0luZm8udHJhY2spOworICAgICAgICAgICAgICAgIGlmIChuZXdJZCAh PSBvbGRJZCkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIHRyYWNrQnVmZmVyID0gbV90cmFj a0J1ZmZlck1hcC50YWtlKG9sZElkKTsKKyAgICAgICAgICAgICAgICAgICAgbmV3VHJhY2tCdWZm ZXJzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihuZXdJZCwgV1RGTW92ZSh0cmFja0J1ZmZlcikpKTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9 CiAKQEAgLTExMzksNyArMTE1NiwxNCBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVy UHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQoY29uc3QgSW5pdAogICAgICAg ICBBU1NFUlQoc2VnbWVudC50ZXh0VHJhY2tzLnNpemUoKSA9PSB0ZXh0VHJhY2tzKCkubGVuZ3Ro KCkpOwogICAgICAgICBmb3IgKGF1dG8mIHRleHRUcmFja0luZm8gOiBzZWdtZW50LnRleHRUcmFj a3MpIHsKICAgICAgICAgICAgIGlmICh0ZXh0VHJhY2tzKCkubGVuZ3RoKCkgPT0gMSkgewotICAg ICAgICAgICAgICAgIGRvd25jYXN0PEluYmFuZFRleHRUcmFjaz4oKnRleHRUcmFja3MoKS5pdGVt KDApKS5zZXRQcml2YXRlKCp0ZXh0VHJhY2tJbmZvLnRyYWNrKTsKKyAgICAgICAgICAgICAgICBh dXRvKiB0cmFjayA9IGRvd25jYXN0PEluYmFuZFRleHRUcmFjaz4odGV4dFRyYWNrcygpLml0ZW0o MCkpOworICAgICAgICAgICAgICAgIGF1dG8gb2xkSWQgPSB0cmFjay0+aWQoKTsKKyAgICAgICAg ICAgICAgICBhdXRvIG5ld0lkID0gdGV4dFRyYWNrSW5mby50cmFjay0+aWQoKTsKKyAgICAgICAg ICAgICAgICB0cmFjay0+c2V0UHJpdmF0ZSgqdGV4dFRyYWNrSW5mby50cmFjayk7CisgICAgICAg ICAgICAgICAgaWYgKG5ld0lkICE9IG9sZElkKSB7CisgICAgICAgICAgICAgICAgICAgIGF1dG8g dHJhY2tCdWZmZXIgPSBtX3RyYWNrQnVmZmVyTWFwLnRha2Uob2xkSWQpOworICAgICAgICAgICAg ICAgICAgICBuZXdUcmFja0J1ZmZlcnMuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKG5ld0lkLCBXVEZN b3ZlKHRyYWNrQnVmZmVyKSkpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgIH0KIApAQCAtMTE0OCw2ICsxMTcyLDExIEBAIHZvaWQgU291cmNl QnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZUluaXRpYWxpemF0aW9uU2VnbWVu dChjb25zdCBJbml0CiAgICAgICAgICAgICBkb3duY2FzdDxJbmJhbmRUZXh0VHJhY2s+KCp0ZXh0 VHJhY2spLnNldFByaXZhdGUoKnRleHRUcmFja0luZm8udHJhY2spOwogICAgICAgICB9CiAKKyAg ICAgICAgd2hpbGUgKCFuZXdUcmFja0J1ZmZlcnMuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBh dXRvIHRyYWNrUGFpciA9IG5ld1RyYWNrQnVmZmVycy50YWtlTGFzdCgpOworICAgICAgICAgICAg bV90cmFja0J1ZmZlck1hcC5hZGQodHJhY2tQYWlyLmZpcnN0LCBXVEZNb3ZlKHRyYWNrUGFpci5z ZWNvbmQpKTsKKyAgICAgICAgfQorCiAgICAgICAgIC8vIDMuMyBTZXQgdGhlIG5lZWQgcmFuZG9t IGFjY2VzcyBwb2ludCBmbGFnIG9uIGFsbCB0cmFjayBidWZmZXJzIHRvIHRydWUuCiAgICAgICAg IGZvciAoYXV0byYgdHJhY2tCdWZmZXIgOiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKQogICAg ICAgICAgICAgdHJhY2tCdWZmZXIubmVlZFJhbmRvbUFjY2Vzc0ZsYWcgPSB0cnVlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRpb1RyYWNrLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svQXVkaW9UcmFjay5jcHAKaW5kZXggODA5ZjFiY2UxZjg0YTVkM2U4 MzdlMTAyZmI2ZWY2ZDI0YzU0ZjlmOC4uY2FiNzc4MjFhOTQ3Y2Q4ZWM3YTIyMDk1Zjc5YTIyNjk5 ZmQwYzMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRpb1RyYWNr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0F1ZGlvVHJhY2suY3BwCkBAIC0x MDQsNiArMTA0LDcgQEAgdm9pZCBBdWRpb1RyYWNrOjpzZXRQcml2YXRlKEF1ZGlvVHJhY2tQcml2 YXRlJiB0cmFja1ByaXZhdGUpCiAjZW5kaWYKIAogICAgIHVwZGF0ZUtpbmRGcm9tUHJpdmF0ZSgp OworICAgIHNldElkKG1fcHJpdmF0ZS0+aWQoKSk7CiB9CiAKIGJvb2wgQXVkaW9UcmFjazo6aXNW YWxpZEtpbmQoY29uc3QgQXRvbVN0cmluZyYgdmFsdWUpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHAKaW5kZXggYTZjYjE4MmY4YTdjZDY5YTFj Y2EzNTQ0ZjAyOWViYzE3NTZjNjY0OS4uYTYwZTk5ZWFiZmI4OWM4OTJhNTFkMmU4NTg1ZGU5ZGJj NjYwYTE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRUZXh0 VHJhY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kVGV4dFRyYWNr LmNwcApAQCAtNzcsNiArNzcsNyBAQCB2b2lkIEluYmFuZFRleHRUcmFjazo6c2V0UHJpdmF0ZShJ bmJhbmRUZXh0VHJhY2tQcml2YXRlJiB0cmFja1ByaXZhdGUpCiAKICAgICBzZXRNb2RlSW50ZXJu YWwobW9kZSgpKTsKICAgICB1cGRhdGVLaW5kRnJvbVByaXZhdGUoKTsKKyAgICBzZXRJZChtX3By aXZhdGUtPmlkKCkpOwogfQogCiB2b2lkIEluYmFuZFRleHRUcmFjazo6c2V0TW9kZShNb2RlIG1v ZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZpZGVvVHJhY2suY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9WaWRlb1RyYWNrLmNwcAppbmRleCA4YmUxZjQ5 ZGQ5MDlkMjlhZmU3NjkxNWY4ZWNkZjBkYzIwYzU5ODU2Li5lZDc1NWEyODBlZjNmODNhYTkxNmUy MTljMTIxYjBkN2FiNDliM2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNr L1ZpZGVvVHJhY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVmlkZW9UcmFj ay5jcHAKQEAgLTEwOSw2ICsxMDksNyBAQCB2b2lkIFZpZGVvVHJhY2s6OnNldFByaXZhdGUoVmlk ZW9UcmFja1ByaXZhdGUmIHRyYWNrUHJpdmF0ZSkKIAogICAgIG1fcHJpdmF0ZS0+c2V0U2VsZWN0 ZWQobV9zZWxlY3RlZCk7CiAgICAgdXBkYXRlS2luZEZyb21Qcml2YXRlKCk7CisgICAgc2V0SWQo bV9wcml2YXRlLT5pZCgpKTsKIH0KIAogYm9vbCBWaWRlb1RyYWNrOjppc1ZhbGlkS2luZChjb25z dCBBdG9tU3RyaW5nJiB2YWx1ZSkgY29uc3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1YTczYjU2ZmVlNDdkYTVjMTRkYTQ1 OGQ3NGU5MWE3YzMzYzE5MjYyLi5mMzk4NGQ2Y2FiNGM0MGQwMzIwYzM3OTkwNGVmYzY1MTg1ODMw YTQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMTAtMjggIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW01TRV0gSGFuZGxlIHRyYWNrSWQgY2hhbmdpbmcg YWNyb3NzIEluaXRpYWxpemF0aW9uIFNlZ21lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgyOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Ut dHJhY2tpZC1jaGFuZ2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tZWRp YS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLmh0bWw6IEFkZGVkLgorCiAyMDIw LTEwLTI0ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFtCaWdT dXJdIEFwcGVuZGluZyBhIG5ldyBXZWJNIGluaXQgc2VnbWVudCBiZXR3ZWVuIENsdXN0ZXIgZWxl bWVudHMgdGhyb3dzIGFuIGVycm9yCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRp YS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtdHJhY2tpZC1jaGFuZ2UtZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQxNzM2MDcyMTc4ZjZhMzBmMmM5OTYxMWJiYjFmM2U5YWNj MDI4M2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uv bWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQzIEBA CitUaGlzIHRlc3RzIHRoZSBhYmlsaXR5IG9mIHRoZSBTb3VyY2VCdWZmZXIgdG8gY2hhbmdlIHRy YWNrSWRzIHdoZW4gYSBzaW5nbGUgdmlkZW9UcmFjayB3aXRoIGEgZGlmZmVyZW50IHRyYWNrSWQg aXMgYXBwZW5kZWQuCisKK1JVTih2aWRlby5zcmMgPSBVUkwuY3JlYXRlT2JqZWN0VVJMKHNvdXJj ZSkpCitFVkVOVChzb3VyY2VvcGVuKQorUlVOKHNvdXJjZS5kdXJhdGlvbiA9IGxvYWRlci5kdXJh dGlvbigpKQorUlVOKHNvdXJjZUJ1ZmZlciA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIobG9hZGVy LnR5cGUoKSkpCitSVU4oc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihsb2FkZXIuaW5pdFNlZ21l bnQoKSkpCitFVkVOVCh1cGRhdGUpCitBcHBlbmQgYSBtZWRpYSBzZWdtZW50LgorUlVOKHNvdXJj ZUJ1ZmZlci5hcHBlbmRCdWZmZXIobG9hZGVyLm1lZGlhU2VnbWVudCgwKSkpCitFVkVOVCh1cGRh dGUpCitHZXQgdGhlIGN1cnJlbnQgYnVmZmVyZWQgcmFuZ2UKK1JVTihpbml0aWFsQnVmZmVyZWRF bmQgPSBzb3VyY2VCdWZmZXIuYnVmZmVyZWQuZW5kKDApKQorTW9kaWZ5IGFuIEluaXQgU2VnbWVu dCB0byBoYXZlIGEgZGlmZmVyZW50IHRyYWNrSUQKK1JVTihtb2RpZmllZEluaXRTZWdtZW50ID0g bG9hZGVyLmluaXRTZWdtZW50KCkuc2xpY2UoMCkpCitSVU4oaW5pdFNlZ21lbnRWaWV3ID0gbmV3 IERhdGFWaWV3KG1vZGlmaWVkSW5pdFNlZ21lbnQpKQorRVhQRUNURUQgKGluaXRTZWdtZW50Vmll dy5nZXRJbnQzMigxODApID09ICcxJykgT0sKK1JVTihpbml0U2VnbWVudFZpZXcuc2V0SW50MzIo MTgwLCAzKSkKK0VYUEVDVEVEIChpbml0U2VnbWVudFZpZXcuZ2V0SW50MzIoNjkzKSA9PSAnMicp IE9LCitSVU4oaW5pdFNlZ21lbnRWaWV3LnNldEludDMyKDY5MywgNCkpCitFWFBFQ1RFRCAoaW5p dFNlZ21lbnRWaWV3LmdldEludDMyKDExMDkpID09ICcxJykgT0sKK1JVTihpbml0U2VnbWVudFZp ZXcuc2V0SW50MzIoMTEwOSwgMykpCitFWFBFQ1RFRCAoaW5pdFNlZ21lbnRWaWV3LmdldEludDMy KDExNDEpID09ICcyJykgT0sKK1JVTihpbml0U2VnbWVudFZpZXcuc2V0SW50MzIoMTE0MSwgNCkp CitBcHBlbmQgdGhlIG1vZGlmaWVkIEluaXQgU2VnbWVudAorUlVOKHNvdXJjZUJ1ZmZlci5hcHBl bmRCdWZmZXIobW9kaWZpZWRJbml0U2VnbWVudCkpCitFVkVOVCh1cGRhdGUpCitFWFBFQ1RFRCAo dmlkZW8udmlkZW9UcmFja3NbMF0uaWQgPT0gJzMnKSBPSworRVhQRUNURUQgKHZpZGVvLmF1ZGlv VHJhY2tzWzBdLmlkID09ICc0JykgT0sKK01vZGlmeSBhbiBNZWRpYSBTZWdtZW50IHRvIGhhdmUg YSBkaWZmZXJlbnQgdHJhY2tJRAorUlVOKG1vZGlmaWVkTWVkaWFTZWdtZW50ID0gbG9hZGVyLm1l ZGlhU2VnbWVudCgwKS5zbGljZSgwKSkKK1JVTihtZWRpYVNlZ21lbnRWaWV3ID0gbmV3IERhdGFW aWV3KG1vZGlmaWVkTWVkaWFTZWdtZW50KSkKK0VYUEVDVEVEIChtZWRpYVNlZ21lbnRWaWV3Lmdl dEludDMyKDQ0KSA9PSAnMScpIE9LCitSVU4obWVkaWFTZWdtZW50Vmlldy5zZXRJbnQzMig0NCwg MykpCitFWFBFQ1RFRCAobWVkaWFTZWdtZW50Vmlldy5nZXRJbnQzMigzMjQpID09ICcyJykgT0sK K1JVTihtZWRpYVNlZ21lbnRWaWV3LnNldEludDMyKDMyNCwgNCkpCitSVU4oc291cmNlQnVmZmVy LnRpbWVzdGFtcE9mZnNldCA9IHNvdXJjZUJ1ZmZlci5idWZmZXJlZC5lbmQoMCkpCitBcHBlbmQg YSBtZWRpYSBzZWdtZW50LgorUlVOKHNvdXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIobW9kaWZpZWRN ZWRpYVNlZ21lbnQpKQorRVZFTlQodXBkYXRlKQorRVhQRUNURUQgKHNvdXJjZUJ1ZmZlci5idWZm ZXJlZC5lbmQoMCkgPiAnMScpIE9LCitFTkQgT0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLmh0bWwg Yi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hh bmdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uYjE4MzNhYmQyYmI0YjBmMWQ3Zjg1NGVhOGFiNjg5ODBiMzdl MjIyNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYS1zb3VyY2UtdHJhY2tpZC1jaGFuZ2UuaHRtbApAQCAtMCwwICsxLDk2IEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPm1lZGlhLXNvdXJjZS10cmFja2lk LWNoYW5nZTwvdGl0bGU+CisgICAgPHNjcmlwdCBzcmM9Im1lZGlhLXNvdXJjZS1sb2FkZXIuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi92aWRlby10ZXN0LmpzIj48L3NjcmlwdD4K KyAgICA8c2NyaXB0PgorICAgIHZhciBsb2FkZXI7CisgICAgdmFyIHNvdXJjZTsKKyAgICB2YXIg c291cmNlQnVmZmVyOworICAgIHZhciBtb2RpZmllZEluaXRTZWdtZW50OworICAgIHZhciBtb2Rp ZmllZE1lZGlhU2VnbWVudDsKKworICAgIGZ1bmN0aW9uIGxvYWRlclByb21pc2UobG9hZGVyKSB7 CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAg ICAgICAgICBsb2FkZXIub25sb2FkID0gcmVzb2x2ZTsKKyAgICAgICAgICAgIGxvYWRlci5vbmVy cm9yID0gcmVqZWN0OworICAgICAgICB9KTsKKyAgICB9CisKKyAgICB3aW5kb3cuYWRkRXZlbnRM aXN0ZW5lcignbG9hZCcsIGFzeW5jIGV2ZW50ID0+IHsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAg ICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgICAgIGxvYWRlciA9IG5ldyBNZWRpYVNv dXJjZUxvYWRlcignY29udGVudC90ZXN0LWZyYWdtZW50ZWQtbWFuaWZlc3QuanNvbicpOworICAg ICAgICAgICAgYXdhaXQgbG9hZGVyUHJvbWlzZShsb2FkZXIpOworCisgICAgICAgICAgICBzb3Vy Y2UgPSBuZXcgTWVkaWFTb3VyY2UoKTsKKyAgICAgICAgICAgIHJ1bigndmlkZW8uc3JjID0gVVJM LmNyZWF0ZU9iamVjdFVSTChzb3VyY2UpJyk7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKHNv dXJjZSwgJ3NvdXJjZW9wZW4nKTsKKyAgICAgICAgICAgIHdhaXRGb3Ioc291cmNlLCAnZXJyb3In KS50aGVuKGVuZFRlc3QpOworICAgICAgICAgICAgd2FpdEZvckV2ZW50QW5kRmFpbCgnZXJyb3In KTsKKworICAgICAgICAgICAgcnVuKCdzb3VyY2UuZHVyYXRpb24gPSBsb2FkZXIuZHVyYXRpb24o KScpOworICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIgPSBzb3VyY2UuYWRkU291cmNlQnVm ZmVyKGxvYWRlci50eXBlKCkpJyk7CisgICAgICAgICAgICBydW4oJ3NvdXJjZUJ1ZmZlci5hcHBl bmRCdWZmZXIobG9hZGVyLmluaXRTZWdtZW50KCkpJyk7CisKKyAgICAgICAgICAgIGF3YWl0IHdh aXRGb3Ioc291cmNlQnVmZmVyLCAndXBkYXRlJyk7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0 ZSgnQXBwZW5kIGEgbWVkaWEgc2VnbWVudC4nKQorICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZm ZXIuYXBwZW5kQnVmZmVyKGxvYWRlci5tZWRpYVNlZ21lbnQoMCkpJyk7CisKKyAgICAgICAgICAg IGF3YWl0IHdhaXRGb3Ioc291cmNlQnVmZmVyLCAndXBkYXRlJyk7CisKKyAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgnR2V0IHRoZSBjdXJyZW50IGJ1ZmZlcmVkIHJhbmdlJyk7CisgICAgICAgICAg ICBydW4oJ2luaXRpYWxCdWZmZXJlZEVuZCA9IHNvdXJjZUJ1ZmZlci5idWZmZXJlZC5lbmQoMCkn KTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCdNb2RpZnkgYW4gSW5pdCBTZWdtZW50IHRv IGhhdmUgYSBkaWZmZXJlbnQgdHJhY2tJRCcpOworICAgICAgICAgICAgcnVuKCdtb2RpZmllZElu aXRTZWdtZW50ID0gbG9hZGVyLmluaXRTZWdtZW50KCkuc2xpY2UoMCknKTsKKyAgICAgICAgICAg IHJ1bignaW5pdFNlZ21lbnRWaWV3ID0gbmV3IERhdGFWaWV3KG1vZGlmaWVkSW5pdFNlZ21lbnQp Jyk7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoJ2luaXRTZWdtZW50Vmlldy5nZXRJbnQzMigx ODApJywgMSk7CisgICAgICAgICAgICBydW4oJ2luaXRTZWdtZW50Vmlldy5zZXRJbnQzMigxODAs IDMpJyk7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoJ2luaXRTZWdtZW50Vmlldy5nZXRJbnQz Mig2OTMpJywgMik7CisgICAgICAgICAgICBydW4oJ2luaXRTZWdtZW50Vmlldy5zZXRJbnQzMig2 OTMsIDQpJyk7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoJ2luaXRTZWdtZW50Vmlldy5nZXRJ bnQzMigxMTA5KScsIDEpOworICAgICAgICAgICAgcnVuKCdpbml0U2VnbWVudFZpZXcuc2V0SW50 MzIoMTEwOSwgMyknKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgnaW5pdFNlZ21lbnRWaWV3 LmdldEludDMyKDExNDEpJywgMik7CisgICAgICAgICAgICBydW4oJ2luaXRTZWdtZW50Vmlldy5z ZXRJbnQzMigxMTQxLCA0KScpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ0FwcGVuZCB0 aGUgbW9kaWZpZWQgSW5pdCBTZWdtZW50JykKKyAgICAgICAgICAgIHJ1bignc291cmNlQnVmZmVy LmFwcGVuZEJ1ZmZlcihtb2RpZmllZEluaXRTZWdtZW50KScpOworICAgICAgICAgICAgYXdhaXQg d2FpdEZvcihzb3VyY2VCdWZmZXIsICd1cGRhdGUnKTsKKworICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCd2aWRlby52aWRlb1RyYWNrc1swXS5pZCcsIDMpOworICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCd2aWRlby5hdWRpb1RyYWNrc1swXS5pZCcsIDQpOworCisgICAgICAgICAgICBjb25zb2xl V3JpdGUoJ01vZGlmeSBhbiBNZWRpYSBTZWdtZW50IHRvIGhhdmUgYSBkaWZmZXJlbnQgdHJhY2tJ RCcpOworICAgICAgICAgICAgcnVuKCdtb2RpZmllZE1lZGlhU2VnbWVudCA9IGxvYWRlci5tZWRp YVNlZ21lbnQoMCkuc2xpY2UoMCknKTsKKyAgICAgICAgICAgIHJ1bignbWVkaWFTZWdtZW50Vmll dyA9IG5ldyBEYXRhVmlldyhtb2RpZmllZE1lZGlhU2VnbWVudCknKTsKKyAgICAgICAgICAgIHRl c3RFeHBlY3RlZCgnbWVkaWFTZWdtZW50Vmlldy5nZXRJbnQzMig0NCknLCAxKTsKKyAgICAgICAg ICAgIHJ1bignbWVkaWFTZWdtZW50Vmlldy5zZXRJbnQzMig0NCwgMyknKTsKKyAgICAgICAgICAg IHRlc3RFeHBlY3RlZCgnbWVkaWFTZWdtZW50Vmlldy5nZXRJbnQzMigzMjQpJywgMik7CisgICAg ICAgICAgICBydW4oJ21lZGlhU2VnbWVudFZpZXcuc2V0SW50MzIoMzI0LCA0KScpOworCisgICAg ICAgICAgICBydW4oJ3NvdXJjZUJ1ZmZlci50aW1lc3RhbXBPZmZzZXQgPSBzb3VyY2VCdWZmZXIu YnVmZmVyZWQuZW5kKDApJyk7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgnQXBwZW5kIGEg bWVkaWEgc2VnbWVudC4nKQorICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIuYXBwZW5kQnVm ZmVyKG1vZGlmaWVkTWVkaWFTZWdtZW50KScpOworCisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9y KHNvdXJjZUJ1ZmZlciwgJ3VwZGF0ZScpOworCisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoJ3Nv dXJjZUJ1ZmZlci5idWZmZXJlZC5lbmQoMCknLCBpbml0aWFsQnVmZmVyZWRFbmQsICc+Jyk7CisK KyAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgfSBjYXRjaCAoZSkgeworICAgICAgICAg ICAgZmFpbFRlc3QoYENhdWdodCBleGNlcHRpb246ICIke2V9ImApOworICAgICAgICB9CisgICAg fSk7CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2PgorICAgICAgICBU aGlzIHRlc3RzIHRoZSBhYmlsaXR5IG9mIHRoZSBTb3VyY2VCdWZmZXIgdG8gY2hhbmdlIHRyYWNr SWRzIHdoZW4gYSBzaW5nbGUgdmlkZW9UcmFjayB3aXRoIGEgZGlmZmVyZW50IHRyYWNrSWQgaXMg YXBwZW5kZWQuCisgICAgPC9kaXY+CisgICAgPHZpZGVvIGNvbnRyb2xzPjwvdmlkZW8+Cis8L2Jv ZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo= 412563 2020-10-28 12:54:33 -0700 2020-10-28 13:43:13 -0700 Patch for landing bug-218294-20201028125432.patch text/plain 13956 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE0YTY1YWI5NGRlNTE3 ZDY3M2Q3MTI4ZWViODQzZWIxNTI5YTA1My4uZWI5NGE4MTM2MGRkMjdlZWVlZWEwNDhlNzI4MzNm ZGYzMjBlOGMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTEwLTI4ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIEhhbmRsZSB0cmFj a0lkIGNoYW5naW5nIGFjcm9zcyBJbml0aWFsaXphdGlvbiBTZWdtZW50cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4Mjk0CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS83MDc3MTMwNj4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgVGVzdDogbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS10cmFja2lk LWNoYW5nZS5odG1sCisKKyAgICAgICAgV2hlbiBhcHBlbmRpbmcgYW4gaW5pdGlhbGl6YXRpb24g c2VnbWVudCBhZnRlciB0aGUgcmVjZWl2ZWRGaXJzdEluaXRpYWxpemF0aW9uU2VnbWVudCBmbGFn IGlzCisgICAgICAgIHRydWUsIGFuZCB3aGVuIHRoZSBudW1iZXIgb2YgdmlkZW8gb3IgYXVkaW8g dHJhY2tzIGlzIDEsIHRoZSB0cmFja0lkIGlzIGFsbG93ZWQgdG8gY2hhbmdlIGFjcm9zcworICAg ICAgICBpbml0aWFsaWF6dGlvbiBzZWdtZW50cy4gV2hlbiB0aGlzIG9jY3VycywgbW92ZSB0aGUg VHJhY2tCdWZmZXIgaW5zaWRlIHRoZSB0cmFja0J1ZmZlck1hcCB0bworICAgICAgICByZWZlciB0 byB0aGUgbmV3IHRyYWNrSWQsIHNvIHRoYXQgd2hlbiBNZWRpYVNhbXBsZXMgYXJlIHBhcnNlZCwg dGhleSdyZSBwdXQgaW50byB0aGUgY29ycmVjdAorICAgICAgICBUcmFja0J1ZmZlci4KKworICAg ICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFs aXphdGlvblNlZ21lbnQpOgorICAgICAgICAqIGh0bWwvdHJhY2svQXVkaW9UcmFjay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpBdWRpb1RyYWNrOjpzZXRQcml2YXRlKToKKyAgICAgICAgKiBodG1s L3RyYWNrL0luYmFuZFRleHRUcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmJhbmRUZXh0 VHJhY2s6OnNldFByaXZhdGUpOgorICAgICAgICAqIGh0bWwvdHJhY2svVmlkZW9UcmFjay5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpWaWRlb1RyYWNrOjpzZXRQcml2YXRlKToKKwogMjAyMC0xMC0y NiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBBdWRp byBhbmQgVmlkZW8gZWxlbWVudCBjcmVhdGlvbiB1cCB0byAzMDB4IHNsb3dlciB0aGFuIG90aGVy IGJyb3dzZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNl L1NvdXJjZUJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1Nv dXJjZUJ1ZmZlci5jcHAKaW5kZXggN2ZlYjdjNjY4ZjUyMWIxMTdjYWY0YjM1M2ZiMTQ4MGU2ZWJj MzZkNS4uYjE2YzJkZjVlZDRhNjBlMjA3ZjkxMThlMmRjN2RkMzllOWM5MTBmZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcApA QCAtMTExMSwxMSArMTExMSwyMSBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJp dmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQoY29uc3QgSW5pdAogICAgICAgICAg ICAgYXBwZW5kRXJyb3IodHJ1ZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKwor ICAgICAgICBWZWN0b3I8c3RkOjpwYWlyPEF0b21TdHJpbmcsIFRyYWNrQnVmZmVyPj4gbmV3VHJh Y2tCdWZmZXJzOworCiAgICAgICAgIC8vIDMuMiBBZGQgdGhlIGFwcHJvcHJpYXRlIHRyYWNrIGRl c2NyaXB0aW9ucyBmcm9tIHRoaXMgaW5pdGlhbGl6YXRpb24gc2VnbWVudCB0byBlYWNoIG9mIHRo ZSB0cmFjayBidWZmZXJzLgogICAgICAgICBBU1NFUlQoc2VnbWVudC5hdWRpb1RyYWNrcy5zaXpl KCkgPT0gYXVkaW9UcmFja3MoKS5sZW5ndGgoKSk7CiAgICAgICAgIGZvciAoYXV0byYgYXVkaW9U cmFja0luZm8gOiBzZWdtZW50LmF1ZGlvVHJhY2tzKSB7CiAgICAgICAgICAgICBpZiAoYXVkaW9U cmFja3MoKS5sZW5ndGgoKSA9PSAxKSB7Ci0gICAgICAgICAgICAgICAgYXVkaW9UcmFja3MoKS5p dGVtKDApLT5zZXRQcml2YXRlKCphdWRpb1RyYWNrSW5mby50cmFjayk7CisgICAgICAgICAgICAg ICAgYXV0byogdHJhY2sgPSBhdWRpb1RyYWNrcygpLml0ZW0oMCk7CisgICAgICAgICAgICAgICAg YXV0byBvbGRJZCA9IHRyYWNrLT5pZCgpOworICAgICAgICAgICAgICAgIGF1dG8gbmV3SWQgPSBh dWRpb1RyYWNrSW5mby50cmFjay0+aWQoKTsKKyAgICAgICAgICAgICAgICB0cmFjay0+c2V0UHJp dmF0ZSgqYXVkaW9UcmFja0luZm8udHJhY2spOworICAgICAgICAgICAgICAgIGlmIChuZXdJZCAh PSBvbGRJZCkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIHRyYWNrQnVmZmVyID0gbV90cmFj a0J1ZmZlck1hcC50YWtlKG9sZElkKTsKKyAgICAgICAgICAgICAgICAgICAgbmV3VHJhY2tCdWZm ZXJzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihuZXdJZCwgV1RGTW92ZSh0cmFja0J1ZmZlcikpKTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9 CiAKQEAgLTExMjcsNyArMTEzNywxNCBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVy UHJpdmF0ZURpZFJlY2VpdmVJbml0aWFsaXphdGlvblNlZ21lbnQoY29uc3QgSW5pdAogICAgICAg ICBBU1NFUlQoc2VnbWVudC52aWRlb1RyYWNrcy5zaXplKCkgPT0gdmlkZW9UcmFja3MoKS5sZW5n dGgoKSk7CiAgICAgICAgIGZvciAoYXV0byYgdmlkZW9UcmFja0luZm8gOiBzZWdtZW50LnZpZGVv VHJhY2tzKSB7CiAgICAgICAgICAgICBpZiAodmlkZW9UcmFja3MoKS5sZW5ndGgoKSA9PSAxKSB7 Ci0gICAgICAgICAgICAgICAgdmlkZW9UcmFja3MoKS5pdGVtKDApLT5zZXRQcml2YXRlKCp2aWRl b1RyYWNrSW5mby50cmFjayk7CisgICAgICAgICAgICAgICAgYXV0byogdHJhY2sgPSB2aWRlb1Ry YWNrcygpLml0ZW0oMCk7CisgICAgICAgICAgICAgICAgYXV0byBvbGRJZCA9IHRyYWNrLT5pZCgp OworICAgICAgICAgICAgICAgIGF1dG8gbmV3SWQgPSB2aWRlb1RyYWNrSW5mby50cmFjay0+aWQo KTsKKyAgICAgICAgICAgICAgICB0cmFjay0+c2V0UHJpdmF0ZSgqdmlkZW9UcmFja0luZm8udHJh Y2spOworICAgICAgICAgICAgICAgIGlmIChuZXdJZCAhPSBvbGRJZCkgeworICAgICAgICAgICAg ICAgICAgICBhdXRvIHRyYWNrQnVmZmVyID0gbV90cmFja0J1ZmZlck1hcC50YWtlKG9sZElkKTsK KyAgICAgICAgICAgICAgICAgICAgbmV3VHJhY2tCdWZmZXJzLmFwcGVuZChzdGQ6Om1ha2VfcGFp cihuZXdJZCwgV1RGTW92ZSh0cmFja0J1ZmZlcikpKTsKKyAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAKQEAgLTExMzksNyArMTE1NiwxNCBA QCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVJbml0aWFs aXphdGlvblNlZ21lbnQoY29uc3QgSW5pdAogICAgICAgICBBU1NFUlQoc2VnbWVudC50ZXh0VHJh Y2tzLnNpemUoKSA9PSB0ZXh0VHJhY2tzKCkubGVuZ3RoKCkpOwogICAgICAgICBmb3IgKGF1dG8m IHRleHRUcmFja0luZm8gOiBzZWdtZW50LnRleHRUcmFja3MpIHsKICAgICAgICAgICAgIGlmICh0 ZXh0VHJhY2tzKCkubGVuZ3RoKCkgPT0gMSkgewotICAgICAgICAgICAgICAgIGRvd25jYXN0PElu YmFuZFRleHRUcmFjaz4oKnRleHRUcmFja3MoKS5pdGVtKDApKS5zZXRQcml2YXRlKCp0ZXh0VHJh Y2tJbmZvLnRyYWNrKTsKKyAgICAgICAgICAgICAgICBhdXRvKiB0cmFjayA9IGRvd25jYXN0PElu YmFuZFRleHRUcmFjaz4odGV4dFRyYWNrcygpLml0ZW0oMCkpOworICAgICAgICAgICAgICAgIGF1 dG8gb2xkSWQgPSB0cmFjay0+aWQoKTsKKyAgICAgICAgICAgICAgICBhdXRvIG5ld0lkID0gdGV4 dFRyYWNrSW5mby50cmFjay0+aWQoKTsKKyAgICAgICAgICAgICAgICB0cmFjay0+c2V0UHJpdmF0 ZSgqdGV4dFRyYWNrSW5mby50cmFjayk7CisgICAgICAgICAgICAgICAgaWYgKG5ld0lkICE9IG9s ZElkKSB7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gdHJhY2tCdWZmZXIgPSBtX3RyYWNrQnVm ZmVyTWFwLnRha2Uob2xkSWQpOworICAgICAgICAgICAgICAgICAgICBuZXdUcmFja0J1ZmZlcnMu YXBwZW5kKHN0ZDo6bWFrZV9wYWlyKG5ld0lkLCBXVEZNb3ZlKHRyYWNrQnVmZmVyKSkpOworICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KIApA QCAtMTE0OCw2ICsxMTcyLDExIEBAIHZvaWQgU291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2 YXRlRGlkUmVjZWl2ZUluaXRpYWxpemF0aW9uU2VnbWVudChjb25zdCBJbml0CiAgICAgICAgICAg ICBkb3duY2FzdDxJbmJhbmRUZXh0VHJhY2s+KCp0ZXh0VHJhY2spLnNldFByaXZhdGUoKnRleHRU cmFja0luZm8udHJhY2spOwogICAgICAgICB9CiAKKyAgICAgICAgd2hpbGUgKCFuZXdUcmFja0J1 ZmZlcnMuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBhdXRvIHRyYWNrUGFpciA9IG5ld1RyYWNr QnVmZmVycy50YWtlTGFzdCgpOworICAgICAgICAgICAgbV90cmFja0J1ZmZlck1hcC5hZGQodHJh Y2tQYWlyLmZpcnN0LCBXVEZNb3ZlKHRyYWNrUGFpci5zZWNvbmQpKTsKKyAgICAgICAgfQorCiAg ICAgICAgIC8vIDMuMyBTZXQgdGhlIG5lZWQgcmFuZG9tIGFjY2VzcyBwb2ludCBmbGFnIG9uIGFs bCB0cmFjayBidWZmZXJzIHRvIHRydWUuCiAgICAgICAgIGZvciAoYXV0byYgdHJhY2tCdWZmZXIg OiBtX3RyYWNrQnVmZmVyTWFwLnZhbHVlcygpKQogICAgICAgICAgICAgdHJhY2tCdWZmZXIubmVl ZFJhbmRvbUFjY2Vzc0ZsYWcgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC90cmFjay9BdWRpb1RyYWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svQXVkaW9U cmFjay5jcHAKaW5kZXggODA5ZjFiY2UxZjg0YTVkM2U4MzdlMTAyZmI2ZWY2ZDI0YzU0ZjlmOC4u Y2FiNzc4MjFhOTQ3Y2Q4ZWM3YTIyMDk1Zjc5YTIyNjk5ZmQwYzMzMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9BdWRpb1RyYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3RyYWNrL0F1ZGlvVHJhY2suY3BwCkBAIC0xMDQsNiArMTA0LDcgQEAgdm9pZCBBdWRp b1RyYWNrOjpzZXRQcml2YXRlKEF1ZGlvVHJhY2tQcml2YXRlJiB0cmFja1ByaXZhdGUpCiAjZW5k aWYKIAogICAgIHVwZGF0ZUtpbmRGcm9tUHJpdmF0ZSgpOworICAgIHNldElkKG1fcHJpdmF0ZS0+ aWQoKSk7CiB9CiAKIGJvb2wgQXVkaW9UcmFjazo6aXNWYWxpZEtpbmQoY29uc3QgQXRvbVN0cmlu ZyYgdmFsdWUpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0lu YmFuZFRleHRUcmFjay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL0luYmFuZFRleHRU cmFjay5jcHAKaW5kZXggYTZjYjE4MmY4YTdjZDY5YTFjY2EzNTQ0ZjAyOWViYzE3NTZjNjY0OS4u YTYwZTk5ZWFiZmI4OWM4OTJhNTFkMmU4NTg1ZGU5ZGJjNjYwYTE0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC90cmFjay9JbmJhbmRUZXh0VHJhY2suY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvdHJhY2svSW5iYW5kVGV4dFRyYWNrLmNwcApAQCAtNzcsNiArNzcsNyBAQCB2 b2lkIEluYmFuZFRleHRUcmFjazo6c2V0UHJpdmF0ZShJbmJhbmRUZXh0VHJhY2tQcml2YXRlJiB0 cmFja1ByaXZhdGUpCiAKICAgICBzZXRNb2RlSW50ZXJuYWwobW9kZSgpKTsKICAgICB1cGRhdGVL aW5kRnJvbVByaXZhdGUoKTsKKyAgICBzZXRJZChtX3ByaXZhdGUtPmlkKCkpOwogfQogCiB2b2lk IEluYmFuZFRleHRUcmFjazo6c2V0TW9kZShNb2RlIG1vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3RyYWNrL1ZpZGVvVHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC90 cmFjay9WaWRlb1RyYWNrLmNwcAppbmRleCA4YmUxZjQ5ZGQ5MDlkMjlhZmU3NjkxNWY4ZWNkZjBk YzIwYzU5ODU2Li5lZDc1NWEyODBlZjNmODNhYTkxNmUyMTljMTIxYjBkN2FiNDliM2M2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1ZpZGVvVHJhY2suY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvdHJhY2svVmlkZW9UcmFjay5jcHAKQEAgLTEwOSw2ICsxMDksNyBA QCB2b2lkIFZpZGVvVHJhY2s6OnNldFByaXZhdGUoVmlkZW9UcmFja1ByaXZhdGUmIHRyYWNrUHJp dmF0ZSkKIAogICAgIG1fcHJpdmF0ZS0+c2V0U2VsZWN0ZWQobV9zZWxlY3RlZCk7CiAgICAgdXBk YXRlS2luZEZyb21Qcml2YXRlKCk7CisgICAgc2V0SWQobV9wcml2YXRlLT5pZCgpKTsKIH0KIAog Ym9vbCBWaWRlb1RyYWNrOjppc1ZhbGlkS2luZChjb25zdCBBdG9tU3RyaW5nJiB2YWx1ZSkgY29u c3QKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCA1YTczYjU2ZmVlNDdkYTVjMTRkYTQ1OGQ3NGU5MWE3YzMzYzE5MjYyLi5mZTI5 MGY2ZWJjZjM3MzFjZGZkOTBjZmZkNzRmY2U1ZjYxZmQxZTNkIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjAtMTAtMjggIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAg ICAgW01TRV0gSGFuZGxlIHRyYWNrSWQgY2hhbmdpbmcgYWNyb3NzIEluaXRpYWxpemF0aW9uIFNl Z21lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTgyOTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNzcxMzA2PgorCisgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIG1lZGlhL21lZGlhLXNvdXJjZS9tZWRp YS1zb3VyY2UtdHJhY2tpZC1jaGFuZ2UtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBt ZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLmh0bWw6IEFkZGVk LgorCiAyMDIwLTEwLTI0ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg ICAgIFtCaWdTdXJdIEFwcGVuZGluZyBhIG5ldyBXZWJNIGluaXQgc2VnbWVudCBiZXR3ZWVuIENs dXN0ZXIgZWxlbWVudHMgdGhyb3dzIGFuIGVycm9yCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9t ZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtdHJhY2tpZC1j aGFuZ2UtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM5NjllM2ExYmQ1ZmQ0YjgyOGFlOTgwYzA2 Yzg2NzA1MzFkYmUxNDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRp YS1zb3VyY2UvbWVkaWEtc291cmNlLXRyYWNraWQtY2hhbmdlLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDQzIEBACitUaGlzIHRlc3RzIHRoZSBhYmlsaXR5IG9mIHRoZSBTb3VyY2VCdWZmZXIgdG8g Y2hhbmdlIHRyYWNrSWRzIHdoZW4gYSBzaW5nbGUgdmlkZW9UcmFjayB3aXRoIGEgZGlmZmVyZW50 IHRyYWNrSWQgaXMgYXBwZW5kZWQuCisKK1JVTih2aWRlby5zcmMgPSBVUkwuY3JlYXRlT2JqZWN0 VVJMKHNvdXJjZSkpCitFVkVOVChzb3VyY2VvcGVuKQorUlVOKHNvdXJjZS5kdXJhdGlvbiA9IGxv YWRlci5kdXJhdGlvbigpKQorUlVOKHNvdXJjZUJ1ZmZlciA9IHNvdXJjZS5hZGRTb3VyY2VCdWZm ZXIobG9hZGVyLnR5cGUoKSkpCitSVU4oc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihsb2FkZXIu aW5pdFNlZ21lbnQoKSkpCitFVkVOVCh1cGRhdGUpCitBcHBlbmQgYSBtZWRpYSBzZWdtZW50Lgor UlVOKHNvdXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIobG9hZGVyLm1lZGlhU2VnbWVudCgwKSkpCitF VkVOVCh1cGRhdGUpCitHZXQgdGhlIGN1cnJlbnQgYnVmZmVyZWQgcmFuZ2UKK1JVTihpbml0aWFs QnVmZmVyZWRFbmQgPSBzb3VyY2VCdWZmZXIuYnVmZmVyZWQuZW5kKDApKQorTW9kaWZ5IGFuIElu aXQgU2VnbWVudCB0byBoYXZlIGEgZGlmZmVyZW50IHRyYWNrSUQKK1JVTihtb2RpZmllZEluaXRT ZWdtZW50ID0gbG9hZGVyLmluaXRTZWdtZW50KCkuc2xpY2UoMCkpCitSVU4oaW5pdFNlZ21lbnRW aWV3ID0gbmV3IERhdGFWaWV3KG1vZGlmaWVkSW5pdFNlZ21lbnQpKQorRVhQRUNURUQgKGluaXRT ZWdtZW50Vmlldy5nZXRJbnQzMigxODApID09ICcxJykgT0sKK1JVTihpbml0U2VnbWVudFZpZXcu c2V0SW50MzIoMTgwLCAzKSkKK0VYUEVDVEVEIChpbml0U2VnbWVudFZpZXcuZ2V0SW50MzIoNjkz KSA9PSAnMicpIE9LCitSVU4oaW5pdFNlZ21lbnRWaWV3LnNldEludDMyKDY5MywgNCkpCitFWFBF Q1RFRCAoaW5pdFNlZ21lbnRWaWV3LmdldEludDMyKDExMDkpID09ICcxJykgT0sKK1JVTihpbml0 U2VnbWVudFZpZXcuc2V0SW50MzIoMTEwOSwgMykpCitFWFBFQ1RFRCAoaW5pdFNlZ21lbnRWaWV3 LmdldEludDMyKDExNDEpID09ICcyJykgT0sKK1JVTihpbml0U2VnbWVudFZpZXcuc2V0SW50MzIo MTE0MSwgNCkpCitBcHBlbmQgdGhlIG1vZGlmaWVkIEluaXQgU2VnbWVudAorUlVOKHNvdXJjZUJ1 ZmZlci5hcHBlbmRCdWZmZXIobW9kaWZpZWRJbml0U2VnbWVudCkpCitFVkVOVCh1cGRhdGUpCitF WFBFQ1RFRCAodmlkZW8udmlkZW9UcmFja3NbMF0uaWQgPT0gJzMnKSBPSworRVhQRUNURUQgKHZp ZGVvLmF1ZGlvVHJhY2tzWzBdLmlkID09ICc0JykgT0sKK01vZGlmeSBhIE1lZGlhIFNlZ21lbnQg dG8gaGF2ZSBhIGRpZmZlcmVudCB0cmFja0lECitSVU4obW9kaWZpZWRNZWRpYVNlZ21lbnQgPSBs b2FkZXIubWVkaWFTZWdtZW50KDApLnNsaWNlKDApKQorUlVOKG1lZGlhU2VnbWVudFZpZXcgPSBu ZXcgRGF0YVZpZXcobW9kaWZpZWRNZWRpYVNlZ21lbnQpKQorRVhQRUNURUQgKG1lZGlhU2VnbWVu dFZpZXcuZ2V0SW50MzIoNDQpID09ICcxJykgT0sKK1JVTihtZWRpYVNlZ21lbnRWaWV3LnNldElu dDMyKDQ0LCAzKSkKK0VYUEVDVEVEIChtZWRpYVNlZ21lbnRWaWV3LmdldEludDMyKDMyNCkgPT0g JzInKSBPSworUlVOKG1lZGlhU2VnbWVudFZpZXcuc2V0SW50MzIoMzI0LCA0KSkKK1JVTihzb3Vy Y2VCdWZmZXIudGltZXN0YW1wT2Zmc2V0ID0gc291cmNlQnVmZmVyLmJ1ZmZlcmVkLmVuZCgwKSkK K0FwcGVuZCBhIG1lZGlhIHNlZ21lbnQuCitSVU4oc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlciht b2RpZmllZE1lZGlhU2VnbWVudCkpCitFVkVOVCh1cGRhdGUpCitFWFBFQ1RFRCAoc291cmNlQnVm ZmVyLmJ1ZmZlcmVkLmVuZCgwKSA+ICcxJykgT0sKK0VORCBPRiBURVNUCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtdHJhY2tpZC1jaGFu Z2UuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtdHJh Y2tpZC1jaGFuZ2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xZGIyYmNiODNmNDg2ZmM5OGIyYTBjMTlkZTU0 ZTdmM2JlZGEzYzM3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEt c291cmNlL21lZGlhLXNvdXJjZS10cmFja2lkLWNoYW5nZS5odG1sCkBAIC0wLDAgKzEsOTYgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+bWVkaWEtc291cmNl LXRyYWNraWQtY2hhbmdlPC90aXRsZT4KKyAgICA8c2NyaXB0IHNyYz0ibWVkaWEtc291cmNlLWxv YWRlci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uL3ZpZGVvLXRlc3QuanMiPjwv c2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgdmFyIGxvYWRlcjsKKyAgICB2YXIgc291cmNlOwor ICAgIHZhciBzb3VyY2VCdWZmZXI7CisgICAgdmFyIG1vZGlmaWVkSW5pdFNlZ21lbnQ7CisgICAg dmFyIG1vZGlmaWVkTWVkaWFTZWdtZW50OworCisgICAgZnVuY3Rpb24gbG9hZGVyUHJvbWlzZShs b2FkZXIpIHsKKyAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+ IHsKKyAgICAgICAgICAgIGxvYWRlci5vbmxvYWQgPSByZXNvbHZlOworICAgICAgICAgICAgbG9h ZGVyLm9uZXJyb3IgPSByZWplY3Q7CisgICAgICAgIH0pOworICAgIH0KKworICAgIHdpbmRvdy5h ZGRFdmVudExpc3RlbmVyKCdsb2FkJywgYXN5bmMgZXZlbnQgPT4geworICAgICAgICB0cnkgewor ICAgICAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworICAgICAgICAgICAgbG9hZGVyID0gbmV3 IE1lZGlhU291cmNlTG9hZGVyKCdjb250ZW50L3Rlc3QtZnJhZ21lbnRlZC1tYW5pZmVzdC5qc29u Jyk7CisgICAgICAgICAgICBhd2FpdCBsb2FkZXJQcm9taXNlKGxvYWRlcik7CisKKyAgICAgICAg ICAgIHNvdXJjZSA9IG5ldyBNZWRpYVNvdXJjZSgpOworICAgICAgICAgICAgcnVuKCd2aWRlby5z cmMgPSBVUkwuY3JlYXRlT2JqZWN0VVJMKHNvdXJjZSknKTsKKyAgICAgICAgICAgIGF3YWl0IHdh aXRGb3Ioc291cmNlLCAnc291cmNlb3BlbicpOworICAgICAgICAgICAgd2FpdEZvcihzb3VyY2Us ICdlcnJvcicpLnRoZW4oZW5kVGVzdCk7CisgICAgICAgICAgICB3YWl0Rm9yRXZlbnRBbmRGYWls KCdlcnJvcicpOworCisgICAgICAgICAgICBydW4oJ3NvdXJjZS5kdXJhdGlvbiA9IGxvYWRlci5k dXJhdGlvbigpJyk7CisgICAgICAgICAgICBydW4oJ3NvdXJjZUJ1ZmZlciA9IHNvdXJjZS5hZGRT b3VyY2VCdWZmZXIobG9hZGVyLnR5cGUoKSknKTsKKyAgICAgICAgICAgIHJ1bignc291cmNlQnVm ZmVyLmFwcGVuZEJ1ZmZlcihsb2FkZXIuaW5pdFNlZ21lbnQoKSknKTsKKworICAgICAgICAgICAg YXdhaXQgd2FpdEZvcihzb3VyY2VCdWZmZXIsICd1cGRhdGUnKTsKKworICAgICAgICAgICAgY29u c29sZVdyaXRlKCdBcHBlbmQgYSBtZWRpYSBzZWdtZW50LicpCisgICAgICAgICAgICBydW4oJ3Nv dXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIobG9hZGVyLm1lZGlhU2VnbWVudCgwKSknKTsKKworICAg ICAgICAgICAgYXdhaXQgd2FpdEZvcihzb3VyY2VCdWZmZXIsICd1cGRhdGUnKTsKKworICAgICAg ICAgICAgY29uc29sZVdyaXRlKCdHZXQgdGhlIGN1cnJlbnQgYnVmZmVyZWQgcmFuZ2UnKTsKKyAg ICAgICAgICAgIHJ1bignaW5pdGlhbEJ1ZmZlcmVkRW5kID0gc291cmNlQnVmZmVyLmJ1ZmZlcmVk LmVuZCgwKScpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ01vZGlmeSBhbiBJbml0IFNl Z21lbnQgdG8gaGF2ZSBhIGRpZmZlcmVudCB0cmFja0lEJyk7CisgICAgICAgICAgICBydW4oJ21v ZGlmaWVkSW5pdFNlZ21lbnQgPSBsb2FkZXIuaW5pdFNlZ21lbnQoKS5zbGljZSgwKScpOworICAg ICAgICAgICAgcnVuKCdpbml0U2VnbWVudFZpZXcgPSBuZXcgRGF0YVZpZXcobW9kaWZpZWRJbml0 U2VnbWVudCknKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgnaW5pdFNlZ21lbnRWaWV3Lmdl dEludDMyKDE4MCknLCAxKTsKKyAgICAgICAgICAgIHJ1bignaW5pdFNlZ21lbnRWaWV3LnNldElu dDMyKDE4MCwgMyknKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgnaW5pdFNlZ21lbnRWaWV3 LmdldEludDMyKDY5MyknLCAyKTsKKyAgICAgICAgICAgIHJ1bignaW5pdFNlZ21lbnRWaWV3LnNl dEludDMyKDY5MywgNCknKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgnaW5pdFNlZ21lbnRW aWV3LmdldEludDMyKDExMDkpJywgMSk7CisgICAgICAgICAgICBydW4oJ2luaXRTZWdtZW50Vmll dy5zZXRJbnQzMigxMTA5LCAzKScpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCdpbml0U2Vn bWVudFZpZXcuZ2V0SW50MzIoMTE0MSknLCAyKTsKKyAgICAgICAgICAgIHJ1bignaW5pdFNlZ21l bnRWaWV3LnNldEludDMyKDExNDEsIDQpJyk7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgn QXBwZW5kIHRoZSBtb2RpZmllZCBJbml0IFNlZ21lbnQnKQorICAgICAgICAgICAgcnVuKCdzb3Vy Y2VCdWZmZXIuYXBwZW5kQnVmZmVyKG1vZGlmaWVkSW5pdFNlZ21lbnQpJyk7CisgICAgICAgICAg ICBhd2FpdCB3YWl0Rm9yKHNvdXJjZUJ1ZmZlciwgJ3VwZGF0ZScpOworCisgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoJ3ZpZGVvLnZpZGVvVHJhY2tzWzBdLmlkJywgMyk7CisgICAgICAgICAgICB0 ZXN0RXhwZWN0ZWQoJ3ZpZGVvLmF1ZGlvVHJhY2tzWzBdLmlkJywgNCk7CisKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgnTW9kaWZ5IGEgTWVkaWEgU2VnbWVudCB0byBoYXZlIGEgZGlmZmVyZW50 IHRyYWNrSUQnKTsKKyAgICAgICAgICAgIHJ1bignbW9kaWZpZWRNZWRpYVNlZ21lbnQgPSBsb2Fk ZXIubWVkaWFTZWdtZW50KDApLnNsaWNlKDApJyk7CisgICAgICAgICAgICBydW4oJ21lZGlhU2Vn bWVudFZpZXcgPSBuZXcgRGF0YVZpZXcobW9kaWZpZWRNZWRpYVNlZ21lbnQpJyk7CisgICAgICAg ICAgICB0ZXN0RXhwZWN0ZWQoJ21lZGlhU2VnbWVudFZpZXcuZ2V0SW50MzIoNDQpJywgMSk7Cisg ICAgICAgICAgICBydW4oJ21lZGlhU2VnbWVudFZpZXcuc2V0SW50MzIoNDQsIDMpJyk7CisgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoJ21lZGlhU2VnbWVudFZpZXcuZ2V0SW50MzIoMzI0KScsIDIp OworICAgICAgICAgICAgcnVuKCdtZWRpYVNlZ21lbnRWaWV3LnNldEludDMyKDMyNCwgNCknKTsK KworICAgICAgICAgICAgcnVuKCdzb3VyY2VCdWZmZXIudGltZXN0YW1wT2Zmc2V0ID0gc291cmNl QnVmZmVyLmJ1ZmZlcmVkLmVuZCgwKScpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoJ0Fw cGVuZCBhIG1lZGlhIHNlZ21lbnQuJykKKyAgICAgICAgICAgIHJ1bignc291cmNlQnVmZmVyLmFw cGVuZEJ1ZmZlcihtb2RpZmllZE1lZGlhU2VnbWVudCknKTsKKworICAgICAgICAgICAgYXdhaXQg d2FpdEZvcihzb3VyY2VCdWZmZXIsICd1cGRhdGUnKTsKKworICAgICAgICAgICAgdGVzdEV4cGVj dGVkKCdzb3VyY2VCdWZmZXIuYnVmZmVyZWQuZW5kKDApJywgaW5pdGlhbEJ1ZmZlcmVkRW5kLCAn PicpOworCisgICAgICAgICAgICBlbmRUZXN0KCk7CisgICAgICAgIH0gY2F0Y2ggKGUpIHsKKyAg ICAgICAgICAgIGZhaWxUZXN0KGBDYXVnaHQgZXhjZXB0aW9uOiAiJHtlfSJgKTsKKyAgICAgICAg fQorICAgIH0pOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdj4KKyAg ICAgICAgVGhpcyB0ZXN0cyB0aGUgYWJpbGl0eSBvZiB0aGUgU291cmNlQnVmZmVyIHRvIGNoYW5n ZSB0cmFja0lkcyB3aGVuIGEgc2luZ2xlIHZpZGVvVHJhY2sgd2l0aCBhIGRpZmZlcmVudCB0cmFj a0lkIGlzIGFwcGVuZGVkLgorICAgIDwvZGl2PgorICAgIDx2aWRlbyBjb250cm9scz48L3ZpZGVv PgorPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK