249855 2022-12-23 15:36:27 -0800 REGRESSION(258195@main): many test crashes 2022-12-23 16:05:30 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 249330 1 commit-queue commit-queue fujii msaboff webkit-bug-importer ysuzuki oldest_to_newest 1921735 0 commit-queue 2022-12-23 15:36:27 -0800 https://commits.webkit.org/258195@main introduced a regression: many test crashes This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1921737 1 464187 commit-queue 2022-12-23 15:36:33 -0800 Created attachment 464187 REVERT of 258195@main Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1921738 2 ews-feeder 2022-12-23 15:39:38 -0800 Committed 258310@main (b396fd875ee3): <https://commits.webkit.org/258310@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464187. 1921739 3 webkit-bug-importer 2022-12-23 15:40:16 -0800 <rdar://problem/103676057> 1921744 4 mark.lam 2022-12-23 16:05:30 -0800 *** Bug 249812 has been marked as a duplicate of this bug. *** 464187 2022-12-23 15:36:33 -0800 2022-12-23 15:39:39 -0800 REVERT of 258195@main bug-249855-20221223153633.patch text/plain 29579 commit-queue RnJvbSAxMzAxNTg3Y2ZhMTZiZWIxYmNhNDMwOTdhNDc2OGY3NjA1Y2YyYWM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDb21taXQgUXVldWUgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3Jn PgpEYXRlOiBGcmksIDIzIERlYyAyMDIyIDE1OjM2OjMwIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g VW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNTgxOTVAbWFpbi4KIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk4NTUKCm1hbnkgdGVzdCBjcmFzaGVzCgpSZXZlcnRlZCBj aGFuZ2VzZXQ6CgoiUkVHUkVTU0lPTigyNTc4MjNAbWFpbik6IG5hbWVkLWdyb3Vwcy9sb29rYmVo aW5kLmpzIFRlc3QyNjItdGVzdCBpcyBmYWlsaW5nIgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQ5MzMwCmh0dHBzOi8vY29tbWl0cy53ZWJraXQub3JnLzI1ODE5NUBt YWluCi0tLQogLi4uL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckludGVycHJldGVyLmNwcCAgIHwg IDU3ICsrKystLS0tLS0KIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJJbnRlcnByZXRl ci5oICB8ICAyNyArLS0tLQogU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckpJVC5jcHAg ICAgICAgIHwgIDE2ICstLQogU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyclBhcnNlci5o ICAgICAgIHwgICA2ICstCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyUGF0dGVybi5j cHAgICAgfCAgMTYgKy0tCiBTb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyUGF0dGVybi5o ICAgICAgfCAgMTggKy0tCiAuLi4vSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyU3ludGF4Q2hlY2tl ci5jcHAgfCAgIDIgKy0KIC4uLi9jb250ZW50ZXh0ZW5zaW9ucy9VUkxGaWx0ZXJQYXJzZXIuY3Bw ICAgICB8ICAgMiArLQogSlNUZXN0cy9zdHJlc3MvcmVnZXhwLWxvb2thcm91bmQtY2FwdHVyZXMu anMgIHwgMTA3IC0tLS0tLS0tLS0tLS0tLS0tLQogOSBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRp b25zKCspLCAyMDYgZGVsZXRpb25zKC0pCiBkZWxldGUgbW9kZSAxMDA2NDQgSlNUZXN0cy9zdHJl c3MvcmVnZXhwLWxvb2thcm91bmQtY2FwdHVyZXMuanMKCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUveWFyci9ZYXJySW50ZXJwcmV0ZXIuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3lhcnIvWWFyckludGVycHJldGVyLmNwcAppbmRleCBkMWY5ZGJhN2NiOGUuLjcxNWY5ZTdi MmI0OSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIvWWFyckludGVycHJl dGVyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySW50ZXJwcmV0ZXIu Y3BwCkBAIC0xMzQsNyArMTM0LDcgQEAgcHVibGljOgogICAgIHsKICAgICAgICAgUGFyZW50aGVz ZXNEaXNqdW5jdGlvbkNvbnRleHQodW5zaWduZWQqIG91dHB1dCwgQnl0ZVRlcm0mIHRlcm0pCiAg ICAgICAgIHsKLSAgICAgICAgICAgIHVuc2lnbmVkIGZpcnN0U3VicGF0dGVybklkID0gdGVybS5z dWJwYXR0ZXJuSWQoKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGZpcnN0U3VicGF0dGVybklkID0g dGVybS5hdG9tLnN1YnBhdHRlcm5JZDsKICAgICAgICAgICAgIHVuc2lnbmVkIG51bU5lc3RlZFN1 YnBhdHRlcm5zID0gdGVybS5hdG9tLnBhcmVudGhlc2VzRGlzanVuY3Rpb24tPm1fbnVtU3VicGF0 dGVybnM7CiAKICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCAobnVtTmVzdGVk U3VicGF0dGVybnMgPDwgMSk7ICsraSkgewpAQCAtODkzLDggKzg5Myw4IEBAIHB1YmxpYzoKICAg ICAgICAgQVNTRVJUKHRlcm0udHlwZSA9PSBCeXRlVGVybTo6VHlwZTo6QmFja1JlZmVyZW5jZSk7 CiAgICAgICAgIEJhY2tUcmFja0luZm9CYWNrUmVmZXJlbmNlKiBiYWNrVHJhY2sgPSByZWludGVy cHJldF9jYXN0PEJhY2tUcmFja0luZm9CYWNrUmVmZXJlbmNlKj4oY29udGV4dC0+ZnJhbWUgKyB0 ZXJtLmZyYW1lTG9jYXRpb24pOwogCi0gICAgICAgIHVuc2lnbmVkIG1hdGNoQmVnaW4gPSBvdXRw dXRbKHRlcm0uc3VicGF0dGVybklkKCkgPDwgMSldOwotICAgICAgICB1bnNpZ25lZCBtYXRjaEVu ZCA9IG91dHB1dFsodGVybS5zdWJwYXR0ZXJuSWQoKSA8PCAxKSArIDFdOworICAgICAgICB1bnNp Z25lZCBtYXRjaEJlZ2luID0gb3V0cHV0Wyh0ZXJtLmF0b20uc3VicGF0dGVybklkIDw8IDEpXTsK KyAgICAgICAgdW5zaWduZWQgbWF0Y2hFbmQgPSBvdXRwdXRbKHRlcm0uYXRvbS5zdWJwYXR0ZXJu SWQgPDwgMSkgKyAxXTsKIAogICAgICAgICAvLyBJZiB0aGUgZW5kIHBvc2l0aW9uIG9mIHRoZSBy ZWZlcmVuY2VkIG1hdGNoIGhhc24ndCBzZXQgeWV0IHRoZW4gdGhlIGJhY2tyZWZlcmVuY2UgaW4g dGhlIHNhbWUgcGFyZW50aGVzZXMgd2hlcmUgaXQgcmVmZXJlbmNlcyB0byB0aGF0LgogICAgICAg ICAvLyBJbiB0aGlzIGNhc2UgdGhlIHJlc3VsdCBvZiBtYXRjaCBpcyBlbXB0eSBzdHJpbmcgbGlr ZSB3aGVuIGl0IHJlZmVyZW5jZXMgdG8gYSBwYXJlbnRoZXNlcyB3aXRoIHplcm8td2lkdGggbWF0 Y2guCkBAIC05NDUsOCArOTQ1LDggQEAgcHVibGljOgogICAgICAgICBBU1NFUlQodGVybS50eXBl ID09IEJ5dGVUZXJtOjpUeXBlOjpCYWNrUmVmZXJlbmNlKTsKICAgICAgICAgQmFja1RyYWNrSW5m b0JhY2tSZWZlcmVuY2UqIGJhY2tUcmFjayA9IHJlaW50ZXJwcmV0X2Nhc3Q8QmFja1RyYWNrSW5m b0JhY2tSZWZlcmVuY2UqPihjb250ZXh0LT5mcmFtZSArIHRlcm0uZnJhbWVMb2NhdGlvbik7CiAK LSAgICAgICAgdW5zaWduZWQgbWF0Y2hCZWdpbiA9IG91dHB1dFsodGVybS5zdWJwYXR0ZXJuSWQo KSA8PCAxKV07Ci0gICAgICAgIHVuc2lnbmVkIG1hdGNoRW5kID0gb3V0cHV0Wyh0ZXJtLnN1YnBh dHRlcm5JZCgpIDw8IDEpICsgMV07CisgICAgICAgIHVuc2lnbmVkIG1hdGNoQmVnaW4gPSBvdXRw dXRbKHRlcm0uYXRvbS5zdWJwYXR0ZXJuSWQgPDwgMSldOworICAgICAgICB1bnNpZ25lZCBtYXRj aEVuZCA9IG91dHB1dFsodGVybS5hdG9tLnN1YnBhdHRlcm5JZCA8PCAxKSArIDFdOwogCiAgICAg ICAgIGlmIChtYXRjaEJlZ2luID09IG9mZnNldE5vTWF0Y2gpCiAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CkBAIC05ODUsNyArOTg1LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVjb3JkUGFyZW50 aGVzZXNNYXRjaChCeXRlVGVybSYgdGVybSwgUGFyZW50aGVzZXNEaXNqdW5jdGlvbkNvbnRleHQq IGNvbnRleHQpCiAgICAgewogICAgICAgICBpZiAodGVybS5jYXB0dXJlKCkpIHsKLSAgICAgICAg ICAgIHVuc2lnbmVkIHN1YnBhdHRlcm5JZCA9IHRlcm0uc3VicGF0dGVybklkKCk7CisgICAgICAg ICAgICB1bnNpZ25lZCBzdWJwYXR0ZXJuSWQgPSB0ZXJtLmF0b20uc3VicGF0dGVybklkOwogICAg ICAgICAgICAgLy8gRm9yIEJhY2t3YXJkIG1hdGNoZXMsIHRoZSBjYXB0dXJlZCBpbmRleGVzIHdo ZXJlIHJlY29yZGVkIGVuZCB0aGVuIHN0YXJ0LgogICAgICAgICAgICAgb3V0cHV0WyhzdWJwYXR0 ZXJuSWQgPDwgMSkgKyB0ZXJtLm1hdGNoRGlyZWN0aW9uKCldID0gY29udGV4dC0+Z2V0RGlzanVu Y3Rpb25Db250ZXh0KHRlcm0pLT5tYXRjaEJlZ2luIC0gdGVybS5pbnB1dFBvc2l0aW9uOwogICAg ICAgICAgICAgb3V0cHV0WyhzdWJwYXR0ZXJuSWQgPDwgMSkgKyAxIC0gdGVybS5tYXRjaERpcmVj dGlvbigpXSA9IGNvbnRleHQtPmdldERpc2p1bmN0aW9uQ29udGV4dCh0ZXJtKS0+bWF0Y2hFbmQg LSB0ZXJtLmlucHV0UG9zaXRpb247CkBAIC05OTMsNyArOTkzLDcgQEAgcHVibGljOgogICAgIH0K ICAgICB2b2lkIHJlc2V0TWF0Y2hlcyhCeXRlVGVybSYgdGVybSwgUGFyZW50aGVzZXNEaXNqdW5j dGlvbkNvbnRleHQqIGNvbnRleHQpCiAgICAgewotICAgICAgICB1bnNpZ25lZCBmaXJzdFN1YnBh dHRlcm5JZCA9IHRlcm0uc3VicGF0dGVybklkKCk7CisgICAgICAgIHVuc2lnbmVkIGZpcnN0U3Vi cGF0dGVybklkID0gdGVybS5hdG9tLnN1YnBhdHRlcm5JZDsKICAgICAgICAgdW5zaWduZWQgY291 bnQgPSB0ZXJtLmF0b20ucGFyZW50aGVzZXNEaXNqdW5jdGlvbi0+bV9udW1TdWJwYXR0ZXJuczsK ICAgICAgICAgY29udGV4dC0+cmVzdG9yZU91dHB1dChvdXRwdXQsIGZpcnN0U3VicGF0dGVybklk LCBjb3VudCk7CiAgICAgfQpAQCAtMTA0MCw3ICsxMDQwLDcgQEAgcHVibGljOgogICAgICAgICB9 CiAKICAgICAgICAgaWYgKHRlcm0uY2FwdHVyZSgpKSB7Ci0gICAgICAgICAgICB1bnNpZ25lZCBz dWJwYXR0ZXJuSWQgPSB0ZXJtLnN1YnBhdHRlcm5JZCgpOworICAgICAgICAgICAgdW5zaWduZWQg c3VicGF0dGVybklkID0gdGVybS5hdG9tLnN1YnBhdHRlcm5JZDsKICAgICAgICAgICAgIC8vIEZv ciBCYWNrd2FyZCBtYXRjaGVzLCB0aGUgY2FwdHVyZWQgaW5kZXhlcyB3aGVyZSByZWNvcmRlZCBl bmQgdGhlbiBzdGFydC4KICAgICAgICAgICAgIG91dHB1dFsoc3VicGF0dGVybklkIDw8IDEpICsg dGVybS5tYXRjaERpcmVjdGlvbigpXSA9IGlucHV0LmdldFBvcygpIC0gdGVybS5pbnB1dFBvc2l0 aW9uOwogICAgICAgICB9CkBAIC0xMDU0LDcgKzEwNTQsNyBAQCBwdWJsaWM6CiAgICAgICAgIEFT U0VSVCh0ZXJtLmF0b20ucXVhbnRpdHlNYXhDb3VudCA9PSAxKTsKIAogICAgICAgICBpZiAodGVy bS5jYXB0dXJlKCkpIHsKLSAgICAgICAgICAgIHVuc2lnbmVkIHN1YnBhdHRlcm5JZCA9IHRlcm0u c3VicGF0dGVybklkKCk7CisgICAgICAgICAgICB1bnNpZ25lZCBzdWJwYXR0ZXJuSWQgPSB0ZXJt LmF0b20uc3VicGF0dGVybklkOwogICAgICAgICAgICAgLy8gRm9yIEJhY2t3YXJkIG1hdGNoZXMs IHRoZSBjYXB0dXJlZCBpbmRleGVzIHdoZXJlIHJlY29yZGVkIGVuZCB0aGVuIHN0YXJ0LgogICAg ICAgICAgICAgb3V0cHV0WyhzdWJwYXR0ZXJuSWQgPDwgMSkgKyAxIC0gdGVybS5tYXRjaERpcmVj dGlvbigpXSA9IGlucHV0LmdldFBvcygpIC0gdGVybS5pbnB1dFBvc2l0aW9uOwogICAgICAgICB9 CkBAIC0xMDc0LDcgKzEwNzQsNyBAQCBwdWJsaWM6CiAgICAgICAgIEJhY2tUcmFja0luZm9QYXJl bnRoZXNlc09uY2UqIGJhY2tUcmFjayA9IHJlaW50ZXJwcmV0X2Nhc3Q8QmFja1RyYWNrSW5mb1Bh cmVudGhlc2VzT25jZSo+KGNvbnRleHQtPmZyYW1lICsgdGVybS5mcmFtZUxvY2F0aW9uKTsKIAog ICAgICAgICBpZiAodGVybS5jYXB0dXJlKCkpIHsKLSAgICAgICAgICAgIHVuc2lnbmVkIHN1YnBh dHRlcm5JZCA9IHRlcm0uc3VicGF0dGVybklkKCk7CisgICAgICAgICAgICB1bnNpZ25lZCBzdWJw YXR0ZXJuSWQgPSB0ZXJtLmF0b20uc3VicGF0dGVybklkOwogICAgICAgICAgICAgb3V0cHV0Wyhz dWJwYXR0ZXJuSWQgPDwgMSldID0gb2Zmc2V0Tm9NYXRjaDsKICAgICAgICAgICAgIG91dHB1dFso c3VicGF0dGVybklkIDw8IDEpICsgMV0gPSBvZmZzZXROb01hdGNoOwogICAgICAgICB9CkBAIC0x MTE5LDcgKzExMTksNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIC8vIHRoZSBzYW1l IGFueXdheSEgKFdlIGRvbid0IHByZS1jaGVjayBmb3IgZ3JlZWR5IG9yIG5vbi1ncmVlZHkgbWF0 Y2hlcy4pCiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCgoJnRlcm0gLSB0ZXJtLmF0b20ucGFy ZW50aGVzZXNXaWR0aCktPnR5cGUgPT0gQnl0ZVRlcm06OlR5cGU6OlBhcmVudGhlc2VzU3VicGF0 dGVybk9uY2VCZWdpbik7CiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCgoJnRlcm0gLSB0ZXJt LmF0b20ucGFyZW50aGVzZXNXaWR0aCktPmlucHV0UG9zaXRpb24gPT0gdGVybS5pbnB1dFBvc2l0 aW9uKTsKLSAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgc3VicGF0dGVybklkID0gdGVybS5z dWJwYXR0ZXJuSWQoKTsKKyAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgc3VicGF0dGVybklk ID0gdGVybS5hdG9tLnN1YnBhdHRlcm5JZDsKICAgICAgICAgICAgICAgICAgICAgLy8gRm9yIEJh Y2t3YXJkIG1hdGNoZXMsIHRoZSBjYXB0dXJlZCBpbmRleGVzIHdoZXJlIHJlY29yZGVkIGVuZCB0 aGVuIHN0YXJ0LgogICAgICAgICAgICAgICAgICAgICBvdXRwdXRbKHN1YnBhdHRlcm5JZCA8PCAx KSArIHRlcm0ubWF0Y2hEaXJlY3Rpb24oKV0gPSBpbnB1dC5nZXRQb3MoKSAtIHRlcm0uaW5wdXRQ b3NpdGlvbjsKICAgICAgICAgICAgICAgICB9CkBAIC0xMjA0LDEwICsxMjA0LDYgQEAgcHVibGlj OgogCiAgICAgICAgIC8vIFdlJ3ZlIHJlYWNoZWQgdGhlIGVuZCBvZiB0aGUgcGFyZW5zOyBpZiB0 aGV5IGFyZSBpbnZlcnRlZCwgdGhpcyBpcyBmYWlsdXJlLgogICAgICAgICBpZiAodGVybS5pbnZl cnQoKSkgewotICAgICAgICAgICAgaWYgKHRlcm0uY29udGFpbnNBbnlDYXB0dXJlcygpKSB7Ci0g ICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBzdWJwYXR0ZXJuID0gdGVybS5zdWJwYXR0ZXJu SWQoKTsgc3VicGF0dGVybiA8PSB0ZXJtLmxhc3RTdWJwYXR0ZXJuSWQoKTsgc3VicGF0dGVybisr KQotICAgICAgICAgICAgICAgICAgICBvdXRwdXRbKHN1YnBhdHRlcm4gPDwgMSldID0gb2Zmc2V0 Tm9NYXRjaDsKLSAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNvbnRleHQtPnRlcm0gLT0gdGVy bS5hdG9tLnBhcmVudGhlc2VzV2lkdGg7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIH0KQEAgLTEyNDMsMTEgKzEyMzksNiBAQCBwdWJsaWM6CiAKICAgICAgICAgaW5wdXQuc2V0 UG9zKGJhY2tUcmFjay0+YmVnaW4pOwogCi0gICAgICAgIGlmICh0ZXJtLmNvbnRhaW5zQW55Q2Fw dHVyZXMoKSkgewotICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBzdWJwYXR0ZXJuID0gdGVybS5z dWJwYXR0ZXJuSWQoKTsgc3VicGF0dGVybiA8PSB0ZXJtLmxhc3RTdWJwYXR0ZXJuSWQoKTsgc3Vi cGF0dGVybisrKQotICAgICAgICAgICAgICAgIG91dHB1dFsoc3VicGF0dGVybiA8PCAxKV0gPSBv ZmZzZXROb01hdGNoOwotICAgICAgICB9Ci0KICAgICAgICAgY29udGV4dC0+dGVybSAtPSB0ZXJt LmF0b20ucGFyZW50aGVzZXNXaWR0aDsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAg LTE1OTAsMTAgKzE1ODEsMTAgQEAgcHVibGljOgogCiAgICAgICAgIHN3aXRjaCAoY3VycmVudFRl cm0oKS50eXBlKSB7CiAgICAgICAgIGNhc2UgQnl0ZVRlcm06OlR5cGU6OlN1YnBhdHRlcm5CZWdp bjoKLSAgICAgICAgICAgIERVTVBfRVhUUkFfSUYoY3VycmVudFRlcm0oKS5jYXB0dXJlKCksICJp ZDoiLCBjdXJyZW50VGVybSgpLnN1YnBhdHRlcm5JZCgpKTsKKyAgICAgICAgICAgIERVTVBfRVhU UkFfSUYoY3VycmVudFRlcm0oKS5jYXB0dXJlKCksICJpZDoiLCBjdXJyZW50VGVybSgpLmF0b20u c3VicGF0dGVybklkKTsKICAgICAgICAgICAgIE1BVENIX05FWFQoKTsKICAgICAgICAgY2FzZSBC eXRlVGVybTo6VHlwZTo6U3VicGF0dGVybkVuZDoKLSAgICAgICAgICAgIERVTVBfRVhUUkFfSUYo Y3VycmVudFRlcm0oKS5jYXB0dXJlKCksICJpZDoiLCBjdXJyZW50VGVybSgpLnN1YnBhdHRlcm5J ZCgpLCAiIC0gUmV0dXJuIE1hdGNoXG4iKTsKKyAgICAgICAgICAgIERVTVBfRVhUUkFfSUYoY3Vy cmVudFRlcm0oKS5jYXB0dXJlKCksICJpZDoiLCBjdXJyZW50VGVybSgpLmF0b20uc3VicGF0dGVy bklkLCAiIC0gUmV0dXJuIE1hdGNoXG4iKTsKICAgICAgICAgICAgIGNvbnRleHQtPm1hdGNoRW5k ID0gaW5wdXQuZ2V0UG9zKCk7CiAgICAgICAgICAgICByZXR1cm4gSlNSZWdFeHBSZXN1bHQ6Ok1h dGNoOwogCkBAIC0xODkzLDcgKzE4ODQsNyBAQCBwdWJsaWM6CiAKICAgICAgICAgc3dpdGNoIChj dXJyZW50VGVybSgpLnR5cGUpIHsKICAgICAgICAgY2FzZSBCeXRlVGVybTo6VHlwZTo6U3VicGF0 dGVybkJlZ2luOgotICAgICAgICAgICAgRFVNUF9FWFRSQSgiaWQ6IiwgY3VycmVudFRlcm0oKS5z dWJwYXR0ZXJuSWQoKSwgIiAtIFJldHVybiBOb01hdGNoXG4iKTsKKyAgICAgICAgICAgIERVTVBf RVhUUkEoImlkOiIsIGN1cnJlbnRUZXJtKCkuYXRvbS5zdWJwYXR0ZXJuSWQsICIgLSBSZXR1cm4g Tm9NYXRjaFxuIik7CiAgICAgICAgICAgICByZXR1cm4gSlNSZWdFeHBSZXN1bHQ6Ok5vTWF0Y2g7 CiAgICAgICAgIGNhc2UgQnl0ZVRlcm06OlR5cGU6OlN1YnBhdHRlcm5FbmQ6CiAgICAgICAgICAg ICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtMjI2NSw3ICsyMjU2LDcgQEAgcHVi bGljOgogICAgICAgICBtX2N1cnJlbnRBbHRlcm5hdGl2ZUluZGV4ID0gYmVnaW5UZXJtICsgMTsK ICAgICB9CiAKLSAgICB2b2lkIGF0b21QYXJlbnRoZXRpY2FsQXNzZXJ0aW9uRW5kKHVuc2lnbmVk IGlucHV0UG9zaXRpb24sIHVuc2lnbmVkIGxhc3RTdWJwYXR0ZXJuSWQsIHVuc2lnbmVkIGZyYW1l TG9jYXRpb24sIENoZWNrZWQ8dW5zaWduZWQ+IHF1YW50aXR5TWF4Q291bnQsIFF1YW50aWZpZXJU eXBlIHF1YW50aXR5VHlwZSkKKyAgICB2b2lkIGF0b21QYXJlbnRoZXRpY2FsQXNzZXJ0aW9uRW5k KHVuc2lnbmVkIGlucHV0UG9zaXRpb24sIHVuc2lnbmVkIGZyYW1lTG9jYXRpb24sIENoZWNrZWQ8 dW5zaWduZWQ+IHF1YW50aXR5TWF4Q291bnQsIFF1YW50aWZpZXJUeXBlIHF1YW50aXR5VHlwZSkK ICAgICB7CiAgICAgICAgIHVuc2lnbmVkIGJlZ2luVGVybSA9IHBvcFBhcmVudGhlc2VzU3RhY2so KTsKICAgICAgICAgY2xvc2VBbHRlcm5hdGl2ZShiZWdpblRlcm0gKyAxKTsKQEAgLTIyNzUsMTMg KzIyNjYsMTEgQEAgcHVibGljOgogCiAgICAgICAgIGJvb2wgaW52ZXJ0ID0gbV9ib2R5RGlzanVu Y3Rpb24tPnRlcm1zW2JlZ2luVGVybV0uaW52ZXJ0KCk7CiAgICAgICAgIE1hdGNoRGlyZWN0aW9u IG1hdGNoRGlyZWN0aW9uID0gbV9ib2R5RGlzanVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0ubWF0 Y2hEaXJlY3Rpb24oKTsKLSAgICAgICAgdW5zaWduZWQgc3VicGF0dGVybklkID0gbV9ib2R5RGlz anVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0uc3VicGF0dGVybklkKCk7CisgICAgICAgIHVuc2ln bmVkIHN1YnBhdHRlcm5JZCA9IG1fYm9keURpc2p1bmN0aW9uLT50ZXJtc1tiZWdpblRlcm1dLmF0 b20uc3VicGF0dGVybklkOwogCiAgICAgICAgIG1fYm9keURpc2p1bmN0aW9uLT50ZXJtcy5hcHBl bmQoQnl0ZVRlcm0oQnl0ZVRlcm06OlR5cGU6OlBhcmVudGhldGljYWxBc3NlcnRpb25FbmQsIHN1 YnBhdHRlcm5JZCwgZmFsc2UsIGludmVydCwgbWF0Y2hEaXJlY3Rpb24sIGlucHV0UG9zaXRpb24p KTsKICAgICAgICAgbV9ib2R5RGlzanVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0uYXRvbS5wYXJl bnRoZXNlc1dpZHRoID0gZW5kVGVybSAtIGJlZ2luVGVybTsKICAgICAgICAgbV9ib2R5RGlzanVu Y3Rpb24tPnRlcm1zW2VuZFRlcm1dLmF0b20ucGFyZW50aGVzZXNXaWR0aCA9IGVuZFRlcm0gLSBi ZWdpblRlcm07Ci0gICAgICAgIG1fYm9keURpc2p1bmN0aW9uLT50ZXJtc1tiZWdpblRlcm1dLmF0 b20uaWRzLmxhc3RTdWJwYXR0ZXJuSWQgPSBsYXN0U3VicGF0dGVybklkOwotICAgICAgICBtX2Jv ZHlEaXNqdW5jdGlvbi0+dGVybXNbZW5kVGVybV0uYXRvbS5pZHMubGFzdFN1YnBhdHRlcm5JZCA9 IGxhc3RTdWJwYXR0ZXJuSWQ7CiAgICAgICAgIG1fYm9keURpc2p1bmN0aW9uLT50ZXJtc1tlbmRU ZXJtXS5mcmFtZUxvY2F0aW9uID0gZnJhbWVMb2NhdGlvbjsKIAogICAgICAgICBtX2JvZHlEaXNq dW5jdGlvbi0+dGVybXNbYmVnaW5UZXJtXS5hdG9tLnF1YW50aXR5TWF4Q291bnQgPSBxdWFudGl0 eU1heENvdW50OwpAQCAtMjM2Nyw3ICsyMzU2LDcgQEAgcHVibGljOgogCiAgICAgICAgIGF1dG8g cGFyZW50aGVzZXNNYXRjaERpcmVjdGlvbiA9IHBhcmVudGhlc2VzQmVnaW4ubWF0Y2hEaXJlY3Rp b24oKTsKICAgICAgICAgYm9vbCBjYXB0dXJlID0gcGFyZW50aGVzZXNCZWdpbi5jYXB0dXJlKCk7 Ci0gICAgICAgIHVuc2lnbmVkIHN1YnBhdHRlcm5JZCA9IHBhcmVudGhlc2VzQmVnaW4uc3VicGF0 dGVybklkKCk7CisgICAgICAgIHVuc2lnbmVkIHN1YnBhdHRlcm5JZCA9IHBhcmVudGhlc2VzQmVn aW4uYXRvbS5zdWJwYXR0ZXJuSWQ7CiAKICAgICAgICAgdW5zaWduZWQgbnVtU3VicGF0dGVybnMg PSBsYXN0U3VicGF0dGVybklkIC0gc3VicGF0dGVybklkICsgMTsKICAgICAgICAgYXV0byBwYXJl bnRoZXNlc0Rpc2p1bmN0aW9uID0gbWFrZVVuaXF1ZTxCeXRlRGlzanVuY3Rpb24+KG51bVN1YnBh dHRlcm5zLCBjYWxsRnJhbWVTaXplKTsKQEAgLTI0MDEsNyArMjM5MCw3IEBAIHB1YmxpYzoKICAg ICAgICAgQVNTRVJUKG1fYm9keURpc2p1bmN0aW9uLT50ZXJtc1tiZWdpblRlcm1dLnR5cGUgPT0g Qnl0ZVRlcm06OlR5cGU6OlBhcmVudGhlc2VzU3VicGF0dGVybk9uY2VCZWdpbik7CiAKICAgICAg ICAgYm9vbCBjYXB0dXJlID0gbV9ib2R5RGlzanVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0uY2Fw dHVyZSgpOwotICAgICAgICB1bnNpZ25lZCBzdWJwYXR0ZXJuSWQgPSBtX2JvZHlEaXNqdW5jdGlv bi0+dGVybXNbYmVnaW5UZXJtXS5zdWJwYXR0ZXJuSWQoKTsKKyAgICAgICAgdW5zaWduZWQgc3Vi cGF0dGVybklkID0gbV9ib2R5RGlzanVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0uYXRvbS5zdWJw YXR0ZXJuSWQ7CiAKICAgICAgICAgbV9ib2R5RGlzanVuY3Rpb24tPnRlcm1zLmFwcGVuZChCeXRl VGVybShCeXRlVGVybTo6VHlwZTo6UGFyZW50aGVzZXNTdWJwYXR0ZXJuT25jZUVuZCwgc3VicGF0 dGVybklkLCBjYXB0dXJlLCBmYWxzZSwgaW5wdXRQb3NpdGlvbikpOwogICAgICAgICBpZiAobV9i b2R5RGlzanVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0ubWF0Y2hEaXJlY3Rpb24oKSA9PSBCYWNr d2FyZCkgewpAQCAtMjQzMyw3ICsyNDIyLDcgQEAgcHVibGljOgogICAgICAgICBpZiAobV9ib2R5 RGlzanVuY3Rpb24tPnRlcm1zW2JlZ2luVGVybV0ubWF0Y2hEaXJlY3Rpb24oKSA9PSBCYWNrd2Fy ZCkKICAgICAgICAgICAgIGlucHV0UG9zaXRpb24gPSAwOwogICAgICAgICBib29sIGNhcHR1cmUg PSBtX2JvZHlEaXNqdW5jdGlvbi0+dGVybXNbYmVnaW5UZXJtXS5jYXB0dXJlKCk7Ci0gICAgICAg IHVuc2lnbmVkIHN1YnBhdHRlcm5JZCA9IG1fYm9keURpc2p1bmN0aW9uLT50ZXJtc1tiZWdpblRl cm1dLnN1YnBhdHRlcm5JZCgpOworICAgICAgICB1bnNpZ25lZCBzdWJwYXR0ZXJuSWQgPSBtX2Jv ZHlEaXNqdW5jdGlvbi0+dGVybXNbYmVnaW5UZXJtXS5hdG9tLnN1YnBhdHRlcm5JZDsKIAogICAg ICAgICBtX2JvZHlEaXNqdW5jdGlvbi0+dGVybXMuYXBwZW5kKEJ5dGVUZXJtKEJ5dGVUZXJtOjpU eXBlOjpQYXJlbnRoZXNlc1N1YnBhdHRlcm5UZXJtaW5hbEVuZCwgc3VicGF0dGVybklkLCBjYXB0 dXJlLCBmYWxzZSwgaW5wdXRQb3NpdGlvbikpOwogICAgICAgICBtX2JvZHlEaXNqdW5jdGlvbi0+ dGVybXNbYmVnaW5UZXJtXS5hdG9tLnBhcmVudGhlc2VzV2lkdGggPSBlbmRUZXJtIC0gYmVnaW5U ZXJtOwpAQCAtMjYwMyw3ICsyNTkyLDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAg ICAgYXRvbVBhcmVudGhldGljYWxBc3NlcnRpb25CZWdpbih0ZXJtLnBhcmVudGhlc2VzLnN1YnBh dHRlcm5JZCwgMCwgdGVybS5pbnZlcnQoKSwgdGVybS5tYXRjaERpcmVjdGlvbigpLCB0ZXJtLmZy YW1lTG9jYXRpb24sIGFsdGVybmF0aXZlRnJhbWVMb2NhdGlvbik7CiAgICAgICAgICAgICAgICAg ICAgICAgICBpZiAoYXV0byBlcnJvciA9IGVtaXREaXNqdW5jdGlvbih0ZXJtLnBhcmVudGhlc2Vz LmRpc2p1bmN0aW9uLCBjdXJyZW50Q291bnRBbHJlYWR5Q2hlY2tlZCwgcG9zaXRpdmVJbnB1dE9m ZnNldCAtIHVuY2hlY2tBbW91bnQsIHRlcm0ubWF0Y2hEaXJlY3Rpb24oKSkpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIGVycm9yOwotICAgICAgICAgICAgICAgICAgICAgICAg YXRvbVBhcmVudGhldGljYWxBc3NlcnRpb25FbmQoMCwgdGVybS5wYXJlbnRoZXNlcy5sYXN0U3Vi cGF0dGVybklkLCB0ZXJtLmZyYW1lTG9jYXRpb24sIHRlcm0ucXVhbnRpdHlNYXhDb3VudCwgdGVy bS5xdWFudGl0eVR5cGUpOworICAgICAgICAgICAgICAgICAgICAgICAgYXRvbVBhcmVudGhldGlj YWxBc3NlcnRpb25FbmQoMCwgdGVybS5mcmFtZUxvY2F0aW9uLCB0ZXJtLnF1YW50aXR5TWF4Q291 bnQsIHRlcm0ucXVhbnRpdHlUeXBlKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh1bmNo ZWNrQW1vdW50KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hlY2tJbnB1dCh1bmNo ZWNrQW1vdW50KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdXJyZW50Q291bnRBbHJl YWR5Q2hlY2tlZCArPSB1bmNoZWNrQW1vdW50OwpAQCAtMjYzMSw3ICsyNjIwLDcgQEAgcHVibGlj OgogCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYXV0byBlcnJvciA9IGVtaXREaXNqdW5j dGlvbih0ZXJtLnBhcmVudGhlc2VzLmRpc2p1bmN0aW9uLCBjaGVja2VkQ291bnRGb3JMb29rYmVo aW5kLCBwb3NpdGl2ZUlucHV0T2Zmc2V0ICsgbWluaW11bVNpemUsIHRlcm0ubWF0Y2hEaXJlY3Rp b24oKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGVycm9yOwotICAgICAg ICAgICAgICAgICAgICAgICAgYXRvbVBhcmVudGhldGljYWxBc3NlcnRpb25FbmQoMCwgdGVybS5w YXJlbnRoZXNlcy5sYXN0U3VicGF0dGVybklkLCB0ZXJtLmZyYW1lTG9jYXRpb24sIHRlcm0ucXVh bnRpdHlNYXhDb3VudCwgdGVybS5xdWFudGl0eVR5cGUpOworICAgICAgICAgICAgICAgICAgICAg ICAgYXRvbVBhcmVudGhldGljYWxBc3NlcnRpb25FbmQoMCwgdGVybS5mcmFtZUxvY2F0aW9uLCB0 ZXJtLnF1YW50aXR5TWF4Q291bnQsIHRlcm0ucXVhbnRpdHlUeXBlKTsKIAogICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKHVuY2hlY2tBbW91bnQpIHsKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjaGVja0lucHV0KHVuY2hlY2tBbW91bnQpOwpAQCAtMjcwMyw3ICsyNjkyLDcgQEAgdm9p ZCBCeXRlVGVybUR1bXBlcjo6ZHVtcFRlcm0oc2l6ZV90IGlkeCwgQnl0ZVRlcm0gdGVybSkKIAog ICAgIGF1dG8gZHVtcENhcHR1cmVkID0gWyZdKEJ5dGVUZXJtJiB0ZXJtKSB7CiAgICAgICAgIGlm ICh0ZXJtLmNhcHR1cmUoKSkKLSAgICAgICAgICAgIG91dC5wcmludCgiIGNhcHR1cmVkICgjIiwg dGVybS5zdWJwYXR0ZXJuSWQoKSwgIikiKTsKKyAgICAgICAgICAgIG91dC5wcmludCgiIGNhcHR1 cmVkICgjIiwgdGVybS5hdG9tLnN1YnBhdHRlcm5JZCwgIikiKTsKICAgICB9OwogCiAgICAgYXV0 byBkdW1wSW52ZXJ0ZWQgPSBbJl0oQnl0ZVRlcm0mIHRlcm0pIHsKQEAgLTI4NjUsNyArMjg1NCw3 IEBAIHZvaWQgQnl0ZVRlcm1EdW1wZXI6OmR1bXBUZXJtKHNpemVfdCBpZHgsIEJ5dGVUZXJtIHRl cm0pCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQnl0ZVRlcm06OlR5cGU6OkJhY2tSZWZlcmVu Y2U6CiAgICAgICAgIG91dHB1dFRlcm1JbmRleEFuZE5lc3QoaWR4LCBtX25lc3RpbmcpOwotICAg ICAgICBvdXQucHJpbnQoIkJhY2tSZWZlcmVuY2UgIyIsIHRlcm0uc3VicGF0dGVybklkKCkpOwor ICAgICAgICBvdXQucHJpbnQoIkJhY2tSZWZlcmVuY2UgIyIsIHRlcm0uYXRvbS5zdWJwYXR0ZXJu SWQpOwogICAgICAgICBkdW1wSW5wdXRQb3NpdGlvbih0ZXJtKTsKICAgICAgICAgZHVtcFF1YW50 aXR5KHRlcm0pOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS95YXJyL1lhcnJJbnRlcnByZXRlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIv WWFyckludGVycHJldGVyLmgKaW5kZXggZGNlZWMzZjc1NDZhLi5mZDQ5YjAyMjA4MWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJJbnRlcnByZXRlci5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJJbnRlcnByZXRlci5oCkBAIC00OSwxMCAr NDksNyBAQCBzdHJ1Y3QgQnl0ZVRlcm0gewogICAgICAgICAgICAgICAgICAgICBVQ2hhcjMyIGhp OwogICAgICAgICAgICAgICAgIH0gY2FzZWRDaGFyYWN0ZXI7CiAgICAgICAgICAgICAgICAgQ2hh cmFjdGVyQ2xhc3MqIGNoYXJhY3RlckNsYXNzOwotICAgICAgICAgICAgICAgIHN0cnVjdCB7Ci0g ICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHN1YnBhdHRlcm5JZDsKLSAgICAgICAgICAgICAg ICAgICAgdW5zaWduZWQgbGFzdFN1YnBhdHRlcm5JZDsKLSAgICAgICAgICAgICAgICB9IGlkczsK KyAgICAgICAgICAgICAgICB1bnNpZ25lZCBzdWJwYXR0ZXJuSWQ7CiAgICAgICAgICAgICB9Owog ICAgICAgICAgICAgdW5pb24gewogICAgICAgICAgICAgICAgIEJ5dGVEaXNqdW5jdGlvbiogcGFy ZW50aGVzZXNEaXNqdW5jdGlvbjsKQEAgLTE5MSw3ICsxODgsNyBAQCBzdHJ1Y3QgQnl0ZVRlcm0g ewogICAgICAgICAsIG1fbWF0Y2hEaXJlY3Rpb24oRm9yd2FyZCkKICAgICAgICAgLCBpbnB1dFBv c2l0aW9uKGlucHV0UG9zKQogICAgIHsKLSAgICAgICAgYXRvbS5pZHMuc3VicGF0dGVybklkID0g c3VicGF0dGVybklkOworICAgICAgICBhdG9tLnN1YnBhdHRlcm5JZCA9IHN1YnBhdHRlcm5JZDsK ICAgICAgICAgYXRvbS5wYXJlbnRoZXNlc0Rpc2p1bmN0aW9uID0gcGFyZW50aGVzZXNJbmZvOwog ICAgICAgICBhdG9tLnF1YW50aXR5VHlwZSA9IFF1YW50aWZpZXJUeXBlOjpGaXhlZENvdW50Owog ICAgICAgICBhdG9tLnF1YW50aXR5TWluQ291bnQgPSAxOwpAQCAtMjE2LDcgKzIxMyw3IEBAIHN0 cnVjdCBCeXRlVGVybSB7CiAgICAgICAgICwgbV9tYXRjaERpcmVjdGlvbihGb3J3YXJkKQogICAg ICAgICAsIGlucHV0UG9zaXRpb24oaW5wdXRQb3MpCiAgICAgewotICAgICAgICBhdG9tLmlkcy5z dWJwYXR0ZXJuSWQgPSBzdWJwYXR0ZXJuSWQ7CisgICAgICAgIGF0b20uc3VicGF0dGVybklkID0g c3VicGF0dGVybklkOwogICAgICAgICBhdG9tLnF1YW50aXR5VHlwZSA9IFF1YW50aWZpZXJUeXBl OjpGaXhlZENvdW50OwogICAgICAgICBhdG9tLnF1YW50aXR5TWluQ291bnQgPSAxOwogICAgICAg ICBhdG9tLnF1YW50aXR5TWF4Q291bnQgPSAxOwpAQCAtMjI5LDcgKzIyNiw3IEBAIHN0cnVjdCBC eXRlVGVybSB7CiAgICAgICAgICwgbV9tYXRjaERpcmVjdGlvbihtYXRjaERpcmVjdGlvbikKICAg ICAgICAgLCBpbnB1dFBvc2l0aW9uKGlucHV0UG9zKQogICAgIHsKLSAgICAgICAgYXRvbS5pZHMu c3VicGF0dGVybklkID0gc3VicGF0dGVybklkOworICAgICAgICBhdG9tLnN1YnBhdHRlcm5JZCA9 IHN1YnBhdHRlcm5JZDsKICAgICAgICAgYXRvbS5xdWFudGl0eVR5cGUgPSBRdWFudGlmaWVyVHlw ZTo6Rml4ZWRDb3VudDsKICAgICAgICAgYXRvbS5xdWFudGl0eU1pbkNvdW50ID0gMTsKICAgICAg ICAgYXRvbS5xdWFudGl0eU1heENvdW50ID0gMTsKQEAgLTM3MCwyMiArMzY3LDYgQEAgc3RydWN0 IEJ5dGVUZXJtIHsKICAgICAgICAgcmV0dXJuIHR5cGUgPT0gVHlwZTo6Q2hhcmFjdGVyQ2xhc3M7 CiAgICAgfQogCi0gICAgYm9vbCBjb250YWluc0FueUNhcHR1cmVzKCkKLSAgICB7Ci0gICAgICAg IEFTU0VSVCh0aGlzLT50eXBlID09IFR5cGU6OlBhcmVudGhldGljYWxBc3NlcnRpb25CZWdpbgot ICAgICAgICAgICAgfHwgdGhpcy0+dHlwZSA9PSBUeXBlOjpQYXJlbnRoZXRpY2FsQXNzZXJ0aW9u RW5kKTsKLSAgICAgICAgcmV0dXJuIGxhc3RTdWJwYXR0ZXJuSWQoKSA+PSBzdWJwYXR0ZXJuSWQo KTsKLSAgICB9Ci0KLSAgICB1bnNpZ25lZCBzdWJwYXR0ZXJuSWQoKQotICAgIHsKLSAgICAgICAg cmV0dXJuIGF0b20uaWRzLnN1YnBhdHRlcm5JZDsKLSAgICB9Ci0KLSAgICB1bnNpZ25lZCBsYXN0 U3VicGF0dGVybklkKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBhdG9tLmlkcy5sYXN0U3VicGF0 dGVybklkOwotICAgIH0KICAgICBib29sIGludmVydCgpCiAgICAgewogICAgICAgICByZXR1cm4g bV9pbnZlcnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklU LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJKSVQuY3BwCmluZGV4IDljODM5 YmE4MGUzOS4uZDlhNzZlOTk2ZjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv eWFyci9ZYXJySklULmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJySklU LmNwcApAQCAtMjQ2OCwxMSArMjQ2OCw2IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBw dWJsaWMgWWFyckpJVEluZm8gewogICAgICAgICAgICAgICAgICAgICAvLyBQUklPUiBhbHRlcmFu YXRpdmUsIGFuZCB3ZSB3aWxsIG9ubHkgY2hlY2sgaW5wdXQgYXZhaWxhYmlsaXR5IGlmIHdlCiAg ICAgICAgICAgICAgICAgICAgIC8vIG5lZWQgdG8gcHJvZ3Jlc3MgaXQgZm9yd2FyZHMuCiAgICAg ICAgICAgICAgICAgICAgIG9wLm1fcmVlbnRyeSA9IG1faml0LmxhYmVsKCk7Ci0gICAgICAgICAg ICAgICAgICAgIGlmIChtX2NvbXBpbGVNb2RlID09IEpJVENvbXBpbGVNb2RlOjpJbmNsdWRlU3Vi cGF0dGVybnMKLSAgICAgICAgICAgICAgICAgICAgICAgICYmIHByaW9yQWx0ZXJuYXRpdmUtPmNs ZWFudXBDYXB0dXJlcygpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9yICh1bnNp Z25lZCBzdWJwYXR0ZXJuID0gcHJpb3JBbHRlcm5hdGl2ZS0+bV9maXJzdFN1YnBhdHRlcm5JZDsg c3VicGF0dGVybiA8PSBwcmlvckFsdGVybmF0aXZlLT5tX2xhc3RTdWJwYXR0ZXJuSWQ7IHN1YnBh dHRlcm4rKykKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xlYXJTdWJwYXR0ZXJu U3RhcnQoc3VicGF0dGVybik7Ci0gICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICAgICAgaWYgKGFsdGVybmF0aXZlLT5tX21pbmltdW1TaXplID4gcHJpb3JBbHRlcm5hdGl2ZS0+ bV9taW5pbXVtU2l6ZSkgewogICAgICAgICAgICAgICAgICAgICAgICAgbV9qaXQuYWRkMzIoTWFj cm9Bc3NlbWJsZXI6OkltbTMyKGFsdGVybmF0aXZlLT5tX21pbmltdW1TaXplIC0gcHJpb3JBbHRl cm5hdGl2ZS0+bV9taW5pbXVtU2l6ZSksIG1fcmVncy5pbmRleCk7CiAgICAgICAgICAgICAgICAg ICAgICAgICBvcC5tX2p1bXBzLmFwcGVuZChqdW1wSWZOb0F2YWlsYWJsZUlucHV0KCkpOwpAQCAt Mjg1MiwxMyArMjg0Nyw4IEBAIGNsYXNzIFlhcnJHZW5lcmF0b3IgZmluYWwgOiBwdWJsaWMgWWFy ckpJVEluZm8gewogICAgICAgICAgICAgICAgIGxvYWRGcm9tRnJhbWUocGFyZW50aGVzZXNGcmFt ZUxvY2F0aW9uICsgQmFja1RyYWNrSW5mb1BhcmVudGhldGljYWxBc3NlcnRpb246OmJlZ2luSW5k ZXgoKSwgbV9yZWdzLmluZGV4KTsKIAogICAgICAgICAgICAgICAgIC8vIElmIGludmVydGVkLCBh IHN1Y2Nlc3NmdWwgbWF0Y2ggb2YgdGhlIGFzc2VydGlvbiBtdXN0IGJlIHRyZWF0ZWQKLSAgICAg ICAgICAgICAgICAvLyBhcyBhIGZhaWx1cmUsIGNsZWFyIGFueSBuZXN0ZWQgY2FwdHVyZXMgYW5k IGp1bXAgdG8gYmFja3RyYWNraW5nLgorICAgICAgICAgICAgICAgIC8vIGFzIGEgZmFpbHVyZSwg c28ganVtcCB0byBiYWNrdHJhY2tpbmcuCiAgICAgICAgICAgICAgICAgaWYgKHRlcm0tPmludmVy dCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChtX2NvbXBpbGVNb2RlID09IEpJVENvbXBp bGVNb2RlOjpJbmNsdWRlU3VicGF0dGVybnMKLSAgICAgICAgICAgICAgICAgICAgICAgICYmIHRl cm0tPmNvbnRhaW5zQW55Q2FwdHVyZXMoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgZm9y ICh1bnNpZ25lZCBzdWJwYXR0ZXJuID0gdGVybS0+cGFyZW50aGVzZXMuc3VicGF0dGVybklkOyBz dWJwYXR0ZXJuIDw9IHRlcm0tPnBhcmVudGhlc2VzLmxhc3RTdWJwYXR0ZXJuSWQ7IHN1YnBhdHRl cm4rKykKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGVhclN1YnBhdHRlcm5TdGFydChz dWJwYXR0ZXJuKTsKLSAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBv cC5tX2p1bXBzLmFwcGVuZChtX2ppdC5qdW1wKCkpOwogICAgICAgICAgICAgICAgICAgICBvcC5t X3JlZW50cnkgPSBtX2ppdC5sYWJlbCgpOwogICAgICAgICAgICAgICAgIH0KQEAgLTM0OTIsNiAr MzQ4MiwxMCBAQCBjbGFzcyBZYXJyR2VuZXJhdG9yIGZpbmFsIDogcHVibGljIFlhcnJKSVRJbmZv IHsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNh c2UgWWFyck9wQ29kZTo6UGFyZW50aGV0aWNhbEFzc2VydGlvbkVuZDogeworICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcmVhbGx5IGJlIGNsZWFyaW5nIGFueSBuZXN0ZWQgc3Vi cGF0dGVybgorICAgICAgICAgICAgICAgIC8vIG1hdGNoZXMgb24gYmFpbGluZyBvdXQgZnJvbSBh ZnRlciB0aGUgcGF0dGVybi4gRmlyZWZveCBoYXMKKyAgICAgICAgICAgICAgICAvLyB0aGlzIGJ1 ZyB0b28gKHByZXN1bWFibHkgYmVjYXVzZSB0aGV5IHVzZSBZQVJSISkKKwogICAgICAgICAgICAg ICAgIC8vIE5ldmVyIGJhY2t0cmFjayBpbnRvIGFuIGFzc2VydGlvbjsgbGF0ZXIgZmFpbHVyZXMg YmFpbCB0byBiZWZvcmUgdGhlIGJlZ2luLgogICAgICAgICAgICAgICAgIG1fYmFja3RyYWNraW5n U3RhdGUudGFrZUJhY2t0cmFja3NUb0p1bXBMaXN0KG9wLm1fanVtcHMsICZtX2ppdCk7CiAgICAg ICAgICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFy ci9ZYXJyUGFyc2VyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyUGFyc2VyLmgK aW5kZXggM2UwYjhmNzIzMTg5Li4xMDZlZjY0NjU4ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS95YXJyL1lhcnJQYXJzZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv eWFyci9ZYXJyUGFyc2VyLmgKQEAgLTM2LDggKzM2LDYgQEAKIAogbmFtZXNwYWNlIEpTQyB7IG5h bWVzcGFjZSBZYXJyIHsKIAotZW51bSBjbGFzcyBDcmVhdGVEaXNqdW5jdGlvblB1cnBvc2UgOiB1 aW50OF90IHsgTm90Rm9yTmV4dEFsdGVybmF0aXZlLCBGb3JOZXh0QWx0ZXJuYXRpdmUgfTsKLQog Ly8gVGhlIFBhcnNlciBjbGFzcyBzaG91bGQgbm90IGJlIHVzZWQgZGlyZWN0bHkgLSBvbmx5IHZp YSB0aGUgWWFycjo6cGFyc2UoKSBtZXRob2QuCiB0ZW1wbGF0ZTxjbGFzcyBEZWxlZ2F0ZSwgdHlw ZW5hbWUgQ2hhclR5cGU+CiBjbGFzcyBQYXJzZXIgewpAQCAtNzY1LDcgKzc2Myw3IEBAIHByaXZh dGU6CiAgICAgICAgICAgICBzd2l0Y2ggKHBlZWsoKSkgewogICAgICAgICAgICAgY2FzZSAnfCc6 CiAgICAgICAgICAgICAgICAgY29uc3VtZSgpOwotICAgICAgICAgICAgICAgIG1fZGVsZWdhdGUu ZGlzanVuY3Rpb24oQ3JlYXRlRGlzanVuY3Rpb25QdXJwb3NlOjpGb3JOZXh0QWx0ZXJuYXRpdmUp OworICAgICAgICAgICAgICAgIG1fZGVsZWdhdGUuZGlzanVuY3Rpb24oKTsKICAgICAgICAgICAg ICAgICBsYXN0VG9rZW5UeXBlID0gVG9rZW5UeXBlOjpOb3RBdG9tOwogICAgICAgICAgICAgICAg IGJyZWFrOwogCkBAIC0xMjgxLDcgKzEyNzksNyBAQCBwcml2YXRlOgogICoKICAqICAgIHZvaWQg cXVhbnRpZnlBdG9tKHVuc2lnbmVkIG1pbiwgdW5zaWduZWQgbWF4LCBib29sIGdyZWVkeSk7CiAg KgotICogICAgdm9pZCBkaXNqdW5jdGlvbihDcmVhdGVEaXNqdW5jdGlvblB1cnBvc2UgcHVycG9z ZSk7CisgKiAgICB2b2lkIGRpc2p1bmN0aW9uKCk7CiAgKgogICogICAgdm9pZCByZXNldEZvclJl cGFyc2luZygpOwogICoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lh cnJQYXR0ZXJuLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJQYXR0ZXJuLmNw cAppbmRleCBiNDhhNTc3ZDVlZTUuLjg3NmYzZDQ0NGMwZCAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3lhcnIvWWFyclBhdHRlcm4uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS95YXJyL1lhcnJQYXR0ZXJuLmNwcApAQCAtNjAxLDcgKzYwMSw3IEBAIHB1YmxpYzoKIAog ICAgICAgICBhdXRvIHBhcmVudGhlc2VzRGlzanVuY3Rpb24gPSBtYWtlVW5pcXVlPFBhdHRlcm5E aXNqdW5jdGlvbj4obV9hbHRlcm5hdGl2ZSk7CiAgICAgICAgIG1fYWx0ZXJuYXRpdmUtPm1fdGVy bXMuYXBwZW5kKFBhdHRlcm5UZXJtKFBhdHRlcm5UZXJtOjpUeXBlOjpQYXJlbnRoZXNlc1N1YnBh dHRlcm4sIHN1YnBhdHRlcm5JZCwgcGFyZW50aGVzZXNEaXNqdW5jdGlvbi5nZXQoKSwgY2FwdHVy ZSwgZmFsc2UsIHBhcmVudGhlc2lzTWF0Y2hEaXJlY3Rpb24oKSkpOwotICAgICAgICBtX2FsdGVy bmF0aXZlID0gcGFyZW50aGVzZXNEaXNqdW5jdGlvbi0+YWRkTmV3QWx0ZXJuYXRpdmUobV9wYXR0 ZXJuLm1fbnVtU3VicGF0dGVybnMsIHBhcmVudGhlc2lzTWF0Y2hEaXJlY3Rpb24oKSk7CisgICAg ICAgIG1fYWx0ZXJuYXRpdmUgPSBwYXJlbnRoZXNlc0Rpc2p1bmN0aW9uLT5hZGROZXdBbHRlcm5h dGl2ZShwYXJlbnRoZXNpc01hdGNoRGlyZWN0aW9uKCkpOwogICAgICAgICBwdXNoUGFyZW50aGVz aXNDb250ZXh0KCk7CiAgICAgICAgIG1fcGF0dGVybi5tX2Rpc2p1bmN0aW9ucy5hcHBlbmQoV1RG TW92ZShwYXJlbnRoZXNlc0Rpc2p1bmN0aW9uKSk7CiAgICAgfQpAQCAtNjEwLDcgKzYxMCw3IEBA IHB1YmxpYzoKICAgICB7CiAgICAgICAgIGF1dG8gcGFyZW50aGVzZXNEaXNqdW5jdGlvbiA9IG1h a2VVbmlxdWU8UGF0dGVybkRpc2p1bmN0aW9uPihtX2FsdGVybmF0aXZlKTsKICAgICAgICAgbV9h bHRlcm5hdGl2ZS0+bV90ZXJtcy5hcHBlbmQoUGF0dGVyblRlcm0oUGF0dGVyblRlcm06OlR5cGU6 OlBhcmVudGhldGljYWxBc3NlcnRpb24sIG1fcGF0dGVybi5tX251bVN1YnBhdHRlcm5zICsgMSwg cGFyZW50aGVzZXNEaXNqdW5jdGlvbi5nZXQoKSwgZmFsc2UsIGludmVydCwgbWF0Y2hEaXJlY3Rp b24pKTsKLSAgICAgICAgbV9hbHRlcm5hdGl2ZSA9IHBhcmVudGhlc2VzRGlzanVuY3Rpb24tPmFk ZE5ld0FsdGVybmF0aXZlKG1fcGF0dGVybi5tX251bVN1YnBhdHRlcm5zLCBtYXRjaERpcmVjdGlv bik7CisgICAgICAgIG1fYWx0ZXJuYXRpdmUgPSBwYXJlbnRoZXNlc0Rpc2p1bmN0aW9uLT5hZGRO ZXdBbHRlcm5hdGl2ZShtYXRjaERpcmVjdGlvbik7CiAgICAgICAgIHB1c2hQYXJlbnRoZXNpc0Nv bnRleHQoKTsKICAgICAgICAgc2V0UGFyZW50aGVzaXNJbnZlcnQoaW52ZXJ0KTsKICAgICAgICAg c2V0UGFyZW50aGVzaXNNYXRjaERpcmVjdGlvbihtYXRjaERpcmVjdGlvbik7CkBAIC03MzgsOCAr NzM4LDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICBuZXdEaXNqdW5jdGlvbiA9IG1h a2VVbmlxdWU8UGF0dGVybkRpc2p1bmN0aW9uPigpOwogICAgICAgICAgICAgICAgICAgICBuZXdE aXNqdW5jdGlvbi0+bV9wYXJlbnQgPSBkaXNqdW5jdGlvbi0+bV9wYXJlbnQ7CiAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgIFBhdHRlcm5BbHRlcm5hdGl2ZSogbmV3QWx0ZXJuYXRp dmUgPSBuZXdEaXNqdW5jdGlvbi0+YWRkTmV3QWx0ZXJuYXRpdmUoYWx0ZXJuYXRpdmUtPm1fZmly c3RTdWJwYXR0ZXJuSWQsIGFsdGVybmF0aXZlLT5tYXRjaERpcmVjdGlvbigpKTsKLSAgICAgICAg ICAgICAgICBuZXdBbHRlcm5hdGl2ZS0+bV9sYXN0U3VicGF0dGVybklkID0gYWx0ZXJuYXRpdmUt Pm1fbGFzdFN1YnBhdHRlcm5JZDsKKyAgICAgICAgICAgICAgICBQYXR0ZXJuQWx0ZXJuYXRpdmUq IG5ld0FsdGVybmF0aXZlID0gbmV3RGlzanVuY3Rpb24tPmFkZE5ld0FsdGVybmF0aXZlKGFsdGVy bmF0aXZlLT5tYXRjaERpcmVjdGlvbigpKTsKICAgICAgICAgICAgICAgICBuZXdBbHRlcm5hdGl2 ZS0+bV90ZXJtcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGFsdGVybmF0aXZlLT5tX3Rlcm1zLnNp emUoKSk7CiAgICAgICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGFsdGVybmF0 aXZlLT5tX3Rlcm1zLnNpemUoKTsgKytpKQogICAgICAgICAgICAgICAgICAgICBuZXdBbHRlcm5h dGl2ZS0+bV90ZXJtcy5hcHBlbmQoY29weVRlcm0oYWx0ZXJuYXRpdmUtPm1fdGVybXNbaV0sIGZp bHRlclN0YXJ0c1dpdGhCT0wpKTsKQEAgLTgzMywxNCArODMyLDkgQEAgcHVibGljOgogICAgICAg ICB9CiAgICAgfQogCi0gICAgdm9pZCBkaXNqdW5jdGlvbihDcmVhdGVEaXNqdW5jdGlvblB1cnBv c2UgcHVycG9zZSA9IENyZWF0ZURpc2p1bmN0aW9uUHVycG9zZTo6Tm90Rm9yTmV4dEFsdGVybmF0 aXZlKQorICAgIHZvaWQgZGlzanVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHB1cnBvc2Ug PT0gQ3JlYXRlRGlzanVuY3Rpb25QdXJwb3NlOjpGb3JOZXh0QWx0ZXJuYXRpdmUgJiYgIW1fYWx0 ZXJuYXRpdmUtPm1fcGFyZW50LT5tX3BhcmVudCkgewotICAgICAgICAgICAgLy8gVG9wIGxldmVs IGFsdGVybmF0aXZlLCByZWNvcmQgY2FwdHVyZWQgcmFuZ2VzIHRvIGNsZWFyIG91dCBmcm9tIHBy aW9yIGFsdGVybmF0aXZlcy4KLSAgICAgICAgICAgIG1fYWx0ZXJuYXRpdmUtPm1fbGFzdFN1YnBh dHRlcm5JZCA9IG1fcGF0dGVybi5tX251bVN1YnBhdHRlcm5zOwotICAgICAgICB9Ci0gICAgICAg IAotICAgICAgICBtX2FsdGVybmF0aXZlID0gbV9hbHRlcm5hdGl2ZS0+bV9wYXJlbnQtPmFkZE5l d0FsdGVybmF0aXZlKG1fcGF0dGVybi5tX251bVN1YnBhdHRlcm5zLCBwYXJlbnRoZXNpc01hdGNo RGlyZWN0aW9uKCkpOworICAgICAgICBtX2FsdGVybmF0aXZlID0gbV9hbHRlcm5hdGl2ZS0+bV9w YXJlbnQtPmFkZE5ld0FsdGVybmF0aXZlKHBhcmVudGhlc2lzTWF0Y2hEaXJlY3Rpb24oKSk7CiAg ICAgfQogCiAgICAgRXJyb3JDb2RlIHNldHVwQWx0ZXJuYXRpdmVPZmZzZXRzKFBhdHRlcm5BbHRl cm5hdGl2ZSogYWx0ZXJuYXRpdmUsIHVuc2lnbmVkIGN1cnJlbnRDYWxsRnJhbWVTaXplLCB1bnNp Z25lZCBpbml0aWFsSW5wdXRQb3NpdGlvbiwgdW5zaWduZWQmIG5ld0NhbGxGcmFtZVNpemUpIFdB Uk5fVU5VU0VEX1JFVFVSTgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3lhcnIv WWFyclBhdHRlcm4uaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJQYXR0ZXJuLmgK aW5kZXggOWE2YzVlODRmNjNlLi5iNTY5NTIyZDY3NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS95YXJyL1lhcnJQYXR0ZXJuLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3lhcnIvWWFyclBhdHRlcm4uaApAQCAtMjk1LDggKzI5NSw3IEBAIHN0cnVjdCBQYXR0ZXJuVGVy bSB7CiAKICAgICBib29sIGNvbnRhaW5zQW55Q2FwdHVyZXMoKQogICAgIHsKLSAgICAgICAgQVNT RVJUKHRoaXMtPnR5cGUgPT0gVHlwZTo6UGFyZW50aGVzZXNTdWJwYXR0ZXJuCi0gICAgICAgICAg ICB8fCB0aGlzLT50eXBlID09IFR5cGU6OlBhcmVudGhldGljYWxBc3NlcnRpb24pOworICAgICAg ICBBU1NFUlQodGhpcy0+dHlwZSA9PSBUeXBlOjpQYXJlbnRoZXNlc1N1YnBhdHRlcm4pOwogICAg ICAgICByZXR1cm4gcGFyZW50aGVzZXMubGFzdFN1YnBhdHRlcm5JZCA+PSBwYXJlbnRoZXNlcy5z dWJwYXR0ZXJuSWQ7CiAgICAgfQogCkBAIC0zMjQsMTAgKzMyMyw4IEBAIHN0cnVjdCBQYXR0ZXJu VGVybSB7CiBzdHJ1Y3QgUGF0dGVybkFsdGVybmF0aXZlIHsKICAgICBXVEZfTUFLRV9GQVNUX0FM TE9DQVRFRDsKIHB1YmxpYzoKLSAgICBQYXR0ZXJuQWx0ZXJuYXRpdmUoUGF0dGVybkRpc2p1bmN0 aW9uKiBkaXNqdW5jdGlvbiwgdW5zaWduZWQgZmlyc3RTdWJwYXR0ZXJuSWQsIE1hdGNoRGlyZWN0 aW9uIG1hdGNoRGlyZWN0aW9uID0gRm9yd2FyZCkKKyAgICBQYXR0ZXJuQWx0ZXJuYXRpdmUoUGF0 dGVybkRpc2p1bmN0aW9uKiBkaXNqdW5jdGlvbiwgTWF0Y2hEaXJlY3Rpb24gbWF0Y2hEaXJlY3Rp b24gPSBGb3J3YXJkKQogICAgICAgICA6IG1fcGFyZW50KGRpc2p1bmN0aW9uKQotICAgICAgICAs IG1fZmlyc3RTdWJwYXR0ZXJuSWQoZmlyc3RTdWJwYXR0ZXJuSWQpCi0gICAgICAgICwgbV9sYXN0 U3VicGF0dGVybklkKDApCiAgICAgICAgICwgbV9kaXJlY3Rpb24obWF0Y2hEaXJlY3Rpb24pCiAg ICAgICAgICwgbV9vbmNlVGhyb3VnaChmYWxzZSkKICAgICAgICAgLCBtX2hhc0ZpeGVkU2l6ZShm YWxzZSkKQEAgLTM1OCwxMSArMzU1LDYgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9vbmNl VGhyb3VnaDsKICAgICB9CiAKLSAgICBib29sIGNsZWFudXBDYXB0dXJlcygpIGNvbnN0Ci0gICAg ewotICAgICAgICByZXR1cm4gISFtX2xhc3RTdWJwYXR0ZXJuSWQ7Ci0gICAgfQotCiAgICAgTWF0 Y2hEaXJlY3Rpb24gbWF0Y2hEaXJlY3Rpb24oKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJu IG1fZGlyZWN0aW9uOwpAQCAtMzczLDggKzM2NSw2IEBAIHB1YmxpYzoKICAgICBWZWN0b3I8UGF0 dGVyblRlcm0+IG1fdGVybXM7CiAgICAgUGF0dGVybkRpc2p1bmN0aW9uKiBtX3BhcmVudDsKICAg ICB1bnNpZ25lZCBtX21pbmltdW1TaXplOwotICAgIHVuc2lnbmVkIG1fZmlyc3RTdWJwYXR0ZXJu SWQ7Ci0gICAgdW5zaWduZWQgbV9sYXN0U3VicGF0dGVybklkOwogICAgIE1hdGNoRGlyZWN0aW9u IG1fZGlyZWN0aW9uOwogICAgIGJvb2wgbV9vbmNlVGhyb3VnaCA6IDE7CiAgICAgYm9vbCBtX2hh c0ZpeGVkU2l6ZSA6IDE7CkBAIC0zOTEsOSArMzgxLDkgQEAgcHVibGljOgogICAgIHsKICAgICB9 CiAgICAgCi0gICAgUGF0dGVybkFsdGVybmF0aXZlKiBhZGROZXdBbHRlcm5hdGl2ZSh1bnNpZ25l ZCBmaXJzdFN1YnBhdHRlcm5JZCA9IDEsIE1hdGNoRGlyZWN0aW9uIG1hdGNoRGlyZWN0aW9uID0g Rm9yd2FyZCkKKyAgICBQYXR0ZXJuQWx0ZXJuYXRpdmUqIGFkZE5ld0FsdGVybmF0aXZlKE1hdGNo RGlyZWN0aW9uIG1hdGNoRGlyZWN0aW9uID0gRm9yd2FyZCkKICAgICB7Ci0gICAgICAgIG1fYWx0 ZXJuYXRpdmVzLmFwcGVuZChtYWtlVW5pcXVlPFBhdHRlcm5BbHRlcm5hdGl2ZT4odGhpcywgZmly c3RTdWJwYXR0ZXJuSWQsIG1hdGNoRGlyZWN0aW9uKSk7CisgICAgICAgIG1fYWx0ZXJuYXRpdmVz LmFwcGVuZChtYWtlVW5pcXVlPFBhdHRlcm5BbHRlcm5hdGl2ZT4odGhpcywgbWF0Y2hEaXJlY3Rp b24pKTsKICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFBhdHRlcm5BbHRlcm5hdGl2ZSo+KG1f YWx0ZXJuYXRpdmVzLmxhc3QoKS5nZXQoKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUveWFyci9ZYXJyU3ludGF4Q2hlY2tlci5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUveWFyci9ZYXJyU3ludGF4Q2hlY2tlci5jcHAKaW5kZXggZWQ5ZDdhYWRiMDhjLi5l MDQ4NDI2YzlkYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS95YXJyL1lhcnJT eW50YXhDaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUveWFyci9ZYXJyU3lu dGF4Q2hlY2tlci5jcHAKQEAgLTUwLDcgKzUwLDcgQEAgcHVibGljOgogICAgIHZvaWQgYXRvbU5h bWVkQmFja1JlZmVyZW5jZShjb25zdCBTdHJpbmcmKSB7IH0KICAgICB2b2lkIGF0b21OYW1lZEZv cndhcmRSZWZlcmVuY2UoY29uc3QgU3RyaW5nJikgeyB9CiAgICAgdm9pZCBxdWFudGlmeUF0b20o dW5zaWduZWQsIHVuc2lnbmVkLCBib29sKSB7IH0KLSAgICB2b2lkIGRpc2p1bmN0aW9uKENyZWF0 ZURpc2p1bmN0aW9uUHVycG9zZSkgeyB9CisgICAgdm9pZCBkaXNqdW5jdGlvbigpIHsgfQogICAg IHZvaWQgcmVzZXRGb3JSZXBhcnNpbmcoKSB7IH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL1VSTEZpbHRlclBhcnNlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jb250ZW50ZXh0ZW5zaW9ucy9VUkxGaWx0ZXJQYXJzZXIuY3BwCmluZGV4IGQ0NDc0OGJl ZjAyOS4uNWM3OTVjZDFhYWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0 ZW5zaW9ucy9VUkxGaWx0ZXJQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRl eHRlbnNpb25zL1VSTEZpbHRlclBhcnNlci5jcHAKQEAgLTIzOSw3ICsyMzksNyBAQCBwdWJsaWM6 CiAgICAgICAgIG1fZmxvYXRpbmdUZXJtID0gbV9vcGVuR3JvdXBzLnRha2VMYXN0KCk7CiAgICAg fQogCi0gICAgdm9pZCBkaXNqdW5jdGlvbihKU0M6OllhcnI6OkNyZWF0ZURpc2p1bmN0aW9uUHVy cG9zZSkKKyAgICB2b2lkIGRpc2p1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGZhaWwoVVJMRmls dGVyUGFyc2VyOjpEaXNqdW5jdGlvbik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJl c3MvcmVnZXhwLWxvb2thcm91bmQtY2FwdHVyZXMuanMgYi9KU1Rlc3RzL3N0cmVzcy9yZWdleHAt bG9va2Fyb3VuZC1jYXB0dXJlcy5qcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNjRm MTI5YWMxYWRiLi4wMDAwMDAwMDAwMDAKLS0tIGEvSlNUZXN0cy9zdHJlc3MvcmVnZXhwLWxvb2th cm91bmQtY2FwdHVyZXMuanMKKysrIC9kZXYvbnVsbApAQCAtMSwxMDcgKzAsMCBAQAotLy8gV2l0 aCB2ZXJib3NlIHNldCB0byBmYWxzZSwgdGhpcyB0ZXN0IGlzIHN1Y2Nlc3NmdWwgaWYgdGhlcmUg aXMgbm8gb3V0cHV0LiAgU2V0IHZlcmJvc2UgdG8gdHJ1ZSB0byBzZWUgZXhwZWN0ZWQgbWF0Y2hl cy4KLWxldCB2ZXJib3NlID0gZmFsc2U7Ci0KLWZ1bmN0aW9uIGFycmF5VG9TdHJpbmcoYXJyKQot ewotICBsZXQgc3RyID0gJyc7Ci0gIGFyci5mb3JFYWNoKGZ1bmN0aW9uKHYsIGluZGV4KSB7Ci0g ICAgaWYgKHR5cGVvZiB2ID09ICJzdHJpbmciKQotICAgICAgICBzdHIgKz0gIlwiIiArIHYgKyAi XCIiOwotICAgIGVsc2UKLSAgICAgICAgc3RyICs9IHY7Ci0KLSAgICBpZiAoaW5kZXggIT0gKGFy ci5sZW5ndGggLSAxKSkgewotICAgICAgc3RyICs9ICcsJzsKLSAgICB9OwotICB9KTsKLSAgcmV0 dXJuICJbIiArIHN0ciArICJdIjsKLX0KLQotZnVuY3Rpb24gZHVtcFZhbHVlKHYpCi17Ci0gICAg aWYgKHYgPT09IG51bGwpCi0gICAgICAgIHJldHVybiAiPG51bGw+IjsKLQotICAgIGlmICh2ID09 PSB1bmRlZmluZWQpCi0gICAgICAgIHJldHVybiAiPHVuZGVmaW5lZD4iOwotCi0gICAgaWYgKHR5 cGVvZiB2ID09ICJzdHJpbmciKQotICAgICAgICByZXR1cm4gIlwiIiArIHYgKyAiXCIiOwotCi0g ICAgaWYgKHYubGVuZ3RoKQotICAgICAgICByZXR1cm4gYXJyYXlUb1N0cmluZyh2KTsKLQotICAg IHJldHVybiB2OwotfQotCi1mdW5jdGlvbiBjb21wYXJlQXJyYXkoYSwgYikKLXsKLSAgICBpZiAo YSA9PT0gbnVsbCAmJiBiID09PSBudWxsKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIGlm IChhID09PSBudWxsKSB7Ci0gICAgICAgIHByaW50KCIjIyMgYSBpcyBudWxsLCBiIGlzIG5vdCBu dWxsIik7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KLSAgICBpZiAoYiA9PT0gbnVs bCkgewotICAgICAgICBwcmludCgiIyMjIGEgaXMgbm90IG51bGwsIGIgaXMgbnVsbCIpOwotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgaWYgKGEubGVuZ3RoICE9PSBiLmxlbmd0 aCkgewotICAgICAgICBwcmludCgiIyMjIGEubGVuZ3RoOiAiICsgYS5sZW5ndGggKyAiLCBiLmxl bmd0aDogIiArIGIubGVuZ3RoKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQotICAg IGZvciAodmFyIGkgPSAwOyBpIDwgYS5sZW5ndGg7IGkrKykgewotICAgICAgICBpZiAoYVtpXSAh PT0gYltpXSkgewotICAgICAgICAgICAgcHJpbnQoIiMjIyBhWyIgKyBpICsgIl06IFwiIiArIGFb aV0gKyAiXCIgIT09IGJbIiArIGkgKyAiXTogXCIiICsgYltpXSArICJcIiIpOwotICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIHRydWU7Ci19 Ci0KLWxldCB0ZXN0TnVtYmVyID0gMDsKLQotZnVuY3Rpb24gdGVzdFJlZ0V4cChyZSwgc3RyLCBl eHApCi17Ci0gICAgdGVzdE51bWJlcisrOwotCi0gICAgbGV0IGFjdHVhbCA9IHN0ci5tYXRjaChy ZSk7Ci0KLSAgICBpZiAoY29tcGFyZUFycmF5KGV4cCwgYWN0dWFsKSkgewotICAgICAgICBpZiAo dmVyYm9zZSkKLSAgICAgICAgICAgIHByaW50KGR1bXBWYWx1ZShzdHIpICsiLm1hdGNoKCIgKyBy ZS50b1N0cmluZygpICsgIiksIHBhc3NlZCAiLCBkdW1wVmFsdWUoZXhwKSk7Ci0gICAgfSBlbHNl Ci0gICAgICAgIHByaW50KGR1bXBWYWx1ZShzdHIpICsiLm1hdGNoKCIgKyByZS50b1N0cmluZygp ICsgIiksIEZBSUxFRCB0ZXN0ICMiICsgdGVzdE51bWJlciArICIsIEV4cGVjdGVkICIsIGR1bXBW YWx1ZShleHApLCAiIGdvdCAiLCBkdW1wVmFsdWUoYWN0dWFsKSk7Ci19Ci0KLS8vIFRlc3QgMQot dGVzdFJlZ0V4cCgvYyg/IShcRCkpfGMvdSwgImFiY2RlZiIsIFsiYyIsIHVuZGVmaW5lZF0pOwot dGVzdFJlZ0V4cCgvYyg/IShcRCl7M30pfGMvdSwgImFiY2RlZiIsIFsiYyIsIHVuZGVmaW5lZF0p OwotdGVzdFJlZ0V4cCgvYyg/PShkZSl4KXxjL3UsICJhYmNkZWYiLCBbImMiLCB1bmRlZmluZWRd KTsKLXRlc3RSZWdFeHAoL2MoPz0oZGVmKSl4fGMvdSwgImFiY2RlZiIsIFsiYyIsIHVuZGVmaW5l ZF0pOwotdGVzdFJlZ0V4cCgvYyg/PShkZWYpKXh8Yyg/IShkZWYpKXxjLywgImFiY2RlZiIsIFsi YyIsIHVuZGVmaW5lZCwgdW5kZWZpbmVkXSk7Ci0KLS8vIFRlc3QgNgotdGVzdFJlZ0V4cCgvKD88 IShcRHszfSkpZnxmL3UsICJhYmNkZWYiLCBbImYiLCB1bmRlZmluZWRdKTsKLXRlc3RSZWdFeHAo Lyg/PCEoXER7M30pKWYvLCAiYWJjZGVmIiwgbnVsbCk7Ci10ZXN0UmVnRXhwKC8oPzwhKFxEKSlm L3UsICJhYmNkZWYiLCBudWxsKTsKLXRlc3RSZWdFeHAoLyg/PCEoXEQpezN9KWYvdSwgImFiY2Rl ZiIsIG51bGwpOwotdGVzdFJlZ0V4cCgvKD88IShcRCl7M30pZnxmL3UsICJhYmNkZWYiLCBbImYi LCB1bmRlZmluZWRdKTsKLQotLy8gVGVzdCAxMQotdGVzdFJlZ0V4cCgvKD88PShcdyl7Nn0pZi8s ICJhYmNkZWYiLCBudWxsKTsKLXRlc3RSZWdFeHAoL2YoPz0oXHd7Nn0pfSkvLCAiYWJjZGVmIiwg bnVsbCk7Ci10ZXN0UmVnRXhwKC8oKD88IVxEezN9KSlmfGYvdSwgImFiY2RlZiIsIFsiZiIsIHVu ZGVmaW5lZF0pOwotdGVzdFJlZ0V4cCgvKD88IShcRCl7M30pZi8sICJhYmNkZWYiLCBudWxsKTsK LXRlc3RSZWdFeHAoLyg/PCEoXGQpezN9KWYvLCAiYWJjZGVmIiwgWyJmIiwgdW5kZWZpbmVkXSk7 Ci0KLS8vIFRlc3QgMTYKLXRlc3RSZWdFeHAoLyg/PCEoXEQpezN9KWYvLCAiYWJjZGVmIiwgbnVs bCk7Ci10ZXN0UmVnRXhwKC8oPzwhKFxEKXszfSlmfGYvLCAiYWJjZGVmIiwgWyJmIiwgdW5kZWZp bmVkXSk7Ci10ZXN0UmVnRXhwKC8oKD88IVxEezN9KSlmfGYvLCAiYWJjZGVmIiwgWyJmIiwgdW5k ZWZpbmVkXSk7Ci10ZXN0UmVnRXhwKC8oPzwhKFx3ezN9KSlmKD89KFx3ezN9KSl8KD88PShcdys/ KSljKD89KFx3ezJ9KSl8KD88PShcd3s0fSkpYyg/PShcd3szfSkkKS8sICJhYmNkZWYiLCBbImMi LHVuZGVmaW5lZCx1bmRlZmluZWQsImIiLCJkZSIsdW5kZWZpbmVkLHVuZGVmaW5lZF0pOwo=