199299 2019-06-27 16:38:15 -0700 macCatalyst: Selected range sometimes wrong after autocorrection 2019-06-28 13:14:57 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue simon.fraser thorton timothy webkit-bug-importer wenson_hsieh oldest_to_newest 1548667 0 thorton 2019-06-27 16:38:15 -0700 macCatalyst: Selected range sometimes wrong after autocorrection 1548668 1 373069 thorton 2019-06-27 16:38:25 -0700 Created attachment 373069 Patch 1548669 2 thorton 2019-06-27 16:38:27 -0700 <rdar://problem/49717224> 1548921 3 373069 commit-queue 2019-06-28 13:14:55 -0700 Comment on attachment 373069 Patch Clearing flags on attachment: 373069 Committed r246932: <https://trac.webkit.org/changeset/246932> 1548922 4 commit-queue 2019-06-28 13:14:57 -0700 All reviewed patches have been landed. Closing bug. 373069 2019-06-27 16:38:25 -0700 2019-06-28 13:14:55 -0700 Patch bug-199299-20190627163824.patch text/plain 10055 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjYjNlMTA5MTAxYWU3Yzgy NDcxYTAzNTZkYjA4MzdiY2M4MjVmMTMuLmFjNzRjOTY2OWU2OTM2NDhhNzdkNWVhN2RjNmY1MGYz NWU1ZTAyOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDYtMjcgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgbWFjQ2F0YWx5c3Q6IFNl bGVjdGVkIHJhbmdlIHNvbWV0aW1lcyB3cm9uZyBhZnRlciBhdXRvY29ycmVjdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5Mjk5CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80OTcxNzIyND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9s bGVyLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXIu bW06CisgICAgICAgIChXZWJLaXQ6OlRleHRDaGVja2luZ0NvbnRyb2xsZXI6OnJlcGxhY2VSZWxh dGl2ZVRvU2VsZWN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyByZXBsYWNlU2VsZWN0aW9u T2Zmc2V0Omxlbmd0aDp3aXRoQW5ub3RhdGVkU3RyaW5nOnJlbGF0aXZlUmVwbGFjZW1lbnRSYW5n ZTpdKToKKyAgICAgICAgUGx1bWIgdGhlIHdob2xlIHJlbGF0aXZlIHJlcGxhY2VtZW50IHJhbmdl IHRocm91Z2ggdG8gdGhlIFdlYiBDb250ZW50IHByb2Nlc3MuCisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvQ29jb2EvVGV4dENoZWNraW5nQ29udHJvbGxlclByb3h5Lmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXJQcm94eS5t ZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvVGV4dENoZWNr aW5nQ29udHJvbGxlclByb3h5Lm1tOgorICAgICAgICAoV2ViS2l0OjpUZXh0Q2hlY2tpbmdDb250 cm9sbGVyUHJveHk6OnJlcGxhY2VSZWxhdGl2ZVRvU2VsZWN0aW9uKToKKyAgICAgICAgT25seSBy ZXBsYWNlIHRoZSB0ZXh0IG9mIHRoZSBzdWJzdHJpbmcgdGhhdCBjaGFuZ2VkICh0aGUgcmVwbGFj ZW1lbnQgcmFuZ2UpLAorICAgICAgICBhbmQgZml4IHVwIHRoZSBzZWxlY3Rpb24gb2Zmc2V0IG1h dGggKGl0IHdhcyByZWFsbHkganVzdCB3cm9uZyBiZWZvcmUpLgorCiAyMDE5LTA2LTI3ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBXZWJTb2Nr ZXRzOiBhdm9pZCBkYXRhIGNvcGllcyB3aGVuIHF1ZXVpbmcgdGFza3MgaW4gV2ViU29ja2V0Q2hh bm5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVGV4dENoZWNr aW5nQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVGV4dENoZWNr aW5nQ29udHJvbGxlci5oCmluZGV4IDgxYTgyZmMzNTExM2E4NDkwNzdhYTFlODY4YmIyMDUxZTY2 Y2JlYjAuLjBjMmQ2ZGY1NDYzOWE1ZjQwZWZhNGE4MWMxNzdmOWFjNjc3NjZhMDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9s bGVyLmgKQEAgLTQyLDcgKzQyLDcgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IFRleHRDaGVja2lu Z0NvbnRyb2xsZXIoV2ViUGFnZVByb3h5Jik7CiAgICAgflRleHRDaGVja2luZ0NvbnRyb2xsZXIo KSA9IGRlZmF1bHQ7CiAKLSAgICB2b2lkIHJlcGxhY2VSZWxhdGl2ZVRvU2VsZWN0aW9uKE5TQXR0 cmlidXRlZFN0cmluZyAqYW5ub3RhdGVkU3RyaW5nLCBpbnQ2NF90IHNlbGVjdGlvbk9mZnNldCwg dWludDY0X3QgbGVuZ3RoLCBib29sIHRleHRDaGFuZ2VkKTsKKyAgICB2b2lkIHJlcGxhY2VSZWxh dGl2ZVRvU2VsZWN0aW9uKE5TQXR0cmlidXRlZFN0cmluZyAqYW5ub3RhdGVkU3RyaW5nLCBpbnQ2 NF90IHNlbGVjdGlvbk9mZnNldCwgdWludDY0X3QgbGVuZ3RoLCB1aW50NjRfdCByZWxhdGl2ZVJl cGxhY2VtZW50TG9jYXRpb24sIHVpbnQ2NF90IHJlbGF0aXZlUmVwbGFjZW1lbnRMZW5ndGgpOwog ICAgIHZvaWQgcmVtb3ZlQW5ub3RhdGlvblJlbGF0aXZlVG9TZWxlY3Rpb24oTlNTdHJpbmcgKmFu bm90YXRpb25OYW1lLCBpbnQ2NF90IHNlbGVjdGlvbk9mZnNldCwgdWludDY0X3QgbGVuZ3RoKTsK IAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1Rl eHRDaGVja2luZ0NvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9U ZXh0Q2hlY2tpbmdDb250cm9sbGVyLm1tCmluZGV4IGQzNzBmMDM0MGRkNWE5YmFmMGIwMjBlYmRl YWEzNmM5MWJlOGIwMTQuLmYwMjA4M2RjZWM3MzMxODNmNDZjNTNlZjYzYWIxNGFjMTQ1ZGI4MDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1RleHRDaGVja2luZ0Nv bnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVGV4dENoZWNr aW5nQ29udHJvbGxlci5tbQpAQCAtMzksMTIgKzM5LDEyIEBAIFRleHRDaGVja2luZ0NvbnRyb2xs ZXI6OlRleHRDaGVja2luZ0NvbnRyb2xsZXIoV2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCiB7 CiB9CiAKLXZvaWQgVGV4dENoZWNraW5nQ29udHJvbGxlcjo6cmVwbGFjZVJlbGF0aXZlVG9TZWxl Y3Rpb24oTlNBdHRyaWJ1dGVkU3RyaW5nICphbm5vdGF0ZWRTdHJpbmcsIGludDY0X3Qgc2VsZWN0 aW9uT2Zmc2V0LCB1aW50NjRfdCBsZW5ndGgsIGJvb2wgdGV4dENoYW5nZWQpCit2b2lkIFRleHRD aGVja2luZ0NvbnRyb2xsZXI6OnJlcGxhY2VSZWxhdGl2ZVRvU2VsZWN0aW9uKE5TQXR0cmlidXRl ZFN0cmluZyAqYW5ub3RhdGVkU3RyaW5nLCBpbnQ2NF90IHNlbGVjdGlvbk9mZnNldCwgdWludDY0 X3QgbGVuZ3RoLCB1aW50NjRfdCByZWxhdGl2ZVJlcGxhY2VtZW50TG9jYXRpb24sIHVpbnQ2NF90 IHJlbGF0aXZlUmVwbGFjZW1lbnRMZW5ndGgpCiB7CiAgICAgaWYgKCFtX3BhZ2UuaGFzUnVubmlu Z1Byb2Nlc3MoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9wYWdlLnByb2Nlc3MoKS5zZW5k KE1lc3NhZ2VzOjpUZXh0Q2hlY2tpbmdDb250cm9sbGVyUHJveHk6OlJlcGxhY2VSZWxhdGl2ZVRv U2VsZWN0aW9uKGFubm90YXRlZFN0cmluZywgc2VsZWN0aW9uT2Zmc2V0LCBsZW5ndGgsIHRleHRD aGFuZ2VkKSwgbV9wYWdlLnBhZ2VJRCgpKTsKKyAgICBtX3BhZ2UucHJvY2VzcygpLnNlbmQoTWVz c2FnZXM6OlRleHRDaGVja2luZ0NvbnRyb2xsZXJQcm94eTo6UmVwbGFjZVJlbGF0aXZlVG9TZWxl Y3Rpb24oYW5ub3RhdGVkU3RyaW5nLCBzZWxlY3Rpb25PZmZzZXQsIGxlbmd0aCwgcmVsYXRpdmVS ZXBsYWNlbWVudExvY2F0aW9uLCByZWxhdGl2ZVJlcGxhY2VtZW50TGVuZ3RoKSwgbV9wYWdlLnBh Z2VJRCgpKTsKIH0KIAogdm9pZCBUZXh0Q2hlY2tpbmdDb250cm9sbGVyOjpyZW1vdmVBbm5vdGF0 aW9uUmVsYXRpdmVUb1NlbGVjdGlvbihOU1N0cmluZyAqYW5ub3RhdGlvbk5hbWUsIGludDY0X3Qg c2VsZWN0aW9uT2Zmc2V0LCB1aW50NjRfdCBsZW5ndGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCAzMzkz OGU0OTVkZmViNWIzNWQ5NTBkNDFjYWU0ODhiOTgyYjI0OTBmLi44ODEwMzYwMWIyMWE1MzRjMTEx OGNmMWVhMzRhNmZjOGY3M2FmNDk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTU4MDQsNyArNTgwNCw3 IEBAIC0gKHZvaWQpc2VsZWN0V29yZEZvclJlcGxhY2VtZW50CiAjaWYgRU5BQkxFKFBMQVRGT1JN X0RSSVZFTl9URVhUX0NIRUNLSU5HKQogLSAodm9pZClyZXBsYWNlU2VsZWN0aW9uT2Zmc2V0OihO U0ludGVnZXIpc2VsZWN0aW9uT2Zmc2V0IGxlbmd0aDooTlNVSW50ZWdlcilsZW5ndGggd2l0aEFu bm90YXRlZFN0cmluZzooTlNBdHRyaWJ1dGVkU3RyaW5nICopYW5ub3RhdGVkU3RyaW5nIHJlbGF0 aXZlUmVwbGFjZW1lbnRSYW5nZTooTlNSYW5nZSlyZWxhdGl2ZVJlcGxhY2VtZW50UmFuZ2UKIHsK LSAgICBfdGV4dENoZWNraW5nQ29udHJvbGxlci0+cmVwbGFjZVJlbGF0aXZlVG9TZWxlY3Rpb24o YW5ub3RhdGVkU3RyaW5nLCBzZWxlY3Rpb25PZmZzZXQsIGxlbmd0aCwgcmVsYXRpdmVSZXBsYWNl bWVudFJhbmdlLmxvY2F0aW9uICE9IE5TTm90Rm91bmQpOworICAgIF90ZXh0Q2hlY2tpbmdDb250 cm9sbGVyLT5yZXBsYWNlUmVsYXRpdmVUb1NlbGVjdGlvbihhbm5vdGF0ZWRTdHJpbmcsIHNlbGVj dGlvbk9mZnNldCwgbGVuZ3RoLCByZWxhdGl2ZVJlcGxhY2VtZW50UmFuZ2UubG9jYXRpb24sIHJl bGF0aXZlUmVwbGFjZW1lbnRSYW5nZS5sZW5ndGgpOwogfQogCiAtICh2b2lkKXJlbW92ZUFubm90 YXRpb246KE5TQXR0cmlidXRlZFN0cmluZ0tleSlhbm5vdGF0aW9uTmFtZSBmb3JTZWxlY3Rpb25P ZmZzZXQ6KE5TSW50ZWdlcilzZWxlY3Rpb25PZmZzZXQgbGVuZ3RoOihOU1VJbnRlZ2VyKWxlbmd0 aApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvVGV4 dENoZWNraW5nQ29udHJvbGxlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9sbGVyUHJveHkuaAppbmRleCA4ZGJjMmIwNGUw NTBiY2VhNmY3MjA1MzUyNTY0NzI0ZjkxOTA2MDg2Li4wMGExZTJlOGUyNjMzNTYzYzMwNjk5OGRk MTVhMjE4Yjk2ZDE2NTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9sbGVyUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9sbGVyUHJveHku aApAQCAtNjQsNyArNjQsNyBAQCBwcml2YXRlOgogICAgIE9wdGlvbmFsPFJhbmdlQW5kT2Zmc2V0 PiByYW5nZUFuZE9mZnNldFJlbGF0aXZlVG9TZWxlY3Rpb24oaW50NjRfdCBvZmZzZXQsIHVpbnQ2 NF90IGxlbmd0aCk7CiAKICAgICAvLyBNZXNzYWdlIGhhbmRsZXJzLgotICAgIHZvaWQgcmVwbGFj ZVJlbGF0aXZlVG9TZWxlY3Rpb24oQXR0cmlidXRlZFN0cmluZywgaW50NjRfdCBzZWxlY3Rpb25P ZmZzZXQsIHVpbnQ2NF90IGxlbmd0aCwgYm9vbCB0ZXh0Q2hhbmdlZCk7CisgICAgdm9pZCByZXBs YWNlUmVsYXRpdmVUb1NlbGVjdGlvbihBdHRyaWJ1dGVkU3RyaW5nLCBpbnQ2NF90IHNlbGVjdGlv bk9mZnNldCwgdWludDY0X3QgbGVuZ3RoLCB1aW50NjRfdCByZWxhdGl2ZVJlcGxhY2VtZW50TG9j YXRpb24sIHVpbnQ2NF90IHJlbGF0aXZlUmVwbGFjZW1lbnRMZW5ndGgpOwogICAgIHZvaWQgcmVt b3ZlQW5ub3RhdGlvblJlbGF0aXZlVG9TZWxlY3Rpb24oU3RyaW5nIGFubm90YXRpb25OYW1lLCBp bnQ2NF90IHNlbGVjdGlvbk9mZnNldCwgdWludDY0X3QgbGVuZ3RoKTsKIAogICAgIFdlYlBhZ2Um IG1fcGFnZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nv Y29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXJQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXJQcm94eS5t ZXNzYWdlcy5pbgppbmRleCAxZmZhMjcxY2UzMTBhOTQzNDhlMjE2NzM4MjJkMjFmYWFhNDNiM2U5 Li42YTQyNWY3YzMyYTY1MzFlNmI5MDczNmZjMWVlNjg2NzE0MzgyYjY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9UZXh0Q2hlY2tpbmdDb250cm9s bGVyUHJveHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvQ29jb2EvVGV4dENoZWNraW5nQ29udHJvbGxlclByb3h5Lm1lc3NhZ2VzLmluCkBAIC0yMyw5 ICsyMyw5IEBACiAjaWYgRU5BQkxFKFBMQVRGT1JNX0RSSVZFTl9URVhUX0NIRUNLSU5HKQogCiBt ZXNzYWdlcyAtPiBUZXh0Q2hlY2tpbmdDb250cm9sbGVyUHJveHkgewotICAgIFJlcGxhY2VSZWxh dGl2ZVRvU2VsZWN0aW9uKHN0cnVjdCBXZWJLaXQ6OkF0dHJpYnV0ZWRTdHJpbmcgYW5ub3RhdGVk U3RyaW5nLCBpbnQ2NF90IHNlbGVjdGlvbk9mZnNldCwgdWludDY0X3QgbGVuZ3RoLCBib29sIHRl eHRDaGFuZ2VkKQorICAgIFJlcGxhY2VSZWxhdGl2ZVRvU2VsZWN0aW9uKHN0cnVjdCBXZWJLaXQ6 OkF0dHJpYnV0ZWRTdHJpbmcgYW5ub3RhdGVkU3RyaW5nLCBpbnQ2NF90IHNlbGVjdGlvbk9mZnNl dCwgdWludDY0X3QgbGVuZ3RoLCB1aW50NjRfdCByZWxhdGl2ZVJlcGxhY2VtZW50TG9jYXRpb24s IHVpbnQ2NF90IHJlbGF0aXZlUmVwbGFjZW1lbnRMZW5ndGgpCiAKICAgICBSZW1vdmVBbm5vdGF0 aW9uUmVsYXRpdmVUb1NlbGVjdGlvbihTdHJpbmcgYW5ub3RhdGlvbk5hbWUsIGludDY0X3Qgc2Vs ZWN0aW9uT2Zmc2V0LCB1aW50NjRfdCBsZW5ndGgpCiB9CiAKLSNlbmRpZgpcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvQ29jb2EvVGV4dENoZWNraW5nQ29udHJvbGxlclByb3h5Lm1tIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29jb2EvVGV4dENoZWNraW5nQ29udHJvbGxlclBy b3h5Lm1tCmluZGV4IGIwYjA0Njc0Y2IxNWUwNDEwMjU1YjQwNjE1ZjJkMDZhMDZjMGRmYjkuLjFk NWMwYTZkYTU1MmM2NTU1M2ZjMThjZmVjYWQ0MjliMTcwYzRhYzkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0NvY29hL1RleHRDaGVja2luZ0NvbnRyb2xsZXJQ cm94eS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db2NvYS9UZXh0 Q2hlY2tpbmdDb250cm9sbGVyUHJveHkubW0KQEAgLTkwLDcgKzkwLDcgQEAgT3B0aW9uYWw8VGV4 dENoZWNraW5nQ29udHJvbGxlclByb3h5OjpSYW5nZUFuZE9mZnNldD4gVGV4dENoZWNraW5nQ29u dHJvbGxlclByb3gKICAgICByZXR1cm4ge3sgVGV4dEl0ZXJhdG9yOjpyYW5nZUZyb21Mb2NhdGlv bkFuZExlbmd0aChyb290LCBzZWxlY3Rpb25Mb2NhdGlvbiwgbGVuZ3RoKSwgc2VsZWN0aW9uTG9j YXRpb24gfX07CiB9CiAKLXZvaWQgVGV4dENoZWNraW5nQ29udHJvbGxlclByb3h5OjpyZXBsYWNl UmVsYXRpdmVUb1NlbGVjdGlvbihBdHRyaWJ1dGVkU3RyaW5nIGFubm90YXRlZFN0cmluZywgaW50 NjRfdCBzZWxlY3Rpb25PZmZzZXQsIHVpbnQ2NF90IGxlbmd0aCwgYm9vbCB0ZXh0Q2hhbmdlZCkK K3ZvaWQgVGV4dENoZWNraW5nQ29udHJvbGxlclByb3h5OjpyZXBsYWNlUmVsYXRpdmVUb1NlbGVj dGlvbihBdHRyaWJ1dGVkU3RyaW5nIGFubm90YXRlZFN0cmluZywgaW50NjRfdCBzZWxlY3Rpb25P ZmZzZXQsIHVpbnQ2NF90IGxlbmd0aCwgdWludDY0X3QgcmVsYXRpdmVSZXBsYWNlbWVudExvY2F0 aW9uLCB1aW50NjRfdCByZWxhdGl2ZVJlcGxhY2VtZW50TGVuZ3RoKQogewogICAgIEZyYW1lJiBm cmFtZSA9IG1fcGFnZS5jb3JlUGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWlu RnJhbWUoKTsKICAgICBGcmFtZVNlbGVjdGlvbiYgZnJhbWVTZWxlY3Rpb24gPSBmcmFtZS5zZWxl Y3Rpb24oKTsKQEAgLTEwNywxNiArMTA3LDIwIEBAIHZvaWQgVGV4dENoZWNraW5nQ29udHJvbGxl clByb3h5OjpyZXBsYWNlUmVsYXRpdmVUb1NlbGVjdGlvbihBdHRyaWJ1dGVkU3RyaW5nIGFuCiAg ICAgYXV0byYgbWFya2VycyA9IGZyYW1lLmRvY3VtZW50KCktPm1hcmtlcnMoKTsKICAgICBtYXJr ZXJzLnJlbW92ZU1hcmtlcnMoKnJhbmdlLCByZWxldmFudE1hcmtlclR5cGVzKCkpOwogCi0gICAg aWYgKHRleHRDaGFuZ2VkKSB7Ci0gICAgICAgIGJvb2wgcmVzdG9yZVNlbGVjdGlvbiA9IGZyYW1l U2VsZWN0aW9uLnNlbGVjdGlvbigpLmlzUmFuZ2UoKTsKLQotICAgICAgICBmcmFtZS5lZGl0b3Io KS5yZXBsYWNlUmFuZ2VGb3JTcGVsbENoZWNraW5nKCpyYW5nZSwgW2Fubm90YXRlZFN0cmluZy5z dHJpbmcgc3RyaW5nXSk7Ci0KLSAgICAgICAgc2l6ZV90IHNlbGVjdGlvbkxvY2F0aW9uVG9SZXN0 b3JlID0gbG9jYXRpb25JblJvb3QgLSBzZWxlY3Rpb25PZmZzZXQ7Ci0gICAgICAgIGlmIChyZXN0 b3JlU2VsZWN0aW9uICYmIHNlbGVjdGlvbkxvY2F0aW9uVG9SZXN0b3JlID4gbG9jYXRpb25JblJv b3QgKyBsZW5ndGgpIHsKLSAgICAgICAgICAgIHNlbGVjdGlvbkxvY2F0aW9uVG9SZXN0b3JlIC09 IGxvY2F0aW9uSW5Sb290IC0gbGVuZ3RoOwotICAgICAgICAgICAgYXV0byBzZWxlY3Rpb25Ub1Jl c3RvcmUgPSBUZXh0SXRlcmF0b3I6OnJhbmdlRnJvbUxvY2F0aW9uQW5kTGVuZ3RoKHJvb3QsIHNl bGVjdGlvbkxvY2F0aW9uVG9SZXN0b3JlLCAwKTsKLSAgICAgICAgICAgIGZyYW1lU2VsZWN0aW9u Lm1vdmVUbyhzZWxlY3Rpb25Ub1Jlc3RvcmUuZ2V0KCkpOworICAgIGlmIChyZWxhdGl2ZVJlcGxh Y2VtZW50TG9jYXRpb24gIT0gTlNOb3RGb3VuZCkgeworICAgICAgICBhdXRvIHJhbmdlQW5kT2Zm c2V0T2ZSZXBsYWNlbWVudCA9IHJhbmdlQW5kT2Zmc2V0UmVsYXRpdmVUb1NlbGVjdGlvbihzZWxl Y3Rpb25PZmZzZXQgKyByZWxhdGl2ZVJlcGxhY2VtZW50TG9jYXRpb24sIHJlbGF0aXZlUmVwbGFj ZW1lbnRMZW5ndGgpOworICAgICAgICBpZiAocmFuZ2VBbmRPZmZzZXRPZlJlcGxhY2VtZW50KSB7 CisgICAgICAgICAgICBhdXRvIHJlcGxhY2VtZW50UmFuZ2UgPSByYW5nZUFuZE9mZnNldE9mUmVw bGFjZW1lbnQtPnJhbmdlOworICAgICAgICAgICAgaWYgKHJlcGxhY2VtZW50UmFuZ2UpIHsKKyAg ICAgICAgICAgICAgICBib29sIHJlc3RvcmVTZWxlY3Rpb24gPSBmcmFtZVNlbGVjdGlvbi5zZWxl Y3Rpb24oKS5pc1JhbmdlKCk7CisgICAgICAgICAgICAgICAgZnJhbWUuZWRpdG9yKCkucmVwbGFj ZVJhbmdlRm9yU3BlbGxDaGVja2luZygqcmVwbGFjZW1lbnRSYW5nZSwgW1thbm5vdGF0ZWRTdHJp bmcuc3RyaW5nIHN0cmluZ10gc3Vic3RyaW5nV2l0aFJhbmdlOk5TTWFrZVJhbmdlKHJlbGF0aXZl UmVwbGFjZW1lbnRMb2NhdGlvbiwgcmVsYXRpdmVSZXBsYWNlbWVudExlbmd0aCldKTsKKworICAg ICAgICAgICAgICAgIHNpemVfdCBzZWxlY3Rpb25Mb2NhdGlvblRvUmVzdG9yZSA9IGxvY2F0aW9u SW5Sb290IC0gc2VsZWN0aW9uT2Zmc2V0OworICAgICAgICAgICAgICAgIGlmIChyZXN0b3JlU2Vs ZWN0aW9uICYmIHNlbGVjdGlvbkxvY2F0aW9uVG9SZXN0b3JlID4gbG9jYXRpb25JblJvb3QgKyBy ZWxhdGl2ZVJlcGxhY2VtZW50TG9jYXRpb24gKyByZWxhdGl2ZVJlcGxhY2VtZW50TGVuZ3RoKSB7 CisgICAgICAgICAgICAgICAgICAgIGF1dG8gc2VsZWN0aW9uVG9SZXN0b3JlID0gVGV4dEl0ZXJh dG9yOjpyYW5nZUZyb21Mb2NhdGlvbkFuZExlbmd0aChyb290LCBzZWxlY3Rpb25Mb2NhdGlvblRv UmVzdG9yZSwgMCk7CisgICAgICAgICAgICAgICAgICAgIGZyYW1lU2VsZWN0aW9uLm1vdmVUbyhz ZWxlY3Rpb25Ub1Jlc3RvcmUuZ2V0KCkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgIH0KIAo=