230454 2021-09-18 21:44:22 -0700 Remove adjustForIOSCaretWhenScrolling() code 2021-10-13 17:41:19 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser changseok dbates esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan megan_gardner mifenton pdr sam simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1794840 0 simon.fraser 2021-09-18 21:44:22 -0700 Remove adjustForIOSCaretWhenScrolling() code 1794841 1 438576 simon.fraser 2021-09-18 21:47:56 -0700 Created attachment 438576 Patch 1794842 2 simon.fraser 2021-09-18 21:47:59 -0700 <rdar://problem/15579797> 1794845 3 438578 simon.fraser 2021-09-18 22:13:05 -0700 Created attachment 438578 Patch 1794884 4 438578 sam 2021-09-19 09:46:14 -0700 Comment on attachment 438578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438578&action=review > Source/WebCore/ChangeLog:12 > + web-detectable that the scrollX for a scroller could end up as -2. And removing the code If web detectable, it should really have a test case that changes. (Though perhaps that is why there are failing tests :) ). 1795927 5 438909 megan_gardner 2021-09-21 20:25:10 -0700 Created attachment 438909 Patch 1804100 6 ews-feeder 2021-10-13 17:41:14 -0700 Committed r284138 (242958@main): <https://commits.webkit.org/242958@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438909. 438576 2021-09-18 21:47:56 -0700 2021-09-18 22:21:16 -0700 Patch bug-230454-20210918214755.patch text/plain 10699 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM2YWViOGNlZjgzMjIz ZmViZTg0M2E3OWIwMjczMjE3ZWM4NzQ5OC4uZjljOWNhMTAyZTI5OTc0ZWYyYzFmNTUyNjA5YzI0 MGRmOTE1NDg5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA5LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBhZGp1 c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoKSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA0NTQKKyAgICAgICAgPHJkYXI6Ly8xNTU3OTc5 Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg ImFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyIgY29kZSBhdHRlbXB0ZWQgdG8gb3Zlci1z Y3JvbGwgaG9yaXpvbnRhbGx5IGF0IHRoZSBzdGFydAorICAgICAgICBvciBlbmQgb2YgYW4gb3Zl cmZsb3cgc2Nyb2xsIGluIG9yZGVyIHRvIG1ha2Ugc3BhY2UgZm9yIHRoZSBjYXJldCB0byBzaG93 LiBIb3dldmVyLCBpdCB3YXMKKyAgICAgICAgd3JvbmcgaW4gdmFyaW91cyB3YXlzLiBJdCBhbHdh eXMgZGlkIHRoaXMsIGV2ZW4gZm9yIHNjcm9sbGVycyB3aXRoIG5vIHZpc2libGUgY2FyZXQuIEl0 IHdhcworICAgICAgICB3ZWItZGV0ZWN0YWJsZSB0aGF0IHRoZSBzY3JvbGxYIGZvciBhIHNjcm9s bGVyIGNvdWxkIGVuZCB1cCBhcyAtMi4gQW5kIHJlbW92aW5nIHRoZSBjb2RlCisgICAgICAgIGRv ZXNuJ3QgcmVzdWx0IGluIG9idmlvdXNseSBpbmNvcnJlY3QgYmVoYXZpb3IuCisKKyAgICAgICAg KiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2Vs ZWN0aW9uOjpyZXZlYWxTZWxlY3Rpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll clNjcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWE6OnNjcm9sbFRvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWE6OnVwZGF0ZVNjcm9sbEluZm9BZnRlckxheW91dCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaDoKKwogMjAyMS0wOS0xOCAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBsb2dn aW5nIGxlZnQgaW4gYnkgbWlzdGFrZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBk MTc2ODk3ODExZjJkMGI0MTNhMmFiNTIxNGE3ZWFhNmU3MDNiMWY2Li41NTcxZDg4YTEyMmMyMjMw ZmIzN2YwNjljMWE4MjY1NjNlY2U2MDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMjEtMDktMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu ZygpIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMDQ1NAorICAgICAgICA8cmRhcjovLzE1NTc5Nzk3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSAiYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Ny b2xsaW5nIiBjb2RlIGF0dGVtcHRlZCB0byBvdmVyLXNjcm9sbCBob3Jpem9udGFsbHkgYXQgdGhl IHN0YXJ0CisgICAgICAgIG9yIGVuZCBvZiBhbiBvdmVyZmxvdyBzY3JvbGwgaW4gb3JkZXIgdG8g bWFrZSBzcGFjZSBmb3IgdGhlIGNhcmV0IHRvIHNob3cuIEhvd2V2ZXIsIGl0IHdhcworICAgICAg ICB3cm9uZyBpbiB2YXJpb3VzIHdheXMuIEl0IGFsd2F5cyBkaWQgdGhpcywgZXZlbiBmb3Igc2Ny b2xsZXJzIHdpdGggbm8gdmlzaWJsZSBjYXJldC4gSXQgd2FzCisgICAgICAgIHdlYi1kZXRlY3Rh YmxlIHRoYXQgdGhlIHNjcm9sbFggZm9yIGEgc2Nyb2xsZXIgY291bGQgZW5kIHVwIGFzIC0yLiBB bmQgcmVtb3ZpbmcgdGhlIGNvZGUKKyAgICAgICAgZG9lc24ndCByZXN1bHQgaW4gb2J2aW91c2x5 IGluY29ycmVjdCBiZWhhdmlvci4KKworICAgICAgICAqIERPTS9ET01IVE1MLm1tOgorICAgICAg ICAoLVtET01IVE1MRWxlbWVudCBzZXRTY3JvbGxYT2Zmc2V0OnNjcm9sbFlPZmZzZXQ6YWRqdXN0 Rm9ySU9TQ2FyZXQ6XSk6CisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAg KC1bV2ViRnJhbWUgX3Njcm9sbERPTVJhbmdlVG9WaXNpYmxlOl0pOgorICAgICAgICAoLVtXZWJG cmFtZSBfc2Nyb2xsRE9NUmFuZ2VUb1Zpc2libGU6d2l0aEluc2V0Ol0pOgorCiAyMDIxLTA5LTE3 ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VXNlIE9iamVjdElkZW50aWZpZXIgZm9yIFJlc291cmNlTG9hZGVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IDM0MDUyOTExYWE5MDg0MzJhNjNhODMzZmE3 Y2JkOWE2N2U3ZDZmMDcuLjE0Mzk1NGExNjU2Mzg5ODk1YjZjYWI0MGJmYTg0NGJiZDRlNWUwYTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC0yNDM5LDEw ICsyNDM5LDcgQEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6cmV2ZWFsU2VsZWN0aW9uKFNlbGVjdGlv blJldmVhbE1vZGUgcmV2ZWFsTW9kZSwgY29uc3QgU2Nyb2wKICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQogICAgICAgICBpZiAoUmVuZGVyTGF5ZXIqIGxheWVyID0gc3RhcnQuZGVwcmVjYXRlZE5v ZGUoKS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKSkgewogICAgICAgICAgICAgaWYgKCFt X3Njcm9sbGluZ1N1cHByZXNzQ291bnQpIHsKLSAgICAgICAgICAgICAgICBhdXRvKiBzY3JvbGxh YmxlQXJlYSA9IGxheWVyLT5lbnN1cmVMYXllclNjcm9sbGFibGVBcmVhKCk7Ci0gICAgICAgICAg ICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0 cnVlKTsKICAgICAgICAgICAgICAgICBsYXllci0+c2Nyb2xsUmVjdFRvVmlzaWJsZShyZWN0LCBp bnNpZGVGaXhlZCwgeyByZXZlYWxNb2RlLCBhbGlnbm1lbnQsIGFsaWdubWVudCwgU2hvdWxkQWxs b3dDcm9zc09yaWdpblNjcm9sbGluZzo6WWVzLCBzY3JvbGxCZWhhdmlvcn0pOwotICAgICAgICAg ICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmco ZmFsc2UpOwogICAgICAgICAgICAgICAgIHVwZGF0ZUFwcGVhcmFuY2UoKTsKICAgICAgICAgICAg ICAgICBpZiAobV9kb2N1bWVudC0+cGFnZSgpKQogICAgICAgICAgICAgICAgICAgICBtX2RvY3Vt ZW50LT5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLm5vdGlmeVJldmVhbGVkU2VsZWN0aW9uQnlT Y3JvbGxpbmdGcmFtZSgqbV9kb2N1bWVudC0+ZnJhbWUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggYjBl ZDQ0OTRhYTVmZTBjZDg4N2FhMjRiOGYzZjJhMmU3MjI3MmI0ZC4uM2UzZWExNWI4NzQ1NmI0M2Ni OTYxNDhlYmU0NjdhNzNmYzExZjU5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMjkzLDIzICsyOTMsNiBA QCB2b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvKGNvbnN0IFNjcm9sbFBv c2l0aW9uJiBwb3NpdGlvbikKICAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIGRpbWVuc2lvbnMg d2lsbCBiZSBjb21wdXRlZCBpZiB0aGV5IG5lZWQgdG8gYmUgKGZvciBvdmVyZmxvdzpoaWRkZW4g YmxvY2tzKS4KICAgICAgICAgaWYgKG1fc2Nyb2xsRGltZW5zaW9uc0RpcnR5KQogICAgICAgICAg ICAgY29tcHV0ZVNjcm9sbERpbWVuc2lvbnMoKTsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQot ICAgICAgICBpZiAoYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKCkpIHsKLSAgICAgICAg ICAgIC8vIEZJWE1FOiBJdCdzIG5vdCBjbGVhciB3aGF0IHRoaXMgY29kZSBpcyB0cnlpbmcgdG8g ZG8uIEJlaGF2aW9yIHNlZW1zIHJlYXNvbmFibGUgd2l0aCBpdCByZW1vdmVkLgotICAgICAgICAg ICAgaW50IG1heE9mZnNldCA9IHNjcm9sbFdpZHRoKCkgLSByb3VuZFRvSW50KGJveC0+Y2xpZW50 V2lkdGgoKSk7Ci0gICAgICAgICAgICBTY3JvbGxPZmZzZXQgbmV3T2Zmc2V0ID0gc2Nyb2xsT2Zm c2V0RnJvbVBvc2l0aW9uKG5ld1Bvc2l0aW9uKTsKLSAgICAgICAgICAgIGludCBzY3JvbGxYT2Zm c2V0ID0gbmV3T2Zmc2V0LngoKTsKLSAgICAgICAgICAgIGlmIChzY3JvbGxYT2Zmc2V0ID4gbWF4 T2Zmc2V0IC0gY2FyZXRXaWR0aCkgewotICAgICAgICAgICAgICAgIHNjcm9sbFhPZmZzZXQgKz0g Y2FyZXRXaWR0aDsKLSAgICAgICAgICAgICAgICBpZiAoc2Nyb2xsWE9mZnNldCA8PSBjYXJldFdp ZHRoKQotICAgICAgICAgICAgICAgICAgICBzY3JvbGxYT2Zmc2V0ID0gMDsKLSAgICAgICAgICAg IH0gZWxzZSBpZiAoc2Nyb2xsWE9mZnNldCA8IG1fc2Nyb2xsUG9zaXRpb24ueCgpIC0gY2FyZXRX aWR0aCkKLSAgICAgICAgICAgICAgICBzY3JvbGxYT2Zmc2V0IC09IGNhcmV0V2lkdGg7Ci0KLSAg ICAgICAgICAgIG5ld09mZnNldC5zZXRYKHNjcm9sbFhPZmZzZXQpOwotICAgICAgICAgICAgbmV3 UG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbkZyb21PZmZzZXQobmV3T2Zmc2V0KTsKLSAgICAgICAg fQotI2VuZGlmCiAgICAgfQogCiAgICAgaWYgKG1fc2Nyb2xsUG9zaXRpb24gPT0gbmV3UG9zaXRp b24gJiYgY3VycmVudFNjcm9sbEJlaGF2aW9yU3RhdHVzKCkgPT0gU2Nyb2xsQmVoYXZpb3JTdGF0 dXM6Ok5vdEluQW5pbWF0aW9uKSB7CkBAIC0xMjMwLDE4ICsxMjEzLDggQEAgdm9pZCBSZW5kZXJM YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXQoKQogICAgICAg ICAvLyBMYXlvdXQgbWF5IGNhdXNlIHVzIHRvIGJlIGF0IGFuIGludmFsaWQgc2Nyb2xsIHBvc2l0 aW9uLiBJbiB0aGlzIGNhc2Ugd2UgbmVlZAogICAgICAgICAvLyB0byBwdWxsIG91ciBzY3JvbGwg b2Zmc2V0cyBiYWNrIHRvIHRoZSBtYXggKG9yIHB1c2ggdGhlbSB1cCB0byB0aGUgbWluKS4KICAg ICAgICAgU2Nyb2xsT2Zmc2V0IGNsYW1wZWRTY3JvbGxPZmZzZXQgPSBjbGFtcFNjcm9sbE9mZnNl dChzY3JvbGxPZmZzZXQoKSk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgLy8g RklYTUU6IFRoaXMgbG9va3Mgd3JvbmcuIFRoZSBjYXJldCBhZGp1c3QgbW9kZSBzaG91bGQgb25s eSBiZSBlbmFibGVkIG9uIGVkaXRpbmcgcmVsYXRlZCBlbnRyeSBwb2ludHMuCi0gICAgICAgIC8v IFRoaXMgY29kZSB3YXMgYWRkZWQgdG8gZml4IGFuIGlzc3VlIHdoZXJlIHRoZSB0ZXh0IGluc2Vy dGlvbiBwb2ludCB3b3VsZCBhbHdheXMgYmUgZHJhd24gb24gdGhlIHJpZ2h0IGVkZ2UKLSAgICAg ICAgLy8gb2YgYSB0ZXh0IGZpZWxkIHdob3NlIGNvbnRlbnQgb3ZlcmZsb3dlZCBpdHMgYm91bmRz LiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzE1NTc5Nzk3PiBmb3IgbW9yZSBkZXRhaWxzLgotICAgICAg ICBzZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcodHJ1ZSk7Ci0jZW5kaWYKICAgICAg ICAgaWYgKGNsYW1wZWRTY3JvbGxPZmZzZXQgIT0gc2Nyb2xsT2Zmc2V0KCkpCiAgICAgICAgICAg ICBzY3JvbGxUb09mZnNldChjbGFtcGVkU2Nyb2xsT2Zmc2V0KTsKLQotI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCi0gICAgICAgIHNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyhmYWxz ZSk7Ci0jZW5kaWYKICAgICB9CiAKICAgICB1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFi bGVBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxl QXJlYS5oCmluZGV4IGNjODE5OGRjZTNlNmQ0MGFmOTk5MDFmMTgwMDZhNjQ3Y2JhZjM0MGUuLjRi Y2FjMmRkMGMzODM3YjU2ZjdlYTcxYzVlYjg1NDZlMzU4MTI1ODIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaApAQCAtMjM1 LDExICsyMzUsNiBAQCBwdWJsaWM6CiAKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFJlY3Q+IHVw ZGF0ZVNjcm9sbFBvc2l0aW9uKGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYsIGNv bnN0IExheW91dFJlY3QmIHJldmVhbFJlY3QsIGNvbnN0IExheW91dFJlY3QmIGxvY2FsRXhwb3Nl UmVjdCk7CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGJvb2wgYWRqdXN0Rm9ySU9T Q2FyZXRXaGVuU2Nyb2xsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9hZGp1c3RGb3JJT1NDYXJldFdo ZW5TY3JvbGxpbmc7IH0KLSAgICB2b2lkIHNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu Zyhib29sIGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZykgeyBtX2FkanVzdEZvcklPU0Nh cmV0V2hlblNjcm9sbGluZyA9IGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZzsgfQotI2Vu ZGlmCi0KIHByaXZhdGU6CiAgICAgYm9vbCBoYXNIb3Jpem9udGFsT3ZlcmZsb3coKSBjb25zdDsK ICAgICBib29sIGhhc1ZlcnRpY2FsT3ZlcmZsb3coKSBjb25zdDsKQEAgLTI3MiwxMSArMjY3LDgg QEAgcHJpdmF0ZToKICAgICBib29sIG1fcmVnaXN0ZXJlZFNjcm9sbGFibGVBcmVhIHsgZmFsc2Ug fTsKICAgICBib29sIG1faGFzQ29tcG9zaXRlZFNjcm9sbGFibGVPdmVyZmxvdyB7IGZhbHNlIH07 CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotI2lmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRT KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpICYmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQog ICAgIGJvb2wgbV9yZWdpc3RlcmVkQXNUb3VjaEV2ZW50TGlzdGVuZXJGb3JTY3JvbGxpbmcgeyBm YWxzZSB9OwotI2VuZGlmCi0gICAgYm9vbCBtX2FkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu ZyB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBib29sIG1fcmVxdWlyZXNTY3JvbGxQb3NpdGlvblJl Y29uY2lsaWF0aW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1fY29udGFpbnNEaXJ0eU92ZXJsYXlT Y3JvbGxiYXJzIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0RPTS9ET01IVE1MLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0K aW5kZXggNWYzYTI4ZmVlNjMzNzIxMWJlYTk4NmI1NTM3NDlkOGZlYTUxYjFkMi4uNDJiOTZjNGZi ZDk2ZGVkNmIzOTJmMjBiODQzZGIyOTg2ZDA2OGY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv RE9NL0RPTUhUTUwubW0KQEAgLTEzMCwxNCArMTMwLDkgQEAgLSAodm9pZClzZXRTY3JvbGxYT2Zm c2V0OihpbnQpeCBzY3JvbGxZT2Zmc2V0OihpbnQpeSBhZGp1c3RGb3JJT1NDYXJldDooQk9PTClh ZGoKICAgICAgICAgcmV0dXJuOwogICAgIGF1dG8qIHNjcm9sbGFibGVBcmVhID0gbGF5ZXItPmVu c3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKIAotICAgIGlmIChhZGp1c3RGb3JJT1NDYXJldCkK LSAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu Zyh0cnVlKTsKLQogICAgIGF1dG8gc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zID0gV2ViQ29y ZTo6U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsKICAg ICBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMuY2xhbXBpbmcgPSBXZWJDb3JlOjpTY3JvbGxD bGFtcGluZzo6VW5jbGFtcGVkOwogICAgIHNjcm9sbGFibGVBcmVhLT5zY3JvbGxUb09mZnNldChX ZWJDb3JlOjpTY3JvbGxPZmZzZXQoeCwgeSksIHNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyk7 Ci0gICAgaWYgKGFkanVzdEZvcklPU0NhcmV0KQotICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0 QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKIH0KIAogLSAodm9pZClhYnNv bHV0ZVBvc2l0aW9uOihpbnQgKil4IDooaW50ICopeSA6KGludCAqKXcgOihpbnQgKiloCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tIGIvU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQppbmRleCA3YjFkN2FjNzdi OTE0ZTYwNTJlNzcwZjYxZjAzZjBkMzgyYzY5ZWJhLi41Njg4NzAyYjVhZWRhM2FkNzkxNjQxNzQ4 NzZiZGRmMGYwOWYyMGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYkZyYW1lLm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2Vi RnJhbWUubW0KQEAgLTczMiw5ICs3MzIsNyBAQCAtICh2b2lkKV9zY3JvbGxET01SYW5nZVRvVmlz aWJsZTooRE9NUmFuZ2UgKilyYW5nZQogICAgICAgICBhdXRvKiBsYXllciA9IHN0YXJ0Tm9kZS0+ cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKTsKICAgICAgICAgaWYgKGxheWVyKSB7CiAgICAg ICAgICAgICBhdXRvKiBzY3JvbGxhYmxlQXJlYSA9IGxheWVyLT5lbnN1cmVMYXllclNjcm9sbGFi bGVBcmVhKCk7Ci0gICAgICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0QWRqdXN0Rm9ySU9TQ2Fy ZXRXaGVuU2Nyb2xsaW5nKHRydWUpOwogICAgICAgICAgICAgc3RhcnROb2RlLT5yZW5kZXJlcigp LT5zY3JvbGxSZWN0VG9WaXNpYmxlKFdlYkNvcmU6OmVuY2xvc2luZ0ludFJlY3QocmFuZ2VSZWN0 KSwgaW5zaWRlRml4ZWQsIHsgV2ViQ29yZTo6U2VsZWN0aW9uUmV2ZWFsTW9kZTo6UmV2ZWFsLCBX ZWJDb3JlOjpTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFdlYkNvcmU6OlNj cm9sbEFsaWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgV2ViQ29yZTo6U2hvdWxkQWxsb3dD cm9zc09yaWdpblNjcm9sbGluZzo6WWVzIH0pOwotICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEt PnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyhmYWxzZSk7CiAgICAgICAgICAgICBf cHJpdmF0ZS0+Y29yZUZyYW1lLT5zZWxlY3Rpb24oKS5zZXRDYXJldFJlY3ROZWVkc1VwZGF0ZSgp OwogICAgICAgICAgICAgX3ByaXZhdGUtPmNvcmVGcmFtZS0+c2VsZWN0aW9uKCkudXBkYXRlQXBw ZWFyYW5jZSgpOwogICAgICAgICB9CkBAIC03NTMsOSArNzUxLDcgQEAgLSAodm9pZClfc2Nyb2xs RE9NUmFuZ2VUb1Zpc2libGU6KERPTVJhbmdlICopcmFuZ2Ugd2l0aEluc2V0OihDR0Zsb2F0KWlu c2V0CiAgICAgICAgIGF1dG8qIGxheWVyID0gc3RhcnROb2RlLT5yZW5kZXJlcigpLT5lbmNsb3Np bmdMYXllcigpOwogICAgICAgICBpZiAobGF5ZXIpIHsKICAgICAgICAgICAgIGF1dG8qIHNjcm9s bGFibGVBcmVhID0gbGF5ZXItPmVuc3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKLSAgICAgICAg ICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcodHJ1 ZSk7CiAgICAgICAgICAgICBzdGFydE5vZGUtPnJlbmRlcmVyKCktPnNjcm9sbFJlY3RUb1Zpc2li bGUoV2ViQ29yZTo6ZW5jbG9zaW5nSW50UmVjdChyYW5nZVJlY3QpLCBpbnNpZGVGaXhlZCwgeyBX ZWJDb3JlOjpTZWxlY3Rpb25SZXZlYWxNb2RlOjpSZXZlYWwsIFdlYkNvcmU6OlNjcm9sbEFsaWdu bWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgV2ViQ29yZTo6U2Nyb2xsQWxpZ25tZW50OjphbGln blRvRWRnZUlmTmVlZGVkLCBXZWJDb3JlOjpTaG91bGRBbGxvd0Nyb3NzT3JpZ2luU2Nyb2xsaW5n OjpZZXN9KTsKLSAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RGb3JJT1NDYXJl dFdoZW5TY3JvbGxpbmcoZmFsc2UpOwogCiAgICAgICAgICAgICBhdXRvIGNvcmVGcmFtZSA9IGNv cmUoc2VsZik7CiAgICAgICAgICAgICBpZiAoY29yZUZyYW1lKSB7Cg== 438578 2021-09-18 22:13:05 -0700 2021-09-19 09:46:14 -0700 Patch bug-230454-20210918221304.patch text/plain 10755 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM2YWViOGNlZjgzMjIz ZmViZTg0M2E3OWIwMjczMjE3ZWM4NzQ5OC4uZjljOWNhMTAyZTI5OTc0ZWYyYzFmNTUyNjA5YzI0 MGRmOTE1NDg5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA5LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBhZGp1 c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoKSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA0NTQKKyAgICAgICAgPHJkYXI6Ly8xNTU3OTc5 Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg ImFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyIgY29kZSBhdHRlbXB0ZWQgdG8gb3Zlci1z Y3JvbGwgaG9yaXpvbnRhbGx5IGF0IHRoZSBzdGFydAorICAgICAgICBvciBlbmQgb2YgYW4gb3Zl cmZsb3cgc2Nyb2xsIGluIG9yZGVyIHRvIG1ha2Ugc3BhY2UgZm9yIHRoZSBjYXJldCB0byBzaG93 LiBIb3dldmVyLCBpdCB3YXMKKyAgICAgICAgd3JvbmcgaW4gdmFyaW91cyB3YXlzLiBJdCBhbHdh eXMgZGlkIHRoaXMsIGV2ZW4gZm9yIHNjcm9sbGVycyB3aXRoIG5vIHZpc2libGUgY2FyZXQuIEl0 IHdhcworICAgICAgICB3ZWItZGV0ZWN0YWJsZSB0aGF0IHRoZSBzY3JvbGxYIGZvciBhIHNjcm9s bGVyIGNvdWxkIGVuZCB1cCBhcyAtMi4gQW5kIHJlbW92aW5nIHRoZSBjb2RlCisgICAgICAgIGRv ZXNuJ3QgcmVzdWx0IGluIG9idmlvdXNseSBpbmNvcnJlY3QgYmVoYXZpb3IuCisKKyAgICAgICAg KiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2Vs ZWN0aW9uOjpyZXZlYWxTZWxlY3Rpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll clNjcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWE6OnNjcm9sbFRvKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyU2Nyb2xs YWJsZUFyZWE6OnVwZGF0ZVNjcm9sbEluZm9BZnRlckxheW91dCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaDoKKwogMjAyMS0wOS0xOCAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBsb2dn aW5nIGxlZnQgaW4gYnkgbWlzdGFrZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRleCBk MTc2ODk3ODExZjJkMGI0MTNhMmFiNTIxNGE3ZWFhNmU3MDNiMWY2Li41NTcxZDg4YTEyMmMyMjMw ZmIzN2YwNjljMWE4MjY1NjNlY2U2MDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5 L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMjEtMDktMTggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu ZygpIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMDQ1NAorICAgICAgICA8cmRhcjovLzE1NTc5Nzk3PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSAiYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Ny b2xsaW5nIiBjb2RlIGF0dGVtcHRlZCB0byBvdmVyLXNjcm9sbCBob3Jpem9udGFsbHkgYXQgdGhl IHN0YXJ0CisgICAgICAgIG9yIGVuZCBvZiBhbiBvdmVyZmxvdyBzY3JvbGwgaW4gb3JkZXIgdG8g bWFrZSBzcGFjZSBmb3IgdGhlIGNhcmV0IHRvIHNob3cuIEhvd2V2ZXIsIGl0IHdhcworICAgICAg ICB3cm9uZyBpbiB2YXJpb3VzIHdheXMuIEl0IGFsd2F5cyBkaWQgdGhpcywgZXZlbiBmb3Igc2Ny b2xsZXJzIHdpdGggbm8gdmlzaWJsZSBjYXJldC4gSXQgd2FzCisgICAgICAgIHdlYi1kZXRlY3Rh YmxlIHRoYXQgdGhlIHNjcm9sbFggZm9yIGEgc2Nyb2xsZXIgY291bGQgZW5kIHVwIGFzIC0yLiBB bmQgcmVtb3ZpbmcgdGhlIGNvZGUKKyAgICAgICAgZG9lc24ndCByZXN1bHQgaW4gb2J2aW91c2x5 IGluY29ycmVjdCBiZWhhdmlvci4KKworICAgICAgICAqIERPTS9ET01IVE1MLm1tOgorICAgICAg ICAoLVtET01IVE1MRWxlbWVudCBzZXRTY3JvbGxYT2Zmc2V0OnNjcm9sbFlPZmZzZXQ6YWRqdXN0 Rm9ySU9TQ2FyZXQ6XSk6CisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAg KC1bV2ViRnJhbWUgX3Njcm9sbERPTVJhbmdlVG9WaXNpYmxlOl0pOgorICAgICAgICAoLVtXZWJG cmFtZSBfc2Nyb2xsRE9NUmFuZ2VUb1Zpc2libGU6d2l0aEluc2V0Ol0pOgorCiAyMDIxLTA5LTE3 ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VXNlIE9iamVjdElkZW50aWZpZXIgZm9yIFJlc291cmNlTG9hZGVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IDM0MDUyOTExYWE5MDg0MzJhNjNhODMzZmE3 Y2JkOWE2N2U3ZDZmMDcuLjE0Mzk1NGExNjU2Mzg5ODk1YjZjYWI0MGJmYTg0NGJiZDRlNWUwYTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC0yNDM5LDEw ICsyNDM5LDcgQEAgdm9pZCBGcmFtZVNlbGVjdGlvbjo6cmV2ZWFsU2VsZWN0aW9uKFNlbGVjdGlv blJldmVhbE1vZGUgcmV2ZWFsTW9kZSwgY29uc3QgU2Nyb2wKICNpZiBQTEFURk9STShJT1NfRkFN SUxZKQogICAgICAgICBpZiAoUmVuZGVyTGF5ZXIqIGxheWVyID0gc3RhcnQuZGVwcmVjYXRlZE5v ZGUoKS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKSkgewogICAgICAgICAgICAgaWYgKCFt X3Njcm9sbGluZ1N1cHByZXNzQ291bnQpIHsKLSAgICAgICAgICAgICAgICBhdXRvKiBzY3JvbGxh YmxlQXJlYSA9IGxheWVyLT5lbnN1cmVMYXllclNjcm9sbGFibGVBcmVhKCk7Ci0gICAgICAgICAg ICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0 cnVlKTsKICAgICAgICAgICAgICAgICBsYXllci0+c2Nyb2xsUmVjdFRvVmlzaWJsZShyZWN0LCBp bnNpZGVGaXhlZCwgeyByZXZlYWxNb2RlLCBhbGlnbm1lbnQsIGFsaWdubWVudCwgU2hvdWxkQWxs b3dDcm9zc09yaWdpblNjcm9sbGluZzo6WWVzLCBzY3JvbGxCZWhhdmlvcn0pOwotICAgICAgICAg ICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmco ZmFsc2UpOwogICAgICAgICAgICAgICAgIHVwZGF0ZUFwcGVhcmFuY2UoKTsKICAgICAgICAgICAg ICAgICBpZiAobV9kb2N1bWVudC0+cGFnZSgpKQogICAgICAgICAgICAgICAgICAgICBtX2RvY3Vt ZW50LT5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLm5vdGlmeVJldmVhbGVkU2VsZWN0aW9uQnlT Y3JvbGxpbmdGcmFtZSgqbV9kb2N1bWVudC0+ZnJhbWUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggYjBl ZDQ0OTRhYTVmZTBjZDg4N2FhMjRiOGYzZjJhMmU3MjI3MmI0ZC4uM2UzZWExNWI4NzQ1NmI0M2Ni OTYxNDhlYmU0NjdhNzNmYzExZjU5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNwcApAQCAtMjkzLDIzICsyOTMsNiBA QCB2b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnNjcm9sbFRvKGNvbnN0IFNjcm9sbFBv c2l0aW9uJiBwb3NpdGlvbikKICAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhlIGRpbWVuc2lvbnMg d2lsbCBiZSBjb21wdXRlZCBpZiB0aGV5IG5lZWQgdG8gYmUgKGZvciBvdmVyZmxvdzpoaWRkZW4g YmxvY2tzKS4KICAgICAgICAgaWYgKG1fc2Nyb2xsRGltZW5zaW9uc0RpcnR5KQogICAgICAgICAg ICAgY29tcHV0ZVNjcm9sbERpbWVuc2lvbnMoKTsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQot ICAgICAgICBpZiAoYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKCkpIHsKLSAgICAgICAg ICAgIC8vIEZJWE1FOiBJdCdzIG5vdCBjbGVhciB3aGF0IHRoaXMgY29kZSBpcyB0cnlpbmcgdG8g ZG8uIEJlaGF2aW9yIHNlZW1zIHJlYXNvbmFibGUgd2l0aCBpdCByZW1vdmVkLgotICAgICAgICAg ICAgaW50IG1heE9mZnNldCA9IHNjcm9sbFdpZHRoKCkgLSByb3VuZFRvSW50KGJveC0+Y2xpZW50 V2lkdGgoKSk7Ci0gICAgICAgICAgICBTY3JvbGxPZmZzZXQgbmV3T2Zmc2V0ID0gc2Nyb2xsT2Zm c2V0RnJvbVBvc2l0aW9uKG5ld1Bvc2l0aW9uKTsKLSAgICAgICAgICAgIGludCBzY3JvbGxYT2Zm c2V0ID0gbmV3T2Zmc2V0LngoKTsKLSAgICAgICAgICAgIGlmIChzY3JvbGxYT2Zmc2V0ID4gbWF4 T2Zmc2V0IC0gY2FyZXRXaWR0aCkgewotICAgICAgICAgICAgICAgIHNjcm9sbFhPZmZzZXQgKz0g Y2FyZXRXaWR0aDsKLSAgICAgICAgICAgICAgICBpZiAoc2Nyb2xsWE9mZnNldCA8PSBjYXJldFdp ZHRoKQotICAgICAgICAgICAgICAgICAgICBzY3JvbGxYT2Zmc2V0ID0gMDsKLSAgICAgICAgICAg IH0gZWxzZSBpZiAoc2Nyb2xsWE9mZnNldCA8IG1fc2Nyb2xsUG9zaXRpb24ueCgpIC0gY2FyZXRX aWR0aCkKLSAgICAgICAgICAgICAgICBzY3JvbGxYT2Zmc2V0IC09IGNhcmV0V2lkdGg7Ci0KLSAg ICAgICAgICAgIG5ld09mZnNldC5zZXRYKHNjcm9sbFhPZmZzZXQpOwotICAgICAgICAgICAgbmV3 UG9zaXRpb24gPSBzY3JvbGxQb3NpdGlvbkZyb21PZmZzZXQobmV3T2Zmc2V0KTsKLSAgICAgICAg fQotI2VuZGlmCiAgICAgfQogCiAgICAgaWYgKG1fc2Nyb2xsUG9zaXRpb24gPT0gbmV3UG9zaXRp b24gJiYgY3VycmVudFNjcm9sbEJlaGF2aW9yU3RhdHVzKCkgPT0gU2Nyb2xsQmVoYXZpb3JTdGF0 dXM6Ok5vdEluQW5pbWF0aW9uKSB7CkBAIC0xMjMwLDE4ICsxMjEzLDggQEAgdm9pZCBSZW5kZXJM YXllclNjcm9sbGFibGVBcmVhOjp1cGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXQoKQogICAgICAg ICAvLyBMYXlvdXQgbWF5IGNhdXNlIHVzIHRvIGJlIGF0IGFuIGludmFsaWQgc2Nyb2xsIHBvc2l0 aW9uLiBJbiB0aGlzIGNhc2Ugd2UgbmVlZAogICAgICAgICAvLyB0byBwdWxsIG91ciBzY3JvbGwg b2Zmc2V0cyBiYWNrIHRvIHRoZSBtYXggKG9yIHB1c2ggdGhlbSB1cCB0byB0aGUgbWluKS4KICAg ICAgICAgU2Nyb2xsT2Zmc2V0IGNsYW1wZWRTY3JvbGxPZmZzZXQgPSBjbGFtcFNjcm9sbE9mZnNl dChzY3JvbGxPZmZzZXQoKSk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgLy8g RklYTUU6IFRoaXMgbG9va3Mgd3JvbmcuIFRoZSBjYXJldCBhZGp1c3QgbW9kZSBzaG91bGQgb25s eSBiZSBlbmFibGVkIG9uIGVkaXRpbmcgcmVsYXRlZCBlbnRyeSBwb2ludHMuCi0gICAgICAgIC8v IFRoaXMgY29kZSB3YXMgYWRkZWQgdG8gZml4IGFuIGlzc3VlIHdoZXJlIHRoZSB0ZXh0IGluc2Vy dGlvbiBwb2ludCB3b3VsZCBhbHdheXMgYmUgZHJhd24gb24gdGhlIHJpZ2h0IGVkZ2UKLSAgICAg ICAgLy8gb2YgYSB0ZXh0IGZpZWxkIHdob3NlIGNvbnRlbnQgb3ZlcmZsb3dlZCBpdHMgYm91bmRz LiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzE1NTc5Nzk3PiBmb3IgbW9yZSBkZXRhaWxzLgotICAgICAg ICBzZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcodHJ1ZSk7Ci0jZW5kaWYKICAgICAg ICAgaWYgKGNsYW1wZWRTY3JvbGxPZmZzZXQgIT0gc2Nyb2xsT2Zmc2V0KCkpCiAgICAgICAgICAg ICBzY3JvbGxUb09mZnNldChjbGFtcGVkU2Nyb2xsT2Zmc2V0KTsKLQotI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCi0gICAgICAgIHNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyhmYWxz ZSk7Ci0jZW5kaWYKICAgICB9CiAKICAgICB1cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFi bGVBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxl QXJlYS5oCmluZGV4IGNjODE5OGRjZTNlNmQ0MGFmOTk5MDFmMTgwMDZhNjQ3Y2JhZjM0MGUuLjRi Y2FjMmRkMGMzODM3YjU2ZjdlYTcxYzVlYjg1NDZlMzU4MTI1ODIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuaApAQCAtMjM1 LDExICsyMzUsNiBAQCBwdWJsaWM6CiAKICAgICBzdGQ6Om9wdGlvbmFsPExheW91dFJlY3Q+IHVw ZGF0ZVNjcm9sbFBvc2l0aW9uKGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYsIGNv bnN0IExheW91dFJlY3QmIHJldmVhbFJlY3QsIGNvbnN0IExheW91dFJlY3QmIGxvY2FsRXhwb3Nl UmVjdCk7CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGJvb2wgYWRqdXN0Rm9ySU9T Q2FyZXRXaGVuU2Nyb2xsaW5nKCkgY29uc3QgeyByZXR1cm4gbV9hZGp1c3RGb3JJT1NDYXJldFdo ZW5TY3JvbGxpbmc7IH0KLSAgICB2b2lkIHNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu Zyhib29sIGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZykgeyBtX2FkanVzdEZvcklPU0Nh cmV0V2hlblNjcm9sbGluZyA9IGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZzsgfQotI2Vu ZGlmCi0KIHByaXZhdGU6CiAgICAgYm9vbCBoYXNIb3Jpem9udGFsT3ZlcmZsb3coKSBjb25zdDsK ICAgICBib29sIGhhc1ZlcnRpY2FsT3ZlcmZsb3coKSBjb25zdDsKQEAgLTI3MiwxMSArMjY3LDgg QEAgcHJpdmF0ZToKICAgICBib29sIG1fcmVnaXN0ZXJlZFNjcm9sbGFibGVBcmVhIHsgZmFsc2Ug fTsKICAgICBib29sIG1faGFzQ29tcG9zaXRlZFNjcm9sbGFibGVPdmVyZmxvdyB7IGZhbHNlIH07 CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotI2lmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRT KQorI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpICYmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKQog ICAgIGJvb2wgbV9yZWdpc3RlcmVkQXNUb3VjaEV2ZW50TGlzdGVuZXJGb3JTY3JvbGxpbmcgeyBm YWxzZSB9OwotI2VuZGlmCi0gICAgYm9vbCBtX2FkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu ZyB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBib29sIG1fcmVxdWlyZXNTY3JvbGxQb3NpdGlvblJl Y29uY2lsaWF0aW9uIHsgZmFsc2UgfTsKICAgICBib29sIG1fY29udGFpbnNEaXJ0eU92ZXJsYXlT Y3JvbGxiYXJzIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0RPTS9ET01IVE1MLm1tIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0K aW5kZXggNWYzYTI4ZmVlNjMzNzIxMWJlYTk4NmI1NTM3NDlkOGZlYTUxYjFkMi4uNDJiOTZjNGZi ZDk2ZGVkNmIzOTJmMjBiODQzZGIyOTg2ZDA2OGY5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv RE9NL0RPTUhUTUwubW0KQEAgLTEzMCwxNCArMTMwLDkgQEAgLSAodm9pZClzZXRTY3JvbGxYT2Zm c2V0OihpbnQpeCBzY3JvbGxZT2Zmc2V0OihpbnQpeSBhZGp1c3RGb3JJT1NDYXJldDooQk9PTClh ZGoKICAgICAgICAgcmV0dXJuOwogICAgIGF1dG8qIHNjcm9sbGFibGVBcmVhID0gbGF5ZXItPmVu c3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKIAotICAgIGlmIChhZGp1c3RGb3JJT1NDYXJldCkK LSAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGlu Zyh0cnVlKTsKLQogICAgIGF1dG8gc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zID0gV2ViQ29y ZTo6U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsKICAg ICBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMuY2xhbXBpbmcgPSBXZWJDb3JlOjpTY3JvbGxD bGFtcGluZzo6VW5jbGFtcGVkOwogICAgIHNjcm9sbGFibGVBcmVhLT5zY3JvbGxUb09mZnNldChX ZWJDb3JlOjpTY3JvbGxPZmZzZXQoeCwgeSksIHNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyk7 Ci0gICAgaWYgKGFkanVzdEZvcklPU0NhcmV0KQotICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0 QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKIH0KIAogLSAodm9pZClhYnNv bHV0ZVBvc2l0aW9uOihpbnQgKil4IDooaW50ICopeSA6KGludCAqKXcgOihpbnQgKiloCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tIGIvU291 cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQppbmRleCA3YjFkN2FjNzdi OTE0ZTYwNTJlNzcwZjYxZjAzZjBkMzgyYzY5ZWJhLi42OTIyYTQwNTMzNDdlZjIxOTg4ZTM0ZGNi YjUyZWQ2NGExYzU4OWVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJW aWV3L1dlYkZyYW1lLm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2Vi RnJhbWUubW0KQEAgLTczMSwxMCArNzMxLDcgQEAgLSAodm9pZClfc2Nyb2xsRE9NUmFuZ2VUb1Zp c2libGU6KERPTVJhbmdlICopcmFuZ2UKICNlbHNlCiAgICAgICAgIGF1dG8qIGxheWVyID0gc3Rh cnROb2RlLT5yZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpOwogICAgICAgICBpZiAobGF5ZXIp IHsKLSAgICAgICAgICAgIGF1dG8qIHNjcm9sbGFibGVBcmVhID0gbGF5ZXItPmVuc3VyZUxheWVy U2Nyb2xsYWJsZUFyZWEoKTsKLSAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RG b3JJT1NDYXJldFdoZW5TY3JvbGxpbmcodHJ1ZSk7CiAgICAgICAgICAgICBzdGFydE5vZGUtPnJl bmRlcmVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoV2ViQ29yZTo6ZW5jbG9zaW5nSW50UmVjdChy YW5nZVJlY3QpLCBpbnNpZGVGaXhlZCwgeyBXZWJDb3JlOjpTZWxlY3Rpb25SZXZlYWxNb2RlOjpS ZXZlYWwsIFdlYkNvcmU6OlNjcm9sbEFsaWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgV2Vi Q29yZTo6U2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBXZWJDb3JlOjpTaG91 bGRBbGxvd0Nyb3NzT3JpZ2luU2Nyb2xsaW5nOjpZZXMgfSk7Ci0gICAgICAgICAgICBzY3JvbGxh YmxlQXJlYS0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKICAgICAg ICAgICAgIF9wcml2YXRlLT5jb3JlRnJhbWUtPnNlbGVjdGlvbigpLnNldENhcmV0UmVjdE5lZWRz VXBkYXRlKCk7CiAgICAgICAgICAgICBfcHJpdmF0ZS0+Y29yZUZyYW1lLT5zZWxlY3Rpb24oKS51 cGRhdGVBcHBlYXJhbmNlKCk7CiAgICAgICAgIH0KQEAgLTc1MiwxMCArNzQ5LDcgQEAgLSAodm9p ZClfc2Nyb2xsRE9NUmFuZ2VUb1Zpc2libGU6KERPTVJhbmdlICopcmFuZ2Ugd2l0aEluc2V0OihD R0Zsb2F0KWluc2V0CiAgICAgaWYgKHN0YXJ0Tm9kZSAmJiBzdGFydE5vZGUtPnJlbmRlcmVyKCkp IHsKICAgICAgICAgYXV0byogbGF5ZXIgPSBzdGFydE5vZGUtPnJlbmRlcmVyKCktPmVuY2xvc2lu Z0xheWVyKCk7CiAgICAgICAgIGlmIChsYXllcikgewotICAgICAgICAgICAgYXV0byogc2Nyb2xs YWJsZUFyZWEgPSBsYXllci0+ZW5zdXJlTGF5ZXJTY3JvbGxhYmxlQXJlYSgpOwotICAgICAgICAg ICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0cnVl KTsKICAgICAgICAgICAgIHN0YXJ0Tm9kZS0+cmVuZGVyZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJs ZShXZWJDb3JlOjplbmNsb3NpbmdJbnRSZWN0KHJhbmdlUmVjdCksIGluc2lkZUZpeGVkLCB7IFdl YkNvcmU6OlNlbGVjdGlvblJldmVhbE1vZGU6OlJldmVhbCwgV2ViQ29yZTo6U2Nyb2xsQWxpZ25t ZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBXZWJDb3JlOjpTY3JvbGxBbGlnbm1lbnQ6OmFsaWdu VG9FZGdlSWZOZWVkZWQsIFdlYkNvcmU6OlNob3VsZEFsbG93Q3Jvc3NPcmlnaW5TY3JvbGxpbmc6 Olllc30pOwotICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0 V2hlblNjcm9sbGluZyhmYWxzZSk7CiAKICAgICAgICAgICAgIGF1dG8gY29yZUZyYW1lID0gY29y ZShzZWxmKTsKICAgICAgICAgICAgIGlmIChjb3JlRnJhbWUpIHsK 438909 2021-09-21 20:25:10 -0700 2021-10-13 17:41:17 -0700 Patch bug-230454-20210921202508.patch text/plain 16609 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzk3NzNiMWNkNmU1ZGFj ZDc1MTY3NTI0ZDVhMTQyZWU3OTE4YjUxOS4uZTc0NmQ0NWFjNDQxZjI2MjAyZDZlNmExODljZmVk MTdkMDE2ZGU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA5LTIxICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGFk anVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZygpIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ1NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSAiYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Ny b2xsaW5nIiBjb2RlIGF0dGVtcHRlZCB0byBvdmVyLXNjcm9sbCBob3Jpem9udGFsbHkgYXQgdGhl IHN0YXJ0CisgICAgICAgIG9yIGVuZCBvZiBhbiBvdmVyZmxvdyBzY3JvbGwgaW4gb3JkZXIgdG8g bWFrZSBzcGFjZSBmb3IgdGhlIGNhcmV0IHRvIHNob3cuIEhvd2V2ZXIsIGl0IHdhcworICAgICAg ICB3cm9uZyBpbiB2YXJpb3VzIHdheXMuIEl0IGFsd2F5cyBkaWQgdGhpcywgZXZlbiBmb3Igc2Ny b2xsZXJzIHdpdGggbm8gdmlzaWJsZSBjYXJldC4gSXQgd2FzCisgICAgICAgIHdlYi1kZXRlY3Rh YmxlIHRoYXQgdGhlIHNjcm9sbFggZm9yIGEgc2Nyb2xsZXIgY291bGQgZW5kIHVwIGFzIC0yLiBB bmQgcmVtb3ZpbmcgdGhlIGNvZGUKKyAgICAgICAgZG9lc24ndCByZXN1bHQgaW4gb2J2aW91c2x5 IGluY29ycmVjdCBiZWhhdmlvci4KKworICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVTZWxlY3Rpb246OnJldmVhbFNlbGVjdGlvbik6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsVG8pOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6dXBkYXRlU2Nyb2xsSW5m b0FmdGVyTGF5b3V0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxl QXJlYS5oOgorCiAyMDIxLTA5LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIE1vZGVybml6ZSBFTkFCTEVfSU9TVVJGQUNFX1BPT0xfU1RBVElTVElD UyBsb2dnaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKaW5kZXggZDA3OTliNWZhZDg2Yzdi NTA0YzFlNzNkZTkwMTY4MGYyZjc0ODk5Ni4uZWNkMzJmMmRjODg1MzlkOWM3YmIzZDA2ODA2Nzcy NmM1ZmQyMmRmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBA CisyMDIxLTA5LTIxICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisK KyAgICAgICAgUmVtb3ZlIGFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZygpIGNvZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDQ1NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSAiYWRqdXN0 Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nIiBjb2RlIGF0dGVtcHRlZCB0byBvdmVyLXNjcm9sbCBo b3Jpem9udGFsbHkgYXQgdGhlIHN0YXJ0CisgICAgICAgIG9yIGVuZCBvZiBhbiBvdmVyZmxvdyBz Y3JvbGwgaW4gb3JkZXIgdG8gbWFrZSBzcGFjZSBmb3IgdGhlIGNhcmV0IHRvIHNob3cuIEhvd2V2 ZXIsIGl0IHdhcworICAgICAgICB3cm9uZyBpbiB2YXJpb3VzIHdheXMuIEl0IGFsd2F5cyBkaWQg dGhpcywgZXZlbiBmb3Igc2Nyb2xsZXJzIHdpdGggbm8gdmlzaWJsZSBjYXJldC4gSXQgd2FzCisg ICAgICAgIHdlYi1kZXRlY3RhYmxlIHRoYXQgdGhlIHNjcm9sbFggZm9yIGEgc2Nyb2xsZXIgY291 bGQgZW5kIHVwIGFzIC0yLiBBbmQgcmVtb3ZpbmcgdGhlIGNvZGUKKyAgICAgICAgZG9lc24ndCBy ZXN1bHQgaW4gb2J2aW91c2x5IGluY29ycmVjdCBiZWhhdmlvci4KKworICAgICAgICAqIERPTS9E T01IVE1MLm1tOgorICAgICAgICAoLVtET01IVE1MRWxlbWVudCBzZXRTY3JvbGxYT2Zmc2V0OnNj cm9sbFlPZmZzZXQ6YWRqdXN0Rm9ySU9TQ2FyZXQ6XSk6CisgICAgICAgICogV2ViVmlldy9XZWJG cmFtZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUgX3Njcm9sbERPTVJhbmdlVG9WaXNpYmxlOl0p OgorICAgICAgICAoLVtXZWJGcmFtZSBfc2Nyb2xsRE9NUmFuZ2VUb1Zpc2libGU6d2l0aEluc2V0 Ol0pOgorCiAyMDIxLTA5LTIwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgU3RvcCB1c2luZyBtYWtlUmVmKCp0aGlzKSAvIG1ha2VSZWZQdHIodGhpcykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAKaW5kZXggNWJmYjI2MDE0YTQzZTUy ZDIyZWY2ZDgwMTVlYWVkNTc1YWQxY2ZhMS4uNmJmNmU5NDMwZGFiNDkyNTJiN2Q1MzY1YWU1ZGJm NjBlMDkyM2Y0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAK QEAgLTI0MzksMTAgKzI0MzksNyBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpyZXZlYWxTZWxlY3Rp b24oU2VsZWN0aW9uUmV2ZWFsTW9kZSByZXZlYWxNb2RlLCBjb25zdCBTY3JvbAogI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCiAgICAgICAgIGlmIChSZW5kZXJMYXllciogbGF5ZXIgPSBzdGFydC5k ZXByZWNhdGVkTm9kZSgpLT5yZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpKSB7CiAgICAgICAg ICAgICBpZiAoIW1fc2Nyb2xsaW5nU3VwcHJlc3NDb3VudCkgewotICAgICAgICAgICAgICAgIGF1 dG8qIHNjcm9sbGFibGVBcmVhID0gbGF5ZXItPmVuc3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsK LSAgICAgICAgICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVu U2Nyb2xsaW5nKHRydWUpOwogICAgICAgICAgICAgICAgIGxheWVyLT5zY3JvbGxSZWN0VG9WaXNp YmxlKHJlY3QsIGluc2lkZUZpeGVkLCB7IHJldmVhbE1vZGUsIGFsaWdubWVudCwgYWxpZ25tZW50 LCBTaG91bGRBbGxvd0Nyb3NzT3JpZ2luU2Nyb2xsaW5nOjpZZXMsIHNjcm9sbEJlaGF2aW9yfSk7 Ci0gICAgICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hl blNjcm9sbGluZyhmYWxzZSk7CiAgICAgICAgICAgICAgICAgdXBkYXRlQXBwZWFyYW5jZSgpOwog ICAgICAgICAgICAgICAgIGlmIChtX2RvY3VtZW50LT5wYWdlKCkpCiAgICAgICAgICAgICAgICAg ICAgIG1fZG9jdW1lbnQtPnBhZ2UoKS0+Y2hyb21lKCkuY2xpZW50KCkubm90aWZ5UmV2ZWFsZWRT ZWxlY3Rpb25CeVNjcm9sbGluZ0ZyYW1lKCptX2RvY3VtZW50LT5mcmFtZSgpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllclNjcm9sbGFibGVBcmVhLmNw cAppbmRleCA3NmFjNDc4NGQ5ODBlNTc1MjYwM2Q4M2IwYWViOTcxY2FkMjllODBhLi4wMGNmY2Ex YWI0MWZmZGFiNTIxZTg2MWNkOGRiODM4ZWE1NDcyZTEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC0yOTMs MjMgKzI5Myw2IEBAIHZvaWQgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJlYTo6c2Nyb2xsVG8oY29u c3QgU2Nyb2xsUG9zaXRpb24mIHBvc2l0aW9uKQogICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGUg ZGltZW5zaW9ucyB3aWxsIGJlIGNvbXB1dGVkIGlmIHRoZXkgbmVlZCB0byBiZSAoZm9yIG92ZXJm bG93OmhpZGRlbiBibG9ja3MpLgogICAgICAgICBpZiAobV9zY3JvbGxEaW1lbnNpb25zRGlydHkp CiAgICAgICAgICAgICBjb21wdXRlU2Nyb2xsRGltZW5zaW9ucygpOwotI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCi0gICAgICAgIGlmIChhZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoKSkg ewotICAgICAgICAgICAgLy8gRklYTUU6IEl0J3Mgbm90IGNsZWFyIHdoYXQgdGhpcyBjb2RlIGlz IHRyeWluZyB0byBkby4gQmVoYXZpb3Igc2VlbXMgcmVhc29uYWJsZSB3aXRoIGl0IHJlbW92ZWQu Ci0gICAgICAgICAgICBpbnQgbWF4T2Zmc2V0ID0gc2Nyb2xsV2lkdGgoKSAtIHJvdW5kVG9JbnQo Ym94LT5jbGllbnRXaWR0aCgpKTsKLSAgICAgICAgICAgIFNjcm9sbE9mZnNldCBuZXdPZmZzZXQg PSBzY3JvbGxPZmZzZXRGcm9tUG9zaXRpb24obmV3UG9zaXRpb24pOwotICAgICAgICAgICAgaW50 IHNjcm9sbFhPZmZzZXQgPSBuZXdPZmZzZXQueCgpOwotICAgICAgICAgICAgaWYgKHNjcm9sbFhP ZmZzZXQgPiBtYXhPZmZzZXQgLSBjYXJldFdpZHRoKSB7Ci0gICAgICAgICAgICAgICAgc2Nyb2xs WE9mZnNldCArPSBjYXJldFdpZHRoOwotICAgICAgICAgICAgICAgIGlmIChzY3JvbGxYT2Zmc2V0 IDw9IGNhcmV0V2lkdGgpCi0gICAgICAgICAgICAgICAgICAgIHNjcm9sbFhPZmZzZXQgPSAwOwot ICAgICAgICAgICAgfSBlbHNlIGlmIChzY3JvbGxYT2Zmc2V0IDwgbV9zY3JvbGxQb3NpdGlvbi54 KCkgLSBjYXJldFdpZHRoKQotICAgICAgICAgICAgICAgIHNjcm9sbFhPZmZzZXQgLT0gY2FyZXRX aWR0aDsKLQotICAgICAgICAgICAgbmV3T2Zmc2V0LnNldFgoc2Nyb2xsWE9mZnNldCk7Ci0gICAg ICAgICAgICBuZXdQb3NpdGlvbiA9IHNjcm9sbFBvc2l0aW9uRnJvbU9mZnNldChuZXdPZmZzZXQp OwotICAgICAgICB9Ci0jZW5kaWYKICAgICB9CiAKICAgICBpZiAobV9zY3JvbGxQb3NpdGlvbiA9 PSBuZXdQb3NpdGlvbiAmJiBjdXJyZW50U2Nyb2xsQmVoYXZpb3JTdGF0dXMoKSA9PSBTY3JvbGxC ZWhhdmlvclN0YXR1czo6Tm90SW5BbmltYXRpb24pIHsKQEAgLTEyMzAsMTggKzEyMTMsOCBAQCB2 b2lkIFJlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWE6OnVwZGF0ZVNjcm9sbEluZm9BZnRlckxheW91 dCgpCiAgICAgICAgIC8vIExheW91dCBtYXkgY2F1c2UgdXMgdG8gYmUgYXQgYW4gaW52YWxpZCBz Y3JvbGwgcG9zaXRpb24uIEluIHRoaXMgY2FzZSB3ZSBuZWVkCiAgICAgICAgIC8vIHRvIHB1bGwg b3VyIHNjcm9sbCBvZmZzZXRzIGJhY2sgdG8gdGhlIG1heCAob3IgcHVzaCB0aGVtIHVwIHRvIHRo ZSBtaW4pLgogICAgICAgICBTY3JvbGxPZmZzZXQgY2xhbXBlZFNjcm9sbE9mZnNldCA9IGNsYW1w U2Nyb2xsT2Zmc2V0KHNjcm9sbE9mZnNldCgpKTsKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQot ICAgICAgICAvLyBGSVhNRTogVGhpcyBsb29rcyB3cm9uZy4gVGhlIGNhcmV0IGFkanVzdCBtb2Rl IHNob3VsZCBvbmx5IGJlIGVuYWJsZWQgb24gZWRpdGluZyByZWxhdGVkIGVudHJ5IHBvaW50cy4K LSAgICAgICAgLy8gVGhpcyBjb2RlIHdhcyBhZGRlZCB0byBmaXggYW4gaXNzdWUgd2hlcmUgdGhl IHRleHQgaW5zZXJ0aW9uIHBvaW50IHdvdWxkIGFsd2F5cyBiZSBkcmF3biBvbiB0aGUgcmlnaHQg ZWRnZQotICAgICAgICAvLyBvZiBhIHRleHQgZmllbGQgd2hvc2UgY29udGVudCBvdmVyZmxvd2Vk IGl0cyBib3VuZHMuIFNlZSA8cmRhcjovL3Byb2JsZW0vMTU1Nzk3OTc+IGZvciBtb3JlIGRldGFp bHMuCi0gICAgICAgIHNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0cnVlKTsKLSNl bmRpZgogICAgICAgICBpZiAoY2xhbXBlZFNjcm9sbE9mZnNldCAhPSBzY3JvbGxPZmZzZXQoKSkK ICAgICAgICAgICAgIHNjcm9sbFRvT2Zmc2V0KGNsYW1wZWRTY3JvbGxPZmZzZXQpOwotCi0jaWYg UExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICAgICAgc2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Ny b2xsaW5nKGZhbHNlKTsKLSNlbmRpZgogICAgIH0KIAogICAgIHVwZGF0ZVNjcm9sbGJhcnNBZnRl ckxheW91dCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyU2Nyb2xsYWJsZUFyZWEuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll clNjcm9sbGFibGVBcmVhLmgKaW5kZXggY2M4MTk4ZGNlM2U2ZDQwYWY5OTkwMWYxODAwNmE2NDdj YmFmMzQwZS4uNGJjYWMyZGQwYzM4MzdiNTZmN2VhNzFjNWViODU0NmUzNTgxMjU4MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJl YS5oCkBAIC0yMzUsMTEgKzIzNSw2IEBAIHB1YmxpYzoKIAogICAgIHN0ZDo6b3B0aW9uYWw8TGF5 b3V0UmVjdD4gdXBkYXRlU2Nyb2xsUG9zaXRpb24oY29uc3QgU2Nyb2xsUG9zaXRpb25DaGFuZ2VP cHRpb25zJiwgY29uc3QgTGF5b3V0UmVjdCYgcmV2ZWFsUmVjdCwgY29uc3QgTGF5b3V0UmVjdCYg bG9jYWxFeHBvc2VSZWN0KTsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgYm9vbCBh ZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoKSBjb25zdCB7IHJldHVybiBtX2FkanVzdEZv cklPU0NhcmV0V2hlblNjcm9sbGluZzsgfQotICAgIHZvaWQgc2V0QWRqdXN0Rm9ySU9TQ2FyZXRX aGVuU2Nyb2xsaW5nKGJvb2wgYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKSB7IG1fYWRq dXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nID0gYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xs aW5nOyB9Ci0jZW5kaWYKLQogcHJpdmF0ZToKICAgICBib29sIGhhc0hvcml6b250YWxPdmVyZmxv dygpIGNvbnN0OwogICAgIGJvb2wgaGFzVmVydGljYWxPdmVyZmxvdygpIGNvbnN0OwpAQCAtMjcy LDExICsyNjcsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9yZWdpc3RlcmVkU2Nyb2xsYWJsZUFy ZWEgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNDb21wb3NpdGVkU2Nyb2xsYWJsZU92ZXJmbG93 IHsgZmFsc2UgfTsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0jaWYgRU5BQkxFKElPU19U T1VDSF9FVkVOVFMpCisjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgRU5BQkxFKElPU19UT1VD SF9FVkVOVFMpCiAgICAgYm9vbCBtX3JlZ2lzdGVyZWRBc1RvdWNoRXZlbnRMaXN0ZW5lckZvclNj cm9sbGluZyB7IGZhbHNlIH07Ci0jZW5kaWYKLSAgICBib29sIG1fYWRqdXN0Rm9ySU9TQ2FyZXRX aGVuU2Nyb2xsaW5nIHsgZmFsc2UgfTsKICNlbmRpZgogICAgIGJvb2wgbV9yZXF1aXJlc1Njcm9s bFBvc2l0aW9uUmVjb25jaWxpYXRpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9jb250YWluc0Rp cnR5T3ZlcmxheVNjcm9sbGJhcnMgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00v RE9NSFRNTC5tbQppbmRleCA1ZjNhMjhmZWU2MzM3MjExYmVhOTg2YjU1Mzc0OWQ4ZmVhNTFiMWQy Li40MmI5NmM0ZmJkOTZkZWQ2YjM5MmYyMGI4NDNkYjI5ODZkMDY4Zjk5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQpAQCAtMTMwLDE0ICsxMzAsOSBAQAogICAgICAgICBy ZXR1cm47CiAgICAgYXV0byogc2Nyb2xsYWJsZUFyZWEgPSBsYXllci0+ZW5zdXJlTGF5ZXJTY3Jv bGxhYmxlQXJlYSgpOwogCi0gICAgaWYgKGFkanVzdEZvcklPU0NhcmV0KQotICAgICAgICBzY3Jv bGxhYmxlQXJlYS0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKHRydWUpOwotCiAg ICAgYXV0byBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMgPSBXZWJDb3JlOjpTY3JvbGxQb3Np dGlvbkNoYW5nZU9wdGlvbnM6OmNyZWF0ZVByb2dyYW1tYXRpYygpOwogICAgIHNjcm9sbFBvc2l0 aW9uQ2hhbmdlT3B0aW9ucy5jbGFtcGluZyA9IFdlYkNvcmU6OlNjcm9sbENsYW1waW5nOjpVbmNs YW1wZWQ7CiAgICAgc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbFRvT2Zmc2V0KFdlYkNvcmU6OlNjcm9s bE9mZnNldCh4LCB5KSwgc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zKTsKLSAgICBpZiAoYWRq dXN0Rm9ySU9TQ2FyZXQpCi0gICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RGb3JJT1ND YXJldFdoZW5TY3JvbGxpbmcoZmFsc2UpOwogfQogCiAtICh2b2lkKWFic29sdXRlUG9zaXRpb246 KGludCAqKXggOihpbnQgKil5IDooaW50ICopdyA6KGludCAqKWgKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0gYi9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCmluZGV4IDdiMWQ3YWM3N2I5MTRlNjA1MmU3NzBm NjFmMDNmMGQzODJjNjllYmEuLjY5MjJhNDA1MzM0N2VmMjE5ODhlMzRkY2JiNTJlZDY0YTFjNTg5 ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViRnJhbWUu bW0KKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQpAQCAt NzMxLDEwICs3MzEsNyBAQCBzdGF0aWMgTlNVUkwgKmNyZWF0ZVVuaXF1ZVdlYkRhdGFVUkwoKTsK ICNlbHNlCiAgICAgICAgIGF1dG8qIGxheWVyID0gc3RhcnROb2RlLT5yZW5kZXJlcigpLT5lbmNs b3NpbmdMYXllcigpOwogICAgICAgICBpZiAobGF5ZXIpIHsKLSAgICAgICAgICAgIGF1dG8qIHNj cm9sbGFibGVBcmVhID0gbGF5ZXItPmVuc3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKLSAgICAg ICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmco dHJ1ZSk7CiAgICAgICAgICAgICBzdGFydE5vZGUtPnJlbmRlcmVyKCktPnNjcm9sbFJlY3RUb1Zp c2libGUoV2ViQ29yZTo6ZW5jbG9zaW5nSW50UmVjdChyYW5nZVJlY3QpLCBpbnNpZGVGaXhlZCwg eyBXZWJDb3JlOjpTZWxlY3Rpb25SZXZlYWxNb2RlOjpSZXZlYWwsIFdlYkNvcmU6OlNjcm9sbEFs aWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgV2ViQ29yZTo6U2Nyb2xsQWxpZ25tZW50Ojph bGlnblRvRWRnZUlmTmVlZGVkLCBXZWJDb3JlOjpTaG91bGRBbGxvd0Nyb3NzT3JpZ2luU2Nyb2xs aW5nOjpZZXMgfSk7Ci0gICAgICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0QWRqdXN0Rm9ySU9T Q2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKICAgICAgICAgICAgIF9wcml2YXRlLT5jb3JlRnJh bWUtPnNlbGVjdGlvbigpLnNldENhcmV0UmVjdE5lZWRzVXBkYXRlKCk7CiAgICAgICAgICAgICBf cHJpdmF0ZS0+Y29yZUZyYW1lLT5zZWxlY3Rpb24oKS51cGRhdGVBcHBlYXJhbmNlKCk7CiAgICAg ICAgIH0KQEAgLTc1MiwxMCArNzQ5LDcgQEAgc3RhdGljIE5TVVJMICpjcmVhdGVVbmlxdWVXZWJE YXRhVVJMKCk7CiAgICAgaWYgKHN0YXJ0Tm9kZSAmJiBzdGFydE5vZGUtPnJlbmRlcmVyKCkpIHsK ICAgICAgICAgYXV0byogbGF5ZXIgPSBzdGFydE5vZGUtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0xh eWVyKCk7CiAgICAgICAgIGlmIChsYXllcikgewotICAgICAgICAgICAgYXV0byogc2Nyb2xsYWJs ZUFyZWEgPSBsYXllci0+ZW5zdXJlTGF5ZXJTY3JvbGxhYmxlQXJlYSgpOwotICAgICAgICAgICAg c2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0cnVlKTsK ICAgICAgICAgICAgIHN0YXJ0Tm9kZS0+cmVuZGVyZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShX ZWJDb3JlOjplbmNsb3NpbmdJbnRSZWN0KHJhbmdlUmVjdCksIGluc2lkZUZpeGVkLCB7IFdlYkNv cmU6OlNlbGVjdGlvblJldmVhbE1vZGU6OlJldmVhbCwgV2ViQ29yZTo6U2Nyb2xsQWxpZ25tZW50 OjphbGlnblRvRWRnZUlmTmVlZGVkLCBXZWJDb3JlOjpTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9F ZGdlSWZOZWVkZWQsIFdlYkNvcmU6OlNob3VsZEFsbG93Q3Jvc3NPcmlnaW5TY3JvbGxpbmc6Olll c30pOwotICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldEFkanVzdEZvcklPU0NhcmV0V2hl blNjcm9sbGluZyhmYWxzZSk7CiAKICAgICAgICAgICAgIGF1dG8gY29yZUZyYW1lID0gY29yZShz ZWxmKTsKICAgICAgICAgICAgIGlmIChjb3JlRnJhbWUpIHsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlOGNlNzU5NzRjODk5 NWU4ZGU1NmZhNmRlYzM4OTc3ZmY1YzI1ZTA5Li5lYTVkMzcxM2VmOWMwMDIxNTc0YTc1YzFiZWU0 ZmEzMDcxZDdkOGZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjEtMDktMjEgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgYWRqdXN0 Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKCkgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNDU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNlIHRlc3RzIHdpdGggdGhlIHVuaWZpZWQgY29k ZSBwYXRoLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zLXdrMi9lZGl0aW5nL2lucHV0L2NhcmV0 LWF0LXRoZS1lZGdlLW9mLWlucHV0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9p b3Mtd2syL2Zhc3QvbGF5ZXJzL3Njcm9sbC1yZWN0LXRvLXZpc2libGUtZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIHBsYXRmb3JtL2lvcy9mYXN0L2Zvcm1zL2lucHV0LXRleHQtc2Nyb2xsLWxlZnQt b24tYmx1ci1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZvcm0vaW9zL2Zhc3QvZm9ybXMv dGV4dGZpZWxkLW91dGxpbmUtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA5LTIxICBBeXVtaSBLb2pp bWEgIDxheXVtaV9rb2ppbWFAYXBwbGUuY29tPgogCiAgICAgICAgIFsgbWFjT1Mgd2syIFJlbGVh c2UgXSBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3BhZ2UtdmlzaWJpbGl0eS91bmxv YWQtYnViYmxlcy5odG1sIGlzIGEgZmxha3kgZmFpbHVyZS4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3BsYXRmb3JtL2lvcy13azIvZWRpdGluZy9pbnB1dC9jYXJldC1hdC10aGUtZWRnZS1vZi1p bnB1dC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL2VkaXRpbmcv aW5wdXQvY2FyZXQtYXQtdGhlLWVkZ2Utb2YtaW5wdXQtZXhwZWN0ZWQudHh0CmluZGV4IDA0Nzkw NDk0OTgyNjJlOWJhMzM1ZDYzNjRlNzljMjNkNjgzZDYzYzIuLjllZWU5ZmRjZTk2MTJmODRmN2Ri ZjQxOTMzYzQ0MWQ3OTljMzFiNjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lv cy13azIvZWRpdGluZy9pbnB1dC9jYXJldC1hdC10aGUtZWRnZS1vZi1pbnB1dC1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXdrMi9lZGl0aW5nL2lucHV0L2NhcmV0 LWF0LXRoZS1lZGdlLW9mLWlucHV0LWV4cGVjdGVkLnR4dApAQCAtMTAsNyArMTAsNyBAQCBsYXll ciBhdCAoMCwwKSBzaXplIDgwMHg2MQogICAgICAgICBSZW5kZXJUZXh0Q29udHJvbCB7SU5QVVR9 IGF0ICgyLDIpIHNpemUgODV4MjIgW2JnY29sb3I9I0ZGRkZGRl0gW2JvcmRlcjogKDFweCBzb2xp ZCAjM0MzQzQzOTkpXQogICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAw eDAKICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCi1sYXllciBh dCAoMTcsMzMpIHNpemUgNzF4MTQgc2Nyb2xsWCAxMzQgc2Nyb2xsV2lkdGggMjA0CitsYXllciBh dCAoMTcsMzMpIHNpemUgNzF4MTQgc2Nyb2xsWCAxMzIgc2Nyb2xsV2lkdGggMjA0CiAgIFJlbmRl ckJsb2NrIHtESVZ9IGF0ICg2LDMpIHNpemUgNzN4MTUKICAgICBSZW5kZXJUZXh0IHsjdGV4dH0g YXQgKDAsMCkgc2l6ZSAyMDJ4MTQKICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDIwMjog IjAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OSIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2lvcy13azIvZmFzdC9sYXllcnMvc2Nyb2xsLXJlY3QtdG8tdmlzaWJsZS1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL2Zhc3QvbGF5ZXJzL3Njcm9s bC1yZWN0LXRvLXZpc2libGUtZXhwZWN0ZWQudHh0CmluZGV4IDdjZTFiNTMwZTNkNmJjZTAzNTgx NDI4NGRjYWFhOWE0ZGE0YzFjNmQuLjhhNjkyNzkyZTIwOWFmZWUwOTk4MzI5OTI3ZDM2YWY0YjI0 Yjc4MzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvZmFzdC9sYXll cnMvc2Nyb2xsLXJlY3QtdG8tdmlzaWJsZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vaW9zLXdrMi9mYXN0L2xheWVycy9zY3JvbGwtcmVjdC10by12aXNpYmxlLWV4cGVj dGVkLnR4dApAQCAtMTksMjIgKzE5LDIyIEBAIGxheWVyIGF0ICgwLDApIHNpemUgODAweDY2NAog ICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDU2KSBzaXplIDc4NHgyMAogICAgICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA0NjV4MTkKICAgICAgICAgICB0ZXh0IHJ1biBh dCAoMCwwKSB3aWR0aCA0NjU6ICJUaGUgbGV0dGVyIEEgc2hvdWxkIGJlIGZ1bGx5IHZpc2libGUg aW4gZWFjaCBvbmUgb2YgdGhlIGVpZ2h0IGJveGVzIGJlbG93LiIKLWxheWVyIGF0ICgyOCwxMDQp IHNpemUgMTUweDUwIGNsaXAgYXQgKDI4LDEwNCkgc2l6ZSAxNTB4MzUgc2Nyb2xsWCA1MiBzY3Jv bGxXaWR0aCAyMDAKK2xheWVyIGF0ICgyOCwxMDQpIHNpemUgMTUweDUwIGNsaXAgYXQgKDI4LDEw NCkgc2l6ZSAxNTB4MzUgc2Nyb2xsWCA1MCBzY3JvbGxXaWR0aCAyMDAKICAgUmVuZGVyQmxvY2sg e0RJVn0gYXQgKDIwLDk2KSBzaXplIDE1MHg1MAogICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDApIHNpemUgMjAweDIwCiAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDE4OCwwKSBzaXpl IDEyeDE5CiAgICAgICAgIHRleHQgcnVuIGF0ICgxODgsMCkgd2lkdGggMTI6ICJBIgotbGF5ZXIg YXQgKDI4LDE3NCkgc2l6ZSAxNjB4NTAgY2xpcCBhdCAoMzgsMTc0KSBzaXplIDE1MHgzNSBzY3Jv bGxYIDUyIHNjcm9sbFdpZHRoIDIwMAorbGF5ZXIgYXQgKDI4LDE3NCkgc2l6ZSAxNjB4NTAgY2xp cCBhdCAoMzgsMTc0KSBzaXplIDE1MHgzNSBzY3JvbGxYIDUwIHNjcm9sbFdpZHRoIDIwMAogICBS ZW5kZXJCbG9jayB7RElWfSBhdCAoMjAsMTY2KSBzaXplIDE2MHg1MCBbYm9yZGVyOiBub25lICgx MHB4IHNvbGlkICMwMDAwMDApXQogICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgxMCwwKSBzaXpl IDIwMHgyMAogICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxODgsMCkgc2l6ZSAxMngxOQog ICAgICAgICB0ZXh0IHJ1biBhdCAoMTg4LDApIHdpZHRoIDEyOiAiQSIKLWxheWVyIGF0ICgyOCwy NDQpIHNpemUgMTYweDUwIGNsaXAgYXQgKDI4LDI0NCkgc2l6ZSAxNTB4MzUgc2Nyb2xsWCA1MiBz Y3JvbGxXaWR0aCAyMDAKK2xheWVyIGF0ICgyOCwyNDQpIHNpemUgMTYweDUwIGNsaXAgYXQgKDI4 LDI0NCkgc2l6ZSAxNTB4MzUgc2Nyb2xsWCA1MCBzY3JvbGxXaWR0aCAyMDAKICAgUmVuZGVyQmxv Y2sge0RJVn0gYXQgKDIwLDIzNikgc2l6ZSAxNjB4NTAgW2JvcmRlcjogbm9uZSAoMTBweCBzb2xp ZCAjMDAwMDAwKSBub25lXQogICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgwLDApIHNpemUgMjAw eDIwCiAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDE4OCwwKSBzaXplIDEyeDE5CiAgICAg ICAgIHRleHQgcnVuIGF0ICgxODgsMCkgd2lkdGggMTI6ICJBIgotbGF5ZXIgYXQgKDI4LDMxNCkg c2l6ZSAxNTB4NTAgY2xpcCBhdCAoMjgsMzE0KSBzaXplIDEzNXgzNSBzY3JvbGxYIDY3IHNjcm9s bFdpZHRoIDIwMAorbGF5ZXIgYXQgKDI4LDMxNCkgc2l6ZSAxNTB4NTAgY2xpcCBhdCAoMjgsMzE0 KSBzaXplIDEzNXgzNSBzY3JvbGxYIDY1IHNjcm9sbFdpZHRoIDIwMAogICBSZW5kZXJCbG9jayB7 RElWfSBhdCAoMjAsMzA2KSBzaXplIDE1MHg1MAogICAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICgw LDApIHNpemUgMjAweDIwCiAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDE4OCwwKSBzaXpl IDEyeDE5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZmFzdC9mb3Jtcy9p bnB1dC10ZXh0LXNjcm9sbC1sZWZ0LW9uLWJsdXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vaW9zL2Zhc3QvZm9ybXMvaW5wdXQtdGV4dC1zY3JvbGwtbGVmdC1vbi1ibHVyLWV4 cGVjdGVkLnR4dAppbmRleCA4ZjNkY2I2ZjlmYzM5Y2JkYTE5NDE1NTczNmQyMTIwYjhmOWJmNzA4 Li4zYTgzODAxZWRiODlhNjQwNDVmMTMzZjExYTAzOWY4Zjg5MDY2ZjNmIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZmFzdC9mb3Jtcy9pbnB1dC10ZXh0LXNjcm9sbC1sZWZ0 LW9uLWJsdXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0 L2Zvcm1zL2lucHV0LXRleHQtc2Nyb2xsLWxlZnQtb24tYmx1ci1leHBlY3RlZC50eHQKQEAgLTI0 LDcgKzI0LDcgQEAgbGF5ZXIgYXQgKDE3OSwxMykgc2l6ZSAxMzl4MTQgc2Nyb2xsWCAxNjIgc2Ny b2xsV2lkdGggMzAyCiAgIFJlbmRlckJsb2NrIHtESVZ9IGF0ICg2LDMpIHNpemUgMTQxeDE1CiAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgtMTYyLDApIHNpemUgMzAzeDE0CiAgICAgICB0ZXh0 IHJ1biBhdCAoLTE2MiwwKSB3aWR0aCAzMDI6ICJ0aGlzIHRleHQgZmllbGQgaGFzIGEgbG90IG9m IHRleHQgaW4gaXQgc28gdGhhdCBpdCBuZWVkcyB0byBzY3JvbCIKLWxheWVyIGF0ICgzNDAsMTMp IHNpemUgMTQxeDE0IHNjcm9sbFggMTY0IHNjcm9sbFdpZHRoIDMwNAorbGF5ZXIgYXQgKDM0MCwx Mykgc2l6ZSAxNDF4MTQgc2Nyb2xsWCAxNjIgc2Nyb2xsV2lkdGggMzA0CiAgIFJlbmRlckJsb2Nr IHtESVZ9IGF0ICg2LDMpIHNpemUgMTQzeDE1CiAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMzAzeDE0CiAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzMDM6ICJ0aGlz IHRleHQgZmllbGQgaGFzIGEgbG90IG9mIHRleHQgaW4gaXQgc28gdGhhdCBpdCBuZWVkcyB0byBz Y3JvbCIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9mYXN0L2Zvcm1zL3Rl eHRmaWVsZC1vdXRsaW5lLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9m YXN0L2Zvcm1zL3RleHRmaWVsZC1vdXRsaW5lLWV4cGVjdGVkLnR4dAppbmRleCA0ZjdkZDFhYTFm OGI2NWUwMTRjNTAwNDNlMzgzNWZjYTMxOTQ1MDlhLi40ZTVlNTJlNDk4YjFhOWM1M2M4ZTIzNWU2 NjJmZThmMWNmNDNiMzg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvZmFz dC9mb3Jtcy90ZXh0ZmllbGQtb3V0bGluZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vaW9zL2Zhc3QvZm9ybXMvdGV4dGZpZWxkLW91dGxpbmUtZXhwZWN0ZWQudHh0CkBA IC04LDcgKzgsNyBAQCBsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKICAgICAgIFJlbmRlckJS IHtCUn0gYXQgKDU2MiwwKSBzaXplIDF4MTkKICAgICAgIFJlbmRlclRleHRDb250cm9sIHtJTlBV VH0gYXQgKDIsMjIpIHNpemUgMjY1eDM3IFtiZ2NvbG9yPSNGRkZGRkZdIFtib3JkZXI6ICgxcHgg c29saWQgIzAwMDAwMCldCiAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAw eDAKLWxheWVyIGF0ICgyMSwzNSkgc2l6ZSAyNDN4MjUgc2Nyb2xsWCAyNzAgc2Nyb2xsV2lkdGgg NTExCitsYXllciBhdCAoMjEsMzUpIHNpemUgMjQzeDI1IHNjcm9sbFggMjY4IHNjcm9sbFdpZHRo IDUxMQogICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMTEsNSkgc2l6ZSAyNDN4MjUKICAgICBSZW5k ZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSA1MDl4MjUKICAgICAgIHRleHQgcnVuIGF0ICgw LDApIHdpZHRoIDUwOTogIlRoaXMgdGVzdHMgdGhhdCB0eXBpbmcgZG9lc24ndCBjdXQgaG9sZXMg aW4gdGhlIGZvY3VzIG91dGxpbmUiCg==