208706 2020-03-06 04:11:15 -0800 [GTK][WPE] Surrounding text for input methods should not be limited to the current paragraph 2020-03-09 01:39:52 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned berto bugs-noreply ews-watchlist gustavo zan oldest_to_newest 1626609 0 cgarcia 2020-03-06 04:11:15 -0800 It should include all the text around the cursor position. 1626610 1 392704 cgarcia 2020-03-06 04:19:47 -0800 Created attachment 392704 Patch 1626611 2 ews-watchlist 2020-03-06 04:20:50 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1627696 3 cgarcia 2020-03-09 01:39:52 -0700 Committed r258131: <https://trac.webkit.org/changeset/258131> 392704 2020-03-06 04:19:47 -0800 2020-03-09 01:24:15 -0700 Patch wk2-im-surrounding.diff text/plain 12361 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNTMxNTU1YWNlNDcuLjBiOWJlODQ2MzVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDI1IEBACisyMDIwLTAzLTA2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXVtXUEVdIFN1cnJvdW5kaW5nIHRleHQgZm9yIGlucHV0IG1l dGhvZHMgc2hvdWxkIG5vdCBiZSBsaW1pdGVkIHRvIHRoZSBjdXJyZW50IHBhcmFncmFwaAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NzA2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgc2hvdWxkIGlu Y2x1ZGUgYWxsIHRoZSB0ZXh0IGFyb3VuZCB0aGUgY3Vyc29yIHBvc2l0aW9uLgorCisgICAgICAg ICogU2hhcmVkL0VkaXRvclN0YXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6 OlBvc3RMYXlvdXREYXRhOjplbmNvZGUgY29uc3QpOiBSZW5hbWUgcGFyYWdyYXBoQ29udGV4dCog YXMgc3Vycm91bmRpbmdDb250ZXh0Ki4KKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6OlBv c3RMYXlvdXREYXRhOjpkZWNvZGUpOiBEaXR0by4KKyAgICAgICAgKiBTaGFyZWQvRWRpdG9yU3Rh dGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6 CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVVwZGF0ZVRleHRJbnB1dFN0YXRlKTogRGl0dG8u CisgICAgICAgICogVUlQcm9jZXNzL0FQSS93cGUvV1BFVmlldy5jcHA6CisgICAgICAgIChXS1dQ RTo6Vmlldzo6c2VsZWN0aW9uRGlkQ2hhbmdlKTogRGl0dG8uCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkZWxldGVT dXJyb3VuZGluZyk6IFVzZSBjb250ZW50IGVkaXRhYmxlIHRleHQgYXMgY29udGV4dCBpbnN0ZWFk IG9mIGp1c3QgcGFyYWdyYXBoLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9nbGliL1dl YlBhZ2VHTGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGxhdGZvcm1FZGl0b3JT dGF0ZSBjb25zdCk6IERpdHRvLgorCiAyMDIwLTAzLTA1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBNb3VzZSB3aGVlbCBldmVudHMg b24gaG9yaXpvbnRhbCBzY3JvbGxiYXIgbm90IGNvcnJlY3RseSBoYW5kbGVkIHdoZW4gQUMgbW9k ZSBpcyBmb3JjZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRl LmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAppbmRleCAwNTk1YjNl NjM4Ni4uNGMwYjlhNjQ2ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRv clN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAKQEAg LTE0Myw5ICsxNDMsOSBAQCB2b2lkIEVkaXRvclN0YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZW5jb2Rl KElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IHN0cmluZ0ZvckNh bmRpZGF0ZVJlcXVlc3Q7CiAjZW5kaWYKICNpZiBQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKFdQ RSkKLSAgICBlbmNvZGVyIDw8IHBhcmFncmFwaENvbnRleHQ7Ci0gICAgZW5jb2RlciA8PCBwYXJh Z3JhcGhDb250ZXh0Q3Vyc29yUG9zaXRpb247Ci0gICAgZW5jb2RlciA8PCBwYXJhZ3JhcGhDb250 ZXh0U2VsZWN0aW9uUG9zaXRpb247CisgICAgZW5jb2RlciA8PCBzdXJyb3VuZGluZ0NvbnRleHQ7 CisgICAgZW5jb2RlciA8PCBzdXJyb3VuZGluZ0NvbnRleHRDdXJzb3JQb3NpdGlvbjsKKyAgICBl bmNvZGVyIDw8IHN1cnJvdW5kaW5nQ29udGV4dFNlbGVjdGlvblBvc2l0aW9uOwogI2VuZGlmCiAg ICAgZW5jb2RlciA8PCBmb250QXR0cmlidXRlczsKICAgICBlbmNvZGVyIDw8IGNhbkN1dDsKQEAg LTIyMCwxMSArMjIwLDExIEBAIGJvb2wgRWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRhOjpkZWNv ZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBQb3N0TGF5b3V0RGF0YSYKICAgICAgICAgcmV0dXJu IGZhbHNlOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShXUEUpCi0gICAg aWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQucGFyYWdyYXBoQ29udGV4dCkpCisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShyZXN1bHQuc3Vycm91bmRpbmdDb250ZXh0KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnBhcmFncmFwaENvbnRleHRD dXJzb3JQb3NpdGlvbikpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuc3Vycm91bmRp bmdDb250ZXh0Q3Vyc29yUG9zaXRpb24pKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYg KCFkZWNvZGVyLmRlY29kZShyZXN1bHQucGFyYWdyYXBoQ29udGV4dFNlbGVjdGlvblBvc2l0aW9u KSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zdXJyb3VuZGluZ0NvbnRleHRTZWxl Y3Rpb25Qb3NpdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5oIGIvU291cmNlL1dlYktpdC9T aGFyZWQvRWRpdG9yU3RhdGUuaAppbmRleCA5ZjYwNDUzY2UxZC4uNmZhYTdjZTgxNTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmgKKysrIGIvU291cmNlL1dl YktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuaApAQCAtMTIxLDkgKzEyMSw5IEBAIHN0cnVjdCBFZGl0 b3JTdGF0ZSB7CiAgICAgICAgIFN0cmluZyBzdHJpbmdGb3JDYW5kaWRhdGVSZXF1ZXN0OwogI2Vu ZGlmCiAjaWYgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShXUEUpCi0gICAgICAgIFN0cmluZyBw YXJhZ3JhcGhDb250ZXh0OwotICAgICAgICB1aW50NjRfdCBwYXJhZ3JhcGhDb250ZXh0Q3Vyc29y UG9zaXRpb24geyAwIH07Ci0gICAgICAgIHVpbnQ2NF90IHBhcmFncmFwaENvbnRleHRTZWxlY3Rp b25Qb3NpdGlvbiB7IDAgfTsKKyAgICAgICAgU3RyaW5nIHN1cnJvdW5kaW5nQ29udGV4dDsKKyAg ICAgICAgdWludDY0X3Qgc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9zaXRpb24geyAwIH07Cisg ICAgICAgIHVpbnQ2NF90IHN1cnJvdW5kaW5nQ29udGV4dFNlbGVjdGlvblBvc2l0aW9uIHsgMCB9 OwogI2VuZGlmCiAKICAgICAgICAgT3B0aW9uYWw8V2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXM+IGZv bnRBdHRyaWJ1dGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCAyYjA1Zjc1ODFiMi4uOTJhMmY1ZDRkN2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jh c2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll d0Jhc2UuY3BwCkBAIC0xNjkzLDggKzE2OTMsOCBAQCB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVXBk YXRlVGV4dElucHV0U3RhdGUoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYmtpdFdlYlZpZXdCYXNlKQog ICAgIGNvbnN0IGF1dG8mIGVkaXRvclN0YXRlID0gd2Via2l0V2ViVmlld0Jhc2UtPnByaXYtPnBh Z2VQcm94eS0+ZWRpdG9yU3RhdGUoKTsKICAgICBpZiAoIWVkaXRvclN0YXRlLmlzTWlzc2luZ1Bv c3RMYXlvdXREYXRhKSB7CiAgICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5pbnB1dE1l dGhvZEZpbHRlci5ub3RpZnlDdXJzb3JSZWN0KGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCku Y2FyZXRSZWN0QXRTdGFydCk7Ci0gICAgICAgIHdlYmtpdFdlYlZpZXdCYXNlLT5wcml2LT5pbnB1 dE1ldGhvZEZpbHRlci5ub3RpZnlTdXJyb3VuZGluZyhlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0 YSgpLnBhcmFncmFwaENvbnRleHQsIGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkucGFyYWdy YXBoQ29udGV4dEN1cnNvclBvc2l0aW9uLAotICAgICAgICAgICAgZWRpdG9yU3RhdGUucG9zdExh eW91dERhdGEoKS5wYXJhZ3JhcGhDb250ZXh0U2VsZWN0aW9uUG9zaXRpb24pOworICAgICAgICB3 ZWJraXRXZWJWaWV3QmFzZS0+cHJpdi0+aW5wdXRNZXRob2RGaWx0ZXIubm90aWZ5U3Vycm91bmRp bmcoZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5zdXJyb3VuZGluZ0NvbnRleHQsIGVkaXRv clN0YXRlLnBvc3RMYXlvdXREYXRhKCkuc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9zaXRpb24s CisgICAgICAgICAgICBlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLnN1cnJvdW5kaW5nQ29u dGV4dFNlbGVjdGlvblBvc2l0aW9uKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS93cGUvV1BFVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvd3BlL1dQRVZpZXcuY3BwCmluZGV4IDExMDdmNzYxNzJiLi45NWFiMTc2ZTgzZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL3dwZS9XUEVWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvd3BlL1dQRVZpZXcuY3BwCkBAIC0yNTgs OCArMjU4LDggQEAgdm9pZCBWaWV3OjpzZWxlY3Rpb25EaWRDaGFuZ2UoKQogICAgIGNvbnN0IGF1 dG8mIGVkaXRvclN0YXRlID0gbV9wYWdlUHJveHktPmVkaXRvclN0YXRlKCk7CiAgICAgaWYgKCFl ZGl0b3JTdGF0ZS5pc01pc3NpbmdQb3N0TGF5b3V0RGF0YSkgewogICAgICAgICBtX2lucHV0TWV0 aG9kRmlsdGVyLm5vdGlmeUN1cnNvclJlY3QoZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5j YXJldFJlY3RBdFN0YXJ0KTsKLSAgICAgICAgbV9pbnB1dE1ldGhvZEZpbHRlci5ub3RpZnlTdXJy b3VuZGluZyhlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLnBhcmFncmFwaENvbnRleHQsIGVk aXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkucGFyYWdyYXBoQ29udGV4dEN1cnNvclBvc2l0aW9u LAotICAgICAgICAgICAgZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5wYXJhZ3JhcGhDb250 ZXh0U2VsZWN0aW9uUG9zaXRpb24pOworICAgICAgICBtX2lucHV0TWV0aG9kRmlsdGVyLm5vdGlm eVN1cnJvdW5kaW5nKGVkaXRvclN0YXRlLnBvc3RMYXlvdXREYXRhKCkuc3Vycm91bmRpbmdDb250 ZXh0LCBlZGl0b3JTdGF0ZS5wb3N0TGF5b3V0RGF0YSgpLnN1cnJvdW5kaW5nQ29udGV4dEN1cnNv clBvc2l0aW9uLAorICAgICAgICAgICAgZWRpdG9yU3RhdGUucG9zdExheW91dERhdGEoKS5zdXJy b3VuZGluZ0NvbnRleHRTZWxlY3Rpb25Qb3NpdGlvbik7CiAgICAgfQogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDJmZjhhYTNjOTMxLi44 MDM5NzcwYjMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKQEAgLTU0NzcsOSArNTQ3Nyw5IEBAIHZvaWQgV2ViUGFnZTo6ZGVsZXRlU3Vycm91bmRp bmcoaW50NjRfdCBvZmZzZXQsIHVuc2lnbmVkIGNoYXJhY3RlckNvdW50KQogICAgICAgICByZXR1 cm47CiAKICAgICBhdXRvIHNlbGVjdGlvblN0YXJ0ID0gc2VsZWN0aW9uLnZpc2libGVTdGFydCgp OwotICAgIGF1dG8gcGFyYWdyYXBoUmFuZ2UgPSBtYWtlUmFuZ2Uoc3RhcnRPZlBhcmFncmFwaChz ZWxlY3Rpb25TdGFydCksIHNlbGVjdGlvblN0YXJ0KTsKLSAgICBhdXRvIGN1cnNvclBvc2l0aW9u ID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChwYXJhZ3JhcGhSYW5nZS5nZXQoKSk7Ci0gICAg YXV0byYgcm9vdE5vZGUgPSBwYXJhZ3JhcGhSYW5nZS0+c3RhcnRDb250YWluZXIoKS50cmVlU2Nv cGUoKS5yb290Tm9kZSgpOworICAgIGF1dG8gc3Vycm91bmRpbmdSYW5nZSA9IG1ha2VSYW5nZShz dGFydE9mRWRpdGFibGVDb250ZW50KHNlbGVjdGlvblN0YXJ0KSwgc2VsZWN0aW9uU3RhcnQpOwor ICAgIGF1dG8gY3Vyc29yUG9zaXRpb24gPSBUZXh0SXRlcmF0b3I6OnJhbmdlTGVuZ3RoKHN1cnJv dW5kaW5nUmFuZ2UuZ2V0KCkpOworICAgIGF1dG8mIHJvb3ROb2RlID0gc3Vycm91bmRpbmdSYW5n ZS0+c3RhcnRDb250YWluZXIoKS50cmVlU2NvcGUoKS5yb290Tm9kZSgpOwogICAgIGF1dG8gc2Vs ZWN0aW9uUmFuZ2UgPSBUZXh0SXRlcmF0b3I6OnJhbmdlRnJvbUxvY2F0aW9uQW5kTGVuZ3RoKCZy b290Tm9kZSwgY3Vyc29yUG9zaXRpb24gKyBvZmZzZXQsIGNoYXJhY3RlckNvdW50KTsKICAgICBp ZiAoIXNlbGVjdGlvblJhbmdlKQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9nbGliL1dlYlBhZ2VHTGliLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2dsaWIvV2ViUGFnZUdMaWIuY3BwCmluZGV4IDI5MWQ0 ZGFjNjNhLi4zYTdiYWE2YzEwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvZ2xpYi9XZWJQYWdlR0xpYi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvZ2xpYi9XZWJQYWdlR0xpYi5jcHAKQEAgLTEwNywyMSArMTA3LDIxIEBAIHZv aWQgV2ViUGFnZTo6cGxhdGZvcm1FZGl0b3JTdGF0ZShGcmFtZSYgZnJhbWUsIEVkaXRvclN0YXRl JiByZXN1bHQsIEluY2x1ZGVQb3N0CiAKICAgICBpZiAoc2VsZWN0aW9uLmlzQ29udGVudEVkaXRh YmxlKCkpIHsKICAgICAgICAgYXV0byBzZWxlY3Rpb25TdGFydCA9IHNlbGVjdGlvbi52aXNpYmxl U3RhcnQoKTsKLSAgICAgICAgYXV0byBwYXJhZ3JhcGhTdGFydCA9IHN0YXJ0T2ZQYXJhZ3JhcGgo c2VsZWN0aW9uU3RhcnQpOwotICAgICAgICBhdXRvIHBhcmFncmFwaEVuZCA9IGVuZE9mUGFyYWdy YXBoKHNlbGVjdGlvblN0YXJ0KTsKLSAgICAgICAgYXV0byBwYXJhZ3JhcGhSYW5nZSA9IG1ha2VS YW5nZShwYXJhZ3JhcGhTdGFydCwgcGFyYWdyYXBoRW5kKTsKKyAgICAgICAgYXV0byBzdXJyb3Vu ZGluZ1N0YXJ0ID0gc3RhcnRPZkVkaXRhYmxlQ29udGVudChzZWxlY3Rpb25TdGFydCk7CisgICAg ICAgIGF1dG8gc3Vycm91bmRpbmdFbmQgPSBlbmRPZkVkaXRhYmxlQ29udGVudChzZWxlY3Rpb25T dGFydCk7CisgICAgICAgIGF1dG8gc3Vycm91bmRpbmdSYW5nZSA9IG1ha2VSYW5nZShzdXJyb3Vu ZGluZ1N0YXJ0LCBzdXJyb3VuZGluZ0VuZCk7CiAgICAgICAgIGF1dG8gY29tcG9zaXRpb25SYW5n ZSA9IGZyYW1lLmVkaXRvcigpLmNvbXBvc2l0aW9uUmFuZ2UoKTsKLSAgICAgICAgaWYgKGNvbXBv c2l0aW9uUmFuZ2UgJiYgcGFyYWdyYXBoUmFuZ2UtPmNvbnRhaW5zKCpjb21wb3NpdGlvblJhbmdl KSkgewotICAgICAgICAgICAgYXV0byBjbG9uZWRSYW5nZSA9IHBhcmFncmFwaFJhbmdlLT5jbG9u ZVJhbmdlKCk7Ci0gICAgICAgICAgICBwYXJhZ3JhcGhSYW5nZS0+c2V0RW5kKGNvbXBvc2l0aW9u UmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSk7CisgICAgICAgIGlmIChjb21wb3NpdGlvblJhbmdlICYm IHN1cnJvdW5kaW5nUmFuZ2UtPmNvbnRhaW5zKCpjb21wb3NpdGlvblJhbmdlKSkgeworICAgICAg ICAgICAgYXV0byBjbG9uZWRSYW5nZSA9IHN1cnJvdW5kaW5nUmFuZ2UtPmNsb25lUmFuZ2UoKTsK KyAgICAgICAgICAgIHN1cnJvdW5kaW5nUmFuZ2UtPnNldEVuZChjb21wb3NpdGlvblJhbmdlLT5z dGFydFBvc2l0aW9uKCkpOwogICAgICAgICAgICAgY2xvbmVkUmFuZ2UtPnNldFN0YXJ0KGNvbXBv c2l0aW9uUmFuZ2UtPmVuZFBvc2l0aW9uKCkpOwotICAgICAgICAgICAgcG9zdExheW91dERhdGEu cGFyYWdyYXBoQ29udGV4dCA9IHBsYWluVGV4dChwYXJhZ3JhcGhSYW5nZS5nZXQoKSkgKyBwbGFp blRleHQoY2xvbmVkUmFuZ2UucHRyKCkpOwotICAgICAgICAgICAgcG9zdExheW91dERhdGEucGFy YWdyYXBoQ29udGV4dEN1cnNvclBvc2l0aW9uID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChw YXJhZ3JhcGhSYW5nZS5nZXQoKSk7Ci0gICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5wYXJhZ3Jh cGhDb250ZXh0U2VsZWN0aW9uUG9zaXRpb24gPSBwb3N0TGF5b3V0RGF0YS5wYXJhZ3JhcGhDb250 ZXh0Q3Vyc29yUG9zaXRpb247CisgICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5zdXJyb3VuZGlu Z0NvbnRleHQgPSBwbGFpblRleHQoc3Vycm91bmRpbmdSYW5nZS5nZXQoKSkgKyBwbGFpblRleHQo Y2xvbmVkUmFuZ2UucHRyKCkpOworICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRp bmdDb250ZXh0Q3Vyc29yUG9zaXRpb24gPSBUZXh0SXRlcmF0b3I6OnJhbmdlTGVuZ3RoKHN1cnJv dW5kaW5nUmFuZ2UuZ2V0KCkpOworICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRp bmdDb250ZXh0U2VsZWN0aW9uUG9zaXRpb24gPSBwb3N0TGF5b3V0RGF0YS5zdXJyb3VuZGluZ0Nv bnRleHRDdXJzb3JQb3NpdGlvbjsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHBvc3RM YXlvdXREYXRhLnBhcmFncmFwaENvbnRleHQgPSBwbGFpblRleHQocGFyYWdyYXBoUmFuZ2UuZ2V0 KCkpOwotICAgICAgICAgICAgcG9zdExheW91dERhdGEucGFyYWdyYXBoQ29udGV4dEN1cnNvclBv c2l0aW9uID0gVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UocGFyYWdyYXBoU3Rh cnQsIHNlbGVjdGlvblN0YXJ0KS5nZXQoKSk7Ci0gICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS5w YXJhZ3JhcGhDb250ZXh0U2VsZWN0aW9uUG9zaXRpb24gPSBUZXh0SXRlcmF0b3I6OnJhbmdlTGVu Z3RoKG1ha2VSYW5nZShwYXJhZ3JhcGhTdGFydCwgc2VsZWN0aW9uLnZpc2libGVFbmQoKSkuZ2V0 KCkpOworICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0ID0gcGxh aW5UZXh0KHN1cnJvdW5kaW5nUmFuZ2UuZ2V0KCkpOworICAgICAgICAgICAgcG9zdExheW91dERh dGEuc3Vycm91bmRpbmdDb250ZXh0Q3Vyc29yUG9zaXRpb24gPSBUZXh0SXRlcmF0b3I6OnJhbmdl TGVuZ3RoKG1ha2VSYW5nZShzdXJyb3VuZGluZ1N0YXJ0LCBzZWxlY3Rpb25TdGFydCkuZ2V0KCkp OworICAgICAgICAgICAgcG9zdExheW91dERhdGEuc3Vycm91bmRpbmdDb250ZXh0U2VsZWN0aW9u UG9zaXRpb24gPSBUZXh0SXRlcmF0b3I6OnJhbmdlTGVuZ3RoKG1ha2VSYW5nZShzdXJyb3VuZGlu Z1N0YXJ0LCBzZWxlY3Rpb24udmlzaWJsZUVuZCgpKS5nZXQoKSk7CiAgICAgICAgIH0KICAgICB9 CiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg OTcxMDYyODQ5YzguLjgwY2Y0MTFkMDg4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDYgIENhcmxvcyBH YXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0g U3Vycm91bmRpbmcgdGV4dCBmb3IgaW5wdXQgbWV0aG9kcyBzaG91bGQgbm90IGJlIGxpbWl0ZWQg dG8gdGhlIGN1cnJlbnQgcGFyYWdyYXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDg3MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgdGVzdCBjYXNlIHRvIGNoZWNrIHN1cnJvdW5kaW5nIHRleHQg aW4gbXVsdGlsaW5lIGNvbnRleHQuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdEdMaWIvVGVzdElucHV0TWV0aG9kQ29udGV4dC5jcHA6CisgICAgICAgICh0ZXN0V2ViS2l0 SW5wdXRNZXRob2RDb250ZXh0U3Vycm91bmRpbmcpOgorCiAyMDIwLTAzLTA1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFdLTmF2aWdh dGlvbkRlbGVnYXRlUHJpdmF0ZSBTUEkgdG8gaW5mb3JtIGFwcGxpY2F0aW9uIG9mIHN1YmZyYW1l IG5hdmlnYXRpb25zCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dEdMaWIvVGVzdElucHV0TWV0aG9kQ29udGV4dC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdEdMaWIvVGVzdElucHV0TWV0aG9kQ29udGV4dC5jcHAKaW5kZXggZWEyYTgzODgx OTguLjAyNWZkZDNhNzg0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdEdMaWIvVGVzdElucHV0TWV0aG9kQ29udGV4dC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RJbnB1dE1ldGhvZENvbnRleHQuY3BwCkBAIC01Miw3 ICs1Miw3IEBAIHR5cGVkZWYgc3RydWN0IF9XZWJLaXRJbnB1dE1ldGhvZENvbnRleHRNb2NrQ2xh c3MgewogCiBHX0RFRklORV9UWVBFKFdlYktpdElucHV0TWV0aG9kQ29udGV4dE1vY2ssIHdlYmtp dF9pbnB1dF9tZXRob2RfY29udGV4dF9tb2NrLCBXRUJLSVRfVFlQRV9JTlBVVF9NRVRIT0RfQ09O VEVYVCkKIAotc3RhdGljIGNvbnN0IGNoYXIqIHRlc3RIVE1MID0gIjxodG1sPjxib2R5PjxpbnB1 dCBpZD0nZWRpdGFibGUnIGNvbnRlbnRlZGl0YWJsZSBvbmtleWRvd249J2xvZ0tleURvd24oKScg b25rZXl1cD0nbG9nS2V5VXAoKScgb25rZXlwcmVzcz0nbG9nS2V5UHJlc3MoKSc+PC9pbnB1dD48 c2NyaXB0PiIKK3N0YXRpYyBjb25zdCBjaGFyKiB0ZXN0SFRNTCA9ICI8aHRtbD48Ym9keT48dGV4 dGFyZWEgaWQ9J2VkaXRhYmxlJyByb3dzPSczJywgY29scz0nNTAnIG9ua2V5ZG93bj0nbG9nS2V5 RG93bigpJyBvbmtleXVwPSdsb2dLZXlVcCgpJyBvbmtleXByZXNzPSdsb2dLZXlQcmVzcygpJz48 L3RleHRhcmVhPjxzY3JpcHQ+IgogICAgICJ2YXIgaW5wdXQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnZWRpdGFibGUnKTsiCiAgICAgImlucHV0LmFkZEV2ZW50TGlzdGVuZXIoJ2NvbXBvc2l0 aW9uc3RhcnQnLCBsb2dDb21wb3NpdGlvbkV2ZW50KTsiCiAgICAgImlucHV0LmFkZEV2ZW50TGlz dGVuZXIoJ2NvbXBvc2l0aW9udXBkYXRlJywgbG9nQ29tcG9zaXRpb25FdmVudCk7IgpAQCAtODYw LDYgKzg2MCwxNiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViS2l0SW5wdXRNZXRob2RDb250ZXh0U3Vy cm91bmRpbmcoSW5wdXRNZXRob2RUZXN0KiB0ZXN0LCBnY29ucwogICAgIGdfYXNzZXJ0X2NtcHN0 cih0ZXN0LT5zdXJyb3VuZGluZ1RleHQoKSwgPT0sICJXZWJLaXRHVEtXUEVXZWJLaXRhYmNXZWJL aXRHVEvwn5iA77iPIik7CiAgICAgZ19hc3NlcnRfY21wdWludCh0ZXN0LT5zdXJyb3VuZGluZ0N1 cnNvckluZGV4KCksID09LCAzNyk7CiAgICAgZ19hc3NlcnRfY21wdWludCh0ZXN0LT5zdXJyb3Vu ZGluZ1NlbGVjdGlvbkluZGV4KCksID09LCB0ZXN0LT5zdXJyb3VuZGluZ0N1cnNvckluZGV4KCkp OworICAgIHRlc3QtPm1fZXZlbnRzLmNsZWFyKCk7CisKKyAgICAvLyBDaGVjayBtdWx0aWxpbmUg Y29udGV4dC4KKyAgICB0ZXN0LT5rZXlTdHJva2VBbmRXYWl0Rm9yRXZlbnRzKEtFWShSZXR1cm4p LCAzKTsKKyAgICB0ZXN0LT5rZXlTdHJva2VBbmRXYWl0Rm9yRXZlbnRzKEtFWShhKSwgNik7Cisg ICAgdGVzdC0+d2FpdEZvclN1cnJvdW5kaW5nVGV4dCgiV2ViS2l0R1RLV1BFV2ViS2l0YWJjV2Vi S2l0R1RL8J+YgO+4j1xuYSIpOworICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXN0LT5zdXJyb3VuZGlu Z1RleHQoKSwgPT0sICJXZWJLaXRHVEtXUEVXZWJLaXRhYmNXZWJLaXRHVEvwn5iA77iPXG5hIik7 CisgICAgZ19hc3NlcnRfY21wdWludCh0ZXN0LT5zdXJyb3VuZGluZ0N1cnNvckluZGV4KCksID09 LCAzOSk7CisgICAgZ19hc3NlcnRfY21wdWludCh0ZXN0LT5zdXJyb3VuZGluZ1NlbGVjdGlvbklu ZGV4KCksID09LCB0ZXN0LT5zdXJyb3VuZGluZ0N1cnNvckluZGV4KCkpOworICAgIHRlc3QtPm1f ZXZlbnRzLmNsZWFyKCk7CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJLaXRJbnB1dE1ldGhvZENv bnRleHRSZXNldChJbnB1dE1ldGhvZFRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCg==