216097 2020-09-02 14:12:54 -0700 Simplify some editing code 2020-09-04 10:22:56 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 216143 1 darin darin cdumez changseok commit-queue esprehn+autocc ews-watchlist gyuyoung.kim kangil.han mifenton sam tsavell webkit-bug-importer wenson_hsieh oldest_to_newest 1684978 0 darin 2020-09-02 14:12:54 -0700 Simplify some editing code 1684980 1 407810 darin 2020-09-02 14:15:54 -0700 Created attachment 407810 Patch 1684990 2 darin 2020-09-02 14:19:23 -0700 Came from one of the things Sam Weinig asked for in my last patch. 1685102 3 ews-feeder 2020-09-02 18:32:46 -0700 Committed r266498: <https://trac.webkit.org/changeset/266498> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407810. 1685103 4 webkit-bug-importer 2020-09-02 18:33:46 -0700 <rdar://problem/68246474> 1685327 5 tsavell 2020-09-03 10:31:16 -0700 It looks like the changes in https://trac.webkit.org/changeset/266498/webkit has caused editing/inserting/insert-paragraph-separator-crash.html to crash constantly with an assertion on Mac and iOS debug History: https://results.webkit.org/?suite=layout-tests&test=editing%2Finserting%2Finsert-paragraph-separator-crash.html Log: https://build.webkit.org/results/Apple-Catalina-Debug-WK1-Tests/r266517%20(6843)/editing/inserting/insert-paragraph-separator-crash-crash-log.txt 1685334 6 tsavell 2020-09-03 10:37:16 -0700 Created https://bugs.webkit.org/show_bug.cgi?id=216128 to track this 1685425 7 darin 2020-09-03 14:08:26 -0700 Lets roll this out. I will re-land after fixing. 1685433 8 commit-queue 2020-09-03 14:33:52 -0700 Re-opened since this is blocked by bug 216143 1685741 9 407810 darin 2020-09-04 10:22:34 -0700 Comment on attachment 407810 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407810&action=review > Source/WebCore/page/DOMSelection.cpp:344 > + frame->selection().setSelectedRange(makeSimpleRange(selectedRange->start), Affinity::Upstream, FrameSelection::ShouldCloseTyping::No); Turns out this needs to be Affinity::Downstream to preserve behavior. Might be correct to have it be upstream, but requires changes elsewhere. Landing with Affinity::Downstream to preserve behavior. 1685742 10 darin 2020-09-04 10:22:56 -0700 Committed r266618: <https://trac.webkit.org/changeset/266618> 407810 2020-09-02 14:15:54 -0700 2020-09-02 18:32:46 -0700 Patch bug-216097-20200902141553.patch text/plain 7980 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGJjMTE0OGUxMmNlYTU1 MmE5MjFlOGEwNWI4NTE1NWNhZDNiYmVjYS4uMzc0OGMxZjgyYmM0ZTIwMWZiOGU2ODg2MTA2MjM0 M2IzY2UwNjFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTA5LTAyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBzb21lIGVkaXRp bmcgY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjE2MDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBkb20vQ29udGFpbmVyTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250YWluZXJOb2Rl OjpyZXBsYWNlQWxsQ2hpbGRyZW5XaXRoTmV3VGV4dCk6CisgICAgICAgIElmIHN0cmluZyBpcyBl bXB0eSwgZG9uJ3QgYWRkIGEgdGV4dCBub2RlLiBUdXJucyBvdXQgYWxsIGNhbGxlcnMgd2FudGVk CisgICAgICAgIHRoaXMgYmVoYXZpb3IuCisKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpOb2RlOjpzZXRUZXh0Q29udGVudCk6IFNpbXBsaWZ5IGJ5IHJlbHlpbmcg b24gbmV3IGJlaGF2aW9yCisgICAgICAgIG9mIHJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0 IHdoZW4gcGFzc2VkIGFuIGVtcHR5IHN0cmluZy4KKworICAgICAgICAqIGVkaXRpbmcvaW9zL0Vk aXRvcklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6c2V0VGV4dEFzQ2hpbGRPZkVs ZW1lbnQpOiBVc2UKKyAgICAgICAgcmVwbGFjZUFsbENoaWxkcmVuV2l0aE5ld1RleHQgaW5zdGVh ZCBvZiB0aGUgdW5uZWNlc3NhcmlseSBjb21wbGljYXRlZAorICAgICAgICBjb2RlIHRoYXQgd2Fz IGhlcmUuIEFsc28gc2ltcGxpZnkgdGhlIFZpc2liZVNlbGVjdGlvbiBtYW5pcHVsYXRpb24gYXQK KyAgICAgICAgdGhlIGVuZCBvZiB0aGUgZnVuY3Rpb24uCisKKyAgICAgICAgKiBodG1sL0hUTUxF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50OjpzZXRJbm5lclRleHQp OiBTaW1wbGlmeSBieSByZWx5aW5nIG9uIG5ldworICAgICAgICBiZWhhdmlvciBvZiByZXBsYWNl QWxsQ2hpbGRyZW5XaXRoTmV3VGV4dCB3aGVuIHBhc3NlZCBhbiBlbXB0eSBzdHJpbmcuCisKKyAg ICAgICAgKiBwYWdlL0RPTVNlbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01TZWxl Y3Rpb246OmRlbGV0ZUZyb21Eb2N1bWVudCk6IFNpbXBsaWZ5IGJ5IHVzaW5nIHRoZQorICAgICAg ICBzZWxlY3Rpb24gZnVuY3Rpb24gdGhhdCB0YWtlcyBhIFNpbXBsZVJhbmdlIHJhdGhlciB0aGFu IHRoZSBvbmUgdGhhdAorICAgICAgICB0YWtlcyB0d28gY29udGFpbmVycyBhbmQgb2Zmc2V0cy4K KwogMjAyMC0wOS0wMSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGNvbXBhcmVQb3NpdGlvbnMgYW5kIG1ha2UgVmlzaWJsZVBvc2l0aW9uIGltcHJvdmVt ZW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwIGIv U291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IGEyMmJiOGY5OGM1ZWM3 ZjQ4Yzc4NzlkMmYwYjg0MzRlYWYyNTRlMzEuLmVkZDA3NjUwMDFkYmE0YWM4YjEzNDc2N2M1MTk0 NDMzYjk2NmEyMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2Rl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKQEAgLTYzMiw2 ICs2MzIsMTEgQEAgdm9pZCBDb250YWluZXJOb2RlOjpyZXBsYWNlQWxsQ2hpbGRyZW4oc3RkOjpu dWxscHRyX3QpCiAvLyBodHRwczovL2RvbS5zcGVjLndoYXR3Zy5vcmcvI2NvbmNlcHQtbm9kZS1y ZXBsYWNlLWFsbAogdm9pZCBDb250YWluZXJOb2RlOjpyZXBsYWNlQWxsQ2hpbGRyZW5XaXRoTmV3 VGV4dChjb25zdCBTdHJpbmcmIHRleHQpCiB7CisgICAgaWYgKHRleHQuaXNFbXB0eSgpKSB7Cisg ICAgICAgIHJlcGxhY2VBbGxDaGlsZHJlbihudWxscHRyKTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKwogICAgIGF1dG8gbm9kZSA9IGRvY3VtZW50KCkuY3JlYXRlVGV4dE5vZGUodGV4dCk7CiAg ICAgaWYgKCFoYXNDaGlsZE5vZGVzKCkpIHsKICAgICAgICAgLy8gYXBwZW5kQ2hpbGRXaXRob3V0 UHJlSW5zZXJ0aW9uVmFsaWRpdHlDaGVjaygpIGNhbiBvbmx5IHRocm93IHdoZW4gbm9kZSBoYXMg YSBwYXJlbnQgYW5kIHdlIGFscmVhZHkgYXNzZXJ0ZWQgaXQgZG9lc24ndC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNw cAppbmRleCAxNmVmYTBiNTllMGU0MWI5NjUxNTMyMzNiZjVlYTBkOTU2YjNkNTc3Li43M2ZlMTA3 OWY0NGJhYzdiMThiMDhjZmY1ZTJiOTNhNzhhMTgwNGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0x NTgwLDE0ICsxNTgwLDkgQEAgRXhjZXB0aW9uT3I8dm9pZD4gTm9kZTo6c2V0VGV4dENvbnRlbnQo Y29uc3QgU3RyaW5nJiB0ZXh0KQogICAgIGNhc2UgUFJPQ0VTU0lOR19JTlNUUlVDVElPTl9OT0RF OgogICAgICAgICByZXR1cm4gc2V0Tm9kZVZhbHVlKHRleHQpOwogICAgIGNhc2UgRUxFTUVOVF9O T0RFOgotICAgIGNhc2UgRE9DVU1FTlRfRlJBR01FTlRfTk9ERTogewotICAgICAgICBhdXRvJiBj b250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXJOb2RlPigqdGhpcyk7Ci0gICAgICAgIGlmICh0 ZXh0LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGNvbnRhaW5lci5yZXBsYWNlQWxsQ2hpbGRyZW4o bnVsbHB0cik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNvbnRhaW5lci5yZXBsYWNlQWxs Q2hpbGRyZW5XaXRoTmV3VGV4dCh0ZXh0KTsKKyAgICBjYXNlIERPQ1VNRU5UX0ZSQUdNRU5UX05P REU6CisgICAgICAgIGRvd25jYXN0PENvbnRhaW5lck5vZGU+KCp0aGlzKS5yZXBsYWNlQWxsQ2hp bGRyZW5XaXRoTmV3VGV4dCh0ZXh0KTsKICAgICAgICAgcmV0dXJuIHsgfTsKLSAgICB9CiAgICAg Y2FzZSBET0NVTUVOVF9OT0RFOgogICAgIGNhc2UgRE9DVU1FTlRfVFlQRV9OT0RFOgogICAgICAg ICAvLyBEbyBub3RoaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9pb3Mv RWRpdG9ySU9TLm1tIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9pb3MvRWRpdG9ySU9TLm1tCmlu ZGV4IDA4ZDEyZGJkMDBmMjI2NjEwZDNhNGU1NWYxMDU4NmZlZDQ1NzMxOGMuLjIzOWU4OTQzOWM4 MzQ5MmIzNzg2Yzc4ODdmZWYyNGE3ZDM3YWNlNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvaW9zL0VkaXRvcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2lv cy9FZGl0b3JJT1MubW0KQEAgLTMyOSw0OCArMzI5LDIwIEBAIHZvaWQgRWRpdG9yOjpzZXRUZXh0 QXNDaGlsZE9mRWxlbWVudChjb25zdCBTdHJpbmcmIHRleHQsIEVsZW1lbnQmIGVsZW1lbnQpCiAg ICAgY2xlYXJVbmRvUmVkb09wZXJhdGlvbnMoKTsKIAogICAgIC8vIElmIHRoZSBlbGVtZW50IGlz IGVtcHR5IGFscmVhZHkgYW5kIHdlJ3JlIG5vdCBhZGRpbmcgdGV4dCwgd2UgY2FuIGVhcmx5IHJl dHVybiBhbmQgYXZvaWQgY2xlYXJpbmcvc2V0dGluZwotICAgIC8vIGEgc2VsZWN0aW9uIGF0IFsw LCAwXSBhbmQgdGhlIGV4cGVuc2UgaW52b2x2ZWQgaW4gY3JlYXRpb24gVmlzaWJsZVBvc2l0aW9u cy4KKyAgICAvLyBhIHNlbGVjdGlvbiBhdCBbMCwgMF0gYW5kIHRoZSBleHBlbnNlIGludm9sdmVk IGluIGNyZWF0aW5nIFZpc2libGVQb3NpdGlvbnMuCiAgICAgaWYgKCFlbGVtZW50LmZpcnN0Q2hp bGQoKSAmJiB0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gQXMgYSBz aWRlIGVmZmVjdCB0aGlzIGZ1bmN0aW9uIHNldHMgYSBjYXJldCBzZWxlY3Rpb24gYWZ0ZXIgdGhl IGluc2VydGVkIGNvbnRlbnQuIE11Y2ggb2Ygd2hhdAotICAgIC8vIGZvbGxvd3MgaXMgbW9yZSBl eHBlbnNpdmUgaWYgdGhlcmUgaXMgYSBzZWxlY3Rpb24sIHNvIGNsZWFyIGl0IHNpbmNlIGl0J3Mg Z29pbmcgdG8gY2hhbmdlIGFueXdheS4KKyAgICAvLyBBcyBhIHNpZGUgZWZmZWN0IHRoaXMgZnVu Y3Rpb24gc2V0cyBhIGNhcmV0IHNlbGVjdGlvbiBhZnRlciB0aGUgaW5zZXJ0ZWQgY29udGVudC4K KyAgICAvLyBXaGF0IGZvbGxvd3MgaXMgbW9yZSBleHBlbnNpdmUgaWYgdGhlcmUgaXMgYSBzZWxl Y3Rpb24sIHNvIGNsZWFyIGl0IHNpbmNlIGl0J3MgZ29pbmcgdG8gY2hhbmdlIGFueXdheS4KICAg ICBtX2RvY3VtZW50LnNlbGVjdGlvbigpLmNsZWFyKCk7CiAKLSAgICAvLyBjbGVhciBvdXQgYWxs IGN1cnJlbnQgY2hpbGRyZW4gb2YgZWxlbWVudAotICAgIGVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4o KTsKKyAgICBlbGVtZW50LnJlcGxhY2VBbGxDaGlsZHJlbldpdGhOZXdUZXh0KHRleHQpOwogCi0g ICAgaWYgKHRleHQubGVuZ3RoKCkpIHsKLSAgICAgICAgLy8gaW5zZXJ0IG5ldyB0ZXh0Ci0gICAg ICAgIC8vIHJlbW92ZSBlbGVtZW50IGZyb20gdHJlZSB3aGlsZSBkb2luZyBpdAotICAgICAgICAv LyBGSVhNRTogVGhlIGVsZW1lbnQgd2UncmUgaW5zZXJ0aW5nIGludG8gaXMgb2Z0ZW4gdGhlIGJv ZHkgZWxlbWVudC4gSXQgc2VlbXMgc3RyYW5nZSB0byBiZSByZW1vdmluZyBpdAotICAgICAgICAv LyAoZXZlbiBpZiBpdCBpcyBvbmx5IHRlbXBvcmFyeSkuIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5k IGRvZXNuJ3QgYm90aGVyIGRvaW5nIHRoaXMgd2hlbiBpdCBpbnNlcnRzCi0gICAgICAgIC8vIGNv bnRlbnQsIHdoeSBzaG91bGQgd2UgaGVyZT8KLSAgICAgICAgUmVmUHRyPE5vZGU+IHBhcmVudCA9 IGVsZW1lbnQucGFyZW50Tm9kZSgpOwotICAgICAgICBSZWZQdHI8Tm9kZT4gc2libGluZ0FmdGVy ID0gZWxlbWVudC5uZXh0U2libGluZygpOwotICAgICAgICBpZiAocGFyZW50KQotICAgICAgICAg ICAgZWxlbWVudC5yZW1vdmUoKTsKLQotICAgICAgICBlbGVtZW50LmFwcGVuZENoaWxkKGNyZWF0 ZUZyYWdtZW50RnJvbVRleHQobWFrZVJhbmdlU2VsZWN0aW5nTm9kZUNvbnRlbnRzKGVsZW1lbnQp LCB0ZXh0KSk7Ci0KLSAgICAgICAgLy8gcmVzdG9yZSBlbGVtZW50IHRvIGRvY3VtZW50Ci0gICAg ICAgIGlmIChwYXJlbnQpIHsKLSAgICAgICAgICAgIGlmIChzaWJsaW5nQWZ0ZXIpCi0gICAgICAg ICAgICAgICAgcGFyZW50LT5pbnNlcnRCZWZvcmUoZWxlbWVudCwgc2libGluZ0FmdGVyLmdldCgp KTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBwYXJlbnQtPmFwcGVuZENoaWxk KGVsZW1lbnQpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgLy8gc2V0IHRoZSBzZWxlY3Rpb24g dG8gdGhlIGVuZAotICAgIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zKGNyZWF0ZUxlZ2FjeUVk aXRpbmdQb3NpdGlvbigmZWxlbWVudCwgZWxlbWVudC5jb3VudENoaWxkTm9kZXMoKSkpOwotICAg IGlmICh2aXNpYmxlUG9zLmlzTnVsbCgpKQorICAgIFZpc2libGVQb3NpdGlvbiBhZnRlckNvbnRl bnRzID0gY3JlYXRlTGVnYWN5RWRpdGluZ1Bvc2l0aW9uKCZlbGVtZW50LCBlbGVtZW50LmNvdW50 Q2hpbGROb2RlcygpKTsKKyAgICBpZiAoYWZ0ZXJDb250ZW50cy5pc051bGwoKSkKICAgICAgICAg cmV0dXJuOwotCi0gICAgVmlzaWJsZVNlbGVjdGlvbiBzZWxlY3Rpb247Ci0gICAgc2VsZWN0aW9u LnNldEJhc2UodmlzaWJsZVBvcyk7Ci0gICAgc2VsZWN0aW9uLnNldEV4dGVudCh2aXNpYmxlUG9z KTsKLSAgICBtX2RvY3VtZW50LnNlbGVjdGlvbigpLnNldFNlbGVjdGlvbihzZWxlY3Rpb24pOwor ICAgIG1fZG9jdW1lbnQuc2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uKGFmdGVyQ29udGVudHMpOwog CiAgICAgY2xpZW50KCktPnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxFbGVtZW50LmNwcAppbmRleCA5Mzk4NGYzODJjZDRlZjFkZjZjYzE3YzAzM2Y1NWZk YmYxNzZiNGY2Li41ODU0M2IxNWU0OTU4ZjEzMjQ3MTQ0MTlmNjVkMzQ4NTkwNjE1NjVkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcApAQCAtNTM5LDEwICs1MzksNyBAQCBFeGNlcHRp b25Pcjx2b2lkPiBIVE1MRWxlbWVudDo6c2V0SW5uZXJUZXh0KGNvbnN0IFN0cmluZyYgdGV4dCkK ICAgICAvLyBGSVhNRTogVGhpcyBkb2Vzbid0IHRha2Ugd2hpdGVzcGFjZSBjb2xsYXBzaW5nIGlu dG8gYWNjb3VudCBhdCBhbGwuCiAKICAgICBpZiAoIXRleHQuY29udGFpbnMoJ1xuJykgJiYgIXRl eHQuY29udGFpbnMoJ1xyJykpIHsKLSAgICAgICAgaWYgKHRleHQuaXNFbXB0eSgpKQotICAgICAg ICAgICAgcmVwbGFjZUFsbENoaWxkcmVuKG51bGxwdHIpOwotICAgICAgICBlbHNlCi0gICAgICAg ICAgICByZXBsYWNlQWxsQ2hpbGRyZW5XaXRoTmV3VGV4dCh0ZXh0KTsKKyAgICAgICAgcmVwbGFj ZUFsbENoaWxkcmVuV2l0aE5ld1RleHQodGV4dCk7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVNlbGVjdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVNlbGVjdGlvbi5jcHAKaW5kZXggZWNmMmFlYWQ2ZDRlZWM4 N2EyZWVmYTMzNDMyZDAwNGEyNGNhM2YxOC4uYTE3M2FjYzU3MWMxMGUwNjA4MmFlZDYxNzRhOGE4 MmE5MjQ1MWYzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01TZWxlY3Rpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NU2VsZWN0aW9uLmNwcApAQCAtMzMyLDcg KzMzMiw3IEBAIHZvaWQgRE9NU2VsZWN0aW9uOjphZGRSYW5nZShSYW5nZSYgbGl2ZVJhbmdlKQog CiB2b2lkIERPTVNlbGVjdGlvbjo6ZGVsZXRlRnJvbURvY3VtZW50KCkKIHsKLSAgICBhdXRvKiBm cmFtZSA9IHRoaXMtPmZyYW1lKCk7CisgICAgYXV0byBmcmFtZSA9IG1ha2VSZWZQdHIodGhpcy0+ ZnJhbWUoKSk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0zNDAsMTEg KzM0MCw4IEBAIHZvaWQgRE9NU2VsZWN0aW9uOjpkZWxldGVGcm9tRG9jdW1lbnQoKQogICAgIGlm ICghc2VsZWN0ZWRSYW5nZSB8fCBzZWxlY3RlZFJhbmdlLT5zdGFydC5jb250YWluZXItPmNvbnRh aW5pbmdTaGFkb3dSb290KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlZjxGcmFtZT4gcHJv dGVjdG9yKCpmcmFtZSk7CiAgICAgY3JlYXRlTGl2ZVJhbmdlKCpzZWxlY3RlZFJhbmdlKS0+ZGVs ZXRlQ29udGVudHMoKTsKLSAgICBhdXRvIGNvbnRhaW5lciA9IHNlbGVjdGVkUmFuZ2UtPnN0YXJ0 LmNvbnRhaW5lci5wdHIoKTsKLSAgICBhdXRvIG9mZnNldCA9IHNlbGVjdGVkUmFuZ2UtPnN0YXJ0 Lm9mZnNldDsKLSAgICBzZXRCYXNlQW5kRXh0ZW50KGNvbnRhaW5lciwgb2Zmc2V0LCBjb250YWlu ZXIsIG9mZnNldCk7CisgICAgZnJhbWUtPnNlbGVjdGlvbigpLnNldFNlbGVjdGVkUmFuZ2UobWFr ZVNpbXBsZVJhbmdlKHNlbGVjdGVkUmFuZ2UtPnN0YXJ0KSwgQWZmaW5pdHk6OlVwc3RyZWFtLCBG cmFtZVNlbGVjdGlvbjo6U2hvdWxkQ2xvc2VUeXBpbmc6Ok5vKTsKIH0KIAogYm9vbCBET01TZWxl Y3Rpb246OmNvbnRhaW5zTm9kZShOb2RlJiBub2RlLCBib29sIGFsbG93UGFydGlhbCkgY29uc3QK