216978 2020-09-25 09:28:26 -0700 REGRESSION (r260276): Transform `scale()` removes round corners declared with `border-radius` on a hover state in Safari 2021-05-13 16:19:59 -0700 1 1 1 Unclassified WebKit Compositing Safari 14 Mac macOS 10.15 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=140535 InRadar P2 Normal --- 1 alehm heycam alehm brendan changseok darin esprehn+autocc ews-watchlist fred.wang glenn heycam kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1691911 0 alehm 2020-09-25 09:28:26 -0700 Overview: Please take a look at the demo: https://jsfiddle.net/0fpho21q/2/ Steps to Reproduce: 1. Open the link above. 2. Hover over the first button. 3. Hover over the second button. Actual Results: Round corners are removed from the first button. Expected Results: Round corners should be kept on a hover state, i.e. observe behavior of the second button. Build Date & Hardware: Date and hardware of the build in which you first encountered the bug. Safari Version 14.0 (15610.1.28.1.9, 15610), macOS Catalina Version 10.15.6 Additional Builds and Platforms: Works as intended in Chrome. 1692410 1 webkit-bug-importer 2020-09-27 10:13:11 -0700 <rdar://problem/69660229> 1693151 2 410052 simon.fraser 2020-09-29 14:25:36 -0700 Created attachment 410052 Testcase 1693152 3 simon.fraser 2020-09-29 14:26:36 -0700 This is about clip rects and compositing. 1699998 4 simon.fraser 2020-10-20 16:24:16 -0700 This is because PaintLayerFlag::PaintingOverflowContents is set so we incorrectly ignore ore the clip. 1700013 5 simon.fraser 2020-10-20 16:52:22 -0700 ... and the transform makes a layer a clipRectsContext.rootLayer 1742002 6 brendan 2021-03-20 03:12:53 -0700 *** Bug 223507 has been marked as a duplicate of this bug. *** 1753471 7 426891 heycam 2021-04-23 00:02:20 -0700 Created attachment 426891 Testcase without :hover Just the bad sub-test. 1758835 8 428248 heycam 2021-05-11 00:15:13 -0700 Created attachment 428248 Patch 1759174 9 428348 heycam 2021-05-11 23:49:41 -0700 Created attachment 428348 Patch 1759523 10 428348 darin 2021-05-12 20:47:06 -0700 Comment on attachment 428348 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428348&action=review It’s possible that one of the more layout-savvy people wants to look this over too, but this looks obviously right to me. > Source/WebCore/rendering/RenderLayer.cpp:4495 > + // FIXME: Do we need to set the posClipRect to be affected by border-radius too? Seems like our job is to come up with a test case for this so we don’t have to leave a question behind in the code. > LayoutTests/fast/layers/overflow-scroll-transform-border-radius.html:5 > + <div id="e" style="width: 50px; height: 50px; background-color: blue;"></div> Not sure we need the id property here. 1759845 11 heycam 2021-05-13 14:56:44 -0700 (In reply to Darin Adler from comment #10) > > Source/WebCore/rendering/RenderLayer.cpp:4495 > > + // FIXME: Do we need to set the posClipRect to be affected by border-radius too? > > Seems like our job is to come up with a test case for this so we don’t have > to leave a question behind in the code. I tried and failed to make a test case that needed this the other day. Now trying the "assert if we look at this state and run the whole test suite" technique. Will remove the comment if nothing comes up. 1759858 12 428569 heycam 2021-05-13 15:36:54 -0700 Created attachment 428569 Patch 1759879 13 ews-feeder 2021-05-13 16:19:56 -0700 Committed r277462 (237705@main): <https://commits.webkit.org/237705@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428569. 410052 2020-09-29 14:25:36 -0700 2020-09-29 14:25:36 -0700 Testcase border-radius-clipping.html text/html 1497 simon.fraser PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBj b250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MSwgc2hyaW5rLXRvLWZp dD1ubyI+CiAgICA8dGl0bGU+PC90aXRsZT4KICAgIDxzdHlsZT4KICAgICAgICAuY2hvb3Nlci1j b250YWluZXIgewogICAgICAgICAgICBvdmVyZmxvdy14OiBoaWRkZW47CiAgICAgICAgICAgIG92 ZXJmbG93LXk6IGF1dG87CiAgICAgICAgICAgIHdpZHRoOiAyMDBweDsKICAgICAgICAgICAgbWFy Z2luOiAxNnB4IDA7CiAgICAgICAgICAgIHBhZGRpbmc6IDIwcHg7CiAgICAgICAgICAgIGJvcmRl cjogMXB4IHNvbGlkIGJsYWNrOwogICAgICAgICAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZSgwcHgs IDBweCk7CiAgICAgICAgfQoKICAgICAgICAuY2hvb3Nlci1jb250YWluZXIuc2hvcnQgewogICAg ICAgICAgICBoZWlnaHQ6IDgwcHg7CiAgICAgICAgfQoKICAgICAgICAuY2hvb3Nlci1jb250YWlu ZXIubG9uZyB7CiAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CiAgICAgICAgfQoKICAgICAgICBi dXR0b24gewogICAgICAgICAgICBvdmVyZmxvdzogaGlkZGVuOwogICAgICAgICAgICBwb3NpdGlv bjogcmVsYXRpdmU7CiAgICAgICAgICAgIGJvcmRlci13aWR0aDogMDsKICAgICAgICAgICAgYm9y ZGVyLXJhZGl1czogNTAlOwogICAgICAgICAgICBoZWlnaHQ6IDg0cHg7CiAgICAgICAgICAgIHdp ZHRoOiA4NHB4OwogICAgICAgICAgICBtYXJnaW46IDA7CiAgICAgICAgfQoKICAgICAgICBidXR0 b246aG92ZXIgewogICAgICAgICAgICB0cmFuc2Zvcm06IHNjYWxlKDEuMDUpOwogICAgICAgIH0K CiAgICAgICAgYnV0dG9uIC5waG90by12aWV3IHsKICAgICAgICAgICAgcG9zaXRpb246IGFic29s dXRlOwogICAgICAgICAgICBib3R0b206IDA7CiAgICAgICAgICAgIGxlZnQ6IDA7CiAgICAgICAg ICAgIHJpZ2h0OiAwOwogICAgICAgICAgICB0b3A6IDA7CiAgICAgICAgfQoKICAgICAgICBpbWcg ewogICAgICAgICAgICBoZWlnaHQ6IDEwMCU7CiAgICAgICAgICAgIHdpZHRoOiAxMDAlOwogICAg ICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmF5OwogICAgICAgIH0KCiAgICA8L3N0eWxlPgo8 L2hlYWQ+Cjxib2R5PgogICAgCiAgICA8ZGl2IGNsYXNzPSJjaG9vc2VyLWNvbnRhaW5lciBzaG9y dCI+CiAgICAgICAgPGJ1dHRvbj4KICAgICAgICAgIDxkaXYgY2xhc3M9InBob3RvLXZpZXciPgog ICAgICAgICAgICA8aW1nPgogICAgICAgICAgPC9kaXY+CiAgICAgICAgPC9idXR0b24+CiAgICA8 L2Rpdj4KCiAgICA8ZGl2IGNsYXNzPSJjaG9vc2VyLWNvbnRhaW5lciBsb25nIj4KICAgICAgICA8 YnV0dG9uPgogICAgICAgICAgPGRpdiBjbGFzcz0icGhvdG8tdmlldyI+CiAgICAgICAgICAgIDxp bWc+CiAgICAgICAgICA8L2Rpdj4KICAgICAgICA8L2J1dHRvbj4KICAgIDwvZGl2PgoKICAgIAo8 L2JvZHk+CjwvaHRtbD4K 426891 2021-04-23 00:02:20 -0700 2021-04-23 00:02:20 -0700 Testcase without :hover bad.html text/html 581 heycam PCFET0NUWVBFIGh0bWw+CjxzdHlsZT4KLml0ZW0geyBvdmVyZmxvdy14OiBoaWRkZW47IG92ZXJm bG93LXk6IGF1dG87IGhlaWdodDogMTAwcHg7IH0KLm91dGVyIHsgYm9yZGVyOiA0cHggc29saWQg Ymx1ZTsgYm9yZGVyLXJhZGl1czogMTAwMHB4OyBvdmVyZmxvdzogaGlkZGVuOyBwb3NpdGlvbjog cmVsYXRpdmU7IHdpZHRoOiA4MHB4OyBoZWlnaHQ6IDgwcHg7IHRyYW5zZm9ybTogc2NhbGUoMS4w NSk7IH0KLmlubmVyIHsgb3ZlcmZsb3c6IGhpZGRlbjsgcG9zaXRpb246IGFic29sdXRlOyByaWdo dDogMDsgdG9wOiAwOyB9Cgouc3F1YXJlIHsgd2lkdGg6IDUwcHg7IGhlaWdodDogNTBweDsgYmFj a2dyb3VuZC1jb2xvcjogeWVsbG93OyBib3JkZXI6IDRweCBzb2xpZCByZWQ7IH0KCi5zaG9ydCB7 IGhlaWdodDogODBweDsgfQoubG9uZyB7IGhlaWdodDogMTAwcHg7IH0KPC9zdHlsZT4KPGRpdiBj bGFzcz0iaXRlbSBzaG9ydCI+CiAgPGRpdiBjbGFzcz0ib3V0ZXIiPgogICAgPGRpdiBjbGFzcz0i aW5uZXIiPgogICAgICA8ZGl2IGNsYXNzPSJzcXVhcmUiPjwvZGl2PgogICAgPC9kaXY+CiAgPC9k aXY+CjwvZGl2Pgo= 428248 2021-05-11 00:15:13 -0700 2021-05-11 23:49:36 -0700 Patch bug-216978-20210511171512.patch text/plain 21338 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY3YzdhOTljNDhkZTYw ZGM5NjJiY2IwZGEyNDNhZGEwMzkwZDAxOC4uMTlkNmRjN2E1ZDQ0NjgzOGVhNGZlZjY0ZjVmNzE1 MTczZGExZGQ3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIxLTA1LTExICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIHNjcm9s bGFibGUgdHJhbnNmb3JtZWQgZWxlbWVudHMgdGhhdCBhcmUgdGhlbXNlbHZlcyB3aXRoaW4gc2Ny b2xsYWJsZSBlbGVtZW50cyBkb24ndCBpZ25vcmUgYm9yZGVyLXJhZGl1cy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjk3OAorICAgICAgICA8cmRh cjovLzY5NjYwMjI5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFhYWAorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5ZXJzL292ZXJmbG93LXNjcm9sbC10 cmFuc2Zvcm0tYm9yZGVyLXJhZGl1cy5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzOjpzZXRPdmVyZmxvd0NsaXBS ZWN0QWZmZWN0ZWRCeVJhZGl1cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFp bnRMYXllcldpdGhFZmZlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWlu dExheWVyQ29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5 ZXJCeUFwcGx5aW5nVHJhbnNmb3JtKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpj b2xsZWN0RnJhZ21lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludFRy YW5zZm9ybWVkTGF5ZXJJbnRvRnJhZ21lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpoaXRUZXN0TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmhpdFRl c3RUcmFuc2Zvcm1lZExheWVySW5GcmFnbWVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Q2xpcFJlY3RzQ29u dGV4dDo6Q2xpcFJlY3RzQ29udGV4dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRyZWVB c1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVMYXllcnMpOgorCiAyMDIxLTA0LTIy ICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSW5jbHVk ZSByZWFzb25zIGZvciBjb21wb3NpdGluZyBpbiBzaG93TGF5ZXJUcmVlIG91dHB1dC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDI5YzYzODY3ODQxY2FhNDI4 YzE3ZWIyMTRiYTFjZGNmZGVkZWUwYTcuLjdhM2I4Nzg5MDUzMzUyMmRkNTM0ZDUwYzdjZDhmMTNk NmM0MTYxN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAt MTc3LDYgKzE3Nyw4IEBAIHB1YmxpYzoKICAgICBib29sIGZpeGVkKCkgY29uc3QgeyByZXR1cm4g bV9maXhlZDsgfQogICAgIHZvaWQgc2V0Rml4ZWQoYm9vbCBmaXhlZCkgeyBtX2ZpeGVkID0gZml4 ZWQ7IH0KIAorICAgIHZvaWQgc2V0T3ZlcmZsb3dDbGlwUmVjdEFmZmVjdGVkQnlSYWRpdXMoKSB7 IG1fb3ZlcmZsb3dDbGlwUmVjdC5zZXRBZmZlY3RlZEJ5UmFkaXVzKHRydWUpOyB9CisKICAgICBi b29sIG9wZXJhdG9yPT0oY29uc3QgQ2xpcFJlY3RzJiBvdGhlcikgY29uc3QKICAgICB7CiAgICAg ICAgIHJldHVybiBtX292ZXJmbG93Q2xpcFJlY3QgPT0gb3RoZXIub3ZlcmZsb3dDbGlwUmVjdCgp CkBAIC0zMDQyLDggKzMwNDQsMTAgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllcldpdGhF ZmZlY3RzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5ZXJQYWkKICAgICAgICAg Ly8gTWFrZSBzdXJlIHRoZSBwYXJlbnQncyBjbGlwIHJlY3RzIGhhdmUgYmVlbiBjYWxjdWxhdGVk LgogICAgICAgICBDbGlwUmVjdCBjbGlwUmVjdCA9IHBhaW50aW5nSW5mby5wYWludERpcnR5UmVj dDsKICAgICAgICAgaWYgKHBhcmVudCgpKSB7Ci0gICAgICAgICAgICBDbGlwUmVjdHNDb250ZXh0 IGNsaXBSZWN0c0NvbnRleHQocGFpbnRpbmdJbmZvLnJvb3RMYXllciwgKHBhaW50RmxhZ3MgJiBQ YWludExheWVyRmxhZzo6VGVtcG9yYXJ5Q2xpcFJlY3RzKSA/IFRlbXBvcmFyeUNsaXBSZWN0cyA6 IFBhaW50aW5nQ2xpcFJlY3RzLAotICAgICAgICAgICAgICAgIElnbm9yZU92ZXJsYXlTY3JvbGxi YXJTaXplLCAocGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFnOjpQYWludGluZ092ZXJmbG93Q29u dGVudHMpID8gSWdub3JlT3ZlcmZsb3dDbGlwIDogUmVzcGVjdE92ZXJmbG93Q2xpcCk7CisgICAg ICAgICAgICBDbGlwUmVjdHNDb250ZXh0IGNsaXBSZWN0c0NvbnRleHQocGFpbnRpbmdJbmZvLnJv b3RMYXllciwKKyAgICAgICAgICAgICAgICAocGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFnOjpU ZW1wb3JhcnlDbGlwUmVjdHMpID8gVGVtcG9yYXJ5Q2xpcFJlY3RzIDogUGFpbnRpbmdDbGlwUmVj dHMsCisgICAgICAgICAgICAgICAgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUsIChwYWludEZs YWdzICYgUGFpbnRMYXllckZsYWc6OlBhaW50aW5nT3ZlcmZsb3dDb250ZW50cykgPyBJZ25vcmVP dmVyZmxvd0NsaXAgOiBSZXNwZWN0T3ZlcmZsb3dDbGlwLAorICAgICAgICAgICAgICAgIHBhaW50 aW5nSW5mby5yb290TGF5ZXJJc0ZvclRyYW5zZm9ybSk7CiAgICAgICAgICAgICBjbGlwUmVjdCA9 IGJhY2tncm91bmRDbGlwUmVjdChjbGlwUmVjdHNDb250ZXh0KTsKICAgICAgICAgICAgIGNsaXBS ZWN0LmludGVyc2VjdChwYWludGluZ0luZm8ucGFpbnREaXJ0eVJlY3QpOwogICAgICAgICAKQEAg LTMzNjIsNyArMzM2Niw4IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhH cmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAgICAgICAgICB9 CiAgICAgICAgICAgICBjb2xsZWN0RnJhZ21lbnRzKGxheWVyRnJhZ21lbnRzLCBsb2NhbFBhaW50 aW5nSW5mby5yb290TGF5ZXIsIHBhaW50RGlydHlSZWN0LCBFeGNsdWRlQ29tcG9zaXRlZFBhZ2lu YXRlZExheWVycywKICAgICAgICAgICAgICAgICAobG9jYWxQYWludEZsYWdzICYgUGFpbnRMYXll ckZsYWc6OlRlbXBvcmFyeUNsaXBSZWN0cykgPyBUZW1wb3JhcnlDbGlwUmVjdHMgOiBQYWludGlu Z0NsaXBSZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUsCi0gICAgICAgICAgICAgICAg KGlzUGFpbnRpbmdPdmVyZmxvd0NvbnRlbnRzKSA/IElnbm9yZU92ZXJmbG93Q2xpcCA6IFJlc3Bl Y3RPdmVyZmxvd0NsaXAsIG9mZnNldEZyb21Sb290KTsKKyAgICAgICAgICAgICAgICAoaXNQYWlu dGluZ092ZXJmbG93Q29udGVudHMpID8gSWdub3JlT3ZlcmZsb3dDbGlwIDogUmVzcGVjdE92ZXJm bG93Q2xpcCwKKyAgICAgICAgICAgICAgICBsb2NhbFBhaW50aW5nSW5mby5yb290TGF5ZXJJc0Zv clRyYW5zZm9ybSwgb2Zmc2V0RnJvbVJvb3QpOwogICAgICAgICAgICAgdXBkYXRlUGFpbnRpbmdJ bmZvRm9yRnJhZ21lbnRzKGxheWVyRnJhZ21lbnRzLCBsb2NhbFBhaW50aW5nSW5mbywgbG9jYWxQ YWludEZsYWdzLCBzaG91bGRQYWludENvbnRlbnQsIG9mZnNldEZyb21Sb290KTsKICAgICAgICAg fQogICAgICAgICAKQEAgLTM0MTEsNyArMzQxNiw4IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRp CiAgICAgICAgICAgICBMYXllckZyYWdtZW50cyBsYXllckZyYWdtZW50czsKICAgICAgICAgICAg IGNvbGxlY3RGcmFnbWVudHMobGF5ZXJGcmFnbWVudHMsIHBhaW50aW5nSW5mby5yb290TGF5ZXIs IHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgRXhjbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRM YXllcnMsCiAgICAgICAgICAgICAgICAgKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFn OjpUZW1wb3JhcnlDbGlwUmVjdHMpID8gVGVtcG9yYXJ5Q2xpcFJlY3RzIDogUGFpbnRpbmdDbGlw UmVjdHMsIElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLAotICAgICAgICAgICAgICAgIChpc1Bh aW50aW5nT3ZlcmZsb3dDb250ZW50cykgPyBJZ25vcmVPdmVyZmxvd0NsaXAgOiBSZXNwZWN0T3Zl cmZsb3dDbGlwLCBvZmZzZXRGcm9tUm9vdCk7CisgICAgICAgICAgICAgICAgKGlzUGFpbnRpbmdP dmVyZmxvd0NvbnRlbnRzKSA/IElnbm9yZU92ZXJmbG93Q2xpcCA6IFJlc3BlY3RPdmVyZmxvd0Ns aXAsCisgICAgICAgICAgICAgICAgcGFpbnRpbmdJbmZvLnJvb3RMYXllcklzRm9yVHJhbnNmb3Jt LCBvZmZzZXRGcm9tUm9vdCk7CiAgICAgICAgICAgICB1cGRhdGVQYWludGluZ0luZm9Gb3JGcmFn bWVudHMobGF5ZXJGcmFnbWVudHMsIHBhaW50aW5nSW5mbywgbG9jYWxQYWludEZsYWdzLCBzaG91 bGRQYWludENvbnRlbnQsIG9mZnNldEZyb21Sb290KTsKIAogICAgICAgICAgICAgYXBwbHlGaWx0 ZXJzKGNvbnRleHQsIHBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlvciwgbGF5ZXJGcmFnbWVudHMp OwpAQCAtMzQ3Nyw2ICszNDgzLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckJ5QXBw bHlpbmdUcmFuc2Zvcm0oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdAogICAgIExheW91 dFNpemUgYWRqdXN0ZWRTdWJwaXhlbE9mZnNldCA9IG9mZnNldEZvclRoaXNMYXllciAtIExheW91 dFNpemUoZGV2aWNlUGl4ZWxTbmFwcGVkT2Zmc2V0Rm9yVGhpc0xheWVyKTsKICAgICBMYXllclBh aW50aW5nSW5mbyB0cmFuc2Zvcm1lZFBhaW50aW5nSW5mbyhwYWludGluZ0luZm8pOwogICAgIHRy YW5zZm9ybWVkUGFpbnRpbmdJbmZvLnJvb3RMYXllciA9IHRoaXM7CisgICAgdHJhbnNmb3JtZWRQ YWludGluZ0luZm8ucm9vdExheWVySXNGb3JUcmFuc2Zvcm0gPSBSb290TGF5ZXJJc0ZvclRyYW5z Zm9ybTo6WWVzOwogICAgIHRyYW5zZm9ybWVkUGFpbnRpbmdJbmZvLnBhaW50RGlydHlSZWN0ID0g TGF5b3V0UmVjdChlbmNsb3NlUmVjdFRvRGV2aWNlUGl4ZWxzKHRyYW5zZm9ybS5pbnZlcnNlKCku dmFsdWVPcihBZmZpbmVUcmFuc2Zvcm0oKSkubWFwUmVjdChwYWludGluZ0luZm8ucGFpbnREaXJ0 eVJlY3QpLCBkZXZpY2VTY2FsZUZhY3RvcikpOwogICAgIHRyYW5zZm9ybWVkUGFpbnRpbmdJbmZv LnN1YnBpeGVsT2Zmc2V0ID0gYWRqdXN0ZWRTdWJwaXhlbE9mZnNldDsKICAgICBwYWludExheWVy Q29udGVudHNBbmRSZWZsZWN0aW9uKGNvbnRleHQsIHRyYW5zZm9ybWVkUGFpbnRpbmdJbmZvLCBw YWludEZsYWdzKTsKQEAgLTM1MjgsMTQgKzM1MzUsMTQgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxh eWVyOjplbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXJJblN1YnRyZWUoY29uc3QgUmVuZGVyTGF5ZXIq IHIKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6Y29sbGVjdEZyYWdtZW50cyhMYXllckZyYWdtZW50 cyYgZnJhZ21lbnRzLCBjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBjb25zdCBMYXlvdXRS ZWN0JiBkaXJ0eVJlY3QsIFBhZ2luYXRpb25JbmNsdXNpb25Nb2RlIGluY2x1c2lvbk1vZGUsCi0g ICAgQ2xpcFJlY3RzVHlwZSBjbGlwUmVjdHNUeXBlLCBPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2 YW5jeSBpbk92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5LCBTaG91bGRSZXNwZWN0T3ZlcmZs b3dDbGlwIHJlc3BlY3RPdmVyZmxvd0NsaXAsIGNvbnN0IExheW91dFNpemUmIG9mZnNldEZyb21S b290LAotICAgIGNvbnN0IExheW91dFJlY3QqIGxheWVyQm91bmRpbmdCb3gsIFNob3VsZEFwcGx5 Um9vdE9mZnNldFRvRnJhZ21lbnRzIGFwcGx5Um9vdE9mZnNldFRvRnJhZ21lbnRzKQorICAgIENs aXBSZWN0c1R5cGUgY2xpcFJlY3RzVHlwZSwgT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kg aW5PdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSwgU2hvdWxkUmVzcGVjdE92ZXJmbG93Q2xp cCByZXNwZWN0T3ZlcmZsb3dDbGlwLCBSb290TGF5ZXJJc0ZvclRyYW5zZm9ybSByb290TGF5ZXJJ c0ZvclRyYW5zZm9ybSwKKyAgICBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGcm9tUm9vdCwgY29u c3QgTGF5b3V0UmVjdCogbGF5ZXJCb3VuZGluZ0JveCwgU2hvdWxkQXBwbHlSb290T2Zmc2V0VG9G cmFnbWVudHMgYXBwbHlSb290T2Zmc2V0VG9GcmFnbWVudHMpCiB7CiAgICAgUmVuZGVyTGF5ZXIq IHBhZ2luYXRpb25MYXllciA9IGVuY2xvc2luZ1BhZ2luYXRpb25MYXllckluU3VidHJlZShyb290 TGF5ZXIsIGluY2x1c2lvbk1vZGUpOwogICAgIGlmICghcGFnaW5hdGlvbkxheWVyIHx8IGhhc1Ry YW5zZm9ybSgpKSB7CiAgICAgICAgIC8vIEZvciB1bnBhZ2luYXRlZCBsYXllcnMsIHRoZXJlIGlz IG9ubHkgb25lIGZyYWdtZW50LgogICAgICAgICBMYXllckZyYWdtZW50IGZyYWdtZW50OwotICAg ICAgICBDbGlwUmVjdHNDb250ZXh0IGNsaXBSZWN0c0NvbnRleHQocm9vdExheWVyLCBjbGlwUmVj dHNUeXBlLCBpbk92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5LCByZXNwZWN0T3ZlcmZsb3dD bGlwKTsKKyAgICAgICAgQ2xpcFJlY3RzQ29udGV4dCBjbGlwUmVjdHNDb250ZXh0KHJvb3RMYXll ciwgY2xpcFJlY3RzVHlwZSwgaW5PdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSwgcmVzcGVj dE92ZXJmbG93Q2xpcCwgcm9vdExheWVySXNGb3JUcmFuc2Zvcm0pOwogICAgICAgICBjYWxjdWxh dGVSZWN0cyhjbGlwUmVjdHNDb250ZXh0LCBkaXJ0eVJlY3QsIGZyYWdtZW50LmxheWVyQm91bmRz LCBmcmFnbWVudC5iYWNrZ3JvdW5kUmVjdCwgZnJhZ21lbnQuZm9yZWdyb3VuZFJlY3QsIG9mZnNl dEZyb21Sb290KTsKICAgICAgICAgZnJhZ21lbnRzLmFwcGVuZChmcmFnbWVudCk7CiAgICAgICAg IHJldHVybjsKQEAgLTM1NDYsNyArMzU1Myw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbGxlY3RG cmFnbWVudHMoTGF5ZXJGcmFnbWVudHMmIGZyYWdtZW50cywgY29uc3QgUmVuZGVyTGF5ZXIqCiAg ICAgCiAgICAgLy8gQ2FsY3VsYXRlIGNsaXAgcmVjdHMgcmVsYXRpdmUgdG8gdGhlIGVuY2xvc2lu Z1BhZ2luYXRpb25MYXllci4gVGhlIHB1cnBvc2Ugb2YgdGhpcyBjYWxsIGlzIHRvIGRldGVybWlu ZSBvdXIgYm91bmRzIGNsaXBwZWQgdG8gaW50ZXJtZWRpYXRlCiAgICAgLy8gbGF5ZXJzIGJldHdl ZW4gdXMgYW5kIHRoZSBwYWdpbmF0aW9uIGNvbnRleHQuIEl0J3MgaW1wb3J0YW50IHRvIG1pbmlt aXplIHRoZSBudW1iZXIgb2YgZnJhZ21lbnRzIHdlIG5lZWQgdG8gY3JlYXRlIGFuZCB0aGlzIGhl bHBzIHdpdGggdGhhdC4KLSAgICBDbGlwUmVjdHNDb250ZXh0IHBhZ2luYXRpb25DbGlwUmVjdHND b250ZXh0KHBhZ2luYXRpb25MYXllciwgY2xpcFJlY3RzVHlwZSwgaW5PdmVybGF5U2Nyb2xsYmFy U2l6ZVJlbGV2YW5jeSwgcmVzcGVjdE92ZXJmbG93Q2xpcCk7CisgICAgQ2xpcFJlY3RzQ29udGV4 dCBwYWdpbmF0aW9uQ2xpcFJlY3RzQ29udGV4dChwYWdpbmF0aW9uTGF5ZXIsIGNsaXBSZWN0c1R5 cGUsIGluT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3ksIHJlc3BlY3RPdmVyZmxvd0NsaXAs IFJvb3RMYXllcklzRm9yVHJhbnNmb3JtOjpObyk7CiAgICAgTGF5b3V0UmVjdCBsYXllckJvdW5k c0luRnJhZ21lbnRlZEZsb3c7CiAgICAgQ2xpcFJlY3QgYmFja2dyb3VuZFJlY3RJbkZyYWdtZW50 ZWRGbG93OwogICAgIENsaXBSZWN0IGZvcmVncm91bmRSZWN0SW5GcmFnbWVudGVkRmxvdzsKQEAg LTM1NzAsNyArMzU3Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbGxlY3RGcmFnbWVudHMoTGF5 ZXJGcmFnbWVudHMmIGZyYWdtZW50cywgY29uc3QgUmVuZGVyTGF5ZXIqCiAgICAgICAgIAogICAg ICAgICAvLyBOb3cgY29sbGVjdCBhbmNlc3RvciBmcmFnbWVudHMuCiAgICAgICAgIHBhcmVudFBh Z2luYXRpb25MYXllci0+Y29sbGVjdEZyYWdtZW50cyhhbmNlc3RvckZyYWdtZW50cywgcm9vdExh eWVyLCBkaXJ0eVJlY3QsIGluY2x1c2lvbk1vZGUsIGNsaXBSZWN0c1R5cGUsIGluT3ZlcmxheVNj cm9sbGJhclNpemVSZWxldmFuY3ksIHJlc3BlY3RPdmVyZmxvd0NsaXAsCi0gICAgICAgICAgICBv ZmZzZXRGcm9tQW5jZXN0b3Iocm9vdExheWVyKSwgJmxheWVyRnJhZ21lbnRCb3VuZGluZ0JveElu UGFyZW50UGFnaW5hdGlvbkxheWVyLCBBcHBseVJvb3RPZmZzZXRUb0ZyYWdtZW50cyk7CisgICAg ICAgICAgICByb290TGF5ZXJJc0ZvclRyYW5zZm9ybSwgb2Zmc2V0RnJvbUFuY2VzdG9yKHJvb3RM YXllciksICZsYXllckZyYWdtZW50Qm91bmRpbmdCb3hJblBhcmVudFBhZ2luYXRpb25MYXllciwg QXBwbHlSb290T2Zmc2V0VG9GcmFnbWVudHMpOwogICAgICAgICAKICAgICAgICAgaWYgKGFuY2Vz dG9yRnJhZ21lbnRzLmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTM2MzEsNyAr MzYzOCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbGxlY3RGcmFnbWVudHMoTGF5ZXJGcmFnbWVu dHMmIGZyYWdtZW50cywgY29uc3QgUmVuZGVyTGF5ZXIqCiAgICAgLy8gR2V0IHRoZSBwYXJlbnQg Y2xpcCByZWN0cyBvZiB0aGUgcGFnaW5hdGlvbiBsYXllciwgc2luY2Ugd2UgbmVlZCB0byBpbnRl cnNlY3Qgd2l0aCB0aGF0IHdoZW4gcGFpbnRpbmcgY29sdW1uIGNvbnRlbnRzLgogICAgIENsaXBS ZWN0IGFuY2VzdG9yQ2xpcFJlY3QgPSBkaXJ0eVJlY3Q7CiAgICAgaWYgKHBhZ2luYXRpb25MYXll ci0+cGFyZW50KCkpIHsKLSAgICAgICAgQ2xpcFJlY3RzQ29udGV4dCBjbGlwUmVjdHNDb250ZXh0 KHJvb3RMYXllciwgY2xpcFJlY3RzVHlwZSwgaW5PdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5j eSwgcmVzcGVjdE92ZXJmbG93Q2xpcCk7CisgICAgICAgIENsaXBSZWN0c0NvbnRleHQgY2xpcFJl Y3RzQ29udGV4dChyb290TGF5ZXIsIGNsaXBSZWN0c1R5cGUsIGluT3ZlcmxheVNjcm9sbGJhclNp emVSZWxldmFuY3ksIHJlc3BlY3RPdmVyZmxvd0NsaXAsIHJvb3RMYXllcklzRm9yVHJhbnNmb3Jt KTsKICAgICAgICAgYW5jZXN0b3JDbGlwUmVjdCA9IHBhZ2luYXRpb25MYXllci0+YmFja2dyb3Vu ZENsaXBSZWN0KGNsaXBSZWN0c0NvbnRleHQpOwogICAgICAgICBhbmNlc3RvckNsaXBSZWN0Lmlu dGVyc2VjdChkaXJ0eVJlY3QpOwogICAgIH0KQEAgLTM2NzYsNyArMzY4Myw4IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnBhaW50VHJhbnNmb3JtZWRMYXllckludG9GcmFnbWVudHMoR3JhcGhpY3NDb250 ZXh0JiBjb250ZXh0LCBjCiAgICAgTGF5b3V0UmVjdCB0cmFuc2Zvcm1lZEV4dGVudCA9IHRyYW5z cGFyZW5jeUNsaXBCb3goKnRoaXMsIHBhZ2luYXRlZExheWVyLCBQYWludGluZ1RyYW5zcGFyZW5j eUNsaXBCb3gsIFJvb3RPZlRyYW5zcGFyZW5jeUNsaXBCb3gsIHBhaW50aW5nSW5mby5wYWludEJl aGF2aW9yKTsKICAgICBwYWdpbmF0ZWRMYXllci0+Y29sbGVjdEZyYWdtZW50cyhlbmNsb3NpbmdQ YWdpbmF0aW9uRnJhZ21lbnRzLCBwYWludGluZ0luZm8ucm9vdExheWVyLCBwYWludGluZ0luZm8u cGFpbnREaXJ0eVJlY3QsIEV4Y2x1ZGVDb21wb3NpdGVkUGFnaW5hdGVkTGF5ZXJzLAogICAgICAg ICAocGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFnOjpUZW1wb3JhcnlDbGlwUmVjdHMpID8gVGVt cG9yYXJ5Q2xpcFJlY3RzIDogUGFpbnRpbmdDbGlwUmVjdHMsIElnbm9yZU92ZXJsYXlTY3JvbGxi YXJTaXplLAotICAgICAgICAocGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFnOjpQYWludGluZ092 ZXJmbG93Q29udGVudHMpID8gSWdub3JlT3ZlcmZsb3dDbGlwIDogUmVzcGVjdE92ZXJmbG93Q2xp cCwgb2Zmc2V0T2ZQYWdpbmF0aW9uTGF5ZXJGcm9tUm9vdCwgJnRyYW5zZm9ybWVkRXh0ZW50KTsK KyAgICAgICAgKHBhaW50RmxhZ3MgJiBQYWludExheWVyRmxhZzo6UGFpbnRpbmdPdmVyZmxvd0Nv bnRlbnRzKSA/IElnbm9yZU92ZXJmbG93Q2xpcCA6IFJlc3BlY3RPdmVyZmxvd0NsaXAsCisgICAg ICAgIHBhaW50aW5nSW5mby5yb290TGF5ZXJJc0ZvclRyYW5zZm9ybSwgb2Zmc2V0T2ZQYWdpbmF0 aW9uTGF5ZXJGcm9tUm9vdCwgJnRyYW5zZm9ybWVkRXh0ZW50KTsKICAgICAKICAgICBmb3IgKGNv bnN0IGF1dG8mIGZyYWdtZW50IDogZW5jbG9zaW5nUGFnaW5hdGlvbkZyYWdtZW50cykgewogICAg ICAgICAvLyBBcHBseSB0aGUgcGFnZS9jb2x1bW4gY2xpcCBmb3IgdGhpcyBmcmFnbWVudCwgYXMg d2VsbCBhcyBhbnkgY2xpcHMgZXN0YWJsaXNoZWQgYnkgbGF5ZXJzIGluIGJldHdlZW4gdXMgYW5k CkBAIC0zNjg4LDcgKzM2OTYsOCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludFRyYW5zZm9ybWVk TGF5ZXJJbnRvRnJhZ21lbnRzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgYwogICAgICAgICAg ICAgb2Zmc2V0T2ZQYWdpbmF0aW9uTGF5ZXJGcm9tUm9vdCA9IHRvTGF5b3V0U2l6ZShwYWdpbmF0 ZWRMYXllci0+Y29udmVydFRvTGF5ZXJDb29yZHMocGFpbnRpbmdJbmZvLnJvb3RMYXllciwgdG9M YXlvdXRQb2ludChvZmZzZXRPZlBhZ2luYXRpb25MYXllckZyb21Sb290KSkpOwogICAgIAogICAg ICAgICAgICAgQ2xpcFJlY3RzQ29udGV4dCBjbGlwUmVjdHNDb250ZXh0KHBhZ2luYXRlZExheWVy LCAocGFpbnRGbGFncyAmIFBhaW50TGF5ZXJGbGFnOjpUZW1wb3JhcnlDbGlwUmVjdHMpID8gVGVt cG9yYXJ5Q2xpcFJlY3RzIDogUGFpbnRpbmdDbGlwUmVjdHMsCi0gICAgICAgICAgICAgICAgSWdu b3JlT3ZlcmxheVNjcm9sbGJhclNpemUsIChwYWludEZsYWdzICYgUGFpbnRMYXllckZsYWc6OlBh aW50aW5nT3ZlcmZsb3dDb250ZW50cykgPyBJZ25vcmVPdmVyZmxvd0NsaXAgOiBSZXNwZWN0T3Zl cmZsb3dDbGlwKTsKKyAgICAgICAgICAgICAgICBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZSwg KHBhaW50RmxhZ3MgJiBQYWludExheWVyRmxhZzo6UGFpbnRpbmdPdmVyZmxvd0NvbnRlbnRzKSA/ IElnbm9yZU92ZXJmbG93Q2xpcCA6IFJlc3BlY3RPdmVyZmxvd0NsaXAsCisgICAgICAgICAgICAg ICAgUm9vdExheWVySXNGb3JUcmFuc2Zvcm06Ok5vKTsKICAgICAgICAgICAgIExheW91dFJlY3Qg cGFyZW50Q2xpcFJlY3QgPSBiYWNrZ3JvdW5kQ2xpcFJlY3QoY2xpcFJlY3RzQ29udGV4dCkucmVj dCgpOwogICAgICAgICAgICAgcGFyZW50Q2xpcFJlY3QubW92ZShmcmFnbWVudC5wYWdpbmF0aW9u T2Zmc2V0ICsgb2Zmc2V0T2ZQYWdpbmF0aW9uTGF5ZXJGcm9tUm9vdCk7CiAgICAgICAgICAgICBj bGlwUmVjdC5pbnRlcnNlY3QocGFyZW50Q2xpcFJlY3QpOwpAQCAtNDE0NSw2ICs0MTU0LDcgQEAg UmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjpoaXRUZXN0TGF5ZXIoUmVuZGVyTGF5ZXIqIHJvb3RM YXllciwgUmVuZGVyTGF5ZXIqIGNvbnQKICAgICAvLyBDb2xsZWN0IHRoZSBmcmFnbWVudHMuIFRo aXMgd2lsbCBjb21wdXRlIHRoZSBjbGlwIHJlY3RhbmdsZXMgZm9yIGVhY2ggbGF5ZXIgZnJhZ21l bnQuCiAgICAgTGF5ZXJGcmFnbWVudHMgbGF5ZXJGcmFnbWVudHM7CiAgICAgY29sbGVjdEZyYWdt ZW50cyhsYXllckZyYWdtZW50cywgcm9vdExheWVyLCBoaXRUZXN0UmVjdCwgSW5jbHVkZUNvbXBv c2l0ZWRQYWdpbmF0ZWRMYXllcnMsIFJvb3RSZWxhdGl2ZUNsaXBSZWN0cywgSW5jbHVkZU92ZXJs YXlTY3JvbGxiYXJTaXplLCBSZXNwZWN0T3ZlcmZsb3dDbGlwLAorICAgICAgICBSb290TGF5ZXJJ c0ZvclRyYW5zZm9ybTo6Tm8sIC8vIFhYWAogICAgICAgICBvZmZzZXRGcm9tQW5jZXN0b3Iocm9v dExheWVyKSk7CiAKICAgICBMYXlvdXRQb2ludCBsb2NhbFBvaW50OwpAQCAtNDIzMSw3ICs0MjQx LDkgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjpoaXRUZXN0VHJhbnNmb3JtZWRMYXllcklu RnJhZ21lbnRzKFJlbmRlckxheWVyKiByb290TGEKICAgICBSZW5kZXJMYXllciogcGFnaW5hdGVk TGF5ZXIgPSBlbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXIoSW5jbHVkZUNvbXBvc2l0ZWRQYWdpbmF0 ZWRMYXllcnMpOwogICAgIExheW91dFJlY3QgdHJhbnNmb3JtZWRFeHRlbnQgPSB0cmFuc3BhcmVu Y3lDbGlwQm94KCp0aGlzLCBwYWdpbmF0ZWRMYXllciwgSGl0VGVzdGluZ1RyYW5zcGFyZW5jeUNs aXBCb3gsIFJvb3RPZlRyYW5zcGFyZW5jeUNsaXBCb3gpOwogICAgIHBhZ2luYXRlZExheWVyLT5j b2xsZWN0RnJhZ21lbnRzKGVuY2xvc2luZ1BhZ2luYXRpb25GcmFnbWVudHMsIHJvb3RMYXllciwg aGl0VGVzdFJlY3QsIEluY2x1ZGVDb21wb3NpdGVkUGFnaW5hdGVkTGF5ZXJzLAotICAgICAgICBS b290UmVsYXRpdmVDbGlwUmVjdHMsIEluY2x1ZGVPdmVybGF5U2Nyb2xsYmFyU2l6ZSwgUmVzcGVj dE92ZXJmbG93Q2xpcCwgb2Zmc2V0T2ZQYWdpbmF0aW9uTGF5ZXJGcm9tUm9vdCwgJnRyYW5zZm9y bWVkRXh0ZW50KTsKKyAgICAgICAgUm9vdFJlbGF0aXZlQ2xpcFJlY3RzLCBJbmNsdWRlT3Zlcmxh eVNjcm9sbGJhclNpemUsIFJlc3BlY3RPdmVyZmxvd0NsaXAsCisgICAgICAgIFJvb3RMYXllcklz Rm9yVHJhbnNmb3JtOjpObywgLy8gWFhYCisgICAgICAgIG9mZnNldE9mUGFnaW5hdGlvbkxheWVy RnJvbVJvb3QsICZ0cmFuc2Zvcm1lZEV4dGVudCk7CiAKICAgICBmb3IgKGludCBpID0gZW5jbG9z aW5nUGFnaW5hdGlvbkZyYWdtZW50cy5zaXplKCkgLSAxOyBpID49IDA7IC0taSkgewogICAgICAg ICBjb25zdCBMYXllckZyYWdtZW50JiBmcmFnbWVudCA9IGVuY2xvc2luZ1BhZ2luYXRpb25GcmFn bWVudHMuYXQoaSk7CkBAIC00NDg4LDYgKzQ1MDAsOCBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxj dWxhdGVDbGlwUmVjdHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCwg QwogICAgICAgICAgICAgY2xpcFJlY3RzLnNldE92ZXJmbG93Q2xpcFJlY3QoaW50ZXJzZWN0aW9u KG5ld1Bvc0NsaXAsIGNsaXBSZWN0cy5vdmVyZmxvd0NsaXBSZWN0KCkpKTsKICAgICAgICAgICAg IGNsaXBSZWN0cy5zZXRGaXhlZENsaXBSZWN0KGludGVyc2VjdGlvbihuZXdQb3NDbGlwLCBjbGlw UmVjdHMuZml4ZWRDbGlwUmVjdCgpKSk7CiAgICAgICAgIH0KKyAgICB9IGVsc2UgaWYgKHJlbmRl cmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXJJc0Zv clRyYW5zZm9ybSAmJiByZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpIHsKKyAg ICAgICAgY2xpcFJlY3RzLnNldE92ZXJmbG93Q2xpcFJlY3RBZmZlY3RlZEJ5UmFkaXVzKCk7CiAg ICAgfQogCiAgICAgTE9HX1dJVEhfU1RSRUFNKENsaXBSZWN0cywgc3RyZWFtIDw8ICJSZW5kZXJM YXllciAiIDw8IHRoaXMgPDwgIiBjYWxjdWxhdGVDbGlwUmVjdHMgIiA8PCBjbGlwUmVjdHNDb250 ZXh0IDw8ICIgY29tcHV0ZWQgIiA8PCBjbGlwUmVjdHMpOwpAQCAtNDU1OCw5ICs0NTcyLDEwIEBA IHZvaWQgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZVJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQm IGNsaXBSZWN0c0NvbnRleHQsIGNvbnN0CiAgICAgLy8gVXBkYXRlIHRoZSBjbGlwIHJlY3RzIHRo YXQgd2lsbCBiZSBwYXNzZWQgdG8gY2hpbGQgbGF5ZXJzLgogICAgIGlmIChyZW5kZXJlcigpLmhh c0NsaXBPck92ZXJmbG93Q2xpcCgpKSB7CiAgICAgICAgIC8vIFRoaXMgbGF5ZXIgZXN0YWJsaXNo ZXMgYSBjbGlwIG9mIHNvbWUga2luZC4KLSAgICAgICAgaWYgKHJlbmRlcmVyKCkuaGFzT3ZlcmZs b3dDbGlwKCkgJiYgKHRoaXMgIT0gY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXIgfHwgY2xpcFJl Y3RzQ29udGV4dC5yZXNwZWN0T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RPdmVyZmxvd0NsaXApKSB7 Ci0gICAgICAgICAgICBmb3JlZ3JvdW5kUmVjdC5pbnRlcnNlY3QoZG93bmNhc3Q8UmVuZGVyQm94 PihyZW5kZXJlcigpKS5vdmVyZmxvd0NsaXBSZWN0KHRvTGF5b3V0UG9pbnQob2Zmc2V0RnJvbVJv b3RMb2NhbCksIG51bGxwdHIsIGNsaXBSZWN0c0NvbnRleHQub3ZlcmxheVNjcm9sbGJhclNpemVS ZWxldmFuY3kpKTsKLSAgICAgICAgICAgIGlmIChyZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVy UmFkaXVzKCkpCisgICAgICAgIGlmIChyZW5kZXJlcigpLmhhc092ZXJmbG93Q2xpcCgpKSB7Cisg ICAgICAgICAgICBpZiAodGhpcyAhPSBjbGlwUmVjdHNDb250ZXh0LnJvb3RMYXllciB8fCBjbGlw UmVjdHNDb250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXAgPT0gUmVzcGVjdE92ZXJmbG93Q2xpcCkK KyAgICAgICAgICAgICAgICBmb3JlZ3JvdW5kUmVjdC5pbnRlcnNlY3QoZG93bmNhc3Q8UmVuZGVy Qm94PihyZW5kZXJlcigpKS5vdmVyZmxvd0NsaXBSZWN0KHRvTGF5b3V0UG9pbnQob2Zmc2V0RnJv bVJvb3RMb2NhbCksIG51bGxwdHIsIGNsaXBSZWN0c0NvbnRleHQub3ZlcmxheVNjcm9sbGJhclNp emVSZWxldmFuY3kpKTsKKyAgICAgICAgICAgIGlmIChjbGlwUmVjdHNDb250ZXh0LnJvb3RMYXll cklzRm9yVHJhbnNmb3JtICYmIHJlbmRlcmVyKCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRpdXMoKSkK ICAgICAgICAgICAgICAgICBmb3JlZ3JvdW5kUmVjdC5zZXRBZmZlY3RlZEJ5UmFkaXVzKHRydWUp OwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXgg NjVhYTlmOWJlZjVhZmI5ZDIxZWZlNDBjMjBhMGFhNDZhMjQwYzQ4Yy4uYTJmOTYzYzlhYzg1YzNh YjlkNmIzMDExNDFiMTFjMzU5NGM4MTYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmgKQEAgLTEwMyw2ICsxMDMsMTEgQEAgZW51bSBDbGlwUmVjdHNUeXBlIHsKICAgICBU ZW1wb3JhcnlDbGlwUmVjdHMKIH07CiAKK2VudW0gY2xhc3MgUm9vdExheWVySXNGb3JUcmFuc2Zv cm0gOiBib29sIHsKKyAgICBObywKKyAgICBZZXMKK307CisKIGVudW0gU2hvdWxkUmVzcGVjdE92 ZXJmbG93Q2xpcCB7CiAgICAgSWdub3JlT3ZlcmZsb3dDbGlwLAogICAgIFJlc3BlY3RPdmVyZmxv d0NsaXAKQEAgLTY0MCwxNiArNjQ1LDE4IEBAIHB1YmxpYzoKICAgICBib29sIGhpdFRlc3QoY29u c3QgSGl0VGVzdFJlcXVlc3QmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24mLCBIaXRUZXN0UmVzdWx0 Jik7CiAKICAgICBzdHJ1Y3QgQ2xpcFJlY3RzQ29udGV4dCB7Ci0gICAgICAgIENsaXBSZWN0c0Nv bnRleHQoY29uc3QgUmVuZGVyTGF5ZXIqIGluUm9vdExheWVyLCBDbGlwUmVjdHNUeXBlIGluQ2xp cFJlY3RzVHlwZSwgT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kgaW5PdmVybGF5U2Nyb2xs YmFyU2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBTaG91bGRSZXNw ZWN0T3ZlcmZsb3dDbGlwIGluUmVzcGVjdE92ZXJmbG93Q2xpcCA9IFJlc3BlY3RPdmVyZmxvd0Ns aXApCisgICAgICAgIENsaXBSZWN0c0NvbnRleHQoY29uc3QgUmVuZGVyTGF5ZXIqIGluUm9vdExh eWVyLCBDbGlwUmVjdHNUeXBlIGluQ2xpcFJlY3RzVHlwZSwgT3ZlcmxheVNjcm9sbGJhclNpemVS ZWxldmFuY3kgaW5PdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlT Y3JvbGxiYXJTaXplLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIGluUmVzcGVjdE92ZXJmbG93 Q2xpcCA9IFJlc3BlY3RPdmVyZmxvd0NsaXAsIFJvb3RMYXllcklzRm9yVHJhbnNmb3JtIGluUm9v dExheWVySXNGb3JUcmFuc2Zvcm0gPSBSb290TGF5ZXJJc0ZvclRyYW5zZm9ybTo6Tm8pCiAgICAg ICAgICAgICA6IHJvb3RMYXllcihpblJvb3RMYXllcikKICAgICAgICAgICAgICwgY2xpcFJlY3Rz VHlwZShpbkNsaXBSZWN0c1R5cGUpCiAgICAgICAgICAgICAsIG92ZXJsYXlTY3JvbGxiYXJTaXpl UmVsZXZhbmN5KGluT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kpCiAgICAgICAgICAgICAs IHJlc3BlY3RPdmVyZmxvd0NsaXAoaW5SZXNwZWN0T3ZlcmZsb3dDbGlwKQorICAgICAgICAgICAg LCByb290TGF5ZXJJc0ZvclRyYW5zZm9ybShpblJvb3RMYXllcklzRm9yVHJhbnNmb3JtID09IFJv b3RMYXllcklzRm9yVHJhbnNmb3JtOjpZZXMpCiAgICAgICAgIHsgfQogICAgICAgICBjb25zdCBS ZW5kZXJMYXllciogcm9vdExheWVyOwogICAgICAgICBDbGlwUmVjdHNUeXBlIGNsaXBSZWN0c1R5 cGU7CiAgICAgICAgIE92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5IG92ZXJsYXlTY3JvbGxi YXJTaXplUmVsZXZhbmN5OwogICAgICAgICBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3Bl Y3RPdmVyZmxvd0NsaXA7CisgICAgICAgIGJvb2wgcm9vdExheWVySXNGb3JUcmFuc2Zvcm07CiAg ICAgfTsKIAogICAgIC8vIFRoaXMgbWV0aG9kIGZpZ3VyZXMgb3V0IG91ciBsYXllckJvdW5kcyBp biBjb29yZGluYXRlcyByZWxhdGl2ZSB0bwpAQCAtNjYyLDcgKzY2OSw3IEBAIHB1YmxpYzoKICAg ICAvLyBQdWJsaWMganVzdCBmb3IgUmVuZGVyVHJlZUFzVGV4dC4KICAgICB2b2lkIGNvbGxlY3RG cmFnbWVudHMoTGF5ZXJGcmFnbWVudHMmLCBjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBj b25zdCBMYXlvdXRSZWN0JiBkaXJ0eVJlY3QsCiAgICAgICAgIFBhZ2luYXRpb25JbmNsdXNpb25N b2RlLAotICAgICAgICBDbGlwUmVjdHNUeXBlLCBPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5j eSBpbk92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5LCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dD bGlwLCBjb25zdCBMYXlvdXRTaXplJiBvZmZzZXRGcm9tUm9vdCwKKyAgICAgICAgQ2xpcFJlY3Rz VHlwZSwgT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kgaW5PdmVybGF5U2Nyb2xsYmFyU2l6 ZVJlbGV2YW5jeSwgU2hvdWxkUmVzcGVjdE92ZXJmbG93Q2xpcCwgUm9vdExheWVySXNGb3JUcmFu c2Zvcm0sIGNvbnN0IExheW91dFNpemUmIG9mZnNldEZyb21Sb290LAogICAgICAgICBjb25zdCBM YXlvdXRSZWN0KiBsYXllckJvdW5kaW5nQm94ID0gbnVsbHB0ciwgU2hvdWxkQXBwbHlSb290T2Zm c2V0VG9GcmFnbWVudHMgPSBJZ25vcmVSb290T2Zmc2V0Rm9yRnJhZ21lbnRzKTsKICAgICAgICAg CiAgICAgTGF5b3V0UmVjdCBjaGlsZHJlbkNsaXBSZWN0KCkgY29uc3Q7IC8vIFJldHVybnMgdGhl IGZvcmVncm91bmQgY2xpcCByZWN0IG9mIHRoZSBsYXllciBpbiB0aGUgZG9jdW1lbnQncyBjb29y ZGluYXRlIHNwYWNlLgpAQCAtOTAzLDYgKzkxMCw3IEBAIHByaXZhdGU6CiAgICAgICAgIE9wdGlv blNldDxQYWludEJlaGF2aW9yPiBwYWludEJlaGF2aW9yOwogICAgICAgICBib29sIHJlcXVpcmVT ZWN1cml0eU9yaWdpbkFjY2Vzc0ZvcldpZGdldHM7CiAgICAgICAgIGJvb2wgY2xpcFRvRGlydHlS ZWN0IHsgdHJ1ZSB9OworICAgICAgICBSb290TGF5ZXJJc0ZvclRyYW5zZm9ybSByb290TGF5ZXJJ c0ZvclRyYW5zZm9ybSB7IFJvb3RMYXllcklzRm9yVHJhbnNmb3JtOjpObyB9OwogICAgICAgICBF dmVudFJlZ2lvbkNvbnRleHQqIGV2ZW50UmVnaW9uQ29udGV4dCB7IG51bGxwdHIgfTsKICAgICB9 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKaW5k ZXggYjRhYjM2ZGVlY2MzYzhlNDA3MDUyYjZiMGI3NzJhZjBjY2Y5YTJkMy4uNTcwZDJmNzhlMjEz ZWY5OWNmNzFjZTcwN2Y5OWRjMDdiOTg5YmVkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcApAQCAtNzY4LDcgKzc2OCw3IEBAIHN0YXRpYyB2b2lk IHdyaXRlTGF5ZXJzKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJMYXllciYgcm9vdExheWVy LCBSZW5kZXJMYXllCiAgICAgICAgIAogICAgICAgICBpZiAoYmVoYXZpb3IuY29udGFpbnMoUmVu ZGVyQXNUZXh0RmxhZzo6U2hvd0xheWVyRnJhZ21lbnRzKSkgewogICAgICAgICAgICAgTGF5ZXJG cmFnbWVudHMgbGF5ZXJGcmFnbWVudHM7Ci0gICAgICAgICAgICBsYXllci5jb2xsZWN0RnJhZ21l bnRzKGxheWVyRnJhZ21lbnRzLCAmcm9vdExheWVyLCBwYWludERpcnR5UmVjdCwgUmVuZGVyTGF5 ZXI6OlBhZ2luYXRpb25JbmNsdXNpb25Nb2RlOjpFeGNsdWRlQ29tcG9zaXRlZFBhZ2luYXRlZExh eWVycywgVGVtcG9yYXJ5Q2xpcFJlY3RzLCBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZSwgUmVz cGVjdE92ZXJmbG93Q2xpcCwgb2Zmc2V0RnJvbVJvb3QpOworICAgICAgICAgICAgbGF5ZXIuY29s bGVjdEZyYWdtZW50cyhsYXllckZyYWdtZW50cywgJnJvb3RMYXllciwgcGFpbnREaXJ0eVJlY3Qs IFJlbmRlckxheWVyOjpQYWdpbmF0aW9uSW5jbHVzaW9uTW9kZTo6RXhjbHVkZUNvbXBvc2l0ZWRQ YWdpbmF0ZWRMYXllcnMsIFRlbXBvcmFyeUNsaXBSZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJh clNpemUsIFJlc3BlY3RPdmVyZmxvd0NsaXAsIFJvb3RMYXllcklzRm9yVHJhbnNmb3JtOjpObywg b2Zmc2V0RnJvbVJvb3QpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAobGF5ZXJGcmFn bWVudHMuc2l6ZSgpID4gMSkgewogICAgICAgICAgICAgICAgIFRleHRTdHJlYW06OkluZGVudFNj b3BlIGluZGVudFNjb3BlKHRzLCAyKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiN2Y5YWU3Njk3NzE1ZWI1ZDk1Yzg4Zjlm MTU2ZjdlMmEwMWY3MTUyLi4xYTA5MTUzZjcxYzg1NWM5MDA2MGQ3YTYxYmRjZDQzYzJmZGY4YTdh IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMTEgIENhbWVyb24gTWNDb3JtYWNrICA8 aGV5Y2FtQGFwcGxlLmNvbT4KKworICAgICAgICBFbnN1cmUgc2Nyb2xsYWJsZSB0cmFuc2Zvcm1l ZCBlbGVtZW50cyB0aGF0IGFyZSB0aGVtc2VsdmVzIHdpdGhpbiBzY3JvbGxhYmxlIGVsZW1lbnRz IGRvbid0IGlnbm9yZSBib3JkZXItcmFkaXVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTc4CisgICAgICAgIDxyZGFyOi8vNjk2NjAyMjk+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xh eWVycy9vdmVyZmxvdy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9y bS1ib3JkZXItcmFkaXVzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA1LTA4ICBSaWNreSBNb25kZWxs byAgPHJtb25kZWxsb0BhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGEgdHlwbwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3Jk ZXItcmFkaXVzLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheWVycy9vdmVyZmxv dy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li5lNjA3YmJmMTEyZTdjMDg5Yzg0M2YzZGMxNDI3YjA5NDQ0YTUwZDU3Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1i b3JkZXItcmFkaXVzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw3IEBACis8IURPQ1RZUEUgaHRt bD4KKzxwPlRlc3QgcGFzc2VzIGlmIHRoZSBibHVlIHJlY3RhbmdsZSBoYXMgcm91bmRlZCBjb3Ju ZXJzLjwvcD4KKzxkaXYgc3R5bGU9IndpZHRoOiA1MHB4OyBoZWlnaHQ6IDUwcHg7Ij4KKyAgPGRp diBzdHlsZT0ib3ZlcmZsb3c6IHNjcm9sbDsgYm9yZGVyLXJhZGl1czogMTVweDsiPgorICAgIDxk aXYgc3R5bGU9IndpZHRoOiA1MHB4OyBoZWlnaHQ6IDUwcHg7IGJhY2tncm91bmQtY29sb3I6IGJs dWU7Ij48L2Rpdj4KKyAgPC9kaXY+Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvbGF5ZXJzL292ZXJmbG93LXNjcm9sbC10cmFuc2Zvcm0tYm9yZGVyLXJhZGl1cy5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3JkZXIt cmFkaXVzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjc0MjM1NTQ5ZTJlNDkwOTk5ZTAwZTRmOGEzNzA5YTg0 MDE5NzEyMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5ZXJzL292ZXJm bG93LXNjcm9sbC10cmFuc2Zvcm0tYm9yZGVyLXJhZGl1cy5odG1sCkBAIC0wLDAgKzEsMTEgQEAK KzwhRE9DVFlQRSBodG1sPgorPHA+VGVzdCBwYXNzZXMgaWYgdGhlIGJsdWUgcmVjdGFuZ2xlIGhh cyByb3VuZGVkIGNvcm5lcnMuPC9wPgorPGRpdiBpZD0iY29udGFpbmVyIiBzdHlsZT0id2lkdGg6 IDUwcHg7IGhlaWdodDogNTBweDsgb3ZlcmZsb3c6IHNjcm9sbDsiPgorICA8ZGl2IHN0eWxlPSJv dmVyZmxvdzogc2Nyb2xsOyBib3JkZXItcmFkaXVzOiAxNXB4OyB0cmFuc2Zvcm06IHRyYW5zbGF0 ZSgyNXB4LCAyNXB4KTsiPgorICAgIDxkaXYgc3R5bGU9IndpZHRoOiA1MHB4OyBoZWlnaHQ6IDUw cHg7IGJhY2tncm91bmQtY29sb3I6IGJsdWU7Ij48L2Rpdj4KKyAgPC9kaXY+Cis8L2Rpdj4KKzxz Y3JpcHQ+Citjb250YWluZXIuc2Nyb2xsVG9wID0gMTAwMDsKK2NvbnRhaW5lci5zY3JvbGxMZWZ0 ID0gMTAwMDsKKzwvc2NyaXB0Pgo= 428348 2021-05-11 23:49:41 -0700 2021-05-13 15:36:50 -0700 Patch bug-216978-20210512164939.patch text/plain 6889 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDA1M2FiYTYyMzk3Yzk2 OGM2MTc2MmI5YjM0ODQ0ZjA4ZjI1NjhjZS4uZmM0YTY0NmUxMmZmY2QzMGJkZTFjZTIxNzJmNTFk MzgzZTI1OTk1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA1LTExICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIHNjcm9s bGFibGUgdHJhbnNmb3JtZWQgZWxlbWVudHMgdGhhdCBhcmUgdGhlbXNlbHZlcyB3aXRoaW4gc2Ny b2xsYWJsZSBlbGVtZW50cyBkb24ndCBpZ25vcmUgYm9yZGVyLXJhZGl1cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTc4CisgICAgICAgIDxyZGFy Oi8vNjk2NjAyMjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2UgdXNlIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgdG8gcHJldmVudCBjbGlwcyBm cm9tIGFuY2VzdG9ycworICAgICAgICBmcm9tIGJlaW5nIHVzZWQgd2hlbiB3ZSBwYWludCBhIHNj cm9sbGFibGUgbGF5ZXIgKHdoZW4KKyAgICAgICAgUGFpbnRMYXllckZsYWc6OlBhaW50aW5nT3Zl cmZsb3dDb250ZW50cyBpcyBzZXQpLiBXZSBvbmx5IGxvb2sKKyAgICAgICAgYXQgdGhlIFNob3Vs ZFJlc3BlY3RPdmVyZmxvd0NsaXAgdmFsdWUgd2hlbiB3ZSdyZSBwYWludGluZyBhIGxheWVyCisg ICAgICAgIHdlJ3JlIGNvbnNpZGVyaW5nIHRvIGJlIGEgY2xpcCByZWN0IHJvb3QgbGF5ZXIsIGFu ZCB3ZSB1bmNvbmRpdGlvbmFsbHkKKyAgICAgICAgYXBwbHkgYW5jZXN0b3IgY2xpcHMgZm9yIGxh eWVycyB0aGF0IGFyZW4ndCBjbGlwIHJlY3Qgcm9vdHMuCisKKyAgICAgICAgQSBub24tcm9vdCBs YXllciB3aXRoIGEgdHJhbnNmb3JtIGlzIGhhbmRsZWQgYnkgYXBwbHlpbmcgdGhlIHRyYW5zZm9y bQorICAgICAgICBhbmQgcGFpbnRpbmcgdGhlIGxheWVyIGFzIGEgcm9vdCBsYXllciAoc2luY2Ug d2UgZG9uJ3Qgd2FudCB0byBoYW5kbGUKKyAgICAgICAgY29tcHV0aW5nIHRoZSBlZmZlY3Qgb2Yg YW5jZXN0b3IgY2xpcCByZWN0cyBwYXN0IHRoZSB0cmFuc2Zvcm0pLiBXaGVuCisgICAgICAgIHRo ZSB0cmFuc2Zvcm1lZCBsYXllciBhbHNvIGhhcyBhIGJvcmRlci1yYWRpdXMsIHdlIGluY29ycmVj dGx5IHNraXAKKyAgICAgICAgbWFya2luZyBpdHMgY2xpcCByZWN0IGFzIGJlaW5nIGFmZmVjdGVk IGJ5IHJhZGl1cywgc2luY2Ugd2UgY3VycmVudGx5CisgICAgICAgIGRvIHRoaXMgYXQgdGhlIHNh bWUgdGltZSBhcyBhcHBseWluZyBhbmNlc3RvciBjbGlwIHJlY3RzLgorCisgICAgICAgIFRoaXMg cGF0Y2ggc3BsaXRzIG91dCB0aGUgc2V0QWZmZWN0ZWRCeVJhZGl1cyBjYWxsIHNvIHRoYXQgaXQg aGFwcGVucworICAgICAgICBldmVuIGZvciB0cmFuc2Zvcm1lZCBub24tcm9vdCBsYXllcnMuCisK KyAgICAgICAgVGVzdDogZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3Jk ZXItcmFkaXVzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdHM6OnNldE92ZXJmbG93Q2xpcFJlY3RBZmZlY3RlZEJ5 UmFkaXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVj dHMgY29uc3QpOgorCiAyMDIxLTA0LTIyICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgSW5jbHVkZSByZWFzb25zIGZvciBjb21wb3NpdGluZyBpbiBzaG93 TGF5ZXJUcmVlIG91dHB1dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK aW5kZXggMjljNjM4Njc4NDFjYWE0MjhjMTdlYjIxNGJhMWNkY2ZkZWRlZTBhNy4uYTQyOWJkZDQ2 MTAwYzA2MjllMDI1Mjc0NTU4YzMwZjNkOTU0MGE2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0xNzcsNiArMTc3LDggQEAgcHVibGljOgogICAgIGJvb2wg Zml4ZWQoKSBjb25zdCB7IHJldHVybiBtX2ZpeGVkOyB9CiAgICAgdm9pZCBzZXRGaXhlZChib29s IGZpeGVkKSB7IG1fZml4ZWQgPSBmaXhlZDsgfQogCisgICAgdm9pZCBzZXRPdmVyZmxvd0NsaXBS ZWN0QWZmZWN0ZWRCeVJhZGl1cygpIHsgbV9vdmVyZmxvd0NsaXBSZWN0LnNldEFmZmVjdGVkQnlS YWRpdXModHJ1ZSk7IH0KKwogICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBDbGlwUmVjdHMmIG90 aGVyKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIG1fb3ZlcmZsb3dDbGlwUmVjdCA9PSBv dGhlci5vdmVyZmxvd0NsaXBSZWN0KCkKQEAgLTQ0ODgsNiArNDQ5MCw5IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVj dHNDb250ZXh0LCBDCiAgICAgICAgICAgICBjbGlwUmVjdHMuc2V0T3ZlcmZsb3dDbGlwUmVjdChp bnRlcnNlY3Rpb24obmV3UG9zQ2xpcCwgY2xpcFJlY3RzLm92ZXJmbG93Q2xpcFJlY3QoKSkpOwog ICAgICAgICAgICAgY2xpcFJlY3RzLnNldEZpeGVkQ2xpcFJlY3QoaW50ZXJzZWN0aW9uKG5ld1Bv c0NsaXAsIGNsaXBSZWN0cy5maXhlZENsaXBSZWN0KCkpKTsKICAgICAgICAgfQorICAgIH0gZWxz ZSBpZiAocmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSAmJiB0cmFuc2Zvcm0oKSAmJiByZW5k ZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpIHsKKyAgICAgICAgY2xpcFJlY3RzLnNl dE92ZXJmbG93Q2xpcFJlY3RBZmZlY3RlZEJ5UmFkaXVzKCk7CisgICAgICAgIC8vIEZJWE1FOiBE byB3ZSBuZWVkIHRvIHNldCB0aGUgcG9zQ2xpcFJlY3QgdG8gYmUgYWZmZWN0ZWQgYnkgYm9yZGVy LXJhZGl1cyB0b28/CiAgICAgfQogCiAgICAgTE9HX1dJVEhfU1RSRUFNKENsaXBSZWN0cywgc3Ry ZWFtIDw8ICJSZW5kZXJMYXllciAiIDw8IHRoaXMgPDwgIiBjYWxjdWxhdGVDbGlwUmVjdHMgIiA8 PCBjbGlwUmVjdHNDb250ZXh0IDw8ICIgY29tcHV0ZWQgIiA8PCBjbGlwUmVjdHMpOwpAQCAtNDU1 OCw5ICs0NTYzLDExIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZVJlY3RzKGNvbnN0IENs aXBSZWN0c0NvbnRleHQmIGNsaXBSZWN0c0NvbnRleHQsIGNvbnN0CiAgICAgLy8gVXBkYXRlIHRo ZSBjbGlwIHJlY3RzIHRoYXQgd2lsbCBiZSBwYXNzZWQgdG8gY2hpbGQgbGF5ZXJzLgogICAgIGlm IChyZW5kZXJlcigpLmhhc0NsaXBPck92ZXJmbG93Q2xpcCgpKSB7CiAgICAgICAgIC8vIFRoaXMg bGF5ZXIgZXN0YWJsaXNoZXMgYSBjbGlwIG9mIHNvbWUga2luZC4KLSAgICAgICAgaWYgKHJlbmRl cmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgKHRoaXMgIT0gY2xpcFJlY3RzQ29udGV4dC5yb290 TGF5ZXIgfHwgY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RP dmVyZmxvd0NsaXApKSB7Ci0gICAgICAgICAgICBmb3JlZ3JvdW5kUmVjdC5pbnRlcnNlY3QoZG93 bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5vdmVyZmxvd0NsaXBSZWN0KHRvTGF5b3V0UG9p bnQob2Zmc2V0RnJvbVJvb3RMb2NhbCksIG51bGxwdHIsIGNsaXBSZWN0c0NvbnRleHQub3Zlcmxh eVNjcm9sbGJhclNpemVSZWxldmFuY3kpKTsKLSAgICAgICAgICAgIGlmIChyZW5kZXJlcigpLnN0 eWxlKCkuaGFzQm9yZGVyUmFkaXVzKCkpCisgICAgICAgIGlmIChyZW5kZXJlcigpLmhhc092ZXJm bG93Q2xpcCgpKSB7CisgICAgICAgICAgICBpZiAodGhpcyAhPSBjbGlwUmVjdHNDb250ZXh0LnJv b3RMYXllciB8fCBjbGlwUmVjdHNDb250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXAgPT0gUmVzcGVj dE92ZXJmbG93Q2xpcCkgeworICAgICAgICAgICAgICAgIGZvcmVncm91bmRSZWN0LmludGVyc2Vj dChkb3duY2FzdDxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpLm92ZXJmbG93Q2xpcFJlY3QodG9MYXlv dXRQb2ludChvZmZzZXRGcm9tUm9vdExvY2FsKSwgbnVsbHB0ciwgY2xpcFJlY3RzQ29udGV4dC5v dmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSkpOworICAgICAgICAgICAgICAgIGZvcmVncm91 bmRSZWN0LnNldEFmZmVjdGVkQnlSYWRpdXModHJ1ZSk7CisgICAgICAgICAgICB9IGVsc2UgaWYg KHRyYW5zZm9ybSgpICYmIHJlbmRlcmVyKCkuc3R5bGUoKS5oYXNCb3JkZXJSYWRpdXMoKSkKICAg ICAgICAgICAgICAgICBmb3JlZ3JvdW5kUmVjdC5zZXRBZmZlY3RlZEJ5UmFkaXVzKHRydWUpOwog ICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCAwOWY1YjkzNTk2NDRmOTcyM2U0NzEwYjNjMmZhNDFkYjhlZGFj NmM0Li43YmEzY2U3MmU1NDhhZDY1OGY4NWY2MjNiYWU5YzgxOWRmYWRjOGNhIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTQgQEAKKzIwMjEtMDUtMTEgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2FtQGFwcGxl LmNvbT4KKworICAgICAgICBFbnN1cmUgc2Nyb2xsYWJsZSB0cmFuc2Zvcm1lZCBlbGVtZW50cyB0 aGF0IGFyZSB0aGVtc2VsdmVzIHdpdGhpbiBzY3JvbGxhYmxlIGVsZW1lbnRzIGRvbid0IGlnbm9y ZSBib3JkZXItcmFkaXVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTY5NzgKKyAgICAgICAgPHJkYXI6Ly82OTY2MDIyOT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbGF5ZXJzL292ZXJmbG93 LXNjcm9sbC10cmFuc2Zvcm0tYm9yZGVyLXJhZGl1cy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2xheWVycy9vdmVyZmxvdy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRp dXMuaHRtbDogQWRkZWQuCisKIDIwMjEtMDUtMTEgIENhbWVyb24gTWNDb3JtYWNrICA8aGV5Y2Ft QGFwcGxlLmNvbT4KIAogICAgICAgICBJbmNsdWRlIHJlYXNvbnMgZm9yIGNvbXBvc2l0aW5nIGlu IHNob3dMYXllclRyZWUgb3V0cHV0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheWVy cy9vdmVyZmxvdy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvbGF5ZXJzL292ZXJmbG93LXNjcm9sbC10cmFuc2Zvcm0tYm9yZGVy LXJhZGl1cy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdlZjAzNDUxMWFjMWUwOGNjZmUwNWUw NzQwMDllNTZlNGY1ODRkMTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xh eWVycy9vdmVyZmxvdy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRt bApAQCAtMCwwICsxLDggQEAKKzwhRE9DVFlQRSBodG1sPgorPHA+VGVzdCBwYXNzZXMgaWYgdGhl IGJsdWUgcmVjdGFuZ2xlIGhhcyBhIHJvdW5kZWQgdG9wIGxlZnQgY29ybmVyLjwvcD4KKzxkaXYg aWQ9ImNvbnRhaW5lciIgc3R5bGU9IndpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsgb3ZlcmZs b3c6IHNjcm9sbDsiPgorICA8ZGl2IHN0eWxlPSJ0cmFuc2Zvcm06IHRyYW5zbGF0ZSgxMHB4LCAx MHB4KTsiPgorICAgIDxkaXYgc3R5bGU9IndpZHRoOiA1MHB4OyBoZWlnaHQ6IDUwcHg7IGJhY2tn cm91bmQtY29sb3I6IGJsdWU7IGJvcmRlci1yYWRpdXM6IDI1cHggMCAwIDA7Ij48L2Rpdj4KKyAg PC9kaXY+CisgIDxkaXYgc3R5bGU9IndpZHRoOiAyMDBweDsgaGVpZ2h0OiAxcHg7Ij48L2Rpdj4K KzwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Ny b2xsLXRyYW5zZm9ybS1ib3JkZXItcmFkaXVzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheWVy cy9vdmVyZmxvdy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li45NDU3ZjQ4ZjE3OGEwMDgxZWM5ZmQ1YWNiZTg2Y2IwNjQ2MjM1MDc1Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1i b3JkZXItcmFkaXVzLmh0bWwKQEAgLTAsMCArMSw4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxwPlRl c3QgcGFzc2VzIGlmIHRoZSBibHVlIHJlY3RhbmdsZSBoYXMgYSByb3VuZGVkIHRvcCBsZWZ0IGNv cm5lci48L3A+Cis8ZGl2IGlkPSJjb250YWluZXIiIHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdo dDogMTAwcHg7IG92ZXJmbG93OiBzY3JvbGw7Ij4KKyAgPGRpdiBzdHlsZT0ib3ZlcmZsb3c6IGhp ZGRlbjsgYm9yZGVyLXJhZGl1czogMjVweCAwIDAgMDsgdHJhbnNmb3JtOiB0cmFuc2xhdGUoMTBw eCwgMTBweCk7Ij4KKyAgICA8ZGl2IGlkPSJlIiBzdHlsZT0id2lkdGg6IDUwcHg7IGhlaWdodDog NTBweDsgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsiPjwvZGl2PgorICA8L2Rpdj4KKyAgPGRpdiBz dHlsZT0id2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDFweDsiPjwvZGl2PgorPC9kaXY+Cg== 428569 2021-05-13 15:36:54 -0700 2021-05-13 16:19:57 -0700 Patch bug-216978-20210514083653.patch text/plain 6757 heycam U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDA1M2FiYTYyMzk3Yzk2 OGM2MTc2MmI5YjM0ODQ0ZjA4ZjI1NjhjZS4uNGNmMDNmNTIxMDY5MTNiN2UzZDE2ZDEwNTQ3NzRh ZjZjOGVkYzhlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA1LTExICBDYW1l cm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIHNjcm9s bGFibGUgdHJhbnNmb3JtZWQgZWxlbWVudHMgdGhhdCBhcmUgdGhlbXNlbHZlcyB3aXRoaW4gc2Ny b2xsYWJsZSBlbGVtZW50cyBkb24ndCBpZ25vcmUgYm9yZGVyLXJhZGl1cworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTc4CisgICAgICAgIDxyZGFy Oi8vNjk2NjAyMjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAg ICAgV2UgdXNlIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgdG8gcHJldmVudCBjbGlwcyBmcm9t IGFuY2VzdG9ycworICAgICAgICBmcm9tIGJlaW5nIHVzZWQgd2hlbiB3ZSBwYWludCBhIHNjcm9s bGFibGUgbGF5ZXIgKHdoZW4KKyAgICAgICAgUGFpbnRMYXllckZsYWc6OlBhaW50aW5nT3ZlcmZs b3dDb250ZW50cyBpcyBzZXQpLiBXZSBvbmx5IGxvb2sKKyAgICAgICAgYXQgdGhlIFNob3VsZFJl c3BlY3RPdmVyZmxvd0NsaXAgdmFsdWUgd2hlbiB3ZSdyZSBwYWludGluZyBhIGxheWVyCisgICAg ICAgIHdlJ3JlIGNvbnNpZGVyaW5nIHRvIGJlIGEgY2xpcCByZWN0IHJvb3QgbGF5ZXIsIGFuZCB3 ZSB1bmNvbmRpdGlvbmFsbHkKKyAgICAgICAgYXBwbHkgYW5jZXN0b3IgY2xpcHMgZm9yIGxheWVy cyB0aGF0IGFyZW4ndCBjbGlwIHJlY3Qgcm9vdHMuCisKKyAgICAgICAgQSBub24tcm9vdCBsYXll ciB3aXRoIGEgdHJhbnNmb3JtIGlzIGhhbmRsZWQgYnkgYXBwbHlpbmcgdGhlIHRyYW5zZm9ybQor ICAgICAgICBhbmQgcGFpbnRpbmcgdGhlIGxheWVyIGFzIGEgcm9vdCBsYXllciAoc2luY2Ugd2Ug ZG9uJ3Qgd2FudCB0byBoYW5kbGUKKyAgICAgICAgY29tcHV0aW5nIHRoZSBlZmZlY3Qgb2YgYW5j ZXN0b3IgY2xpcCByZWN0cyBwYXN0IHRoZSB0cmFuc2Zvcm0pLiBXaGVuCisgICAgICAgIHRoZSB0 cmFuc2Zvcm1lZCBsYXllciBhbHNvIGhhcyBhIGJvcmRlci1yYWRpdXMsIHdlIGluY29ycmVjdGx5 IHNraXAKKyAgICAgICAgbWFya2luZyBpdHMgY2xpcCByZWN0IGFzIGJlaW5nIGFmZmVjdGVkIGJ5 IHJhZGl1cywgc2luY2Ugd2UgY3VycmVudGx5CisgICAgICAgIGRvIHRoaXMgYXQgdGhlIHNhbWUg dGltZSBhcyBhcHBseWluZyBhbmNlc3RvciBjbGlwIHJlY3RzLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggc3BsaXRzIG91dCB0aGUgc2V0QWZmZWN0ZWRCeVJhZGl1cyBjYWxsIHNvIHRoYXQgaXQgaGFw cGVucworICAgICAgICBldmVuIGZvciB0cmFuc2Zvcm1lZCBub24tcm9vdCBsYXllcnMuCisKKyAg ICAgICAgVGVzdDogZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3JkZXIt cmFkaXVzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDbGlwUmVjdHM6OnNldE92ZXJmbG93Q2xpcFJlY3RBZmZlY3RlZEJ5UmFk aXVzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMg Y29uc3QpOgorCiAyMDIxLTA0LTIyICBDYW1lcm9uIE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5j b20+CiAKICAgICAgICAgSW5jbHVkZSByZWFzb25zIGZvciBjb21wb3NpdGluZyBpbiBzaG93TGF5 ZXJUcmVlIG91dHB1dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5k ZXggMjljNjM4Njc4NDFjYWE0MjhjMTdlYjIxNGJhMWNkY2ZkZWRlZTBhNy4uZTZhOTVhZmU0OGFl ZjAyNmEyYWUxZTBjZjEyYThhNDIxZjFiNjEzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCkBAIC0xNzcsNiArMTc3LDggQEAgcHVibGljOgogICAgIGJvb2wgZml4 ZWQoKSBjb25zdCB7IHJldHVybiBtX2ZpeGVkOyB9CiAgICAgdm9pZCBzZXRGaXhlZChib29sIGZp eGVkKSB7IG1fZml4ZWQgPSBmaXhlZDsgfQogCisgICAgdm9pZCBzZXRPdmVyZmxvd0NsaXBSZWN0 QWZmZWN0ZWRCeVJhZGl1cygpIHsgbV9vdmVyZmxvd0NsaXBSZWN0LnNldEFmZmVjdGVkQnlSYWRp dXModHJ1ZSk7IH0KKwogICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBDbGlwUmVjdHMmIG90aGVy KSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIG1fb3ZlcmZsb3dDbGlwUmVjdCA9PSBvdGhl ci5vdmVyZmxvd0NsaXBSZWN0KCkKQEAgLTQ0ODgsNyArNDQ5MCw4IEBAIHZvaWQgUmVuZGVyTGF5 ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHND b250ZXh0LCBDCiAgICAgICAgICAgICBjbGlwUmVjdHMuc2V0T3ZlcmZsb3dDbGlwUmVjdChpbnRl cnNlY3Rpb24obmV3UG9zQ2xpcCwgY2xpcFJlY3RzLm92ZXJmbG93Q2xpcFJlY3QoKSkpOwogICAg ICAgICAgICAgY2xpcFJlY3RzLnNldEZpeGVkQ2xpcFJlY3QoaW50ZXJzZWN0aW9uKG5ld1Bvc0Ns aXAsIGNsaXBSZWN0cy5maXhlZENsaXBSZWN0KCkpKTsKICAgICAgICAgfQotICAgIH0KKyAgICB9 IGVsc2UgaWYgKHJlbmRlcmVyKCkuaGFzT3ZlcmZsb3dDbGlwKCkgJiYgdHJhbnNmb3JtKCkgJiYg cmVuZGVyZXIoKS5zdHlsZSgpLmhhc0JvcmRlclJhZGl1cygpKQorICAgICAgICBjbGlwUmVjdHMu c2V0T3ZlcmZsb3dDbGlwUmVjdEFmZmVjdGVkQnlSYWRpdXMoKTsKIAogICAgIExPR19XSVRIX1NU UkVBTShDbGlwUmVjdHMsIHN0cmVhbSA8PCAiUmVuZGVyTGF5ZXIgIiA8PCB0aGlzIDw8ICIgY2Fs Y3VsYXRlQ2xpcFJlY3RzICIgPDwgY2xpcFJlY3RzQ29udGV4dCA8PCAiIGNvbXB1dGVkICIgPDwg Y2xpcFJlY3RzKTsKIH0KQEAgLTQ1NTgsOSArNDU2MSwxMSBAQCB2b2lkIFJlbmRlckxheWVyOjpj YWxjdWxhdGVSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBj b25zdAogICAgIC8vIFVwZGF0ZSB0aGUgY2xpcCByZWN0cyB0aGF0IHdpbGwgYmUgcGFzc2VkIHRv IGNoaWxkIGxheWVycy4KICAgICBpZiAocmVuZGVyZXIoKS5oYXNDbGlwT3JPdmVyZmxvd0NsaXAo KSkgewogICAgICAgICAvLyBUaGlzIGxheWVyIGVzdGFibGlzaGVzIGEgY2xpcCBvZiBzb21lIGtp bmQuCi0gICAgICAgIGlmIChyZW5kZXJlcigpLmhhc092ZXJmbG93Q2xpcCgpICYmICh0aGlzICE9 IGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyIHx8IGNsaXBSZWN0c0NvbnRleHQucmVzcGVjdE92 ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZsb3dDbGlwKSkgewotICAgICAgICAgICAgZm9yZWdy b3VuZFJlY3QuaW50ZXJzZWN0KGRvd25jYXN0PFJlbmRlckJveD4ocmVuZGVyZXIoKSkub3ZlcmZs b3dDbGlwUmVjdCh0b0xheW91dFBvaW50KG9mZnNldEZyb21Sb290TG9jYWwpLCBudWxscHRyLCBj bGlwUmVjdHNDb250ZXh0Lm92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5KSk7Ci0gICAgICAg ICAgICBpZiAocmVuZGVyZXIoKS5zdHlsZSgpLmhhc0JvcmRlclJhZGl1cygpKQorICAgICAgICBp ZiAocmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSkgeworICAgICAgICAgICAgaWYgKHRoaXMg IT0gY2xpcFJlY3RzQ29udGV4dC5yb290TGF5ZXIgfHwgY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0 T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RPdmVyZmxvd0NsaXApIHsKKyAgICAgICAgICAgICAgICBm b3JlZ3JvdW5kUmVjdC5pbnRlcnNlY3QoZG93bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5v dmVyZmxvd0NsaXBSZWN0KHRvTGF5b3V0UG9pbnQob2Zmc2V0RnJvbVJvb3RMb2NhbCksIG51bGxw dHIsIGNsaXBSZWN0c0NvbnRleHQub3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kpKTsKKyAg ICAgICAgICAgICAgICBmb3JlZ3JvdW5kUmVjdC5zZXRBZmZlY3RlZEJ5UmFkaXVzKHRydWUpOwor ICAgICAgICAgICAgfSBlbHNlIGlmICh0cmFuc2Zvcm0oKSAmJiByZW5kZXJlcigpLnN0eWxlKCku aGFzQm9yZGVyUmFkaXVzKCkpCiAgICAgICAgICAgICAgICAgZm9yZWdyb3VuZFJlY3Quc2V0QWZm ZWN0ZWRCeVJhZGl1cyh0cnVlKTsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDlmNWI5MzU5NjQ0Zjk3 MjNlNDcxMGIzYzJmYTQxZGI4ZWRhYzZjNC4uNWEyNDAxNmYzOTAxMWVjOGU0YzU2ZGFmZTNmOGM2 ZGQyN2Q0NTFiNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA1LTExICBDYW1lcm9uIE1j Q29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRW5zdXJlIHNjcm9sbGFibGUg dHJhbnNmb3JtZWQgZWxlbWVudHMgdGhhdCBhcmUgdGhlbXNlbHZlcyB3aXRoaW4gc2Nyb2xsYWJs ZSBlbGVtZW50cyBkb24ndCBpZ25vcmUgYm9yZGVyLXJhZGl1cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2OTc4CisgICAgICAgIDxyZGFyOi8vNjk2 NjAyMjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBm YXN0L2xheWVycy9vdmVyZmxvdy1zY3JvbGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMtZXhwZWN0 ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRy YW5zZm9ybS1ib3JkZXItcmFkaXVzLmh0bWw6IEFkZGVkLgorCiAyMDIxLTA1LTExICBDYW1lcm9u IE1jQ29ybWFjayAgPGhleWNhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSW5jbHVkZSByZWFzb25z IGZvciBjb21wb3NpdGluZyBpbiBzaG93TGF5ZXJUcmVlIG91dHB1dApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3JkZXItcmFk aXVzLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheWVycy9vdmVyZmxvdy1zY3Jv bGwtdHJhbnNmb3JtLWJvcmRlci1yYWRpdXMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yOTVl OTJlOGY5NDU2YmU4MmU3NzRkZDk2YTdjOTNhMWY5MjJmNmU1Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9sYXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3JkZXIt cmFkaXVzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSw4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxw PlRlc3QgcGFzc2VzIGlmIHRoZSBibHVlIHJlY3RhbmdsZSBoYXMgYSByb3VuZGVkIHRvcCBsZWZ0 IGNvcm5lci48L3A+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IG92 ZXJmbG93OiBzY3JvbGw7Ij4KKyAgPGRpdiBzdHlsZT0idHJhbnNmb3JtOiB0cmFuc2xhdGUoMTBw eCwgMTBweCk7Ij4KKyAgICA8ZGl2IHN0eWxlPSJ3aWR0aDogNTBweDsgaGVpZ2h0OiA1MHB4OyBi YWNrZ3JvdW5kLWNvbG9yOiBibHVlOyBib3JkZXItcmFkaXVzOiAyNXB4IDAgMCAwOyI+PC9kaXY+ CisgIDwvZGl2PgorICA8ZGl2IHN0eWxlPSJ3aWR0aDogMjAwcHg7IGhlaWdodDogMXB4OyI+PC9k aXY+Cis8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5ZXJzL292ZXJmbG93 LXNjcm9sbC10cmFuc2Zvcm0tYm9yZGVyLXJhZGl1cy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9s YXllcnMvb3ZlcmZsb3ctc2Nyb2xsLXRyYW5zZm9ybS1ib3JkZXItcmFkaXVzLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNTVmYTk0MjU4ZTY2M2RhYmE0Mzg2NzE1ZmU0ZjdiYTFjYzcwNTE5ZAotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbGF5ZXJzL292ZXJmbG93LXNjcm9sbC10cmFuc2Zv cm0tYm9yZGVyLXJhZGl1cy5odG1sCkBAIC0wLDAgKzEsOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8 cD5UZXN0IHBhc3NlcyBpZiB0aGUgYmx1ZSByZWN0YW5nbGUgaGFzIGEgcm91bmRlZCB0b3AgbGVm dCBjb3JuZXIuPC9wPgorPGRpdiBzdHlsZT0id2lkdGg6IDEwMHB4OyBoZWlnaHQ6IDEwMHB4OyBv dmVyZmxvdzogc2Nyb2xsOyI+CisgIDxkaXYgc3R5bGU9Im92ZXJmbG93OiBoaWRkZW47IGJvcmRl ci1yYWRpdXM6IDI1cHggMCAwIDA7IHRyYW5zZm9ybTogdHJhbnNsYXRlKDEwcHgsIDEwcHgpOyI+ CisgICAgPGRpdiBzdHlsZT0id2lkdGg6IDUwcHg7IGhlaWdodDogNTBweDsgYmFja2dyb3VuZC1j b2xvcjogYmx1ZTsiPjwvZGl2PgorICA8L2Rpdj4KKyAgPGRpdiBzdHlsZT0id2lkdGg6IDIwMHB4 OyBoZWlnaHQ6IDFweDsiPjwvZGl2PgorPC9kaXY+Cg==