216450 2020-09-12 16:22:08 -0700 Fix root cause of problem with text replacements at the beginnings of sentences so we can remove the workaround 2020-09-12 21:56:14 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 216327 1 darin darin cdumez esprehn+autocc ews-watchlist kangil.han megan_gardner mifenton rniwa sam thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1688021 0 darin 2020-09-12 16:22:08 -0700 Fix root case of problem with text replacements at the beginnings of sentences so we can remove the workaround 1688023 1 408624 darin 2020-09-12 16:25:39 -0700 Created attachment 408624 Patch 1688025 2 408626 darin 2020-09-12 16:27:50 -0700 Created attachment 408626 Patch 1688057 3 darin 2020-09-12 21:55:15 -0700 Committed r266987: <https://trac.webkit.org/changeset/266987> 1688058 4 webkit-bug-importer 2020-09-12 21:56:14 -0700 <rdar://problem/68788198> 408624 2020-09-12 16:25:39 -0700 2020-09-12 16:27:49 -0700 Patch bug-216450-20200912162538.patch text/plain 8418 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTMxNjhhYTZjNDZiMTI4 YzYyZWQwNDhmOTMwY2M1M2E2OGRjMWRhYi4uMjVlMWQ5MTJkNWJkM2MwNzI2NTkwMTg4ZTZiMGM5 N2QxYjg1NWEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA5LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggcm9vdCBjYXNlIG9mIHBy b2JsZW0gd2l0aCB0ZXh0IHJlcGxhY2VtZW50cyBhdCB0aGUgYmVnaW5uaW5ncyBvZiBzZW50ZW5j ZXMgc28gd2UgY2FuIHJlbW92ZSB0aGUgd29ya2Fyb3VuZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NDUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAg ICAgKiBkb20vU2ltcGxlUmFuZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcGFyZUJ5RG9j dW1lbnRPcmRlcik6IEFkZGVkIHNvIHdlIGNhbiB1c2Ugc3RkOjptaW4vbWF4LgorICAgICAgICAo V2ViQ29yZTo6dW5pb25SYW5nZSk6IFJlZmFjdG9yZWQgdG8gdXNlIHN0ZDo6bWluL21heC4KKyAg ICAgICAgKFdlYkNvcmU6OmludGVyc2VjdGlvbik6IEFkZGVkLgorICAgICAgICAqIGRvbS9TaW1w bGVSYW5nZS5oOiBBZGRlZCBpbnRlcnNlY3Rpb24uCisKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRv ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om1hcmtNaXNzcGVsbGluZ3NBZnRlclR5 cGluZ1RvV29yZCk6IEludGVyc2VjdCB3aXRoIHRoZSBzZW50ZW5jZSByYW5nZSwKKyAgICAgICAg c2luY2Ugd2UgZG9uJ3QgaGF2ZSBhIGd1YXJuYXRlZSB0aGF0IG1vdmluZyB0byB0aGUgc3RhcnQg b2YgYSB3b3JkIGFuZCBlbmQgb2YgYSB3b3JkCisgICAgICAgIHN0YXlzIHdpdGhpbiB0aGUgc2Vu dGVuY2Ugc2luY2UgdGhlIHdvcmQgYW5kIHNlbnRlbmNlIGFsZ29yaXRobXMgYXJlIG5vdCB3aG9s bHkgY29uc2lzdGVudC4KKyAgICAgICAgSW4gc3VjaCBjYXNlcyB3ZSB3b3VsZCBsaWtlIHRvIHJl c3RyaWN0IG91ciBjaGVja2luZyB0byB0aGUgc2VudGVuY2UuIEFub3RoZXIgd2F5IHRvIGZpeAor ICAgICAgICB0aGlzIHdvdWxkIGJlIHRvIGNoYW5nZSB0aGUgYmVoYXZpb3Igb2YgdGhlIHdvcmQg YW5kIHNlbnRlbmNlIGJvdW5kYXJ5IGZ1bmN0aW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRv cjo6bWFya0FuZFJlcGxhY2VGb3IpOiBSZW1vdmUgdGhlIGJvb2xlYW4gInRydWUiIGZsYWdzIHRo YXQgd2UgdXNlZCB0bworICAgICAgICB0cmlnZ2VyIG91ciB3b3JrYXJvdW5kIGZvciB0aGUgYWJv dmUuCisKKyAgICAgICAgKiBlZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6OmF1dG9tYXRpY1JlcGxhY2VtZW50U3Rh cnQgY29uc3QpOiBSZW1vdmVkIHRoZSBib29sZWFuCisgICAgICAgIGFyZ3VtZW50IGFuZCB0aGUg d29ya2Fyb3VuZCBjb2RlIHRoYXQgcnVucyB3aGVuIGl0J3MgdHJ1ZS4KKyAgICAgICAgKFdlYkNv cmU6OlRleHRDaGVja2luZ1BhcmFncmFwaDo6YXV0b21hdGljUmVwbGFjZW1lbnRMZW5ndGggY29u c3QpOiBEaXR0by4KKyAgICAgICAgKiBlZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5oOiBSZW1v dmVkIHRoZSBib29sZWFuIGFyZ3VtZW50cy4KKwogMjAyMC0wOS0xMiAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gU2ltcGxpZnkgTGluZUJveCBv ZmZzZXQgY29tcHV0YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVS YW5nZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2ltcGxlUmFuZ2UuY3BwCmluZGV4IDAwYzM4 YTgyMzRhMWM4ZWZhYjQ3NWVhOGI0ZDViZjI3Mjc3YjIxZjYuLjY1YmNjODkzMWNjZGQwZTY4ODVj NzlkM2JhMDkwMmE2ODc4ZWFlMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1w bGVSYW5nZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NpbXBsZVJhbmdlLmNwcApAQCAt MjQ2LDExICsyNDYsMjIgQEAgYm9vbCBpbnRlcnNlY3RzKGNvbnN0IFNpbXBsZVJhbmdlJiBhLCBj b25zdCBTaW1wbGVSYW5nZSYgYikKICAgICByZXR1cm4gaXNfbHRlcShkb2N1bWVudE9yZGVyKGEu c3RhcnQsIGIuZW5kKSkgJiYgaXNfbHRlcShkb2N1bWVudE9yZGVyKGIuc3RhcnQsIGEuZW5kKSk7 CiB9CiAKK3N0YXRpYyBib29sIGNvbXBhcmVCeURvY3VtZW50T3JkZXIoY29uc3QgQm91bmRhcnlQ b2ludCYgYSwgY29uc3QgQm91bmRhcnlQb2ludCYgYikKK3sKKyAgICByZXR1cm4gaXNfbHQoZG9j dW1lbnRPcmRlcihhLCBiKSk7Cit9CisKIFNpbXBsZVJhbmdlIHVuaW9uUmFuZ2UoY29uc3QgU2lt cGxlUmFuZ2UmIGEsIGNvbnN0IFNpbXBsZVJhbmdlJiBiKQogewotICAgIGF1dG8mIHN0YXJ0ID0g aXNfbHRlcShkb2N1bWVudE9yZGVyKGEuc3RhcnQsIGIuc3RhcnQpKSA/IGEgOiBiOwotICAgIGF1 dG8mIGVuZCA9IGlzX2x0ZXEoZG9jdW1lbnRPcmRlcihhLmVuZCwgYi5lbmQpKSA/IGIgOiBhOwot ICAgIHJldHVybiB7IHN0YXJ0LnN0YXJ0LCBlbmQuZW5kIH07CisgICAgcmV0dXJuIHsgc3RkOjpt aW4oYS5zdGFydCwgYi5zdGFydCwgY29tcGFyZUJ5RG9jdW1lbnRPcmRlciksIHN0ZDo6bWF4KGEu ZW5kLCBiLmVuZCwgY29tcGFyZUJ5RG9jdW1lbnRPcmRlcikgfTsKK30KKworT3B0aW9uYWw8U2lt cGxlUmFuZ2U+IGludGVyc2VjdGlvbihjb25zdCBPcHRpb25hbDxTaW1wbGVSYW5nZT4mIGEsIGNv bnN0IE9wdGlvbmFsPFNpbXBsZVJhbmdlPiYgYikKK3sKKyAgICAvLyBGSVhNRTogQ2FuIHRoaXMg YmUgZG9uZSB3aXRoIGZld2VyIGNhbGxzIHRvIGRvY3VtZW50T3JkZXI/CisgICAgaWYgKCFhIHx8 ICFiIHx8ICFpbnRlcnNlY3RzKCphLCAqYikpCisgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7 CisgICAgcmV0dXJuIHsgeyBzdGQ6Om1heChhLT5zdGFydCwgYi0+c3RhcnQsIGNvbXBhcmVCeURv Y3VtZW50T3JkZXIpLCBzdGQ6Om1pbihhLT5lbmQsIGItPmVuZCwgY29tcGFyZUJ5RG9jdW1lbnRP cmRlcikgfSB9OwogfQogCiBib29sIGNvbnRhaW5zKGNvbnN0IFNpbXBsZVJhbmdlJiByYW5nZSwg Y29uc3QgTm9kZSYgbm9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVS YW5nZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1NpbXBsZVJhbmdlLmgKaW5kZXggYmFmMjMxOWIx ODI0ZWU4NzkxNjM0MTliOWUzMjU2MTljNTVjMzQ3My4uNjBiMzAyZmViMGNhMWVlOWUxNTZjOWJj M2EyMDBhZTRmZGYzMDFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NpbXBsZVJh bmdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NpbXBsZVJhbmdlLmgKQEAgLTcxLDYgKzcx LDcgQEAgYm9vbCBpc1BvaW50SW5SYW5nZShjb25zdCBTaW1wbGVSYW5nZSYsIGNvbnN0IE9wdGlv bmFsPEJvdW5kYXJ5UG9pbnQ+Jik7CiBXRUJDT1JFX0VYUE9SVCBib29sIGNvbnRhaW5zKGNvbnN0 IFNpbXBsZVJhbmdlJiBvdXRlclJhbmdlLCBjb25zdCBTaW1wbGVSYW5nZSYgaW5uZXJSYW5nZSk7 CiBXRUJDT1JFX0VYUE9SVCBib29sIGludGVyc2VjdHMoY29uc3QgU2ltcGxlUmFuZ2UmLCBjb25z dCBTaW1wbGVSYW5nZSYpOwogV0VCQ09SRV9FWFBPUlQgU2ltcGxlUmFuZ2UgdW5pb25SYW5nZShj b25zdCBTaW1wbGVSYW5nZSYsIGNvbnN0IFNpbXBsZVJhbmdlJik7CitXRUJDT1JFX0VYUE9SVCBP cHRpb25hbDxTaW1wbGVSYW5nZT4gaW50ZXJzZWN0aW9uKGNvbnN0IE9wdGlvbmFsPFNpbXBsZVJh bmdlPiYsIGNvbnN0IE9wdGlvbmFsPFNpbXBsZVJhbmdlPiYpOwogCiBXRUJDT1JFX0VYUE9SVCBi b29sIGNvbnRhaW5zKGNvbnN0IFNpbXBsZVJhbmdlJiwgY29uc3QgTm9kZSYpOwogV0VCQ09SRV9F WFBPUlQgYm9vbCBpbnRlcnNlY3RzKGNvbnN0IFNpbXBsZVJhbmdlJiwgY29uc3QgTm9kZSYpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCmluZGV4IDUwOTA0N2E0YjIxMDFkYzhiNWY4MmNkZjFi MDNmMTdhZmRhY2U1ZjAuLmU3NzIwZmY1Mjc0MGEyYmI5OTBmMDU5ZjhmYThlZDkxNzU4ODdjY2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKQEAgLTI1NDMsNyArMjU0Myw3IEBAIHZvaWQg RWRpdG9yOjptYXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmdUb1dvcmQoY29uc3QgVmlzaWJsZVBv c2l0aW9uJiB3b3JkU3RhcnQsCiAgICAgICAgIGlmICghc3BlbGxDaGVja2luZ1JhbmdlKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gYWRqYWNlbnRXb3JkUmFuZ2UgPSBWaXNp YmxlU2VsZWN0aW9uKHN0YXJ0T2ZXb3JkKHdvcmRTdGFydCwgTGVmdFdvcmRJZk9uQm91bmRhcnkp LCBlbmRPZldvcmQod29yZFN0YXJ0LCBSaWdodFdvcmRJZk9uQm91bmRhcnkpKS50b05vcm1hbGl6 ZWRSYW5nZSgpOworICAgICAgICBhdXRvIGFkamFjZW50V29yZFJhbmdlID0gaW50ZXJzZWN0aW9u KFZpc2libGVTZWxlY3Rpb24oc3RhcnRPZldvcmQod29yZFN0YXJ0LCBMZWZ0V29yZElmT25Cb3Vu ZGFyeSksIGVuZE9mV29yZCh3b3JkU3RhcnQsIFJpZ2h0V29yZElmT25Cb3VuZGFyeSkpLnRvTm9y bWFsaXplZFJhbmdlKCksIGZ1bGxTZW50ZW5jZVJhbmdlKTsKICAgICAgICAgaWYgKCFhZGphY2Vu dFdvcmRSYW5nZSkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMjc5OSw4ICsyNzk5LDggQEAg dm9pZCBFZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKGNvbnN0IFNwZWxsQ2hlY2tSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBWZWN0b3I8VGUKICAgICAgICAgYXV0byByZXN1bHRMb2NhdGlvbiA9IHJl c3VsdHNbaV0ucmFuZ2UubG9jYXRpb24gKyBvZmZzZXREdWVUb1JlcGxhY2VtZW50OwogICAgICAg ICBhdXRvIHJlc3VsdExlbmd0aCA9IHJlc3VsdHNbaV0ucmFuZ2UubGVuZ3RoOwogICAgICAgICBh dXRvIHJlc3VsdEVuZExvY2F0aW9uID0gcmVzdWx0TG9jYXRpb24gKyByZXN1bHRMZW5ndGg7Ci0g ICAgICAgIGF1dG8gYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydExvY2F0aW9uID0gcGFyYWdyYXBo LmF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnQodHJ1ZSk7Ci0gICAgICAgIGF1dG8gYXV0b21hdGlj UmVwbGFjZW1lbnRFbmRMb2NhdGlvbiA9IGF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnRMb2NhdGlv biArIHBhcmFncmFwaC5hdXRvbWF0aWNSZXBsYWNlbWVudExlbmd0aCh0cnVlKSArIG9mZnNldER1 ZVRvUmVwbGFjZW1lbnQ7CisgICAgICAgIGF1dG8gYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydExv Y2F0aW9uID0gcGFyYWdyYXBoLmF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnQoKTsKKyAgICAgICAg YXV0byBhdXRvbWF0aWNSZXBsYWNlbWVudEVuZExvY2F0aW9uID0gYXV0b21hdGljUmVwbGFjZW1l bnRTdGFydExvY2F0aW9uICsgcGFyYWdyYXBoLmF1dG9tYXRpY1JlcGxhY2VtZW50TGVuZ3RoKCkg KyBvZmZzZXREdWVUb1JlcGxhY2VtZW50OwogICAgICAgICBjb25zdCBTdHJpbmcmIHJlcGxhY2Vt ZW50ID0gcmVzdWx0c1tpXS5yZXBsYWNlbWVudDsKICAgICAgICAgYm9vbCByZXN1bHRFbmRzQXRB bWJpZ3VvdXNCb3VuZGFyeSA9IHVzZUFtYmlndW91c0JvdW5kYXJ5T2Zmc2V0ICYmIHNlbGVjdGlv bk9mZnNldCAtIDEgPD0gcmVzdWx0RW5kTG9jYXRpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvVGV4dENoZWNraW5nSGVscGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvVGV4dENoZWNraW5nSGVscGVyLmNwcAppbmRleCA5OWQyYzM5OWQwMGZlMjU1OTQ3YzNk ZWEyYjY0MGFjMDQyNGQ2ZjdkLi41MjZkZWVkZjY4MDdkMzZhZTc4OWVjZTQyYTA4MTA4MGE1ZmZm MzIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0Q2hlY2tpbmdIZWxwZXIuY3Bw CkBAIC0yMDgsMjEgKzIwOCwxNSBAQCB1aW50NjRfdCBUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6OmNo ZWNraW5nTGVuZ3RoKCkgY29uc3QKICAgICByZXR1cm4gKm1fY2hlY2tpbmdMZW5ndGg7CiB9CiAK LXVpbnQ2NF90IFRleHRDaGVja2luZ1BhcmFncmFwaDo6YXV0b21hdGljUmVwbGFjZW1lbnRTdGFy dChib29sIG9sZEJlaGF2aW91cikgY29uc3QKK3VpbnQ2NF90IFRleHRDaGVja2luZ1BhcmFncmFw aDo6YXV0b21hdGljUmVwbGFjZW1lbnRTdGFydCgpIGNvbnN0CiB7Ci0gICAgaWYgKG9sZEJlaGF2 aW91ciAmJiBpc19ndChkb2N1bWVudE9yZGVyKHBhcmFncmFwaFJhbmdlKCkuc3RhcnQsIG1fYXV0 b21hdGljUmVwbGFjZW1lbnRSYW5nZS5zdGFydCkpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAK ICAgICBpZiAoIW1fYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydCkKICAgICAgICAgbV9hdXRvbWF0 aWNSZXBsYWNlbWVudFN0YXJ0ID0gY2hhcmFjdGVyQ291bnQoeyBwYXJhZ3JhcGhSYW5nZSgpLnN0 YXJ0LCBtX2F1dG9tYXRpY1JlcGxhY2VtZW50UmFuZ2Uuc3RhcnQgfSk7CiAgICAgcmV0dXJuICpt X2F1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnQ7CiB9CiAKLXVpbnQ2NF90IFRleHRDaGVja2luZ1Bh cmFncmFwaDo6YXV0b21hdGljUmVwbGFjZW1lbnRMZW5ndGgoYm9vbCBvbGRCZWhhdmlvdXIpIGNv bnN0Cit1aW50NjRfdCBUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6OmF1dG9tYXRpY1JlcGxhY2VtZW50 TGVuZ3RoKCkgY29uc3QKIHsKLSAgICBpZiAob2xkQmVoYXZpb3VyICYmIGlzX2d0KGRvY3VtZW50 T3JkZXIocGFyYWdyYXBoUmFuZ2UoKS5zdGFydCwgbV9hdXRvbWF0aWNSZXBsYWNlbWVudFJhbmdl LnN0YXJ0KSkpCi0gICAgICAgIHJldHVybiBjaGFyYWN0ZXJDb3VudCh7IHBhcmFncmFwaFJhbmdl KCkuc3RhcnQsIG1fYXV0b21hdGljUmVwbGFjZW1lbnRSYW5nZS5lbmQgfSk7Ci0gICAgCiAgICAg aWYgKCFtX2F1dG9tYXRpY1JlcGxhY2VtZW50TGVuZ3RoKQogICAgICAgICBtX2F1dG9tYXRpY1Jl cGxhY2VtZW50TGVuZ3RoID0gY2hhcmFjdGVyQ291bnQobV9hdXRvbWF0aWNSZXBsYWNlbWVudFJh bmdlKTsKICAgICByZXR1cm4gKm1fYXV0b21hdGljUmVwbGFjZW1lbnRMZW5ndGg7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5oIGIvU291cmNl L1dlYkNvcmUvZWRpdGluZy9UZXh0Q2hlY2tpbmdIZWxwZXIuaAppbmRleCAwY2Y5YTM1ZWExZTg3 ODhjODc4MDExNzJkN2Y1ZWEwYmZiMzgyNDQ2Li5iNWQyM2EyZWUzZjVlZmE4ZThjY2MyZTM4OGNj MDk5ODRmMmQ4NzcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVj a2luZ0hlbHBlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dENoZWNraW5nSGVs cGVyLmgKQEAgLTU0LDggKzU0LDggQEAgcHVibGljOgogICAgIHVpbnQ2NF90IGNoZWNraW5nTGVu Z3RoKCkgY29uc3Q7CiAgICAgU3RyaW5nVmlldyBjaGVja2luZ1N1YnN0cmluZygpIGNvbnN0IHsg cmV0dXJuIHRleHQoKS5zdWJzdHJpbmcoY2hlY2tpbmdTdGFydCgpLCBjaGVja2luZ0xlbmd0aCgp KTsgfQogCi0gICAgdWludDY0X3QgYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydChib29sID0gZmFs c2UpIGNvbnN0OwotICAgIHVpbnQ2NF90IGF1dG9tYXRpY1JlcGxhY2VtZW50TGVuZ3RoKGJvb2wg PSBmYWxzZSkgY29uc3Q7CisgICAgdWludDY0X3QgYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydCgp IGNvbnN0OworICAgIHVpbnQ2NF90IGF1dG9tYXRpY1JlcGxhY2VtZW50TGVuZ3RoKCkgY29uc3Q7 CiAKICAgICBib29sIGNoZWNraW5nUmFuZ2VNYXRjaGVzKENoYXJhY3RlclJhbmdlIHJhbmdlKSBj b25zdCB7IHJldHVybiByYW5nZS5sb2NhdGlvbiA9PSBjaGVja2luZ1N0YXJ0KCkgJiYgcmFuZ2Uu bGVuZ3RoID09IGNoZWNraW5nTGVuZ3RoKCk7IH0KICAgICBib29sIGlzQ2hlY2tpbmdSYW5nZUNv dmVyZWRCeShDaGFyYWN0ZXJSYW5nZSByYW5nZSkgY29uc3QgeyByZXR1cm4gcmFuZ2UubG9jYXRp b24gPD0gY2hlY2tpbmdTdGFydCgpICYmIHJhbmdlLmxvY2F0aW9uICsgcmFuZ2UubGVuZ3RoID49 IGNoZWNraW5nU3RhcnQoKSArIGNoZWNraW5nTGVuZ3RoKCk7IH0K 408626 2020-09-12 16:27:50 -0700 2020-09-12 21:54:28 -0700 Patch bug-216450-20200912162749.patch text/plain 8386 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTMxNjhhYTZjNDZiMTI4 YzYyZWQwNDhmOTMwY2M1M2E2OGRjMWRhYi4uOTIxMjI0YjRhMDQwMTI5YjQ0OWI5YTM1OWNiZGRi NjVlOGE3OWRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA5LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggcm9vdCBjYXVzZSBvZiBw cm9ibGVtIHdpdGggdGV4dCByZXBsYWNlbWVudHMgYXQgdGhlIGJlZ2lubmluZ3Mgb2Ygc2VudGVu Y2VzIHNvIHdlIGNhbiByZW1vdmUgdGhlIHdvcmthcm91bmQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjQ1MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZG9tL1NpbXBsZVJhbmdlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNvbXBhcmVCeURvY3VtZW50T3JkZXIpOiBBZGRlZCBzbyB3ZSBjYW4gdXNl IHN0ZDo6bWluL21heC4KKyAgICAgICAgKFdlYkNvcmU6OnVuaW9uUmFuZ2UpOiBSZWZhY3RvcmVk IHRvIHVzZSBzdGQ6Om1pbi9tYXguCisgICAgICAgIChXZWJDb3JlOjppbnRlcnNlY3Rpb24pOiBB ZGRlZC4KKyAgICAgICAgKiBkb20vU2ltcGxlUmFuZ2UuaDogQWRkZWQgaW50ZXJzZWN0aW9uLgor CisgICAgICAgICogZWRpdGluZy9FZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9y OjptYXJrTWlzc3BlbGxpbmdzQWZ0ZXJUeXBpbmdUb1dvcmQpOiBJbnRlcnNlY3Qgd2l0aCB0aGUg c2VudGVuY2UgcmFuZ2UsCisgICAgICAgIHNpbmNlIHdlIGRvbid0IGhhdmUgYSBndWFybmF0ZWUg dGhhdCBtb3ZpbmcgdG8gdGhlIHN0YXJ0IG9mIGEgd29yZCBhbmQgZW5kIG9mIGEgd29yZAorICAg ICAgICBzdGF5cyB3aXRoaW4gdGhlIHNlbnRlbmNlIHNpbmNlIHRoZSB3b3JkIGFuZCBzZW50ZW5j ZSBhbGdvcml0aG1zIGFyZSBub3Qgd2hvbGx5IGNvbnNpc3RlbnQuCisgICAgICAgIEluIHN1Y2gg Y2FzZXMgd2Ugd291bGQgbGlrZSB0byByZXN0cmljdCBvdXIgY2hlY2tpbmcgdG8gdGhlIHNlbnRl bmNlLiBBbm90aGVyIHdheSB0byBmaXgKKyAgICAgICAgdGhpcyB3b3VsZCBiZSB0byBjaGFuZ2Ug dGhlIGJlaGF2aW9yIG9mIHRoZSB3b3JkIGFuZCBzZW50ZW5jZSBib3VuZGFyeSBmdW5jdGlvbnMu CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6Om1hcmtBbmRSZXBsYWNlRm9yKTogUmVtb3ZlIHRo ZSBib29sZWFuICJ0cnVlIiBmbGFncyB0aGF0IHdlIHVzZWQgdG8KKyAgICAgICAgdHJpZ2dlciBv dXIgd29ya2Fyb3VuZCBmb3IgdGhlIGFib3ZlLgorCisgICAgICAgICogZWRpdGluZy9UZXh0Q2hl Y2tpbmdIZWxwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dENoZWNraW5nUGFyYWdyYXBo OjphdXRvbWF0aWNSZXBsYWNlbWVudFN0YXJ0IGNvbnN0KTogUmVtb3ZlZCB0aGUgYm9vbGVhbgor ICAgICAgICBhcmd1bWVudCBhbmQgdGhlIHdvcmthcm91bmQgY29kZSB0aGF0IHJ1bnMgd2hlbiBp dCdzIHRydWUuCisgICAgICAgIChXZWJDb3JlOjpUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6OmF1dG9t YXRpY1JlcGxhY2VtZW50TGVuZ3RoIGNvbnN0KTogRGl0dG8uCisgICAgICAgICogZWRpdGluZy9U ZXh0Q2hlY2tpbmdIZWxwZXIuaDogUmVtb3ZlZCB0aGUgYm9vbGVhbiBhcmd1bWVudHMuCisKIDIw MjAtMDktMTIgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZD XVtJRkNdIFNpbXBsaWZ5IExpbmVCb3ggb2Zmc2V0IGNvbXB1dGF0aW9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vU2ltcGxlUmFuZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1Np bXBsZVJhbmdlLmNwcAppbmRleCAwMGMzOGE4MjM0YTFjOGVmYWI0NzVlYThiNGQ1YmYyNzI3N2Iy MWY2Li42NWJjYzg5MzFjY2RkMGU2ODg1Yzc5ZDNiYTA5MDJhNjg3OGVhZTM1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vU2ltcGxlUmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9TaW1wbGVSYW5nZS5jcHAKQEAgLTI0NiwxMSArMjQ2LDIyIEBAIGJvb2wgaW50ZXJzZWN0 cyhjb25zdCBTaW1wbGVSYW5nZSYgYSwgY29uc3QgU2ltcGxlUmFuZ2UmIGIpCiAgICAgcmV0dXJu IGlzX2x0ZXEoZG9jdW1lbnRPcmRlcihhLnN0YXJ0LCBiLmVuZCkpICYmIGlzX2x0ZXEoZG9jdW1l bnRPcmRlcihiLnN0YXJ0LCBhLmVuZCkpOwogfQogCitzdGF0aWMgYm9vbCBjb21wYXJlQnlEb2N1 bWVudE9yZGVyKGNvbnN0IEJvdW5kYXJ5UG9pbnQmIGEsIGNvbnN0IEJvdW5kYXJ5UG9pbnQmIGIp Cit7CisgICAgcmV0dXJuIGlzX2x0KGRvY3VtZW50T3JkZXIoYSwgYikpOworfQorCiBTaW1wbGVS YW5nZSB1bmlvblJhbmdlKGNvbnN0IFNpbXBsZVJhbmdlJiBhLCBjb25zdCBTaW1wbGVSYW5nZSYg YikKIHsKLSAgICBhdXRvJiBzdGFydCA9IGlzX2x0ZXEoZG9jdW1lbnRPcmRlcihhLnN0YXJ0LCBi LnN0YXJ0KSkgPyBhIDogYjsKLSAgICBhdXRvJiBlbmQgPSBpc19sdGVxKGRvY3VtZW50T3JkZXIo YS5lbmQsIGIuZW5kKSkgPyBiIDogYTsKLSAgICByZXR1cm4geyBzdGFydC5zdGFydCwgZW5kLmVu ZCB9OworICAgIHJldHVybiB7IHN0ZDo6bWluKGEuc3RhcnQsIGIuc3RhcnQsIGNvbXBhcmVCeURv Y3VtZW50T3JkZXIpLCBzdGQ6Om1heChhLmVuZCwgYi5lbmQsIGNvbXBhcmVCeURvY3VtZW50T3Jk ZXIpIH07Cit9CisKK09wdGlvbmFsPFNpbXBsZVJhbmdlPiBpbnRlcnNlY3Rpb24oY29uc3QgT3B0 aW9uYWw8U2ltcGxlUmFuZ2U+JiBhLCBjb25zdCBPcHRpb25hbDxTaW1wbGVSYW5nZT4mIGIpCit7 CisgICAgLy8gRklYTUU6IENhbiB0aGlzIGJlIGRvbmUgd2l0aCBmZXdlciBjYWxscyB0byBkb2N1 bWVudE9yZGVyPworICAgIGlmICghYSB8fCAhYiB8fCAhaW50ZXJzZWN0cygqYSwgKmIpKQorICAg ICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworICAgIHJldHVybiB7IHsgc3RkOjptYXgoYS0+c3Rh cnQsIGItPnN0YXJ0LCBjb21wYXJlQnlEb2N1bWVudE9yZGVyKSwgc3RkOjptaW4oYS0+ZW5kLCBi LT5lbmQsIGNvbXBhcmVCeURvY3VtZW50T3JkZXIpIH0gfTsKIH0KIAogYm9vbCBjb250YWlucyhj b25zdCBTaW1wbGVSYW5nZSYgcmFuZ2UsIGNvbnN0IE5vZGUmIG5vZGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vU2ltcGxlUmFuZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaW1w bGVSYW5nZS5oCmluZGV4IGJhZjIzMTliMTgyNGVlODc5MTYzNDE5YjllMzI1NjE5YzU1YzM0NzMu LjYwYjMwMmZlYjBjYTFlZTllMTU2YzliYzNhMjAwYWU0ZmRmMzAxZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TaW1wbGVSYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9T aW1wbGVSYW5nZS5oCkBAIC03MSw2ICs3MSw3IEBAIGJvb2wgaXNQb2ludEluUmFuZ2UoY29uc3Qg U2ltcGxlUmFuZ2UmLCBjb25zdCBPcHRpb25hbDxCb3VuZGFyeVBvaW50PiYpOwogV0VCQ09SRV9F WFBPUlQgYm9vbCBjb250YWlucyhjb25zdCBTaW1wbGVSYW5nZSYgb3V0ZXJSYW5nZSwgY29uc3Qg U2ltcGxlUmFuZ2UmIGlubmVyUmFuZ2UpOwogV0VCQ09SRV9FWFBPUlQgYm9vbCBpbnRlcnNlY3Rz KGNvbnN0IFNpbXBsZVJhbmdlJiwgY29uc3QgU2ltcGxlUmFuZ2UmKTsKIFdFQkNPUkVfRVhQT1JU IFNpbXBsZVJhbmdlIHVuaW9uUmFuZ2UoY29uc3QgU2ltcGxlUmFuZ2UmLCBjb25zdCBTaW1wbGVS YW5nZSYpOworV0VCQ09SRV9FWFBPUlQgT3B0aW9uYWw8U2ltcGxlUmFuZ2U+IGludGVyc2VjdGlv bihjb25zdCBPcHRpb25hbDxTaW1wbGVSYW5nZT4mLCBjb25zdCBPcHRpb25hbDxTaW1wbGVSYW5n ZT4mKTsKIAogV0VCQ09SRV9FWFBPUlQgYm9vbCBjb250YWlucyhjb25zdCBTaW1wbGVSYW5nZSYs IGNvbnN0IE5vZGUmKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgaW50ZXJzZWN0cyhjb25zdCBTaW1w bGVSYW5nZSYsIGNvbnN0IE5vZGUmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAppbmRleCA1 MDkwNDdhNGIyMTAxZGM4YjVmODJjZGYxYjAzZjE3YWZkYWNlNWYwLi5lNzcyMGZmNTI3NDBhMmJi OTkwZjA1OWY4ZmE4ZWQ5MTc1ODg3Y2NjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCkBA IC0yNTQzLDcgKzI1NDMsNyBAQCB2b2lkIEVkaXRvcjo6bWFya01pc3NwZWxsaW5nc0FmdGVyVHlw aW5nVG9Xb3JkKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgd29yZFN0YXJ0LAogICAgICAgICBpZiAo IXNwZWxsQ2hlY2tpbmdSYW5nZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBhdXRv IGFkamFjZW50V29yZFJhbmdlID0gVmlzaWJsZVNlbGVjdGlvbihzdGFydE9mV29yZCh3b3JkU3Rh cnQsIExlZnRXb3JkSWZPbkJvdW5kYXJ5KSwgZW5kT2ZXb3JkKHdvcmRTdGFydCwgUmlnaHRXb3Jk SWZPbkJvdW5kYXJ5KSkudG9Ob3JtYWxpemVkUmFuZ2UoKTsKKyAgICAgICAgYXV0byBhZGphY2Vu dFdvcmRSYW5nZSA9IGludGVyc2VjdGlvbihWaXNpYmxlU2VsZWN0aW9uKHN0YXJ0T2ZXb3JkKHdv cmRTdGFydCwgTGVmdFdvcmRJZk9uQm91bmRhcnkpLCBlbmRPZldvcmQod29yZFN0YXJ0LCBSaWdo dFdvcmRJZk9uQm91bmRhcnkpKS50b05vcm1hbGl6ZWRSYW5nZSgpLCBmdWxsU2VudGVuY2VSYW5n ZSk7CiAgICAgICAgIGlmICghYWRqYWNlbnRXb3JkUmFuZ2UpCiAgICAgICAgICAgICByZXR1cm47 CiAKQEAgLTI3OTksOCArMjc5OSw4IEBAIHZvaWQgRWRpdG9yOjptYXJrQW5kUmVwbGFjZUZvcihj b25zdCBTcGVsbENoZWNrUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgVmVjdG9yPFRlCiAgICAgICAg IGF1dG8gcmVzdWx0TG9jYXRpb24gPSByZXN1bHRzW2ldLnJhbmdlLmxvY2F0aW9uICsgb2Zmc2V0 RHVlVG9SZXBsYWNlbWVudDsKICAgICAgICAgYXV0byByZXN1bHRMZW5ndGggPSByZXN1bHRzW2ld LnJhbmdlLmxlbmd0aDsKICAgICAgICAgYXV0byByZXN1bHRFbmRMb2NhdGlvbiA9IHJlc3VsdExv Y2F0aW9uICsgcmVzdWx0TGVuZ3RoOwotICAgICAgICBhdXRvIGF1dG9tYXRpY1JlcGxhY2VtZW50 U3RhcnRMb2NhdGlvbiA9IHBhcmFncmFwaC5hdXRvbWF0aWNSZXBsYWNlbWVudFN0YXJ0KHRydWUp OwotICAgICAgICBhdXRvIGF1dG9tYXRpY1JlcGxhY2VtZW50RW5kTG9jYXRpb24gPSBhdXRvbWF0 aWNSZXBsYWNlbWVudFN0YXJ0TG9jYXRpb24gKyBwYXJhZ3JhcGguYXV0b21hdGljUmVwbGFjZW1l bnRMZW5ndGgodHJ1ZSkgKyBvZmZzZXREdWVUb1JlcGxhY2VtZW50OworICAgICAgICBhdXRvIGF1 dG9tYXRpY1JlcGxhY2VtZW50U3RhcnRMb2NhdGlvbiA9IHBhcmFncmFwaC5hdXRvbWF0aWNSZXBs YWNlbWVudFN0YXJ0KCk7CisgICAgICAgIGF1dG8gYXV0b21hdGljUmVwbGFjZW1lbnRFbmRMb2Nh dGlvbiA9IGF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnRMb2NhdGlvbiArIHBhcmFncmFwaC5hdXRv bWF0aWNSZXBsYWNlbWVudExlbmd0aCgpICsgb2Zmc2V0RHVlVG9SZXBsYWNlbWVudDsKICAgICAg ICAgY29uc3QgU3RyaW5nJiByZXBsYWNlbWVudCA9IHJlc3VsdHNbaV0ucmVwbGFjZW1lbnQ7CiAg ICAgICAgIGJvb2wgcmVzdWx0RW5kc0F0QW1iaWd1b3VzQm91bmRhcnkgPSB1c2VBbWJpZ3VvdXNC b3VuZGFyeU9mZnNldCAmJiBzZWxlY3Rpb25PZmZzZXQgLSAxIDw9IHJlc3VsdEVuZExvY2F0aW9u OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5jcHAKaW5k ZXggOTlkMmMzOTlkMDBmZTI1NTk0N2MzZGVhMmI2NDBhYzA0MjRkNmY3ZC4uNTI2ZGVlZGY2ODA3 ZDM2YWU3ODllY2U0MmEwODEwODBhNWZmZjMyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9UZXh0Q2hlY2tpbmdIZWxwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvVGV4dENoZWNraW5nSGVscGVyLmNwcApAQCAtMjA4LDIxICsyMDgsMTUgQEAgdWludDY0X3Qg VGV4dENoZWNraW5nUGFyYWdyYXBoOjpjaGVja2luZ0xlbmd0aCgpIGNvbnN0CiAgICAgcmV0dXJu ICptX2NoZWNraW5nTGVuZ3RoOwogfQogCi11aW50NjRfdCBUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6 OmF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnQoYm9vbCBvbGRCZWhhdmlvdXIpIGNvbnN0Cit1aW50 NjRfdCBUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6OmF1dG9tYXRpY1JlcGxhY2VtZW50U3RhcnQoKSBj b25zdAogewotICAgIGlmIChvbGRCZWhhdmlvdXIgJiYgaXNfZ3QoZG9jdW1lbnRPcmRlcihwYXJh Z3JhcGhSYW5nZSgpLnN0YXJ0LCBtX2F1dG9tYXRpY1JlcGxhY2VtZW50UmFuZ2Uuc3RhcnQpKSkK LSAgICAgICAgcmV0dXJuIDA7Ci0gICAgCiAgICAgaWYgKCFtX2F1dG9tYXRpY1JlcGxhY2VtZW50 U3RhcnQpCiAgICAgICAgIG1fYXV0b21hdGljUmVwbGFjZW1lbnRTdGFydCA9IGNoYXJhY3RlckNv dW50KHsgcGFyYWdyYXBoUmFuZ2UoKS5zdGFydCwgbV9hdXRvbWF0aWNSZXBsYWNlbWVudFJhbmdl LnN0YXJ0IH0pOwogICAgIHJldHVybiAqbV9hdXRvbWF0aWNSZXBsYWNlbWVudFN0YXJ0OwogfQog Ci11aW50NjRfdCBUZXh0Q2hlY2tpbmdQYXJhZ3JhcGg6OmF1dG9tYXRpY1JlcGxhY2VtZW50TGVu Z3RoKGJvb2wgb2xkQmVoYXZpb3VyKSBjb25zdAordWludDY0X3QgVGV4dENoZWNraW5nUGFyYWdy YXBoOjphdXRvbWF0aWNSZXBsYWNlbWVudExlbmd0aCgpIGNvbnN0CiB7Ci0gICAgaWYgKG9sZEJl aGF2aW91ciAmJiBpc19ndChkb2N1bWVudE9yZGVyKHBhcmFncmFwaFJhbmdlKCkuc3RhcnQsIG1f YXV0b21hdGljUmVwbGFjZW1lbnRSYW5nZS5zdGFydCkpKQotICAgICAgICByZXR1cm4gY2hhcmFj dGVyQ291bnQoeyBwYXJhZ3JhcGhSYW5nZSgpLnN0YXJ0LCBtX2F1dG9tYXRpY1JlcGxhY2VtZW50 UmFuZ2UuZW5kIH0pOwotICAgIAogICAgIGlmICghbV9hdXRvbWF0aWNSZXBsYWNlbWVudExlbmd0 aCkKICAgICAgICAgbV9hdXRvbWF0aWNSZXBsYWNlbWVudExlbmd0aCA9IGNoYXJhY3RlckNvdW50 KG1fYXV0b21hdGljUmVwbGFjZW1lbnRSYW5nZSk7CiAgICAgcmV0dXJuICptX2F1dG9tYXRpY1Jl cGxhY2VtZW50TGVuZ3RoOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0 Q2hlY2tpbmdIZWxwZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dENoZWNraW5nSGVs cGVyLmgKaW5kZXggMGNmOWEzNWVhMWU4Nzg4Yzg3ODAxMTcyZDdmNWVhMGJmYjM4MjQ0Ni4uYjVk MjNhMmVlM2Y1ZWZhOGU4Y2NjMmUzODhjYzA5OTg0ZjJkODc3MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9UZXh0Q2hlY2tpbmdIZWxwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL1RleHRDaGVja2luZ0hlbHBlci5oCkBAIC01NCw4ICs1NCw4IEBAIHB1YmxpYzoK ICAgICB1aW50NjRfdCBjaGVja2luZ0xlbmd0aCgpIGNvbnN0OwogICAgIFN0cmluZ1ZpZXcgY2hl Y2tpbmdTdWJzdHJpbmcoKSBjb25zdCB7IHJldHVybiB0ZXh0KCkuc3Vic3RyaW5nKGNoZWNraW5n U3RhcnQoKSwgY2hlY2tpbmdMZW5ndGgoKSk7IH0KIAotICAgIHVpbnQ2NF90IGF1dG9tYXRpY1Jl cGxhY2VtZW50U3RhcnQoYm9vbCA9IGZhbHNlKSBjb25zdDsKLSAgICB1aW50NjRfdCBhdXRvbWF0 aWNSZXBsYWNlbWVudExlbmd0aChib29sID0gZmFsc2UpIGNvbnN0OworICAgIHVpbnQ2NF90IGF1 dG9tYXRpY1JlcGxhY2VtZW50U3RhcnQoKSBjb25zdDsKKyAgICB1aW50NjRfdCBhdXRvbWF0aWNS ZXBsYWNlbWVudExlbmd0aCgpIGNvbnN0OwogCiAgICAgYm9vbCBjaGVja2luZ1JhbmdlTWF0Y2hl cyhDaGFyYWN0ZXJSYW5nZSByYW5nZSkgY29uc3QgeyByZXR1cm4gcmFuZ2UubG9jYXRpb24gPT0g Y2hlY2tpbmdTdGFydCgpICYmIHJhbmdlLmxlbmd0aCA9PSBjaGVja2luZ0xlbmd0aCgpOyB9CiAg ICAgYm9vbCBpc0NoZWNraW5nUmFuZ2VDb3ZlcmVkQnkoQ2hhcmFjdGVyUmFuZ2UgcmFuZ2UpIGNv bnN0IHsgcmV0dXJuIHJhbmdlLmxvY2F0aW9uIDw9IGNoZWNraW5nU3RhcnQoKSAmJiByYW5nZS5s b2NhdGlvbiArIHJhbmdlLmxlbmd0aCA+PSBjaGVja2luZ1N0YXJ0KCkgKyBjaGVja2luZ0xlbmd0 aCgpOyB9Cg==