222640 2021-03-02 22:00:37 -0800 Hold onto AppHighlights and restore them once the page is loaded. 2021-03-09 10:03:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner cdumez esprehn+autocc ews-watchlist hi kangil.han thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1735194 0 megan_gardner 2021-03-02 22:00:37 -0800 Hold onto AppHighlights and restore them once the page is loaded. 1735195 1 422045 megan_gardner 2021-03-02 22:01:23 -0800 Created attachment 422045 Patch 1735201 2 422045 hi 2021-03-02 23:02:27 -0800 Comment on attachment 422045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422045&action=review r=me > Source/WebCore/Modules/highlight/AppHighlightStorage.cpp:254 > + auto strongDocument = makeRefPtr(m_document.get()); I think this will `ASSERT` if `m_document` is not set or has been destroyed. You might have to move this below the `if (!m_document)` check. > Source/WebCore/Modules/highlight/AppHighlightStorage.h:50 > + ~AppHighlightStorage(); NIT: Can you also make this class `final`? > Source/WebCore/dom/Document.cpp:6024 > + if (appHighlightStorageIfExists()) NIT: You could save the return value and use that instead of `appHighlightStorage()` ``` if (auto* appHighlightStorage = appHighlightStorageIfExists()) appHighlightStorage->restoreUnrestoredAppHighlights(); ``` 1735316 3 422045 wenson_hsieh 2021-03-03 09:36:24 -0800 Comment on attachment 422045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422045&action=review >> Source/WebCore/Modules/highlight/AppHighlightStorage.cpp:254 >> + auto strongDocument = makeRefPtr(m_document.get()); > > I think this will `ASSERT` if `m_document` is not set or has been destroyed. You might have to move this below the `if (!m_document)` check. Is this accurate? I'm curious where the assertion is. 1735374 4 422123 megan_gardner 2021-03-03 10:57:19 -0800 Created attachment 422123 Patch for landing 1735376 5 ews-feeder 2021-03-03 10:57:57 -0800 Tools/Scripts/svn-apply failed to apply attachment 422123 to trunk. Please resolve the conflicts and upload a new patch. 1737449 6 422659 megan_gardner 2021-03-08 19:57:50 -0800 Created attachment 422659 Patch for landing 1737473 7 ews-feeder 2021-03-08 22:02:20 -0800 Found 1 new test failure: media/media-fragments/TC0051.html 1737481 8 422667 megan_gardner 2021-03-08 23:53:32 -0800 Created attachment 422667 Patch 1737618 9 422045 hi 2021-03-09 09:34:34 -0800 Comment on attachment 422045 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422045&action=review >>> Source/WebCore/Modules/highlight/AppHighlightStorage.cpp:254 >>> + auto strongDocument = makeRefPtr(m_document.get()); >> >> I think this will `ASSERT` if `m_document` is not set or has been destroyed. You might have to move this below the `if (!m_document)` check. > > Is this accurate? I'm curious where the assertion is. Ah I think I misread the `ASSERT` in `WeakPtr::get`. I thought it was `ASSERT(m_impl || ...);` 😅 1737623 10 422718 megan_gardner 2021-03-09 09:36:45 -0800 Created attachment 422718 Patch for landing 1737634 11 ews-feeder 2021-03-09 10:02:04 -0800 Committed r274155: <https://commits.webkit.org/r274155> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422718. 1737635 12 webkit-bug-importer 2021-03-09 10:03:21 -0800 <rdar://problem/75222415> 422045 2021-03-02 22:01:23 -0800 2021-03-03 10:57:15 -0800 Patch bug-222640-20210302220122.patch text/plain 4679 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTNlNGJlYjQ5NjQzNWVh MjU1OTIzMmEyMjYzNTBjNTI4NjJkNWVlNS4uYTBiYTRhYTg4OTJiODkyYzI5NmQ1YTNjNjY1YWRh ZTE2MGE4MTU0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAyICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgSG9sZCBvbnRv IEFwcEhpZ2hsaWdodHMgYW5kIHJlc3RvcmUgdGhlbSBvbmNlIHRoZSBwYWdlIGlzIGxvYWRlZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjY0MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxl cy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpB cHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0KToKKyAgICAgICAgKFdlYkNv cmU6OkFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cyk6 CisgICAgICAgICogTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oOgorICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6Zmlu aXNoZWRQYXJzaW5nKToKKwogMjAyMS0wMy0wMiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIEFuaW1hdGlvbkZyYW1lUmF0ZSBjb2RlIGludG8g YSAuY3BwIGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0 L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGln aHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5jcHAKaW5kZXggYWIxMTBjNTYyZTM3Y2FmMTFjYzY1ZGJj Zjc2OGI3YzFlNzkzY2VmMS4uOWM0MzQxNjlkMTZmOGViZDhkMTVkNTYwMzI1ODE1NmVkZTY0Yjkx OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxp Z2h0U3RvcmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBw SGlnaGxpZ2h0U3RvcmFnZS5jcHAKQEAgLTIxNCw2ICsyMTQsOCBAQCBBcHBIaWdobGlnaHRTdG9y YWdlOjpBcHBIaWdobGlnaHRTdG9yYWdlKERvY3VtZW50JiBkb2N1bWVudCkKIHsKIH0KIAorQXBw SGlnaGxpZ2h0U3RvcmFnZTo6fkFwcEhpZ2hsaWdodFN0b3JhZ2UoKSA9IGRlZmF1bHQ7CisKIHZv aWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6c3RvcmVBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2UmIHJh bmdlLCBDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodCBpc05ld0dyb3VwKQogewogICAgIGF1dG8g ZGF0YSA9IGNyZWF0ZUFwcEhpZ2hsaWdodFJhbmdlRGF0YShyYW5nZSk7CkBAIC0yMjcsMjQgKzIy OSw0MiBAQCB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnN0b3JlQXBwSGlnaGxpZ2h0KFN0YXRp Y1JhbmdlJiByYW5nZSwgQ3JlYXRlTmV3R3JvdXBGbwogICAgIG1fZG9jdW1lbnQtPnBhZ2UoKS0+ Y2hyb21lKCkuc3RvcmVBcHBIaWdobGlnaHQoaGlnaGxpZ2h0KTsKIH0KIAotYm9vbCBBcHBIaWdo bGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVm ZmVyKQordm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxT aGFyZWRCdWZmZXI+JiYgYnVmZmVyKQogewogICAgIGF1dG8gc3Ryb25nRG9jdW1lbnQgPSBtYWtl UmVmUHRyKG1fZG9jdW1lbnQuZ2V0KCkpOwogCiAgICAgaWYgKCFtX2RvY3VtZW50KQotICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8gYXBwSGlnaGxpZ2h0 UmFuZ2VEYXRhID0gQXBwSGlnaGxpZ2h0UmFuZ2VEYXRhOjpjcmVhdGUoYnVmZmVyKTsKICAgICBp ZiAoIWFwcEhpZ2hsaWdodFJhbmdlRGF0YSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICByZXR1cm47CiAKICAgICBhdXRvIHJhbmdlID0gZmluZFJhbmdlKCphcHBIaWdobGlnaHRSYW5n ZURhdGEsICpzdHJvbmdEb2N1bWVudCk7CiAgICAgCiAgICAgaWYgKCFyYW5nZSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIHN0cm9uZ0RvY3VtZW50LT5hcHBIaWdobGlnaHRSZWdpc3Rlcigp LmFkZEFwcEhpZ2hsaWdodChTdGF0aWNSYW5nZTo6Y3JlYXRlKCpyYW5nZSkpOworICAgICAgICBt X3VucmVzdG9yZWRIaWdobGlnaHRzLmFwcGVuZChhcHBIaWdobGlnaHRSYW5nZURhdGEudmFsdWUo KSk7CisgICAgZWxzZQorICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0 ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKK30KKwor dm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMo KQoreworICAgIFZlY3RvcjxBcHBIaWdobGlnaHRSYW5nZURhdGE+IHJlbWFpbmluZ1JhbmdlczsK KyAgICBhdXRvIHN0cm9uZ0RvY3VtZW50ID0gbWFrZVJlZlB0cihtX2RvY3VtZW50LmdldCgpKTsK IAotICAgIHJldHVybiB0cnVlOworICAgIGlmICghbV9kb2N1bWVudCkKKyAgICAgICAgcmV0dXJu OworICAgIAorICAgIGZvciAoYXV0byYgaGlnaGxpZ2h0IDogbV91bnJlc3RvcmVkSGlnaGxpZ2h0 cykgeworICAgICAgICBhdXRvIHJhbmdlID0gZmluZFJhbmdlKGhpZ2hsaWdodCwgKnN0cm9uZ0Rv Y3VtZW50KTsKKyAgICAgICAgCisgICAgICAgIGlmICghcmFuZ2UpCisgICAgICAgICAgICByZW1h aW5pbmdSYW5nZXMuYXBwZW5kKGhpZ2hsaWdodCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHN0cm9uZ0RvY3VtZW50LT5hcHBIaWdobGlnaHRSZWdpc3RlcigpLmFkZEFwcEhpZ2hsaWdodChT dGF0aWNSYW5nZTo6Y3JlYXRlKCpyYW5nZSkpOworICAgIH0KKyAgICBtX3VucmVzdG9yZWRIaWdo bGlnaHRzID0gV1RGTW92ZShyZW1haW5pbmdSYW5nZXMpOwogfQogCiAjZW5kaWYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu aCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu aAppbmRleCA4Y2EwMjU0NmIzMmJlMDBiNDZhNjY1OWYzOTA5ODU2MTY2YTc3NDM3Li40MDljZjZm NmRjNzk3MmRhMTZlMzI5MjFlZGI5ZGVhZDQxZTEwMTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCkBAIC00Nywx MiArNDcsMTUgQEAgY2xhc3MgQXBwSGlnaGxpZ2h0U3RvcmFnZSA6IFJlZkNvdW50ZWQ8QXBwSGln aGxpZ2h0U3RvcmFnZT4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgog ICAgIEFwcEhpZ2hsaWdodFN0b3JhZ2UoRG9jdW1lbnQmKTsKKyAgICB+QXBwSGlnaGxpZ2h0U3Rv cmFnZSgpOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdG9yZUFwcEhpZ2hsaWdodChTdGF0 aWNSYW5nZSYgLCBDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodCBpc05ld0dyb3VwKTsKLSAgICBX RUJDT1JFX0VYUE9SVCBib29sIHJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4m Jik7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFy ZWRCdWZmZXI+JiYpOworICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCk7 CiAKIHByaXZhdGU6CiAgICAgV2Vha1B0cjxEb2N1bWVudD4gbV9kb2N1bWVudDsKKyAgICBWZWN0 b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRIaWdobGlnaHRzOwogfTsKIAog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBiMmFmMDExYWY5ZGEzOTg0MzI3Yzc3 MmQ4OGYwZjEzMGEwNzkzYjU5Li45ZTAyNzUwNjFmMmQ3MjhiMTg4NWY1YTE1ZWRmZmI1OTJjZWVj MTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTYwMTksNiArNjAxOSwxMSBAQCB2b2lk IERvY3VtZW50OjpmaW5pc2hlZFBhcnNpbmcoKQogICAgICAgICAgICAgc2VydmljZVdvcmtlckNv bnRhaW5lci0+c3RhcnRNZXNzYWdlcygpOwogICAgIH0KICNlbmRpZgorICAgIAorI2lmIEVOQUJM RShBUFBfSElHSExJR0hUUykKKyAgICBpZiAoYXBwSGlnaGxpZ2h0U3RvcmFnZUlmRXhpc3RzKCkp CisgICAgICAgIGFwcEhpZ2hsaWdodFN0b3JhZ2UoKS5yZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hs aWdodHMoKTsKKyNlbmRpZgogfQogCiB2b2lkIERvY3VtZW50OjpjbGVhclNoYXJlZE9iamVjdFBv b2woKQo= 422123 2021-03-03 10:57:19 -0800 2021-03-08 19:57:44 -0800 Patch for landing bug-222640-20210303105718.patch text/plain 4911 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTNlNGJlYjQ5NjQzNWVh MjU1OTIzMmEyMjYzNTBjNTI4NjJkNWVlNS4uNjEzZmU0YzJkNGQ1OWRlZTEzMTNjODY5NzUyNmVh ZTQ5MThmYzM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAyICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgSG9sZCBvbnRv IEFwcEhpZ2hsaWdodHMgYW5kIHJlc3RvcmUgdGhlbSBvbmNlIHRoZSBwYWdlIGlzIGxvYWRlZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjY0MAor CisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICAqIE1vZHVsZXMv aGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw SGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMpOgor ICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaDoKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmZpbmlz aGVkUGFyc2luZyk6CisKIDIwMjEtMDMtMDIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBh cHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBBbmltYXRpb25GcmFtZVJhdGUgY29kZSBpbnRvIGEg LmNwcCBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9B cHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0 L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IGFiMTEwYzU2MmUzN2NhZjExY2M2NWRiY2Y3 NjhiN2MxZTc5M2NlZjEuLjJjMTJkNWU2NmVhMGM1MjI2YjhjODQzN2M3ZjRkYzQxOWE2YzhiNTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdo dFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhp Z2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yMTQsNiArMjE0LDggQEAgQXBwSGlnaGxpZ2h0U3RvcmFn ZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYgZG9jdW1lbnQpCiB7CiB9CiAKK0FwcEhp Z2hsaWdodFN0b3JhZ2U6On5BcHBIaWdobGlnaHRTdG9yYWdlKCkgPSBkZWZhdWx0OworCiB2b2lk IEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnN0b3JlQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlJiByYW5n ZSwgQ3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQgaXNOZXdHcm91cCkKIHsKICAgICBhdXRvIGRh dGEgPSBjcmVhdGVBcHBIaWdobGlnaHRSYW5nZURhdGEocmFuZ2UpOwpAQCAtMjI3LDI0ICsyMjks NDMgQEAgdm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpzdG9yZUFwcEhpZ2hsaWdodChTdGF0aWNS YW5nZSYgcmFuZ2UsIENyZWF0ZU5ld0dyb3VwRm8KICAgICBtX2RvY3VtZW50LT5wYWdlKCktPmNo cm9tZSgpLnN0b3JlQXBwSGlnaGxpZ2h0KGhpZ2hsaWdodCk7CiB9CiAKLWJvb2wgQXBwSGlnaGxp Z2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hhcmVkQnVmZmVyPiYmIGJ1ZmZl cikKK3ZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hh cmVkQnVmZmVyPiYmIGJ1ZmZlcikKIHsKLSAgICBhdXRvIHN0cm9uZ0RvY3VtZW50ID0gbWFrZVJl ZlB0cihtX2RvY3VtZW50LmdldCgpKTsKLQogICAgIGlmICghbV9kb2N1bWVudCkKLSAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgCisgICAgYXV0byBzdHJvbmdEb2N1 bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5nZXQoKSk7CiAKICAgICBhdXRvIGFwcEhpZ2hs aWdodFJhbmdlRGF0YSA9IEFwcEhpZ2hsaWdodFJhbmdlRGF0YTo6Y3JlYXRlKGJ1ZmZlcik7CiAg ICAgaWYgKCFhcHBIaWdobGlnaHRSYW5nZURhdGEpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgcmV0dXJuOwogCiAgICAgYXV0byByYW5nZSA9IGZpbmRSYW5nZSgqYXBwSGlnaGxpZ2h0 UmFuZ2VEYXRhLCAqc3Ryb25nRG9jdW1lbnQpOwogICAgIAogICAgIGlmICghcmFuZ2UpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0 ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKKyAgICAg ICAgbV91bnJlc3RvcmVkSGlnaGxpZ2h0cy5hcHBlbmQoYXBwSGlnaGxpZ2h0UmFuZ2VEYXRhLnZh bHVlKCkpOworICAgIGVsc2UKKyAgICAgICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJl Z2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7Cit9 CiAKLSAgICByZXR1cm4gdHJ1ZTsKK3ZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZVVu cmVzdG9yZWRBcHBIaWdobGlnaHRzKCkKK3sKKyAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VE YXRhPiByZW1haW5pbmdSYW5nZXM7CisKKyAgICBpZiAoIW1fZG9jdW1lbnQpCisgICAgICAgIHJl dHVybjsKKyAgICAKKyAgICBhdXRvIHN0cm9uZ0RvY3VtZW50ID0gbWFrZVJlZlB0cihtX2RvY3Vt ZW50LmdldCgpKTsKKyAgICAKKyAgICBmb3IgKGF1dG8mIGhpZ2hsaWdodCA6IG1fdW5yZXN0b3Jl ZEhpZ2hsaWdodHMpIHsKKyAgICAgICAgYXV0byByYW5nZSA9IGZpbmRSYW5nZShoaWdobGlnaHQs ICpzdHJvbmdEb2N1bWVudCk7CisgICAgICAgIAorICAgICAgICBpZiAoIXJhbmdlKQorICAgICAg ICAgICAgcmVtYWluaW5nUmFuZ2VzLmFwcGVuZChoaWdobGlnaHQpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGlnaGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBI aWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFuZ2UpKTsKKyAgICB9CisgICAgbV91bnJl c3RvcmVkSGlnaGxpZ2h0cyA9IFdURk1vdmUocmVtYWluaW5nUmFuZ2VzKTsKIH0KIAogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGln aHRTdG9yYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGln aHRTdG9yYWdlLmgKaW5kZXggOGNhMDI1NDZiMzJiZTAwYjQ2YTY2NTlmMzkwOTg1NjE2NmE3NzQz Ny4uZjhhODlhOTMyMmE4NTE0MWYyYmRiYmE3NjZhNzE3NjJlYjJkNWQ2MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2Uu aApAQCAtNDMsMTYgKzQzLDE5IEBAIGNsYXNzIEhpZ2hsaWdodDsKIAogZW51bSBjbGFzcyBDcmVh dGVOZXdHcm91cEZvckhpZ2hsaWdodCA6IGJvb2w7CiAKLWNsYXNzIEFwcEhpZ2hsaWdodFN0b3Jh Z2UgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKK2NsYXNzIEFwcEhpZ2hsaWdo dFN0b3JhZ2UgZmluYWwgOiBSZWZDb3VudGVkPEFwcEhpZ2hsaWdodFN0b3JhZ2U+IHsKICAgICBX VEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAgICBBcHBIaWdobGlnaHRTdG9yYWdl KERvY3VtZW50Jik7CisgICAgfkFwcEhpZ2hsaWdodFN0b3JhZ2UoKTsKIAogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc3RvcmVBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2UmICwgQ3JlYXRlTmV3R3Jv dXBGb3JIaWdobGlnaHQgaXNOZXdHcm91cCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9vbCByZXN0 b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOworICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgcmVzdG9yZUFwcEhpZ2hsaWdodChSZWY8U2hhcmVkQnVmZmVyPiYmKTsKKyAgICB2b2lk IHJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxpZ2h0cygpOwogCiBwcml2YXRlOgogICAgIFdlYWtQ dHI8RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CisgICAgVmVjdG9yPEFwcEhpZ2hsaWdodFJhbmdlRGF0 YT4gbV91bnJlc3RvcmVkSGlnaGxpZ2h0czsKIH07CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKaW5kZXggYjJhZjAxMWFmOWRhMzk4NDMyN2M3NzJkODhmMGYxMzBhMDc5M2I1OS4uZTBm OTZhMTAxM2EwZGRhMGU4NjBkMWU1ZWJlMWZlYTI2NDljMTE5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCkBAIC02MDE5LDYgKzYwMTksMTEgQEAgdm9pZCBEb2N1bWVudDo6ZmluaXNoZWRQYXJz aW5nKCkKICAgICAgICAgICAgIHNlcnZpY2VXb3JrZXJDb250YWluZXItPnN0YXJ0TWVzc2FnZXMo KTsKICAgICB9CiAjZW5kaWYKKyAgICAKKyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisgICAg aWYgKGF1dG8qIGFwcEhpZ2hsaWdodFN0b3JhZ2UgPSBhcHBIaWdobGlnaHRTdG9yYWdlSWZFeGlz dHMoKSkKKyAgICAgICAgYXBwSGlnaGxpZ2h0U3RvcmFnZS0+cmVzdG9yZVVucmVzdG9yZWRBcHBI aWdobGlnaHRzKCk7CisjZW5kaWYKIH0KIAogdm9pZCBEb2N1bWVudDo6Y2xlYXJTaGFyZWRPYmpl Y3RQb29sKCkK 422659 2021-03-08 19:57:50 -0800 2021-03-09 09:36:40 -0800 Patch for landing bug-222640-20210308195749.patch text/plain 4919 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY2OGNjNTgyZjY5NTRi NzA4OGY5Y2M1ZGM1ZTBlYzJlN2IxY2U4OS4uZjAyMTIwNDQyMTM2M2UyNmNlMDg3YWYzZmVmMjE2 MzE2MjJjZGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAyICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgSG9sZCBvbnRv IEFwcEhpZ2hsaWdodHMgYW5kIHJlc3RvcmUgdGhlbSBvbmNlIHRoZSBwYWdlIGlzIGxvYWRlZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjY0MAor CisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICAqIE1vZHVsZXMv aGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw SGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMpOgor ICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaDoKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmZpbmlz aGVkUGFyc2luZyk6CisKIDIwMjEtMDMtMDggIEp1bGlhbiBHb256YWxleiAgPGp1bGlhbl9hX2dv bnphbGV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCBpbiBpbiBSZXBsYWNlU2VsZWN0aW9u Q29tbWFuZDo6bWVyZ2VFbmRJZk5lZWRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDE4ZjExNjE2 ZTlhNTY5NDU3ODU5MTcwMzc1ODZhYjI5ZDFkMzFmZmUuLjhjMzVkMDE3OGI0ZmE4YmJjYmI0Mzkz MDE5NTRmNTFmNzU5NGM4YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGln aGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yMTQsNiArMjE0LDggQEAg QXBwSGlnaGxpZ2h0U3RvcmFnZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYgZG9jdW1l bnQpCiB7CiB9CiAKK0FwcEhpZ2hsaWdodFN0b3JhZ2U6On5BcHBIaWdobGlnaHRTdG9yYWdlKCkg PSBkZWZhdWx0OworCiB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnN0b3JlQXBwSGlnaGxpZ2h0 KFJlZjxTdGF0aWNSYW5nZT4mJiByYW5nZSkKIHsKICAgICBhdXRvIGRhdGEgPSBjcmVhdGVBcHBI aWdobGlnaHRSYW5nZURhdGEocmFuZ2UpOwpAQCAtMjI3LDI0ICsyMjksNDMgQEAgdm9pZCBBcHBI aWdobGlnaHRTdG9yYWdlOjpzdG9yZUFwcEhpZ2hsaWdodChSZWY8U3RhdGljUmFuZ2U+JiYgcmFu Z2UpCiAgICAgbV9kb2N1bWVudC0+cGFnZSgpLT5jaHJvbWUoKS5zdG9yZUFwcEhpZ2hsaWdodChX VEZNb3ZlKGhpZ2hsaWdodCkpOwogfQogCi1ib29sIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3Rv cmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCit2b2lkIEFwcEhpZ2hs aWdodFN0b3JhZ2U6OnJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZm ZXIpCiB7Ci0gICAgYXV0byBzdHJvbmdEb2N1bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5n ZXQoKSk7Ci0KICAgICBpZiAoIW1fZG9jdW1lbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgcmV0dXJuOworICAgIAorICAgIGF1dG8gc3Ryb25nRG9jdW1lbnQgPSBtYWtlUmVmUHRy KG1fZG9jdW1lbnQuZ2V0KCkpOwogCiAgICAgYXV0byBhcHBIaWdobGlnaHRSYW5nZURhdGEgPSBB cHBIaWdobGlnaHRSYW5nZURhdGE6OmNyZWF0ZShidWZmZXIpOwogICAgIGlmICghYXBwSGlnaGxp Z2h0UmFuZ2VEYXRhKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybjsKIAog ICAgIGF1dG8gcmFuZ2UgPSBmaW5kUmFuZ2UoKmFwcEhpZ2hsaWdodFJhbmdlRGF0YSwgKnN0cm9u Z0RvY3VtZW50KTsKICAgICAKICAgICBpZiAoIXJhbmdlKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxp Z2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgICAgIG1fdW5yZXN0b3JlZEhp Z2hsaWdodHMuYXBwZW5kKGFwcEhpZ2hsaWdodFJhbmdlRGF0YS52YWx1ZSgpKTsKKyAgICBlbHNl CisgICAgICAgIHN0cm9uZ0RvY3VtZW50LT5hcHBIaWdobGlnaHRSZWdpc3RlcigpLmFkZEFwcEhp Z2hsaWdodChTdGF0aWNSYW5nZTo6Y3JlYXRlKCpyYW5nZSkpOworfQogCi0gICAgcmV0dXJuIHRy dWU7Cit2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxp Z2h0cygpCit7CisgICAgVmVjdG9yPEFwcEhpZ2hsaWdodFJhbmdlRGF0YT4gcmVtYWluaW5nUmFu Z2VzOworCisgICAgaWYgKCFtX2RvY3VtZW50KQorICAgICAgICByZXR1cm47CisgICAgCisgICAg YXV0byBzdHJvbmdEb2N1bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5nZXQoKSk7CisgICAg CisgICAgZm9yIChhdXRvJiBoaWdobGlnaHQgOiBtX3VucmVzdG9yZWRIaWdobGlnaHRzKSB7Cisg ICAgICAgIGF1dG8gcmFuZ2UgPSBmaW5kUmFuZ2UoaGlnaGxpZ2h0LCAqc3Ryb25nRG9jdW1lbnQp OworICAgICAgICAKKyAgICAgICAgaWYgKCFyYW5nZSkKKyAgICAgICAgICAgIHJlbWFpbmluZ1Jh bmdlcy5hcHBlbmQoaGlnaGxpZ2h0KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgc3Ryb25n RG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1Jh bmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgfQorICAgIG1fdW5yZXN0b3JlZEhpZ2hsaWdodHMg PSBXVEZNb3ZlKHJlbWFpbmluZ1Jhbmdlcyk7CiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCmluZGV4 IDMxMTQ2MmZlMzJiNmQxNzM0ZmI0YzVhNmY3YzU4MTYzYTNlMzk5ZmUuLjM4MGIyNWRkNjkxYjNm OGE5YTA1NjYxNTliZTM3MDEwMzYyODhjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKQEAgLTQzLDE2ICs0Mywx OSBAQCBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3MgQ3JlYXRlTmV3R3JvdXBGb3JIaWdo bGlnaHQgOiBib29sOwogCi1jbGFzcyBBcHBIaWdobGlnaHRTdG9yYWdlIDogUmVmQ291bnRlZDxB cHBIaWdobGlnaHRTdG9yYWdlPiB7CitjbGFzcyBBcHBIaWdobGlnaHRTdG9yYWdlIGZpbmFsIDog UmVmQ291bnRlZDxBcHBIaWdobGlnaHRTdG9yYWdlPiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExP Q0FURUQ7CiBwdWJsaWM6CiAgICAgQXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYpOworICAg IH5BcHBIaWdobGlnaHRTdG9yYWdlKCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3Jl QXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5nZT4mJik7Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9v bCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOworICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc3RvcmVBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2UmJik7CisgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOwor ICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCk7CiAKIHByaXZhdGU6CiAg ICAgV2Vha1B0cjxEb2N1bWVudD4gbV9kb2N1bWVudDsKKyAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0 UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRIaWdobGlnaHRzOwogfTsKIAogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCA0MWViZWM4ZGFjNjg0ZDFjNzYwZGU4YzZkNjk0NWM2ZmEzZDVk ODk3Li5iOTk1MjMzNDAzNjhjYzY1OGFmMGNhMTI3ZjZkMmY0ODcxMmVkN2M0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTYwMTksNiArNjAxOSwxMSBAQCB2b2lkIERvY3VtZW50OjpmaW5p c2hlZFBhcnNpbmcoKQogICAgICAgICAgICAgc2VydmljZVdvcmtlckNvbnRhaW5lci0+c3RhcnRN ZXNzYWdlcygpOwogICAgIH0KICNlbmRpZgorICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hU UykKKyAgICBpZiAoYXV0byogYXBwSGlnaGxpZ2h0U3RvcmFnZSA9IGFwcEhpZ2hsaWdodFN0b3Jh Z2VJZkV4aXN0cygpKQorICAgICAgICBhcHBIaWdobGlnaHRTdG9yYWdlLT5yZXN0b3JlVW5yZXN0 b3JlZEFwcEhpZ2hsaWdodHMoKTsKKyNlbmRpZgogfQogCiB2b2lkIERvY3VtZW50OjpjbGVhclNo YXJlZE9iamVjdFBvb2woKQo= 422667 2021-03-08 23:53:32 -0800 2021-03-09 09:36:42 -0800 Patch bug-222640-20210308235332.patch text/plain 4919 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY2OGNjNTgyZjY5NTRi NzA4OGY5Y2M1ZGM1ZTBlYzJlN2IxY2U4OS4uZjAyMTIwNDQyMTM2M2UyNmNlMDg3YWYzZmVmMjE2 MzE2MjJjZGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAyICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgSG9sZCBvbnRv IEFwcEhpZ2hsaWdodHMgYW5kIHJlc3RvcmUgdGhlbSBvbmNlIHRoZSBwYWdlIGlzIGxvYWRlZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjY0MAor CisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICAqIE1vZHVsZXMv aGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw SGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMpOgor ICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaDoKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmZpbmlz aGVkUGFyc2luZyk6CisKIDIwMjEtMDMtMDggIEp1bGlhbiBHb256YWxleiAgPGp1bGlhbl9hX2dv bnphbGV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCBpbiBpbiBSZXBsYWNlU2VsZWN0aW9u Q29tbWFuZDo6bWVyZ2VFbmRJZk5lZWRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDE4ZjExNjE2 ZTlhNTY5NDU3ODU5MTcwMzc1ODZhYjI5ZDFkMzFmZmUuLjhjMzVkMDE3OGI0ZmE4YmJjYmI0Mzkz MDE5NTRmNTFmNzU5NGM4YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGln aGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yMTQsNiArMjE0LDggQEAg QXBwSGlnaGxpZ2h0U3RvcmFnZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYgZG9jdW1l bnQpCiB7CiB9CiAKK0FwcEhpZ2hsaWdodFN0b3JhZ2U6On5BcHBIaWdobGlnaHRTdG9yYWdlKCkg PSBkZWZhdWx0OworCiB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnN0b3JlQXBwSGlnaGxpZ2h0 KFJlZjxTdGF0aWNSYW5nZT4mJiByYW5nZSkKIHsKICAgICBhdXRvIGRhdGEgPSBjcmVhdGVBcHBI aWdobGlnaHRSYW5nZURhdGEocmFuZ2UpOwpAQCAtMjI3LDI0ICsyMjksNDMgQEAgdm9pZCBBcHBI aWdobGlnaHRTdG9yYWdlOjpzdG9yZUFwcEhpZ2hsaWdodChSZWY8U3RhdGljUmFuZ2U+JiYgcmFu Z2UpCiAgICAgbV9kb2N1bWVudC0+cGFnZSgpLT5jaHJvbWUoKS5zdG9yZUFwcEhpZ2hsaWdodChX VEZNb3ZlKGhpZ2hsaWdodCkpOwogfQogCi1ib29sIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3Rv cmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCit2b2lkIEFwcEhpZ2hs aWdodFN0b3JhZ2U6OnJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZm ZXIpCiB7Ci0gICAgYXV0byBzdHJvbmdEb2N1bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5n ZXQoKSk7Ci0KICAgICBpZiAoIW1fZG9jdW1lbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgcmV0dXJuOworICAgIAorICAgIGF1dG8gc3Ryb25nRG9jdW1lbnQgPSBtYWtlUmVmUHRy KG1fZG9jdW1lbnQuZ2V0KCkpOwogCiAgICAgYXV0byBhcHBIaWdobGlnaHRSYW5nZURhdGEgPSBB cHBIaWdobGlnaHRSYW5nZURhdGE6OmNyZWF0ZShidWZmZXIpOwogICAgIGlmICghYXBwSGlnaGxp Z2h0UmFuZ2VEYXRhKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybjsKIAog ICAgIGF1dG8gcmFuZ2UgPSBmaW5kUmFuZ2UoKmFwcEhpZ2hsaWdodFJhbmdlRGF0YSwgKnN0cm9u Z0RvY3VtZW50KTsKICAgICAKICAgICBpZiAoIXJhbmdlKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxp Z2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgICAgIG1fdW5yZXN0b3JlZEhp Z2hsaWdodHMuYXBwZW5kKGFwcEhpZ2hsaWdodFJhbmdlRGF0YS52YWx1ZSgpKTsKKyAgICBlbHNl CisgICAgICAgIHN0cm9uZ0RvY3VtZW50LT5hcHBIaWdobGlnaHRSZWdpc3RlcigpLmFkZEFwcEhp Z2hsaWdodChTdGF0aWNSYW5nZTo6Y3JlYXRlKCpyYW5nZSkpOworfQogCi0gICAgcmV0dXJuIHRy dWU7Cit2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxp Z2h0cygpCit7CisgICAgVmVjdG9yPEFwcEhpZ2hsaWdodFJhbmdlRGF0YT4gcmVtYWluaW5nUmFu Z2VzOworCisgICAgaWYgKCFtX2RvY3VtZW50KQorICAgICAgICByZXR1cm47CisgICAgCisgICAg YXV0byBzdHJvbmdEb2N1bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5nZXQoKSk7CisgICAg CisgICAgZm9yIChhdXRvJiBoaWdobGlnaHQgOiBtX3VucmVzdG9yZWRIaWdobGlnaHRzKSB7Cisg ICAgICAgIGF1dG8gcmFuZ2UgPSBmaW5kUmFuZ2UoaGlnaGxpZ2h0LCAqc3Ryb25nRG9jdW1lbnQp OworICAgICAgICAKKyAgICAgICAgaWYgKCFyYW5nZSkKKyAgICAgICAgICAgIHJlbWFpbmluZ1Jh bmdlcy5hcHBlbmQoaGlnaGxpZ2h0KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgc3Ryb25n RG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1Jh bmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgfQorICAgIG1fdW5yZXN0b3JlZEhpZ2hsaWdodHMg PSBXVEZNb3ZlKHJlbWFpbmluZ1Jhbmdlcyk7CiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCmluZGV4 IDMxMTQ2MmZlMzJiNmQxNzM0ZmI0YzVhNmY3YzU4MTYzYTNlMzk5ZmUuLjM4MGIyNWRkNjkxYjNm OGE5YTA1NjYxNTliZTM3MDEwMzYyODhjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKQEAgLTQzLDE2ICs0Mywx OSBAQCBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3MgQ3JlYXRlTmV3R3JvdXBGb3JIaWdo bGlnaHQgOiBib29sOwogCi1jbGFzcyBBcHBIaWdobGlnaHRTdG9yYWdlIDogUmVmQ291bnRlZDxB cHBIaWdobGlnaHRTdG9yYWdlPiB7CitjbGFzcyBBcHBIaWdobGlnaHRTdG9yYWdlIGZpbmFsIDog UmVmQ291bnRlZDxBcHBIaWdobGlnaHRTdG9yYWdlPiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExP Q0FURUQ7CiBwdWJsaWM6CiAgICAgQXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYpOworICAg IH5BcHBIaWdobGlnaHRTdG9yYWdlKCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3Jl QXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5nZT4mJik7Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9v bCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOworICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc3RvcmVBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2UmJik7CisgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOwor ICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCk7CiAKIHByaXZhdGU6CiAg ICAgV2Vha1B0cjxEb2N1bWVudD4gbV9kb2N1bWVudDsKKyAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0 UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRIaWdobGlnaHRzOwogfTsKIAogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCA0MWViZWM4ZGFjNjg0ZDFjNzYwZGU4YzZkNjk0NWM2ZmEzZDVk ODk3Li5iOTk1MjMzNDAzNjhjYzY1OGFmMGNhMTI3ZjZkMmY0ODcxMmVkN2M0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTYwMTksNiArNjAxOSwxMSBAQCB2b2lkIERvY3VtZW50OjpmaW5p c2hlZFBhcnNpbmcoKQogICAgICAgICAgICAgc2VydmljZVdvcmtlckNvbnRhaW5lci0+c3RhcnRN ZXNzYWdlcygpOwogICAgIH0KICNlbmRpZgorICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hU UykKKyAgICBpZiAoYXV0byogYXBwSGlnaGxpZ2h0U3RvcmFnZSA9IGFwcEhpZ2hsaWdodFN0b3Jh Z2VJZkV4aXN0cygpKQorICAgICAgICBhcHBIaWdobGlnaHRTdG9yYWdlLT5yZXN0b3JlVW5yZXN0 b3JlZEFwcEhpZ2hsaWdodHMoKTsKKyNlbmRpZgogfQogCiB2b2lkIERvY3VtZW50OjpjbGVhclNo YXJlZE9iamVjdFBvb2woKQo= 422718 2021-03-09 09:36:45 -0800 2021-03-09 10:02:06 -0800 Patch for landing bug-222640-20210309093644.patch text/plain 4919 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY2OGNjNTgyZjY5NTRi NzA4OGY5Y2M1ZGM1ZTBlYzJlN2IxY2U4OS4uZjAyMTIwNDQyMTM2M2UyNmNlMDg3YWYzZmVmMjE2 MzE2MjJjZGU0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAzLTAyICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgSG9sZCBvbnRv IEFwcEhpZ2hsaWdodHMgYW5kIHJlc3RvcmUgdGhlbSBvbmNlIHRoZSBwYWdlIGlzIGxvYWRlZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMjY0MAor CisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAgICAqIE1vZHVsZXMv aGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw SGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodCk6CisgICAgICAgIChXZWJDb3Jl OjpBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlVW5yZXN0b3JlZEFwcEhpZ2hsaWdodHMpOgor ICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaDoKKyAgICAg ICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmZpbmlz aGVkUGFyc2luZyk6CisKIDIwMjEtMDMtMDggIEp1bGlhbiBHb256YWxleiAgPGp1bGlhbl9hX2dv bnphbGV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCBpbiBpbiBSZXBsYWNlU2VsZWN0aW9u Q29tbWFuZDo6bWVyZ2VFbmRJZk5lZWRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IDE4ZjExNjE2 ZTlhNTY5NDU3ODU5MTcwMzc1ODZhYjI5ZDFkMzFmZmUuLjhjMzVkMDE3OGI0ZmE4YmJjYmI0Mzkz MDE5NTRmNTFmNzU5NGM4YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGln aGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yMTQsNiArMjE0LDggQEAg QXBwSGlnaGxpZ2h0U3RvcmFnZTo6QXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYgZG9jdW1l bnQpCiB7CiB9CiAKK0FwcEhpZ2hsaWdodFN0b3JhZ2U6On5BcHBIaWdobGlnaHRTdG9yYWdlKCkg PSBkZWZhdWx0OworCiB2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnN0b3JlQXBwSGlnaGxpZ2h0 KFJlZjxTdGF0aWNSYW5nZT4mJiByYW5nZSkKIHsKICAgICBhdXRvIGRhdGEgPSBjcmVhdGVBcHBI aWdobGlnaHRSYW5nZURhdGEocmFuZ2UpOwpAQCAtMjI3LDI0ICsyMjksNDMgQEAgdm9pZCBBcHBI aWdobGlnaHRTdG9yYWdlOjpzdG9yZUFwcEhpZ2hsaWdodChSZWY8U3RhdGljUmFuZ2U+JiYgcmFu Z2UpCiAgICAgbV9kb2N1bWVudC0+cGFnZSgpLT5jaHJvbWUoKS5zdG9yZUFwcEhpZ2hsaWdodChX VEZNb3ZlKGhpZ2hsaWdodCkpOwogfQogCi1ib29sIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3Rv cmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCit2b2lkIEFwcEhpZ2hs aWdodFN0b3JhZ2U6OnJlc3RvcmVBcHBIaWdobGlnaHQoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBidWZm ZXIpCiB7Ci0gICAgYXV0byBzdHJvbmdEb2N1bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5n ZXQoKSk7Ci0KICAgICBpZiAoIW1fZG9jdW1lbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgcmV0dXJuOworICAgIAorICAgIGF1dG8gc3Ryb25nRG9jdW1lbnQgPSBtYWtlUmVmUHRy KG1fZG9jdW1lbnQuZ2V0KCkpOwogCiAgICAgYXV0byBhcHBIaWdobGlnaHRSYW5nZURhdGEgPSBB cHBIaWdobGlnaHRSYW5nZURhdGE6OmNyZWF0ZShidWZmZXIpOwogICAgIGlmICghYXBwSGlnaGxp Z2h0UmFuZ2VEYXRhKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybjsKIAog ICAgIGF1dG8gcmFuZ2UgPSBmaW5kUmFuZ2UoKmFwcEhpZ2hsaWdodFJhbmdlRGF0YSwgKnN0cm9u Z0RvY3VtZW50KTsKICAgICAKICAgICBpZiAoIXJhbmdlKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgc3Ryb25nRG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxp Z2h0KFN0YXRpY1JhbmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgICAgIG1fdW5yZXN0b3JlZEhp Z2hsaWdodHMuYXBwZW5kKGFwcEhpZ2hsaWdodFJhbmdlRGF0YS52YWx1ZSgpKTsKKyAgICBlbHNl CisgICAgICAgIHN0cm9uZ0RvY3VtZW50LT5hcHBIaWdobGlnaHRSZWdpc3RlcigpLmFkZEFwcEhp Z2hsaWdodChTdGF0aWNSYW5nZTo6Y3JlYXRlKCpyYW5nZSkpOworfQogCi0gICAgcmV0dXJuIHRy dWU7Cit2b2lkIEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3RvcmVVbnJlc3RvcmVkQXBwSGlnaGxp Z2h0cygpCit7CisgICAgVmVjdG9yPEFwcEhpZ2hsaWdodFJhbmdlRGF0YT4gcmVtYWluaW5nUmFu Z2VzOworCisgICAgaWYgKCFtX2RvY3VtZW50KQorICAgICAgICByZXR1cm47CisgICAgCisgICAg YXV0byBzdHJvbmdEb2N1bWVudCA9IG1ha2VSZWZQdHIobV9kb2N1bWVudC5nZXQoKSk7CisgICAg CisgICAgZm9yIChhdXRvJiBoaWdobGlnaHQgOiBtX3VucmVzdG9yZWRIaWdobGlnaHRzKSB7Cisg ICAgICAgIGF1dG8gcmFuZ2UgPSBmaW5kUmFuZ2UoaGlnaGxpZ2h0LCAqc3Ryb25nRG9jdW1lbnQp OworICAgICAgICAKKyAgICAgICAgaWYgKCFyYW5nZSkKKyAgICAgICAgICAgIHJlbWFpbmluZ1Jh bmdlcy5hcHBlbmQoaGlnaGxpZ2h0KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgc3Ryb25n RG9jdW1lbnQtPmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuYWRkQXBwSGlnaGxpZ2h0KFN0YXRpY1Jh bmdlOjpjcmVhdGUoKnJhbmdlKSk7CisgICAgfQorICAgIG1fdW5yZXN0b3JlZEhpZ2hsaWdodHMg PSBXVEZNb3ZlKHJlbWFpbmluZ1Jhbmdlcyk7CiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCmluZGV4 IDMxMTQ2MmZlMzJiNmQxNzM0ZmI0YzVhNmY3YzU4MTYzYTNlMzk5ZmUuLjM4MGIyNWRkNjkxYjNm OGE5YTA1NjYxNTliZTM3MDEwMzYyODhjYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgKQEAgLTQzLDE2ICs0Mywx OSBAQCBjbGFzcyBIaWdobGlnaHQ7CiAKIGVudW0gY2xhc3MgQ3JlYXRlTmV3R3JvdXBGb3JIaWdo bGlnaHQgOiBib29sOwogCi1jbGFzcyBBcHBIaWdobGlnaHRTdG9yYWdlIDogUmVmQ291bnRlZDxB cHBIaWdobGlnaHRTdG9yYWdlPiB7CitjbGFzcyBBcHBIaWdobGlnaHRTdG9yYWdlIGZpbmFsIDog UmVmQ291bnRlZDxBcHBIaWdobGlnaHRTdG9yYWdlPiB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExP Q0FURUQ7CiBwdWJsaWM6CiAgICAgQXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYpOworICAg IH5BcHBIaWdobGlnaHRTdG9yYWdlKCk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0b3Jl QXBwSGlnaGxpZ2h0KFJlZjxTdGF0aWNSYW5nZT4mJik7Ci0gICAgV0VCQ09SRV9FWFBPUlQgYm9v bCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOworICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgc3RvcmVBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2UmJik7CisgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0KFJlZjxTaGFyZWRCdWZmZXI+JiYpOwor ICAgIHZvaWQgcmVzdG9yZVVucmVzdG9yZWRBcHBIaWdobGlnaHRzKCk7CiAKIHByaXZhdGU6CiAg ICAgV2Vha1B0cjxEb2N1bWVudD4gbV9kb2N1bWVudDsKKyAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0 UmFuZ2VEYXRhPiBtX3VucmVzdG9yZWRIaWdobGlnaHRzOwogfTsKIAogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCA0MWViZWM4ZGFjNjg0ZDFjNzYwZGU4YzZkNjk0NWM2ZmEzZDVk ODk3Li5iOTk1MjMzNDAzNjhjYzY1OGFmMGNhMTI3ZjZkMmY0ODcxMmVkN2M0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTYwMTksNiArNjAxOSwxMSBAQCB2b2lkIERvY3VtZW50OjpmaW5p c2hlZFBhcnNpbmcoKQogICAgICAgICAgICAgc2VydmljZVdvcmtlckNvbnRhaW5lci0+c3RhcnRN ZXNzYWdlcygpOwogICAgIH0KICNlbmRpZgorICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hU UykKKyAgICBpZiAoYXV0byogYXBwSGlnaGxpZ2h0U3RvcmFnZSA9IGFwcEhpZ2hsaWdodFN0b3Jh Z2VJZkV4aXN0cygpKQorICAgICAgICBhcHBIaWdobGlnaHRTdG9yYWdlLT5yZXN0b3JlVW5yZXN0 b3JlZEFwcEhpZ2hsaWdodHMoKTsKKyNlbmRpZgogfQogCiB2b2lkIERvY3VtZW50OjpjbGVhclNo YXJlZE9iamVjdFBvb2woKQo=