237660 2022-03-09 08:58:04 -0800 Main document is leaking on haaretz.co.il due to lazy image loading 2022-06-23 10:20:45 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=237619 https://bugs.webkit.org/show_bug.cgi?id=208094 https://bugs.webkit.org/show_bug.cgi?id=237672 InRadar P2 Normal --- 241921 1 cdumez cdumez achristensen beidson bfulgham darin ews-watchlist ggaren japhet rbuis simon.fraser webkit-bug-importer youennf oldest_to_newest 1849704 0 cdumez 2022-03-09 08:58:04 -0800 Main document is leaking on haaretz.co.il due to lazy image loading. 1849705 1 webkit-bug-importer 2022-03-09 08:58:33 -0800 <rdar://problem/90035071> 1849713 2 454248 cdumez 2022-03-09 09:17:58 -0800 Created attachment 454248 Patch 1849787 3 454273 cdumez 2022-03-09 11:41:43 -0800 Created attachment 454273 Patch 1850097 4 454362 cdumez 2022-03-10 07:58:20 -0800 Created attachment 454362 Patch 1850124 5 454368 cdumez 2022-03-10 09:10:19 -0800 Created attachment 454368 Patch 1850188 6 454381 cdumez 2022-03-10 11:16:29 -0800 Created attachment 454381 Patch 1850201 7 454387 cdumez 2022-03-10 11:49:00 -0800 Created attachment 454387 Patch 1850219 8 454394 cdumez 2022-03-10 13:35:48 -0800 Created attachment 454394 Patch 1850312 9 454394 ggaren 2022-03-10 16:31:33 -0800 Comment on attachment 454394 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454394&action=review r=me > Source/WebCore/loader/ImageLoader.cpp:183 > + auto inUpdateFromElementScope = makeScopeExit([this] { I'm curious: Are you required to put a scope exit in a local variable? 1850334 10 cdumez 2022-03-10 17:40:03 -0800 (In reply to Geoffrey Garen from comment #9) > Comment on attachment 454394 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454394&action=review > > r=me > > > Source/WebCore/loader/ImageLoader.cpp:183 > > + auto inUpdateFromElementScope = makeScopeExit([this] { > > I'm curious: Are you required to put a scope exit in a local variable? I don't understand the question, do you mean call makeScopeExit() and then not store the return value in a local variable? If so, definitely not and this is why makeScopeExit() is marked as WARN_UNUSED_RETURN. Something needs to control the lifetime of the "scope". Also note that I usually would have used a simpler SetForScope<bool> for this. However, it turns out that it didn't work here because m_inUpdateFromElementScope is a bitfield (Apparently it is not valid C++ to have a reference to a bitfield data member). 1850341 11 ews-feeder 2022-03-10 18:05:30 -0800 Committed r291141 (248301@main): <https://commits.webkit.org/248301@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454394. 1850554 12 ggaren 2022-03-11 10:12:30 -0800 > I don't understand the question, do you mean call makeScopeExit() and then > not store the return value in a local variable? If so, definitely not and > this is why makeScopeExit() is marked as WARN_UNUSED_RETURN. Something needs > to control the lifetime of the "scope". Got it. > Also note that I usually would have used a simpler SetForScope<bool> for > this. However, it turns out that it didn't work here because > m_inUpdateFromElementScope is a bitfield (Apparently it is not valid C++ to > have a reference to a bitfield data member). Yeah, an unfortunate wart in the language. 1872146 13 bfulgham 2022-05-26 14:54:11 -0700 This fix shipped with Safari 15.5 (all platforms). 454248 2022-03-09 09:17:58 -0800 2022-03-09 11:41:41 -0800 Patch bug-237660-20220309091757.patch text/plain 8236 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTllMTE2NWY3MjdjOTJl ZWYwZjIzZWU3Y2Y3MDQ2NzQxNTFkNGEyYy4uMWZlNTU2OTk3Nzg3NDNjM2MwNzExYzE0MWIwZTE1 NDg3ZWUwNTY1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAzLTA5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21F bGVtZW50KToKKwogMjAyMi0wMy0wOSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dIEltcHJvdmUgV0NUaWxlZEJhY2tpbmcgYW5k IFRleHR1cmVNYXBwZXJTcGFyc2VCYWNraW5nU3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VM b2FkZXIuY3BwCmluZGV4IDY1ZmY3MDE1ZmRkMDA5NTJjYjg1OTY0Y2VhODdkOTkwYTNiNmZhODgu LjA5NDJjNmZiMmMxMDllNzA2NDYyMmUxMmNjYWY5MDI3OGI0MDhkYzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ltYWdlTG9hZGVyLmNwcApAQCAtMjM5LDcgKzIzOSw4IEBAIHZvaWQgSW1hZ2VMb2Fk ZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikK ICAgICB9CiAKICAgICBDYWNoZWRJbWFnZSogb2xkSW1hZ2UgPSBtX2ltYWdlLmdldCgpOwotICAg IGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSB8fCByZWxldmFudE11dGF0aW9uID09IFJlbGV2YW50 TXV0YXRpb246OlllcykgeworICAgIGJvb2wgbG9hZEhhc05vd0xhemlseVN0YXJ0ZWQgPSBvbGRJ bWFnZSA9PSBuZXdJbWFnZSAmJiAhbV9oYXNQZW5kaW5nTG9hZEV2ZW50ICYmIG5ld0ltYWdlICYm IG5ld0ltYWdlLT5pc0xvYWRpbmcoKTsKKyAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UgfHwg cmVsZXZhbnRNdXRhdGlvbiA9PSBSZWxldmFudE11dGF0aW9uOjpZZXMgfHwgbG9hZEhhc05vd0xh emlseVN0YXJ0ZWQpIHsKICAgICAgICAgaWYgKG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCkg ewogICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMp OwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gZmFsc2U7CkBAIC0y NTgsOSArMjU5LDEyIEBAIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2 YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikKICAgICAgICAgICAgIG1faGFzUGVuZGluZ0Vy cm9yRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQogCisgICAgICAgIC8vIER1ZSB0byBsYXp5IGlt YWdlIGxvYWRpbmcsIGl0IGlzIHBvc3NpYmxlIHRoYXQgd2UgZGlkIG5vdCBhY3R1YWxseSBzdGFy dCB0aGUgaW1hZ2UgbG9hZC4KKyAgICAgICAgYm9vbCBpbWFnZVdpbGxCZUxvYWRlZExhdGVyID0g bmV3SW1hZ2UgJiYgIW5ld0ltYWdlLT5pc0xvYWRpbmcoKSAmJiBuZXdJbWFnZS0+c3RpbGxOZWVk c0xvYWQoKTsKKwogICAgICAgICBtX2ltYWdlID0gbmV3SW1hZ2U7Ci0gICAgICAgIG1faGFzUGVu ZGluZ0JlZm9yZUxvYWRFdmVudCA9ICFkb2N1bWVudC5pc0ltYWdlRG9jdW1lbnQoKSAmJiBuZXdJ bWFnZTsKLSAgICAgICAgbV9oYXNQZW5kaW5nTG9hZEV2ZW50ID0gbmV3SW1hZ2U7CisgICAgICAg IG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9ICFkb2N1bWVudC5pc0ltYWdlRG9jdW1lbnQo KSAmJiBuZXdJbWFnZSAmJiAhaW1hZ2VXaWxsQmVMb2FkZWRMYXRlcjsKKyAgICAgICAgbV9oYXNQ ZW5kaW5nTG9hZEV2ZW50ID0gbmV3SW1hZ2UgJiYgIWltYWdlV2lsbEJlTG9hZGVkTGF0ZXI7CiAg ICAgICAgIG1faW1hZ2VDb21wbGV0ZSA9ICFuZXdJbWFnZTsKIAogICAgICAgICBpZiAobmV3SW1h Z2UpIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA3MjJjYjJkYTc2ZmZmZDg2NzViMjkyMDBkZDg2YmM2ZmNlY2EzMGEzLi5l OTQ4N2Y2OGMyMmJlZjNiZDg0NmY0ZTRmM2I0ODA4MTE2NmRiZmE5IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMjItMDMtMDkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAg ICAgICBNYWluIGRvY3VtZW50IGlzIGxlYWtpbmcgb24gaGFhcmV0ei5jby5pbCBkdWUgdG8gbGF6 eSBpbWFnZSBsb2FkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzc2NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkwMDM1MDcxPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBsYXlvdXQgdGVz dCBjb3ZlcmFnZS4KKworICAgICAgICAqIGZhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1 bWVudC1sZWFrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9kb20vbGF6eS1p bWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWsuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9k b20vcmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLXBvcHVwLmh0bWw6 IEFkZGVkLgorCiAyMDIyLTAzLTA4ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFt3ZWItYW5pbWF0aW9uc10gZm9udC1mYW1pbHkgc2hvdWxkIHN1cHBvcnQg ZGlzY3JldGUgYW5pbWF0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9m YXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMTI2NThmMWJiNDcyM2NmYzk4MmQ5ZTNhNTExMGM2MDU5N2MxMmVmOAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1 bWVudC1sZWFrLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBACitUZXN0cyB0aGF0IGxhenkg aW1hZ2UgbG9hZGluZyBkb2Vzbid0IGNhdXNlIERvY3VtZW50IGxlYWtzLgorCitPbiBzdWNjZXNz LCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAi VEVTVCBDT01QTEVURSIuCisKKworUEFTUyBpbnRlcm5hbHMuaXNEb2N1bWVudEFsaXZlKGZyYW1l RG9jdW1lbnRJRCkgaXMgdHJ1ZQorUEFTUyBUaGUgcG9wdXAgZG9jdW1lbnQgZGlkbid0IGxlYWsu CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50 LWxlYWsuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1 bWVudC1sZWFrLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2YwZjczMjRlYzViZDk5NjhkZWFiY2MxNTVhMjg4 MzAxZTVlOTcwMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenkt aW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFET0NU WVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9q cy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGVzdHMgdGhhdCBs YXp5IGltYWdlIGxvYWRpbmcgZG9lc24ndCBjYXVzZSBEb2N1bWVudCBsZWFrcy4iKTsKK2pzVGVz dElzQXN5bmMgPSB0cnVlOworCitmcmFtZURvY3VtZW50SUQgPSAwOworY2hlY2tDb3VudCA9IDA7 Citwb3B1cCA9IG51bGw7CisKK2Z1bmN0aW9uIHJ1blRlc3QoKQoreworICAgIHBvcHVwLmNsb3Nl KCk7CisgICAgcG9wdXAgPSBudWxsOworCisgICAgaGFuZGxlID0gc2V0SW50ZXJ2YWwoKCkgPT4g eworICAgICAgICBnYygpOworICAgICAgICBpZiAoIWludGVybmFscy5pc0RvY3VtZW50QWxpdmUo ZnJhbWVEb2N1bWVudElEKSkgeworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbChoYW5kbGUpOwor ICAgICAgICAgICAgdGVzdFBhc3NlZCgiVGhlIHBvcHVwIGRvY3VtZW50IGRpZG4ndCBsZWFrLiIp OworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0KKyAgICAgICAgY2hlY2tD b3VudCsrOworICAgICAgICBpZiAoY2hlY2tDb3VudCA+IDUwMCkgeworICAgICAgICAgICAgY2xl YXJJbnRlcnZhbChoYW5kbGUpOworICAgICAgICAgICAgdGVzdEZhaWxlZCgiVGhlIHBvcHVwIGRv Y3VtZW50IGxlYWtlZC4iKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9 CisgICAgfSwgMTApOworfQorCitvbmxvYWQgPSAoKSA9PiB7CisgICAgcG9wdXAgPSB3aW5kb3cu b3BlbigicmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLXBvcHVwLmh0 bWwiKTsKKyAgICBwb3B1cC5vbmxvYWQgPSAoKSA9PiB7CisgICAgICAgIHBvcHVwLm9ubG9hZCA9 IG51bGw7CisgICAgICAgIGZyYW1lRG9jdW1lbnRJRCA9IGludGVybmFscy5kb2N1bWVudElkZW50 aWZpZXIocG9wdXAuZG9jdW1lbnQpOworICAgICAgICBzaG91bGRCZVRydWUoImludGVybmFscy5p c0RvY3VtZW50QWxpdmUoZnJhbWVEb2N1bWVudElEKSIpOworICAgICAgICBzZXRUaW1lb3V0KHJ1 blRlc3QsIDApOworICAgIH0KK307Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmct ZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vcmVzb3VyY2Vz L2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLXBvcHVwLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u YTZlNmFmZDAwYzI4NjE2YmNlNTY2ZDU4MzlhYjA4NmE5YWY0ZWM5MAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9j dW1lbnQtbGVhay1wb3B1cC5odG1sCkBAIC0wLDAgKzEsMTIgQEAKKzwhRE9DVFlQRSBodG1sPgor PGh0bWw+Cis8Ym9keT4KKzxkaXYgc3R5bGU9ImhlaWdodDogMzAwMHB4Ij4KKzxkaXYgc3R5bGU9 ImhlaWdodDogMjAwMHB4Ij5UZXN0IGxhenkgaW1hZ2UgbG9hZGluZzwvZGl2PgorPGRpdiBzdHls ZT0iaGVpZ2h0OiAxMDAwcHgiPgorPGltZyBsb2FkaW5nPSJsYXp5IiBzcmM9ImFiZS5wbmc/MCI+ PGJyPgorPGltZyBsb2FkaW5nPSJsYXp5IiBzcmM9Im1vemlsbGEuZ2lmPzEiPjxicj4KKzwvZGl2 PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 454273 2022-03-09 11:41:43 -0800 2022-03-10 07:58:18 -0800 Patch bug-237660-20220309114142.patch text/plain 11104 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTllMTE2NWY3MjdjOTJl ZWYwZjIzZWU3Y2Y3MDQ2NzQxNTFkNGEyYy4uMWZlNTU2OTk3Nzg3NDNjM2MwNzExYzE0MWIwZTE1 NDg3ZWUwNTY1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAzLTA5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21F bGVtZW50KToKKwogMjAyMi0wMy0wOSAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBz b255LmNvbT4KIAogICAgICAgICBbV2luQ2Fpcm9dIEltcHJvdmUgV0NUaWxlZEJhY2tpbmcgYW5k IFRleHR1cmVNYXBwZXJTcGFyc2VCYWNraW5nU3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VM b2FkZXIuY3BwCmluZGV4IDY1ZmY3MDE1ZmRkMDA5NTJjYjg1OTY0Y2VhODdkOTkwYTNiNmZhODgu LmIyYzRiZjViODAwMDg2YjRiZTM4YjFlNmQxYTFjNmI4N2E4OTU2NTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ltYWdlTG9hZGVyLmNwcApAQCAtMjM5LDcgKzIzOSw4IEBAIHZvaWQgSW1hZ2VMb2Fk ZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikK ICAgICB9CiAKICAgICBDYWNoZWRJbWFnZSogb2xkSW1hZ2UgPSBtX2ltYWdlLmdldCgpOwotICAg IGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSB8fCByZWxldmFudE11dGF0aW9uID09IFJlbGV2YW50 TXV0YXRpb246OlllcykgeworICAgIGJvb2wgbG9hZEhhc05vd0xhemlseVN0YXJ0ZWQgPSBvbGRJ bWFnZSA9PSBuZXdJbWFnZSAmJiAhbV9oYXNQZW5kaW5nTG9hZEV2ZW50ICYmIG5ld0ltYWdlICYm IG5ld0ltYWdlLT5pc0xvYWRpbmcoKTsKKyAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UgfHwg cmVsZXZhbnRNdXRhdGlvbiA9PSBSZWxldmFudE11dGF0aW9uOjpZZXMgfHwgbG9hZEhhc05vd0xh emlseVN0YXJ0ZWQpIHsKICAgICAgICAgaWYgKG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCkg ewogICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMp OwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gZmFsc2U7CkBAIC0y NTgsOSArMjU5LDEyIEBAIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2 YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikKICAgICAgICAgICAgIG1faGFzUGVuZGluZ0Vy cm9yRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQogCisgICAgICAgIC8vIER1ZSB0byBsYXp5IGlt YWdlIGxvYWRpbmcgYW5kIHRoZSBsb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkgc2V0dGluZywgaXQg aXMgcG9zc2libGUgdGhhdCB3ZSBkaWQgbm90IGFjdHVhbGx5IHN0YXJ0IHRoZSBpbWFnZSBsb2Fk LgorICAgICAgICBib29sIGltYWdlV2lsbEJlTG9hZGVkTGF0ZXIgPSBuZXdJbWFnZSAmJiAhbmV3 SW1hZ2UtPmlzTG9hZGluZygpICYmIG5ld0ltYWdlLT5zdGlsbE5lZWRzTG9hZCgpOworCiAgICAg ICAgIG1faW1hZ2UgPSBuZXdJbWFnZTsKLSAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2 ZW50ID0gIWRvY3VtZW50LmlzSW1hZ2VEb2N1bWVudCgpICYmIG5ld0ltYWdlOwotICAgICAgICBt X2hhc1BlbmRpbmdMb2FkRXZlbnQgPSBuZXdJbWFnZTsKKyAgICAgICAgbV9oYXNQZW5kaW5nQmVm b3JlTG9hZEV2ZW50ID0gIWRvY3VtZW50LmlzSW1hZ2VEb2N1bWVudCgpICYmIG5ld0ltYWdlICYm ICFpbWFnZVdpbGxCZUxvYWRlZExhdGVyOworICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQg PSBuZXdJbWFnZSAmJiAhaW1hZ2VXaWxsQmVMb2FkZWRMYXRlcjsKICAgICAgICAgbV9pbWFnZUNv bXBsZXRlID0gIW5ld0ltYWdlOwogCiAgICAgICAgIGlmIChuZXdJbWFnZSkgewpAQCAtNTc3LDYg KzU4MSwxOSBAQCB2b2lkIEltYWdlTG9hZGVyOjpsb2FkRGVmZXJyZWRJbWFnZSgpCiAgICAgdXBk YXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRhdGlvbjo6Tm8pOwogfQogCit2b2lkIEltYWdlTG9h ZGVyOjp3aWxsU3RhcnRMb2FkaW5nKCkKK3sKKyAgICBpZiAobV9oYXNQZW5kaW5nTG9hZEV2ZW50 KQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBJbiB0aGUgY2FzZXMgd2hlcmUgd2UgZGlkbid0 IGxvYWQgdGhlIGltYWdlIGVhZ2VybHksIGl0IGlzIHBvc3NpYmxlIGZvciBvdXIgQ2FjaGVkSW1h Z2UncyBsb2FkCisgICAgLy8gdG8gc3RhcnQgYXQgYW55IHBvaW50IChlLmcuIGR1ZSB0byBhIHNl dHRpbmcgY2hhbmdlIG9yIGJlY2F1c2UgdGhlIENhY2hlZEltYWdlIHdhcyBuZWVkZWQgYnkgYW5v dGhlcgorICAgIC8vIGNsaWVudCkuCisgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0g IWVsZW1lbnQoKS5kb2N1bWVudCgpLmlzSW1hZ2VEb2N1bWVudCgpOworICAgIG1faGFzUGVuZGlu Z0xvYWRFdmVudCA9IHRydWU7CisgICAgdXBkYXRlZEhhc1BlbmRpbmdFdmVudCgpOworfQorCiB2 b2lkIEltYWdlTG9hZGVyOjpyZXNldExhenlJbWFnZUxvYWRpbmcoRG9jdW1lbnQmIGRvY3VtZW50 KQogewogICAgIGlmIChpc0RlZmVycmVkKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvSW1hZ2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5o CmluZGV4IDlhNGQ0NThhMGQ0Y2MxMGJmNjBmNGY0OWFjYjMxODIyYTJmNTYyOTIuLmMzNjdmNTlj OTZlOWM1OThmNjIwOTcyODMyMDVkN2RiYzNmNThkYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFn ZUxvYWRlci5oCkBAIC04OSw2ICs4OSw3IEBAIHB1YmxpYzoKIHByb3RlY3RlZDoKICAgICBleHBs aWNpdCBJbWFnZUxvYWRlcihFbGVtZW50Jik7CiAgICAgdm9pZCBub3RpZnlGaW5pc2hlZChDYWNo ZWRSZXNvdXJjZSYsIGNvbnN0IE5ldHdvcmtMb2FkTWV0cmljcyYpIG92ZXJyaWRlOworICAgIHZv aWQgd2lsbFN0YXJ0TG9hZGluZygpIG92ZXJyaWRlOwogCiBwcml2YXRlOgogICAgIHZvaWQgcmVz ZXRMYXp5SW1hZ2VMb2FkaW5nKERvY3VtZW50Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Nh Y2hlL0NhY2hlZEltYWdlLmNwcAppbmRleCAyOGZmYjIwODllZWE3NjMwYWIzMTgxOTlhNGI3MzVl NDQ0NGIzMjg1Li4yZjUzMjMyYjY5Y2Q0MDRhYmQwNzMxMjVjM2IyMDI3NmRlMWQzM2FlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKQEAgLTk5LDkgKzk5 LDEyIEBAIENhY2hlZEltYWdlOjp+Q2FjaGVkSW1hZ2UoKQogdm9pZCBDYWNoZWRJbWFnZTo6bG9h ZChDYWNoZWRSZXNvdXJjZUxvYWRlciYgbG9hZGVyKQogewogICAgIG1fc2tpcHBpbmdSZXZhbGlk YXRpb25Eb2N1bWVudCA9IGxvYWRlci5kb2N1bWVudCgpOwotICAgIGlmIChsb2FkZXIuc2hvdWxk UGVyZm9ybUltYWdlTG9hZCh1cmwoKSkpCisgICAgaWYgKGxvYWRlci5zaG91bGRQZXJmb3JtSW1h Z2VMb2FkKHVybCgpKSkgeworICAgICAgICBDYWNoZWRSZXNvdXJjZUNsaWVudFdhbGtlcjxDYWNo ZWRJbWFnZUNsaWVudD4gd2Fsa2VyKG1fY2xpZW50cyk7CisgICAgICAgIHdoaWxlIChhdXRvKiBj bGllbnQgPSB3YWxrZXIubmV4dCgpKQorICAgICAgICAgICAgY2xpZW50LT53aWxsU3RhcnRMb2Fk aW5nKCk7CiAgICAgICAgIENhY2hlZFJlc291cmNlOjpsb2FkKGxvYWRlcik7Ci0gICAgZWxzZQor ICAgIH0gZWxzZQogICAgICAgICBzZXRMb2FkaW5nKGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2VDbGllbnQuaAppbmRleCBmZDU1OGYyZjI4 ZDcxNGM3YjJlODkxYWQyMmE4NjBkMTNkZmRmOTQ4Li5hNzQzNmIwMTFjN2Q4ZmM5ZTYyM2IxOTA1 MjUzMTczNzY4NmUwM2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkSW1hZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkSW1hZ2VDbGllbnQuaApAQCAtNDksNiArNDksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBW aXNpYmxlSW5WaWV3cG9ydFN0YXRlIGltYWdlRnJhbWVBdmFpbGFibGUoQ2FjaGVkSW1hZ2UmIGlt YWdlLCBJbWFnZUFuaW1hdGluZ1N0YXRlLCBjb25zdCBJbnRSZWN0KiBjaGFuZ2VSZWN0KSB7IGlt YWdlQ2hhbmdlZCgmaW1hZ2UsIGNoYW5nZVJlY3QpOyByZXR1cm4gVmlzaWJsZUluVmlld3BvcnRT dGF0ZTo6Tm87IH0KICAgICB2aXJ0dWFsIFZpc2libGVJblZpZXdwb3J0U3RhdGUgaW1hZ2VWaXNp YmxlSW5WaWV3cG9ydChjb25zdCBEb2N1bWVudCYpIGNvbnN0IHsgcmV0dXJuIFZpc2libGVJblZp ZXdwb3J0U3RhdGU6Ok5vOyB9CiAKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFN0YXJ0TG9hZGluZygp IHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaWRSZW1vdmVDYWNoZWRJbWFnZUNsaWVudChDYWNoZWRJ bWFnZSYpIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlUmVuZGVyaW5nVXBkYXRlRm9y SW1hZ2UoQ2FjaGVkSW1hZ2UmKSB7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3MjJjYjJkYTc2ZmZmZDg2NzViMjkyMDBk ZDg2YmM2ZmNlY2EzMGEzLi5lOTQ4N2Y2OGMyMmJlZjNiZDg0NmY0ZTRmM2I0ODA4MTE2NmRiZmE5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDMtMDkgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKworICAgICAgICBNYWluIGRvY3VtZW50IGlzIGxlYWtpbmcgb24gaGFhcmV0 ei5jby5pbCBkdWUgdG8gbGF6eSBpbWFnZSBsb2FkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc2NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzkwMDM1MDcxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBsYXlvdXQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIGZhc3QvZG9tL2xhenkt aW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZmFzdC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWsuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9kb20vcmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVu dC1sZWFrLXBvcHVwLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAzLTA4ICBBbnRvaW5lIFF1aW50ICA8 Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFt3ZWItYW5pbWF0aW9uc10gZm9udC1mYW1p bHkgc2hvdWxkIHN1cHBvcnQgZGlzY3JldGUgYW5pbWF0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVh ay1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTI2NThmMWJiNDcyM2NmYzk4MmQ5ZTNhNTExMGM2 MDU5N2MxMmVmOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenkt aW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBA CitUZXN0cyB0aGF0IGxhenkgaW1hZ2UgbG9hZGluZyBkb2Vzbid0IGNhdXNlIERvY3VtZW50IGxl YWtzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBpbnRlcm5hbHMuaXNE b2N1bWVudEFsaXZlKGZyYW1lRG9jdW1lbnRJRCkgaXMgdHJ1ZQorUEFTUyBUaGUgcG9wdXAgZG9j dW1lbnQgZGlkbid0IGxlYWsuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbGF6eS1pbWFn ZS1sb2FkaW5nLWRvY3VtZW50LWxlYWsuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenkt aW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2YwZjczMjRlYzVi ZDk5NjhkZWFiY2MxNTVhMjg4MzAxZTVlOTcwMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwKQEAgLTAs MCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PgorPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbigiVGVzdHMgdGhhdCBsYXp5IGltYWdlIGxvYWRpbmcgZG9lc24ndCBjYXVzZSBEb2N1bWVu dCBsZWFrcy4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCitmcmFtZURvY3VtZW50SUQgPSAw OworY2hlY2tDb3VudCA9IDA7Citwb3B1cCA9IG51bGw7CisKK2Z1bmN0aW9uIHJ1blRlc3QoKQor eworICAgIHBvcHVwLmNsb3NlKCk7CisgICAgcG9wdXAgPSBudWxsOworCisgICAgaGFuZGxlID0g c2V0SW50ZXJ2YWwoKCkgPT4geworICAgICAgICBnYygpOworICAgICAgICBpZiAoIWludGVybmFs cy5pc0RvY3VtZW50QWxpdmUoZnJhbWVEb2N1bWVudElEKSkgeworICAgICAgICAgICAgY2xlYXJJ bnRlcnZhbChoYW5kbGUpOworICAgICAgICAgICAgdGVzdFBhc3NlZCgiVGhlIHBvcHVwIGRvY3Vt ZW50IGRpZG4ndCBsZWFrLiIpOworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAg IH0KKyAgICAgICAgY2hlY2tDb3VudCsrOworICAgICAgICBpZiAoY2hlY2tDb3VudCA+IDUwMCkg eworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbChoYW5kbGUpOworICAgICAgICAgICAgdGVzdEZh aWxlZCgiVGhlIHBvcHVwIGRvY3VtZW50IGxlYWtlZC4iKTsKKyAgICAgICAgICAgIGZpbmlzaEpT VGVzdCgpOworICAgICAgICB9CisgICAgfSwgMTApOworfQorCitvbmxvYWQgPSAoKSA9PiB7Cisg ICAgcG9wdXAgPSB3aW5kb3cub3BlbigicmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1 bWVudC1sZWFrLXBvcHVwLmh0bWwiKTsKKyAgICBwb3B1cC5vbmxvYWQgPSAoKSA9PiB7CisgICAg ICAgIHBvcHVwLm9ubG9hZCA9IG51bGw7CisgICAgICAgIGZyYW1lRG9jdW1lbnRJRCA9IGludGVy bmFscy5kb2N1bWVudElkZW50aWZpZXIocG9wdXAuZG9jdW1lbnQpOworICAgICAgICBzaG91bGRC ZVRydWUoImludGVybmFscy5pc0RvY3VtZW50QWxpdmUoZnJhbWVEb2N1bWVudElEKSIpOworICAg ICAgICBzZXRUaW1lb3V0KHJ1blRlc3QsIDApOworICAgIH0KK307Cis8L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9s YXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9kb20vcmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLXBvcHVw Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYTZlNmFmZDAwYzI4NjE2YmNlNTY2ZDU4MzlhYjA4NmE5YWY0ZWM5 MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sCkBAIC0wLDAgKzEsMTIgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxkaXYgc3R5bGU9ImhlaWdodDogMzAw MHB4Ij4KKzxkaXYgc3R5bGU9ImhlaWdodDogMjAwMHB4Ij5UZXN0IGxhenkgaW1hZ2UgbG9hZGlu ZzwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDAwcHgiPgorPGltZyBsb2FkaW5nPSJsYXp5 IiBzcmM9ImFiZS5wbmc/MCI+PGJyPgorPGltZyBsb2FkaW5nPSJsYXp5IiBzcmM9Im1vemlsbGEu Z2lmPzEiPjxicj4KKzwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 454362 2022-03-10 07:58:20 -0800 2022-03-10 09:10:16 -0800 Patch bug-237660-20220310075819.patch text/plain 11071 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjhkODg0NjRhZTgxYjdi ZWI3NDg4OWZiZTZiM2Y4YzAxZDYwYmEwZS4uN2RkNWE2MTUyOTg1NDM4Nzk2NTRiZWUyNGM3YWZi YWFmZTU0Y2E2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAzLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21F bGVtZW50KToKKwogMjAyMi0wMy0xMCAgTGF1cm8gTW91cmEgIDxsbW91cmFAaWdhbGlhLmNvbT4K IAogICAgICAgICBBZGQgY29udGV4dC5yb3VuZFJlY3Qgc3VwcG9ydCB0byBPZmZTY3JlZW5DYW52 YXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCmluZGV4IDY1ZmY3MDE1ZmRkMDA5 NTJjYjg1OTY0Y2VhODdkOTkwYTNiNmZhODguLjBmYjVjOWFhNzRmZTYyNDY4MjQ5NDExOGI1NzMw OWEzODZkN2Y0ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcApAQCAtMjM5 LDcgKzIzOSw4IEBAIHZvaWQgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2YW50 TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikKICAgICB9CiAKICAgICBDYWNoZWRJbWFnZSogb2xk SW1hZ2UgPSBtX2ltYWdlLmdldCgpOwotICAgIGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSB8fCBy ZWxldmFudE11dGF0aW9uID09IFJlbGV2YW50TXV0YXRpb246OlllcykgeworICAgIGJvb2wgbG9h ZEhhc05vd0xhemlseVN0YXJ0ZWQgPSBvbGRJbWFnZSA9PSBuZXdJbWFnZSAmJiAhbV9oYXNQZW5k aW5nTG9hZEV2ZW50ICYmIG5ld0ltYWdlICYmIG5ld0ltYWdlLT5pc0xvYWRpbmcoKTsKKyAgICBp ZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UgfHwgcmVsZXZhbnRNdXRhdGlvbiA9PSBSZWxldmFudE11 dGF0aW9uOjpZZXMgfHwgbG9hZEhhc05vd0xhemlseVN0YXJ0ZWQpIHsKICAgICAgICAgaWYgKG1f aGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCkgewogICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50 U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMpOwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmVm b3JlTG9hZEV2ZW50ID0gZmFsc2U7CkBAIC0yNTgsOSArMjU5LDEyIEBAIHZvaWQgSW1hZ2VMb2Fk ZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikK ICAgICAgICAgICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQog CisgICAgICAgIC8vIER1ZSB0byBsYXp5IGltYWdlIGxvYWRpbmcgYW5kIHRoZSBsb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHkgc2V0dGluZywgaXQgaXMgcG9zc2libGUgdGhhdCB3ZSBkaWQgbm90IGFj dHVhbGx5IHN0YXJ0IHRoZSBpbWFnZSBsb2FkLgorICAgICAgICBib29sIGltYWdlV2lsbEJlTG9h ZGVkTGF0ZXIgPSBuZXdJbWFnZSAmJiAhbmV3SW1hZ2UtPmlzTG9hZGVkKCkgJiYgIW5ld0ltYWdl LT5pc0xvYWRpbmcoKSAmJiBuZXdJbWFnZS0+c3RpbGxOZWVkc0xvYWQoKTsKKwogICAgICAgICBt X2ltYWdlID0gbmV3SW1hZ2U7Ci0gICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9 ICFkb2N1bWVudC5pc0ltYWdlRG9jdW1lbnQoKSAmJiBuZXdJbWFnZTsKLSAgICAgICAgbV9oYXNQ ZW5kaW5nTG9hZEV2ZW50ID0gbmV3SW1hZ2U7CisgICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxv YWRFdmVudCA9ICFkb2N1bWVudC5pc0ltYWdlRG9jdW1lbnQoKSAmJiBuZXdJbWFnZSAmJiAhaW1h Z2VXaWxsQmVMb2FkZWRMYXRlcjsKKyAgICAgICAgbV9oYXNQZW5kaW5nTG9hZEV2ZW50ID0gbmV3 SW1hZ2UgJiYgIWltYWdlV2lsbEJlTG9hZGVkTGF0ZXI7CiAgICAgICAgIG1faW1hZ2VDb21wbGV0 ZSA9ICFuZXdJbWFnZTsKIAogICAgICAgICBpZiAobmV3SW1hZ2UpIHsKQEAgLTU3Nyw2ICs1ODEs MTkgQEAgdm9pZCBJbWFnZUxvYWRlcjo6bG9hZERlZmVycmVkSW1hZ2UoKQogICAgIHVwZGF0ZUZy b21FbGVtZW50KFJlbGV2YW50TXV0YXRpb246Ok5vKTsKIH0KIAordm9pZCBJbWFnZUxvYWRlcjo6 d2lsbFN0YXJ0TG9hZGluZygpCit7CisgICAgaWYgKG1faGFzUGVuZGluZ0xvYWRFdmVudCkKKyAg ICAgICAgcmV0dXJuOworCisgICAgLy8gSW4gdGhlIGNhc2VzIHdoZXJlIHdlIGRpZG4ndCBsb2Fk IHRoZSBpbWFnZSBlYWdlcmx5LCBpdCBpcyBwb3NzaWJsZSBmb3Igb3VyIENhY2hlZEltYWdlJ3Mg bG9hZAorICAgIC8vIHRvIHN0YXJ0IGF0IGFueSBwb2ludCAoZS5nLiBkdWUgdG8gYSBzZXR0aW5n IGNoYW5nZSBvciBiZWNhdXNlIHRoZSBDYWNoZWRJbWFnZSB3YXMgbmVlZGVkIGJ5IGFub3RoZXIK KyAgICAvLyBjbGllbnQpLgorICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9ICFlbGVt ZW50KCkuZG9jdW1lbnQoKS5pc0ltYWdlRG9jdW1lbnQoKTsKKyAgICBtX2hhc1BlbmRpbmdMb2Fk RXZlbnQgPSB0cnVlOworICAgIHVwZGF0ZWRIYXNQZW5kaW5nRXZlbnQoKTsKK30KKwogdm9pZCBJ bWFnZUxvYWRlcjo6cmVzZXRMYXp5SW1hZ2VMb2FkaW5nKERvY3VtZW50JiBkb2N1bWVudCkKIHsK ICAgICBpZiAoaXNEZWZlcnJlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ltYWdlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAppbmRl eCA5YTRkNDU4YTBkNGNjMTBiZjYwZjRmNDlhY2IzMTgyMmEyZjU2MjkyLi5jMzY3ZjU5Yzk2ZTlj NTk4ZjYyMDk3MjgzMjA1ZDdkYmMzZjU4ZGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvSW1hZ2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2Fk ZXIuaApAQCAtODksNiArODksNyBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQg SW1hZ2VMb2FkZXIoRWxlbWVudCYpOwogICAgIHZvaWQgbm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVz b3VyY2UmLCBjb25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmKSBvdmVycmlkZTsKKyAgICB2b2lkIHdp bGxTdGFydExvYWRpbmcoKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0TGF6 eUltYWdlTG9hZGluZyhEb2N1bWVudCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRJbWFnZS5jcHAKaW5kZXggMjhmZmIyMDg5ZWVhNzYzMGFiMzE4MTk5YTRiNzM1ZTQ0NDRi MzI4NS4uMmY1MzIzMmI2OWNkNDA0YWJkMDczMTI1YzNiMjAyNzZkZTFkMzNhZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCkBAIC05OSw5ICs5OSwxMiBA QCBDYWNoZWRJbWFnZTo6fkNhY2hlZEltYWdlKCkKIHZvaWQgQ2FjaGVkSW1hZ2U6OmxvYWQoQ2Fj aGVkUmVzb3VyY2VMb2FkZXImIGxvYWRlcikKIHsKICAgICBtX3NraXBwaW5nUmV2YWxpZGF0aW9u RG9jdW1lbnQgPSBsb2FkZXIuZG9jdW1lbnQoKTsKLSAgICBpZiAobG9hZGVyLnNob3VsZFBlcmZv cm1JbWFnZUxvYWQodXJsKCkpKQorICAgIGlmIChsb2FkZXIuc2hvdWxkUGVyZm9ybUltYWdlTG9h ZCh1cmwoKSkpIHsKKyAgICAgICAgQ2FjaGVkUmVzb3VyY2VDbGllbnRXYWxrZXI8Q2FjaGVkSW1h Z2VDbGllbnQ+IHdhbGtlcihtX2NsaWVudHMpOworICAgICAgICB3aGlsZSAoYXV0byogY2xpZW50 ID0gd2Fsa2VyLm5leHQoKSkKKyAgICAgICAgICAgIGNsaWVudC0+d2lsbFN0YXJ0TG9hZGluZygp OwogICAgICAgICBDYWNoZWRSZXNvdXJjZTo6bG9hZChsb2FkZXIpOwotICAgIGVsc2UKKyAgICB9 IGVsc2UKICAgICAgICAgc2V0TG9hZGluZyhmYWxzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50LmgKaW5kZXggZmQ1NThmMmYyOGQ3MTRj N2IyZTg5MWFkMjJhODYwZDEzZGZkZjk0OC4uYTc0MzZiMDExYzdkOGZjOWU2MjNiMTkwNTI1MzE3 Mzc2ODZlMDNmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZEltYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZElt YWdlQ2xpZW50LmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgVmlzaWJs ZUluVmlld3BvcnRTdGF0ZSBpbWFnZUZyYW1lQXZhaWxhYmxlKENhY2hlZEltYWdlJiBpbWFnZSwg SW1hZ2VBbmltYXRpbmdTdGF0ZSwgY29uc3QgSW50UmVjdCogY2hhbmdlUmVjdCkgeyBpbWFnZUNo YW5nZWQoJmltYWdlLCBjaGFuZ2VSZWN0KTsgcmV0dXJuIFZpc2libGVJblZpZXdwb3J0U3RhdGU6 Ok5vOyB9CiAgICAgdmlydHVhbCBWaXNpYmxlSW5WaWV3cG9ydFN0YXRlIGltYWdlVmlzaWJsZUlu Vmlld3BvcnQoY29uc3QgRG9jdW1lbnQmKSBjb25zdCB7IHJldHVybiBWaXNpYmxlSW5WaWV3cG9y dFN0YXRlOjpObzsgfQogCisgICAgdmlydHVhbCB2b2lkIHdpbGxTdGFydExvYWRpbmcoKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVtb3ZlQ2FjaGVkSW1hZ2VDbGllbnQoQ2FjaGVkSW1hZ2Um KSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZVJlbmRlcmluZ1VwZGF0ZUZvckltYWdl KENhY2hlZEltYWdlJikgeyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjAxMDdkYWNlNGM5YjgwMWFkNjUyYmQ5NzA4NzI1 MjY2YzdkNWE5Ni4uYmUwMmU3ZjIyZTM3NmEzNzQyYmIzMDYxMDgwMWUzZjZhMzRiYTE2YyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAzLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBsZWFraW5nIG9uIGhhYXJldHouY28u aWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDAz NTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgbGF5b3V0IHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBmYXN0L2RvbS9sYXp5LWltYWdl LWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZh c3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVh ay1wb3B1cC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBHU3RyZWFtZXIgZ2FyZGVu aW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmct ZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWlt YWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTI2NThm MWJiNDcyM2NmYzk4MmQ5ZTNhNTExMGM2MDU5N2MxMmVmOAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDExIEBACitUZXN0cyB0aGF0IGxhenkgaW1hZ2UgbG9hZGluZyBk b2Vzbid0IGNhdXNlIERvY3VtZW50IGxlYWtzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKworUEFTUyBpbnRlcm5hbHMuaXNEb2N1bWVudEFsaXZlKGZyYW1lRG9jdW1lbnRJRCkgaXMg dHJ1ZQorUEFTUyBUaGUgcG9wdXAgZG9jdW1lbnQgZGlkbid0IGxlYWsuCitQQVNTIHN1Y2Nlc3Nm dWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWsuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uN2YwZjczMjRlYzViZDk5NjhkZWFiY2MxNTVhMjg4MzAxZTVlOTcwMQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1k b2N1bWVudC1sZWFrLmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKzxib2R5PgorPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGVzdHMgdGhhdCBsYXp5IGltYWdlIGxvYWRp bmcgZG9lc24ndCBjYXVzZSBEb2N1bWVudCBsZWFrcy4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVl OworCitmcmFtZURvY3VtZW50SUQgPSAwOworY2hlY2tDb3VudCA9IDA7Citwb3B1cCA9IG51bGw7 CisKK2Z1bmN0aW9uIHJ1blRlc3QoKQoreworICAgIHBvcHVwLmNsb3NlKCk7CisgICAgcG9wdXAg PSBudWxsOworCisgICAgaGFuZGxlID0gc2V0SW50ZXJ2YWwoKCkgPT4geworICAgICAgICBnYygp OworICAgICAgICBpZiAoIWludGVybmFscy5pc0RvY3VtZW50QWxpdmUoZnJhbWVEb2N1bWVudElE KSkgeworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbChoYW5kbGUpOworICAgICAgICAgICAgdGVz dFBhc3NlZCgiVGhlIHBvcHVwIGRvY3VtZW50IGRpZG4ndCBsZWFrLiIpOworICAgICAgICAgICAg ZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH0KKyAgICAgICAgY2hlY2tDb3VudCsrOworICAgICAg ICBpZiAoY2hlY2tDb3VudCA+IDUwMCkgeworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbChoYW5k bGUpOworICAgICAgICAgICAgdGVzdEZhaWxlZCgiVGhlIHBvcHVwIGRvY3VtZW50IGxlYWtlZC4i KTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9CisgICAgfSwgMTApOwor fQorCitvbmxvYWQgPSAoKSA9PiB7CisgICAgcG9wdXAgPSB3aW5kb3cub3BlbigicmVzb3VyY2Vz L2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLXBvcHVwLmh0bWwiKTsKKyAgICBwb3B1 cC5vbmxvYWQgPSAoKSA9PiB7CisgICAgICAgIHBvcHVwLm9ubG9hZCA9IG51bGw7CisgICAgICAg IGZyYW1lRG9jdW1lbnRJRCA9IGludGVybmFscy5kb2N1bWVudElkZW50aWZpZXIocG9wdXAuZG9j dW1lbnQpOworICAgICAgICBzaG91bGRCZVRydWUoImludGVybmFscy5pc0RvY3VtZW50QWxpdmUo ZnJhbWVEb2N1bWVudElEKSIpOworICAgICAgICBzZXRUaW1lb3V0KHJ1blRlc3QsIDApOworICAg IH0KK307Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1w b3B1cC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vcmVzb3VyY2VzL2xhenktaW1hZ2UtbG9h ZGluZy1kb2N1bWVudC1sZWFrLXBvcHVwLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTZlNmFmZDAwYzI4NjE2 YmNlNTY2ZDU4MzlhYjA4NmE5YWY0ZWM5MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1 cC5odG1sCkBAIC0wLDAgKzEsMTIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4K KzxkaXYgc3R5bGU9ImhlaWdodDogMzAwMHB4Ij4KKzxkaXYgc3R5bGU9ImhlaWdodDogMjAwMHB4 Ij5UZXN0IGxhenkgaW1hZ2UgbG9hZGluZzwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDAw cHgiPgorPGltZyBsb2FkaW5nPSJsYXp5IiBzcmM9ImFiZS5wbmc/MCI+PGJyPgorPGltZyBsb2Fk aW5nPSJsYXp5IiBzcmM9Im1vemlsbGEuZ2lmPzEiPjxicj4KKzwvZGl2PgorPC9kaXY+Cis8L2Jv ZHk+Cis8L2h0bWw+Cg== 454368 2022-03-10 09:10:19 -0800 2022-03-10 11:16:26 -0800 Patch bug-237660-20220310091018.patch text/plain 12224 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGEyNGQwMDg5MTQyODAw YWQ3MjE2YTg5NDQwYjc3MTUwMWQ0MTI5My4uYTU4YzFmYTIzNmFmNGY4MDY4MjFjMzhlMGU1Njhj ZTgzMjM0MzY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAzLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21F bGVtZW50KToKKwogMjAyMi0wMy0xMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9y Zz4KIAogICAgICAgICBbd2ViLWFuaW1hdGlvbnNdIGZvbnQtdmFyaWFudC1lYXN0LWFzaWFuIHNo b3VsZCBzdXBwb3J0IGRpc2NyZXRlIGFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxv YWRlci5jcHAKaW5kZXggNjVmZjcwMTVmZGQwMDk1MmNiODU5NjRjZWE4N2Q5OTBhM2I2ZmE4OC4u YTA5MzJkOThjNjA0MGQwNWNkNjI3NTY5ZDExNWE2MTA0MGRmNDJkZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvSW1hZ2VMb2FkZXIuY3BwCkBAIC00Nyw2ICs0Nyw3IEBACiAjaW5jbHVkZSAiUmVuZGVy U1ZHSW1hZ2UuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgPHd0Zi9OZXZlckRl c3Ryb3llZC5oPgorI2luY2x1ZGUgPHd0Zi9TY29wZS5oPgogCiAjaWYgRU5BQkxFKFZJREVPKQog I2luY2x1ZGUgIlJlbmRlclZpZGVvLmgiCkBAIC0xMDYsNiArMTA3LDcgQEAgSW1hZ2VMb2FkZXI6 OkltYWdlTG9hZGVyKEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgLCBtX2ltYWdlQ29tcGxldGUodHJ1 ZSkKICAgICAsIG1fbG9hZE1hbnVhbGx5KGZhbHNlKQogICAgICwgbV9lbGVtZW50SXNQcm90ZWN0 ZWQoZmFsc2UpCisgICAgLCBtX2luVXBkYXRlRnJvbUVsZW1lbnQoZmFsc2UpCiB7CiB9CiAKQEAg LTE3Nyw2ICsxNzksMTEgQEAgdm9pZCBJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQoUmVs ZXZhbnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uKQogICAgIGlmICghbV9mYWlsZWRMb2FkVVJM LmlzRW1wdHkoKSAmJiBhdHRyID09IG1fZmFpbGVkTG9hZFVSTCkKICAgICAgICAgcmV0dXJuOwog CisgICAgbV9pblVwZGF0ZUZyb21FbGVtZW50ID0gdHJ1ZTsKKyAgICBhdXRvIGluVXBkYXRlRnJv bUVsZW1lbnRTY29wZSA9IG1ha2VTY29wZUV4aXQoW3RoaXNdIHsKKyAgICAgICAgbV9pblVwZGF0 ZUZyb21FbGVtZW50ID0gZmFsc2U7CisgICAgfSk7CisKICAgICAvLyBEbyBub3QgbG9hZCBhbnkg aW1hZ2UgaWYgdGhlICdzcmMnIGF0dHJpYnV0ZSBpcyBtaXNzaW5nIG9yIGlmIGl0IGlzCiAgICAg Ly8gYW4gZW1wdHkgc3RyaW5nLgogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZEltYWdl PiBuZXdJbWFnZSA9IG51bGxwdHI7CkBAIC0yMzksNyArMjQ2LDggQEAgdm9pZCBJbWFnZUxvYWRl cjo6dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uKQog ICAgIH0KIAogICAgIENhY2hlZEltYWdlKiBvbGRJbWFnZSA9IG1faW1hZ2UuZ2V0KCk7Ci0gICAg aWYgKG5ld0ltYWdlICE9IG9sZEltYWdlIHx8IHJlbGV2YW50TXV0YXRpb24gPT0gUmVsZXZhbnRN dXRhdGlvbjo6WWVzKSB7CisgICAgYm9vbCBsb2FkSGFzTm93TGF6aWx5U3RhcnRlZCA9IG9sZElt YWdlID09IG5ld0ltYWdlICYmICFtX2hhc1BlbmRpbmdMb2FkRXZlbnQgJiYgbmV3SW1hZ2UgJiYg bmV3SW1hZ2UtPmlzTG9hZGluZygpOworICAgIGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSB8fCBy ZWxldmFudE11dGF0aW9uID09IFJlbGV2YW50TXV0YXRpb246OlllcyB8fCBsb2FkSGFzTm93TGF6 aWx5U3RhcnRlZCkgewogICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KSB7 CiAgICAgICAgICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgqdGhpcyk7 CiAgICAgICAgICAgICBtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgPSBmYWxzZTsKQEAgLTI1 OCw5ICsyNjYsMTIgQEAgdm9pZCBJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZh bnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uKQogICAgICAgICAgICAgbV9oYXNQZW5kaW5nRXJy b3JFdmVudCA9IGZhbHNlOwogICAgICAgICB9CiAKKyAgICAgICAgLy8gRHVlIHRvIGxhenkgaW1h Z2UgbG9hZGluZyBhbmQgdGhlIGxvYWRzSW1hZ2VzQXV0b21hdGljYWxseSBzZXR0aW5nLCBpdCBp cyBwb3NzaWJsZSB0aGF0IHdlIGRpZCBub3QgYWN0dWFsbHkgc3RhcnQgdGhlIGltYWdlIGxvYWQu CisgICAgICAgIGJvb2wgaW1hZ2VXaWxsQmVMb2FkZWRMYXRlciA9IG5ld0ltYWdlICYmICFuZXdJ bWFnZS0+aXNMb2FkZWQoKSAmJiAhbmV3SW1hZ2UtPmlzTG9hZGluZygpICYmIG5ld0ltYWdlLT5z dGlsbE5lZWRzTG9hZCgpOworCiAgICAgICAgIG1faW1hZ2UgPSBuZXdJbWFnZTsKLSAgICAgICAg bV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gIWRvY3VtZW50LmlzSW1hZ2VEb2N1bWVudCgp ICYmIG5ld0ltYWdlOwotICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgPSBuZXdJbWFnZTsK KyAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gIWRvY3VtZW50LmlzSW1hZ2VE b2N1bWVudCgpICYmIG5ld0ltYWdlICYmICFpbWFnZVdpbGxCZUxvYWRlZExhdGVyOworICAgICAg ICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgPSBuZXdJbWFnZSAmJiAhaW1hZ2VXaWxsQmVMb2FkZWRM YXRlcjsKICAgICAgICAgbV9pbWFnZUNvbXBsZXRlID0gIW5ld0ltYWdlOwogCiAgICAgICAgIGlm IChuZXdJbWFnZSkgewpAQCAtNTc3LDYgKzU4OCwxOSBAQCB2b2lkIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpCiAgICAgdXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRhdGlvbjo6 Tm8pOwogfQogCit2b2lkIEltYWdlTG9hZGVyOjp3aWxsU3RhcnRMb2FkaW5nKCkKK3sKKyAgICBp ZiAobV9pblVwZGF0ZUZyb21FbGVtZW50IHx8IG1faGFzUGVuZGluZ0xvYWRFdmVudCkKKyAgICAg ICAgcmV0dXJuOworCisgICAgLy8gSW4gdGhlIGNhc2VzIHdoZXJlIHdlIGRpZG4ndCBsb2FkIHRo ZSBpbWFnZSBlYWdlcmx5LCBpdCBpcyBwb3NzaWJsZSBmb3Igb3VyIENhY2hlZEltYWdlJ3MgbG9h ZAorICAgIC8vIHRvIHN0YXJ0IGF0IGFueSBwb2ludCAoZS5nLiBkdWUgdG8gYSBzZXR0aW5nIGNo YW5nZSBvciBiZWNhdXNlIHRoZSBDYWNoZWRJbWFnZSB3YXMgbmVlZGVkIGJ5IGFub3RoZXIKKyAg ICAvLyBjbGllbnQpLgorICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9ICFlbGVtZW50 KCkuZG9jdW1lbnQoKS5pc0ltYWdlRG9jdW1lbnQoKTsKKyAgICBtX2hhc1BlbmRpbmdMb2FkRXZl bnQgPSB0cnVlOworICAgIHVwZGF0ZWRIYXNQZW5kaW5nRXZlbnQoKTsKK30KKwogdm9pZCBJbWFn ZUxvYWRlcjo6cmVzZXRMYXp5SW1hZ2VMb2FkaW5nKERvY3VtZW50JiBkb2N1bWVudCkKIHsKICAg ICBpZiAoaXNEZWZlcnJlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0lt YWdlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAppbmRleCA5 YTRkNDU4YTBkNGNjMTBiZjYwZjRmNDlhY2IzMTgyMmEyZjU2MjkyLi4zNDI4NjM0MjlhM2VlNGI2 YjU0NWZiYmY4MGFlMzFiZDhlNTYzYjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIu aApAQCAtODksNiArODksNyBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgSW1h Z2VMb2FkZXIoRWxlbWVudCYpOwogICAgIHZvaWQgbm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3Vy Y2UmLCBjb25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmKSBvdmVycmlkZTsKKyAgICB2b2lkIHdpbGxT dGFydExvYWRpbmcoKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0TGF6eUlt YWdlTG9hZGluZyhEb2N1bWVudCYpOwpAQCAtMTMwLDYgKzEzMSw3IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX2ltYWdlQ29tcGxldGUgOiAxOwogICAgIGJvb2wgbV9sb2FkTWFudWFsbHkgOiAxOwog ICAgIGJvb2wgbV9lbGVtZW50SXNQcm90ZWN0ZWQgOiAxOworICAgIGJvb2wgbV9pblVwZGF0ZUZy b21FbGVtZW50IDogMTsKICAgICBMYXp5SW1hZ2VMb2FkU3RhdGUgbV9sYXp5SW1hZ2VMb2FkU3Rh dGUgeyBMYXp5SW1hZ2VMb2FkU3RhdGU6Ok5vbmUgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCmluZGV4IDI4ZmZiMjA4OWVlYTc2MzBhYjMxODE5 OWE0YjczNWU0NDQ0YjMyODUuLjJmNTMyMzJiNjljZDQwNGFiZDA3MzEyNWMzYjIwMjc2ZGUxZDMz YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcApAQCAt OTksOSArOTksMTIgQEAgQ2FjaGVkSW1hZ2U6On5DYWNoZWRJbWFnZSgpCiB2b2lkIENhY2hlZElt YWdlOjpsb2FkKENhY2hlZFJlc291cmNlTG9hZGVyJiBsb2FkZXIpCiB7CiAgICAgbV9za2lwcGlu Z1JldmFsaWRhdGlvbkRvY3VtZW50ID0gbG9hZGVyLmRvY3VtZW50KCk7Ci0gICAgaWYgKGxvYWRl ci5zaG91bGRQZXJmb3JtSW1hZ2VMb2FkKHVybCgpKSkKKyAgICBpZiAobG9hZGVyLnNob3VsZFBl cmZvcm1JbWFnZUxvYWQodXJsKCkpKSB7CisgICAgICAgIENhY2hlZFJlc291cmNlQ2xpZW50V2Fs a2VyPENhY2hlZEltYWdlQ2xpZW50PiB3YWxrZXIobV9jbGllbnRzKTsKKyAgICAgICAgd2hpbGUg KGF1dG8qIGNsaWVudCA9IHdhbGtlci5uZXh0KCkpCisgICAgICAgICAgICBjbGllbnQtPndpbGxT dGFydExvYWRpbmcoKTsKICAgICAgICAgQ2FjaGVkUmVzb3VyY2U6OmxvYWQobG9hZGVyKTsKLSAg ICBlbHNlCisgICAgfSBlbHNlCiAgICAgICAgIHNldExvYWRpbmcoZmFsc2UpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2VDbGllbnQuaCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCmluZGV4IGZk NTU4ZjJmMjhkNzE0YzdiMmU4OTFhZDIyYTg2MGQxM2RmZGY5NDguLmE3NDM2YjAxMWM3ZDhmYzll NjIzYjE5MDUyNTMxNzM3Njg2ZTAzZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCkBAIC00OSw2ICs0OSw3IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIFZpc2libGVJblZpZXdwb3J0U3RhdGUgaW1hZ2VGcmFtZUF2YWlsYWJsZShDYWNoZWRJ bWFnZSYgaW1hZ2UsIEltYWdlQW5pbWF0aW5nU3RhdGUsIGNvbnN0IEludFJlY3QqIGNoYW5nZVJl Y3QpIHsgaW1hZ2VDaGFuZ2VkKCZpbWFnZSwgY2hhbmdlUmVjdCk7IHJldHVybiBWaXNpYmxlSW5W aWV3cG9ydFN0YXRlOjpObzsgfQogICAgIHZpcnR1YWwgVmlzaWJsZUluVmlld3BvcnRTdGF0ZSBp bWFnZVZpc2libGVJblZpZXdwb3J0KGNvbnN0IERvY3VtZW50JikgY29uc3QgeyByZXR1cm4gVmlz aWJsZUluVmlld3BvcnRTdGF0ZTo6Tm87IH0KIAorICAgIHZpcnR1YWwgdm9pZCB3aWxsU3RhcnRM b2FkaW5nKCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlbW92ZUNhY2hlZEltYWdlQ2xpZW50 KENhY2hlZEltYWdlJikgeyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgc2NoZWR1bGVSZW5kZXJpbmdV cGRhdGVGb3JJbWFnZShDYWNoZWRJbWFnZSYpIHsgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDIwMTA3ZGFjZTRjOWI4MDFh ZDY1MmJkOTcwODcyNTI2NmM3ZDVhOTYuLmJlMDJlN2YyMmUzNzZhMzc0MmJiMzA2MTA4MDFlM2Y2 YTM0YmExNmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMy0xMCAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIE1haW4gZG9jdW1lbnQgaXMgbGVha2luZyBv biBoYWFyZXR6LmNvLmlsIGR1ZSB0byBsYXp5IGltYWdlIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNzY2MAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vOTAwMzUwNzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGxheW91dCB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogZmFzdC9k b20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBmYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2FkaW5n LWRvY3VtZW50LWxlYWstcG9wdXAuaHRtbDogQWRkZWQuCisKIDIwMjItMDMtMTAgIFBoaWxpcHBl IE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgR1N0 cmVhbWVyIGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbGF6eS1p bWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFz dC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstZXhwZWN0ZWQudHh0Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjEyNjU4ZjFiYjQ3MjNjZmM5ODJkOWUzYTUxMTBjNjA1OTdjMTJlZjgKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1l bnQtbGVhay1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGVzdHMgdGhhdCBsYXp5IGlt YWdlIGxvYWRpbmcgZG9lc24ndCBjYXVzZSBEb2N1bWVudCBsZWFrcy4KKworT24gc3VjY2Vzcywg eW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRF U1QgQ09NUExFVEUiLgorCisKK1BBU1MgaW50ZXJuYWxzLmlzRG9jdW1lbnRBbGl2ZShmcmFtZURv Y3VtZW50SUQpIGlzIHRydWUKK1BBU1MgVGhlIHBvcHVwIGRvY3VtZW50IGRpZG4ndCBsZWFrLgor UEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1s ZWFrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1l bnQtbGVhay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdmMGY3MzI0ZWM1YmQ5OTY4ZGVhYmNjMTU1YTI4ODMw MWU1ZTk3MDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWlt YWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMt dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHRoYXQgbGF6 eSBpbWFnZSBsb2FkaW5nIGRvZXNuJ3QgY2F1c2UgRG9jdW1lbnQgbGVha3MuIik7Citqc1Rlc3RJ c0FzeW5jID0gdHJ1ZTsKKworZnJhbWVEb2N1bWVudElEID0gMDsKK2NoZWNrQ291bnQgPSAwOwor cG9wdXAgPSBudWxsOworCitmdW5jdGlvbiBydW5UZXN0KCkKK3sKKyAgICBwb3B1cC5jbG9zZSgp OworICAgIHBvcHVwID0gbnVsbDsKKworICAgIGhhbmRsZSA9IHNldEludGVydmFsKCgpID0+IHsK KyAgICAgICAgZ2MoKTsKKyAgICAgICAgaWYgKCFpbnRlcm5hbHMuaXNEb2N1bWVudEFsaXZlKGZy YW1lRG9jdW1lbnRJRCkpIHsKKyAgICAgICAgICAgIGNsZWFySW50ZXJ2YWwoaGFuZGxlKTsKKyAg ICAgICAgICAgIHRlc3RQYXNzZWQoIlRoZSBwb3B1cCBkb2N1bWVudCBkaWRuJ3QgbGVhay4iKTsK KyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9CisgICAgICAgIGNoZWNrQ291 bnQrKzsKKyAgICAgICAgaWYgKGNoZWNrQ291bnQgPiA1MDApIHsKKyAgICAgICAgICAgIGNsZWFy SW50ZXJ2YWwoaGFuZGxlKTsKKyAgICAgICAgICAgIHRlc3RGYWlsZWQoIlRoZSBwb3B1cCBkb2N1 bWVudCBsZWFrZWQuIik7CisgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgfQor ICAgIH0sIDEwKTsKK30KKworb25sb2FkID0gKCkgPT4geworICAgIHBvcHVwID0gd2luZG93Lm9w ZW4oInJlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1s Iik7CisgICAgcG9wdXAub25sb2FkID0gKCkgPT4geworICAgICAgICBwb3B1cC5vbmxvYWQgPSBu dWxsOworICAgICAgICBmcmFtZURvY3VtZW50SUQgPSBpbnRlcm5hbHMuZG9jdW1lbnRJZGVudGlm aWVyKHBvcHVwLmRvY3VtZW50KTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCJpbnRlcm5hbHMuaXNE b2N1bWVudEFsaXZlKGZyYW1lRG9jdW1lbnRJRCkiKTsKKyAgICAgICAgc2V0VGltZW91dChydW5U ZXN0LCAwKTsKKyAgICB9Cit9OworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2FkaW5nLWRv Y3VtZW50LWxlYWstcG9wdXAuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9s YXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE2 ZTZhZmQwMGMyODYxNmJjZTU2NmQ1ODM5YWIwODZhOWFmNGVjOTAKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3Vt ZW50LWxlYWstcG9wdXAuaHRtbApAQCAtMCwwICsxLDEyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDMwMDBweCI+Cis8ZGl2IHN0eWxlPSJo ZWlnaHQ6IDIwMDBweCI+VGVzdCBsYXp5IGltYWdlIGxvYWRpbmc8L2Rpdj4KKzxkaXYgc3R5bGU9 ImhlaWdodDogMTAwMHB4Ij4KKzxpbWcgbG9hZGluZz0ibGF6eSIgc3JjPSJhYmUucG5nPzAiPjxi cj4KKzxpbWcgbG9hZGluZz0ibGF6eSIgc3JjPSJtb3ppbGxhLmdpZj8xIj48YnI+Cis8L2Rpdj4K KzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 454381 2022-03-10 11:16:29 -0800 2022-03-10 11:48:58 -0800 Patch bug-237660-20220310111628.patch text/plain 12472 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU5MTMxNGM3MGYxZTVk MTIyNzIzY2U5ZWUxNGFiOTY0Zjc0ZGUwOS4uY2M3MWI3N2Q5NzJmNzhmNmIxMzAyOTIyNDE2Yzkz NzRhZDU3OGNhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAzLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21F bGVtZW50KToKKwogMjAyMi0wMy0xMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9y Zz4KIAogICAgICAgICBbd2ViLWFuaW1hdGlvbnNdIGZvbnQtdmFyaWFudC1jYXBzIHNob3VsZCBz dXBwb3J0IGRpc2NyZXRlIGFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ltYWdlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5j cHAKaW5kZXggNjVmZjcwMTVmZGQwMDk1MmNiODU5NjRjZWE4N2Q5OTBhM2I2ZmE4OC4uMzkwNzA0 MTI2MjE2ZjMxZDFkNmM2MTc2ODg2ZDllNDRjZmZkYWE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv SW1hZ2VMb2FkZXIuY3BwCkBAIC00Nyw2ICs0Nyw3IEBACiAjaW5jbHVkZSAiUmVuZGVyU1ZHSW1h Z2UuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3ll ZC5oPgorI2luY2x1ZGUgPHd0Zi9TY29wZS5oPgogCiAjaWYgRU5BQkxFKFZJREVPKQogI2luY2x1 ZGUgIlJlbmRlclZpZGVvLmgiCkBAIC0xMDYsNiArMTA3LDcgQEAgSW1hZ2VMb2FkZXI6OkltYWdl TG9hZGVyKEVsZW1lbnQmIGVsZW1lbnQpCiAgICAgLCBtX2ltYWdlQ29tcGxldGUodHJ1ZSkKICAg ICAsIG1fbG9hZE1hbnVhbGx5KGZhbHNlKQogICAgICwgbV9lbGVtZW50SXNQcm90ZWN0ZWQoZmFs c2UpCisgICAgLCBtX2luVXBkYXRlRnJvbUVsZW1lbnQoZmFsc2UpCiB7CiB9CiAKQEAgLTE3Nyw2 ICsxNzksMTEgQEAgdm9pZCBJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRN dXRhdGlvbiByZWxldmFudE11dGF0aW9uKQogICAgIGlmICghbV9mYWlsZWRMb2FkVVJMLmlzRW1w dHkoKSAmJiBhdHRyID09IG1fZmFpbGVkTG9hZFVSTCkKICAgICAgICAgcmV0dXJuOwogCisgICAg bV9pblVwZGF0ZUZyb21FbGVtZW50ID0gdHJ1ZTsKKyAgICBhdXRvIGluVXBkYXRlRnJvbUVsZW1l bnRTY29wZSA9IG1ha2VTY29wZUV4aXQoW3RoaXNdIHsKKyAgICAgICAgbV9pblVwZGF0ZUZyb21F bGVtZW50ID0gZmFsc2U7CisgICAgfSk7CisKICAgICAvLyBEbyBub3QgbG9hZCBhbnkgaW1hZ2Ug aWYgdGhlICdzcmMnIGF0dHJpYnV0ZSBpcyBtaXNzaW5nIG9yIGlmIGl0IGlzCiAgICAgLy8gYW4g ZW1wdHkgc3RyaW5nLgogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZEltYWdlPiBuZXdJ bWFnZSA9IG51bGxwdHI7CkBAIC0yMzksNyArMjQ2LDggQEAgdm9pZCBJbWFnZUxvYWRlcjo6dXBk YXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uKQogICAgIH0K IAogICAgIENhY2hlZEltYWdlKiBvbGRJbWFnZSA9IG1faW1hZ2UuZ2V0KCk7Ci0gICAgaWYgKG5l d0ltYWdlICE9IG9sZEltYWdlIHx8IHJlbGV2YW50TXV0YXRpb24gPT0gUmVsZXZhbnRNdXRhdGlv bjo6WWVzKSB7CisgICAgYm9vbCBsb2FkSGFzTm93TGF6aWx5U3RhcnRlZCA9IG9sZEltYWdlID09 IG5ld0ltYWdlICYmICFtX2hhc1BlbmRpbmdMb2FkRXZlbnQgJiYgbmV3SW1hZ2UgJiYgbmV3SW1h Z2UtPmlzTG9hZGluZygpOworICAgIGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSB8fCByZWxldmFu dE11dGF0aW9uID09IFJlbGV2YW50TXV0YXRpb246OlllcyB8fCBsb2FkSGFzTm93TGF6aWx5U3Rh cnRlZCkgewogICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KSB7CiAgICAg ICAgICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCgqdGhpcyk7CiAgICAg ICAgICAgICBtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgPSBmYWxzZTsKQEAgLTI1OCw5ICsy NjYsMTIgQEAgdm9pZCBJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRh dGlvbiByZWxldmFudE11dGF0aW9uKQogICAgICAgICAgICAgbV9oYXNQZW5kaW5nRXJyb3JFdmVu dCA9IGZhbHNlOwogICAgICAgICB9CiAKKyAgICAgICAgLy8gRHVlIHRvIGxhenkgaW1hZ2UgbG9h ZGluZyBhbmQgdGhlIGxvYWRzSW1hZ2VzQXV0b21hdGljYWxseSBzZXR0aW5nLCBpdCBpcyBwb3Nz aWJsZSB0aGF0IHdlIGRpZCBub3QgYWN0dWFsbHkgc3RhcnQgdGhlIGltYWdlIGxvYWQuCisgICAg ICAgIGJvb2wgaW1hZ2VXaWxsQmVMb2FkZWRMYXRlciA9IG5ld0ltYWdlICYmICFuZXdJbWFnZS0+ aXNMb2FkaW5nKCkgJiYgbmV3SW1hZ2UtPnN0aWxsTmVlZHNMb2FkKCk7CisKICAgICAgICAgbV9p bWFnZSA9IG5ld0ltYWdlOwotICAgICAgICBtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgPSAh ZG9jdW1lbnQuaXNJbWFnZURvY3VtZW50KCkgJiYgbmV3SW1hZ2U7Ci0gICAgICAgIG1faGFzUGVu ZGluZ0xvYWRFdmVudCA9IG5ld0ltYWdlOworICAgICAgICBtX2hhc1BlbmRpbmdCZWZvcmVMb2Fk RXZlbnQgPSAhZG9jdW1lbnQuaXNJbWFnZURvY3VtZW50KCkgJiYgbmV3SW1hZ2UgJiYgIWltYWdl V2lsbEJlTG9hZGVkTGF0ZXI7CisgICAgICAgIG1faGFzUGVuZGluZ0xvYWRFdmVudCA9IG5ld0lt YWdlICYmICFpbWFnZVdpbGxCZUxvYWRlZExhdGVyOwogICAgICAgICBtX2ltYWdlQ29tcGxldGUg PSAhbmV3SW1hZ2U7CiAKICAgICAgICAgaWYgKG5ld0ltYWdlKSB7CkBAIC01NzcsNiArNTg4LDI3 IEBAIHZvaWQgSW1hZ2VMb2FkZXI6OmxvYWREZWZlcnJlZEltYWdlKCkKICAgICB1cGRhdGVGcm9t RWxlbWVudChSZWxldmFudE11dGF0aW9uOjpObyk7CiB9CiAKK3ZvaWQgSW1hZ2VMb2FkZXI6Ondp bGxTdGFydExvYWRpbmcoKQoreworICAgIGlmIChtX2luVXBkYXRlRnJvbUVsZW1lbnQgfHwgbV9o YXNQZW5kaW5nTG9hZEV2ZW50KQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBJbiB0aGUgY2Fz ZXMgd2hlcmUgd2UgZGlkbid0IGxvYWQgdGhlIGltYWdlIGVhZ2VybHksIGl0IGlzIHBvc3NpYmxl IGZvciBvdXIgQ2FjaGVkSW1hZ2UncyBsb2FkCisgICAgLy8gdG8gc3RhcnQgYXQgYW55IHBvaW50 IChlLmcuIGR1ZSB0byBhIHNldHRpbmcgY2hhbmdlIG9yIGJlY2F1c2UgdGhlIENhY2hlZEltYWdl IHdhcyBuZWVkZWQgYnkgYW5vdGhlcgorICAgIC8vIGNsaWVudCkuCisgICAgbV9oYXNQZW5kaW5n QmVmb3JlTG9hZEV2ZW50ID0gIWVsZW1lbnQoKS5kb2N1bWVudCgpLmlzSW1hZ2VEb2N1bWVudCgp OworICAgIG1faGFzUGVuZGluZ0xvYWRFdmVudCA9IHRydWU7CisKKyAgICBpZiAoIWVsZW1lbnQo KS5kb2N1bWVudCgpLmlzSW1hZ2VEb2N1bWVudCgpKQorICAgICAgICBkaXNwYXRjaFBlbmRpbmdC ZWZvcmVMb2FkRXZlbnQoKTsKKyAgICBlbHNlCisgICAgICAgIHVwZGF0ZVJlbmRlcmVyKCk7CisK KyAgICBpZiAoUmVuZGVySW1hZ2VSZXNvdXJjZSogaW1hZ2VSZXNvdXJjZSA9IHJlbmRlckltYWdl UmVzb3VyY2UoKSkKKyAgICAgICAgaW1hZ2VSZXNvdXJjZS0+cmVzZXRBbmltYXRpb24oKTsKKwor ICAgIHVwZGF0ZWRIYXNQZW5kaW5nRXZlbnQoKTsKK30KIHZvaWQgSW1hZ2VMb2FkZXI6OnJlc2V0 TGF6eUltYWdlTG9hZGluZyhEb2N1bWVudCYgZG9jdW1lbnQpCiB7CiAgICAgaWYgKGlzRGVmZXJy ZWQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKaW5kZXggOWE0ZDQ1OGEwZDRjYzEw YmY2MGY0ZjQ5YWNiMzE4MjJhMmY1NjI5Mi4uMzQyODYzNDI5YTNlZTRiNmI1NDVmYmJmODBhZTMx YmQ4ZTU2M2I3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKQEAgLTg5LDYgKzg5 LDcgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIGV4cGxpY2l0IEltYWdlTG9hZGVyKEVsZW1l bnQmKTsKICAgICB2b2lkIG5vdGlmeUZpbmlzaGVkKENhY2hlZFJlc291cmNlJiwgY29uc3QgTmV0 d29ya0xvYWRNZXRyaWNzJikgb3ZlcnJpZGU7CisgICAgdm9pZCB3aWxsU3RhcnRMb2FkaW5nKCkg b3ZlcnJpZGU7CiAKIHByaXZhdGU6CiAgICAgdm9pZCByZXNldExhenlJbWFnZUxvYWRpbmcoRG9j dW1lbnQmKTsKQEAgLTEzMCw2ICsxMzEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pbWFnZUNv bXBsZXRlIDogMTsKICAgICBib29sIG1fbG9hZE1hbnVhbGx5IDogMTsKICAgICBib29sIG1fZWxl bWVudElzUHJvdGVjdGVkIDogMTsKKyAgICBib29sIG1faW5VcGRhdGVGcm9tRWxlbWVudCA6IDE7 CiAgICAgTGF6eUltYWdlTG9hZFN0YXRlIG1fbGF6eUltYWdlTG9hZFN0YXRlIHsgTGF6eUltYWdl TG9hZFN0YXRlOjpOb25lIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0Nh Y2hlZEltYWdlLmNwcAppbmRleCAyOGZmYjIwODllZWE3NjMwYWIzMTgxOTlhNGI3MzVlNDQ0NGIz Mjg1Li4yZjUzMjMyYjY5Y2Q0MDRhYmQwNzMxMjVjM2IyMDI3NmRlMWQzM2FlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKQEAgLTk5LDkgKzk5LDEyIEBA IENhY2hlZEltYWdlOjp+Q2FjaGVkSW1hZ2UoKQogdm9pZCBDYWNoZWRJbWFnZTo6bG9hZChDYWNo ZWRSZXNvdXJjZUxvYWRlciYgbG9hZGVyKQogewogICAgIG1fc2tpcHBpbmdSZXZhbGlkYXRpb25E b2N1bWVudCA9IGxvYWRlci5kb2N1bWVudCgpOwotICAgIGlmIChsb2FkZXIuc2hvdWxkUGVyZm9y bUltYWdlTG9hZCh1cmwoKSkpCisgICAgaWYgKGxvYWRlci5zaG91bGRQZXJmb3JtSW1hZ2VMb2Fk KHVybCgpKSkgeworICAgICAgICBDYWNoZWRSZXNvdXJjZUNsaWVudFdhbGtlcjxDYWNoZWRJbWFn ZUNsaWVudD4gd2Fsa2VyKG1fY2xpZW50cyk7CisgICAgICAgIHdoaWxlIChhdXRvKiBjbGllbnQg PSB3YWxrZXIubmV4dCgpKQorICAgICAgICAgICAgY2xpZW50LT53aWxsU3RhcnRMb2FkaW5nKCk7 CiAgICAgICAgIENhY2hlZFJlc291cmNlOjpsb2FkKGxvYWRlcik7Ci0gICAgZWxzZQorICAgIH0g ZWxzZQogICAgICAgICBzZXRMb2FkaW5nKGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2VDbGllbnQuaAppbmRleCBmZDU1OGYyZjI4ZDcxNGM3 YjJlODkxYWQyMmE4NjBkMTNkZmRmOTQ4Li5hNzQzNmIwMTFjN2Q4ZmM5ZTYyM2IxOTA1MjUzMTcz NzY4NmUwM2Y2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk SW1hZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1h Z2VDbGllbnQuaApAQCAtNDksNiArNDksNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBWaXNpYmxl SW5WaWV3cG9ydFN0YXRlIGltYWdlRnJhbWVBdmFpbGFibGUoQ2FjaGVkSW1hZ2UmIGltYWdlLCBJ bWFnZUFuaW1hdGluZ1N0YXRlLCBjb25zdCBJbnRSZWN0KiBjaGFuZ2VSZWN0KSB7IGltYWdlQ2hh bmdlZCgmaW1hZ2UsIGNoYW5nZVJlY3QpOyByZXR1cm4gVmlzaWJsZUluVmlld3BvcnRTdGF0ZTo6 Tm87IH0KICAgICB2aXJ0dWFsIFZpc2libGVJblZpZXdwb3J0U3RhdGUgaW1hZ2VWaXNpYmxlSW5W aWV3cG9ydChjb25zdCBEb2N1bWVudCYpIGNvbnN0IHsgcmV0dXJuIFZpc2libGVJblZpZXdwb3J0 U3RhdGU6Ok5vOyB9CiAKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFN0YXJ0TG9hZGluZygpIHsgfQog ICAgIHZpcnR1YWwgdm9pZCBkaWRSZW1vdmVDYWNoZWRJbWFnZUNsaWVudChDYWNoZWRJbWFnZSYp IHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlUmVuZGVyaW5nVXBkYXRlRm9ySW1hZ2Uo Q2FjaGVkSW1hZ2UmKSB7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNmJhODI1MjdmMjlhMGZjZDU4N2UxZTlhMDdhMDY2 NWIyZDNlZTQxLi41ZDEwNmQzYzNjMjk5OTgyZmNlZmNkNmQxZDAyODBiMWNkMmE3ODJjIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTcgQEAKKzIwMjItMDMtMTAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KKworICAgICAgICBNYWluIGRvY3VtZW50IGlzIGxlYWtpbmcgb24gaGFhcmV0ei5jby5p bCBkdWUgdG8gbGF6eSBpbWFnZSBsb2FkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc2NjAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkwMDM1 MDcxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBsYXlvdXQgdGVzdCBjb3ZlcmFnZS4KKworICAgICAgICAqIGZhc3QvZG9tL2xhenktaW1hZ2Ut bG9hZGluZy1kb2N1bWVudC1sZWFrLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWsuaHRtbDogQWRkZWQuCisgICAg ICAgICogZmFzdC9kb20vcmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFr LXBvcHVwLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAzLTEwICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0 c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFt3ZWItYW5pbWF0aW9uc10gZm9udC12YXJpYW50LWNh cHMgc2hvdWxkIHN1cHBvcnQgZGlzY3JldGUgYW5pbWF0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVh ay1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTI2NThmMWJiNDcyM2NmYzk4MmQ5ZTNhNTExMGM2 MDU5N2MxMmVmOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenkt aW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDExIEBA CitUZXN0cyB0aGF0IGxhenkgaW1hZ2UgbG9hZGluZyBkb2Vzbid0IGNhdXNlIERvY3VtZW50IGxl YWtzLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBpbnRlcm5hbHMuaXNE b2N1bWVudEFsaXZlKGZyYW1lRG9jdW1lbnRJRCkgaXMgdHJ1ZQorUEFTUyBUaGUgcG9wdXAgZG9j dW1lbnQgZGlkbid0IGxlYWsuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbGF6eS1pbWFn ZS1sb2FkaW5nLWRvY3VtZW50LWxlYWsuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenkt aW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2YwZjczMjRlYzVi ZDk5NjhkZWFiY2MxNTVhMjg4MzAxZTVlOTcwMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwKQEAgLTAs MCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PgorPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbigiVGVzdHMgdGhhdCBsYXp5IGltYWdlIGxvYWRpbmcgZG9lc24ndCBjYXVzZSBEb2N1bWVu dCBsZWFrcy4iKTsKK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCitmcmFtZURvY3VtZW50SUQgPSAw OworY2hlY2tDb3VudCA9IDA7Citwb3B1cCA9IG51bGw7CisKK2Z1bmN0aW9uIHJ1blRlc3QoKQor eworICAgIHBvcHVwLmNsb3NlKCk7CisgICAgcG9wdXAgPSBudWxsOworCisgICAgaGFuZGxlID0g c2V0SW50ZXJ2YWwoKCkgPT4geworICAgICAgICBnYygpOworICAgICAgICBpZiAoIWludGVybmFs cy5pc0RvY3VtZW50QWxpdmUoZnJhbWVEb2N1bWVudElEKSkgeworICAgICAgICAgICAgY2xlYXJJ bnRlcnZhbChoYW5kbGUpOworICAgICAgICAgICAgdGVzdFBhc3NlZCgiVGhlIHBvcHVwIGRvY3Vt ZW50IGRpZG4ndCBsZWFrLiIpOworICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAg IH0KKyAgICAgICAgY2hlY2tDb3VudCsrOworICAgICAgICBpZiAoY2hlY2tDb3VudCA+IDUwMCkg eworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbChoYW5kbGUpOworICAgICAgICAgICAgdGVzdEZh aWxlZCgiVGhlIHBvcHVwIGRvY3VtZW50IGxlYWtlZC4iKTsKKyAgICAgICAgICAgIGZpbmlzaEpT VGVzdCgpOworICAgICAgICB9CisgICAgfSwgMTApOworfQorCitvbmxvYWQgPSAoKSA9PiB7Cisg ICAgcG9wdXAgPSB3aW5kb3cub3BlbigicmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1 bWVudC1sZWFrLXBvcHVwLmh0bWwiKTsKKyAgICBwb3B1cC5vbmxvYWQgPSAoKSA9PiB7CisgICAg ICAgIHBvcHVwLm9ubG9hZCA9IG51bGw7CisgICAgICAgIGZyYW1lRG9jdW1lbnRJRCA9IGludGVy bmFscy5kb2N1bWVudElkZW50aWZpZXIocG9wdXAuZG9jdW1lbnQpOworICAgICAgICBzaG91bGRC ZVRydWUoImludGVybmFscy5pc0RvY3VtZW50QWxpdmUoZnJhbWVEb2N1bWVudElEKSIpOworICAg ICAgICBzZXRUaW1lb3V0KHJ1blRlc3QsIDApOworICAgIH0KK307Cis8L3NjcmlwdD4KKzwvYm9k eT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9s YXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9kb20vcmVzb3VyY2VzL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLXBvcHVw Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYTZlNmFmZDAwYzI4NjE2YmNlNTY2ZDU4MzlhYjA4NmE5YWY0ZWM5 MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sCkBAIC0wLDAgKzEsMTIgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxkaXYgc3R5bGU9ImhlaWdodDogMzAw MHB4Ij4KKzxkaXYgc3R5bGU9ImhlaWdodDogMjAwMHB4Ij5UZXN0IGxhenkgaW1hZ2UgbG9hZGlu ZzwvZGl2PgorPGRpdiBzdHlsZT0iaGVpZ2h0OiAxMDAwcHgiPgorPGltZyBsb2FkaW5nPSJsYXp5 IiBzcmM9ImFiZS5wbmc/MCI+PGJyPgorPGltZyBsb2FkaW5nPSJsYXp5IiBzcmM9Im1vemlsbGEu Z2lmPzEiPjxicj4KKzwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 454387 2022-03-10 11:49:00 -0800 2022-03-10 13:35:46 -0800 Patch bug-237660-20220310114859.patch text/plain 14054 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU5MTMxNGM3MGYxZTVk MTIyNzIzY2U5ZWUxNGFiOTY0Zjc0ZGUwOS4uM2Y4YThkYzRmNjA1ZTU1OWVhNWI4MTQ5YzlkYTQ4 NDg5Y2I4NDZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIyLTAzLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OkltYWdlTG9hZGVy KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6ZGlkVXBkYXRlQ2FjaGVkSW1hZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OndpbGxTdGFydExvYWRpbmcpOgorICAgICAgICAq IGxvYWRlci9JbWFnZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRJbWFn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFnZTo6bG9hZCk6CisgICAgICAgICog bG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDYWNo ZWRJbWFnZUNsaWVudDo6d2lsbFN0YXJ0TG9hZGluZyk6CisKIDIwMjItMDMtMTAgIEFudG9pbmUg UXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW3dlYi1hbmltYXRpb25zXSBm b250LXZhcmlhbnQtY2FwcyBzaG91bGQgc3VwcG9ydCBkaXNjcmV0ZSBhbmltYXRpb24KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCmluZGV4IDY1ZmY3MDE1ZmRkMDA5NTJjYjg1OTY0 Y2VhODdkOTkwYTNiNmZhODguLjBkM2IwZWVlMTcwNWVhODRiN2UzNjZjNDAxMWUyZmQ5MDZjOTg4 M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcApAQCAtNDcsNiArNDcsNyBA QAogI2luY2x1ZGUgIlJlbmRlclNWR0ltYWdlLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNp bmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KKyNpbmNsdWRlIDx3dGYvU2NvcGUuaD4KIAog I2lmIEVOQUJMRShWSURFTykKICNpbmNsdWRlICJSZW5kZXJWaWRlby5oIgpAQCAtMTA2LDYgKzEw Nyw3IEBAIEltYWdlTG9hZGVyOjpJbWFnZUxvYWRlcihFbGVtZW50JiBlbGVtZW50KQogICAgICwg bV9pbWFnZUNvbXBsZXRlKHRydWUpCiAgICAgLCBtX2xvYWRNYW51YWxseShmYWxzZSkKICAgICAs IG1fZWxlbWVudElzUHJvdGVjdGVkKGZhbHNlKQorICAgICwgbV9pblVwZGF0ZUZyb21FbGVtZW50 KGZhbHNlKQogewogfQogCkBAIC0xNzcsNiArMTc5LDExIEBAIHZvaWQgSW1hZ2VMb2FkZXI6OnVw ZGF0ZUZyb21FbGVtZW50KFJlbGV2YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikKICAgICBp ZiAoIW1fZmFpbGVkTG9hZFVSTC5pc0VtcHR5KCkgJiYgYXR0ciA9PSBtX2ZhaWxlZExvYWRVUkwp CiAgICAgICAgIHJldHVybjsKIAorICAgIG1faW5VcGRhdGVGcm9tRWxlbWVudCA9IHRydWU7Cisg ICAgYXV0byBpblVwZGF0ZUZyb21FbGVtZW50U2NvcGUgPSBtYWtlU2NvcGVFeGl0KFt0aGlzXSB7 CisgICAgICAgIG1faW5VcGRhdGVGcm9tRWxlbWVudCA9IGZhbHNlOworICAgIH0pOworCiAgICAg Ly8gRG8gbm90IGxvYWQgYW55IGltYWdlIGlmIHRoZSAnc3JjJyBhdHRyaWJ1dGUgaXMgbWlzc2lu ZyBvciBpZiBpdCBpcwogICAgIC8vIGFuIGVtcHR5IHN0cmluZy4KICAgICBDYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRJbWFnZT4gbmV3SW1hZ2UgPSBudWxscHRyOwpAQCAtMjM4LDggKzI0NSwx NiBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudChSZWxldmFudE11dGF0aW9u IHJlbGV2YW50TXV0YXRpb24pCiAgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5kaXNwYXRjaEV2 ZW50U29vbigqdGhpcyk7CiAgICAgfQogCisgICAgZGlkVXBkYXRlQ2FjaGVkSW1hZ2UocmVsZXZh bnRNdXRhdGlvbiwgV1RGTW92ZShuZXdJbWFnZSkpOworfQorCit2b2lkIEltYWdlTG9hZGVyOjpk aWRVcGRhdGVDYWNoZWRJbWFnZShSZWxldmFudE11dGF0aW9uIHJlbGV2YW50TXV0YXRpb24sIENh Y2hlZFJlc291cmNlSGFuZGxlPENhY2hlZEltYWdlPiYmIG5ld0ltYWdlKQoreworICAgIGF1dG8m IGRvY3VtZW50ID0gZWxlbWVudCgpLmRvY3VtZW50KCk7CisKICAgICBDYWNoZWRJbWFnZSogb2xk SW1hZ2UgPSBtX2ltYWdlLmdldCgpOwotICAgIGlmIChuZXdJbWFnZSAhPSBvbGRJbWFnZSB8fCBy ZWxldmFudE11dGF0aW9uID09IFJlbGV2YW50TXV0YXRpb246OlllcykgeworICAgIGJvb2wgbG9h ZEhhc05vd0xhemlseVN0YXJ0ZWQgPSBvbGRJbWFnZSA9PSBuZXdJbWFnZSAmJiAhbV9oYXNQZW5k aW5nTG9hZEV2ZW50ICYmIG5ld0ltYWdlICYmIG5ld0ltYWdlLT5pc0xvYWRpbmcoKTsKKyAgICBp ZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UgfHwgcmVsZXZhbnRNdXRhdGlvbiA9PSBSZWxldmFudE11 dGF0aW9uOjpZZXMgfHwgbG9hZEhhc05vd0xhemlseVN0YXJ0ZWQpIHsKICAgICAgICAgaWYgKG1f aGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCkgewogICAgICAgICAgICAgYmVmb3JlTG9hZEV2ZW50 U2VuZGVyKCkuY2FuY2VsRXZlbnQoKnRoaXMpOwogICAgICAgICAgICAgbV9oYXNQZW5kaW5nQmVm b3JlTG9hZEV2ZW50ID0gZmFsc2U7CkBAIC0yNTgsOSArMjczLDEyIEBAIHZvaWQgSW1hZ2VMb2Fk ZXI6OnVwZGF0ZUZyb21FbGVtZW50KFJlbGV2YW50TXV0YXRpb24gcmVsZXZhbnRNdXRhdGlvbikK ICAgICAgICAgICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQog CisgICAgICAgIC8vIER1ZSB0byBsYXp5IGltYWdlIGxvYWRpbmcgYW5kIHRoZSBsb2Fkc0ltYWdl c0F1dG9tYXRpY2FsbHkgc2V0dGluZywgaXQgaXMgcG9zc2libGUgdGhhdCB3ZSBkaWQgbm90IGFj dHVhbGx5IHN0YXJ0IHRoZSBpbWFnZSBsb2FkLgorICAgICAgICBib29sIGltYWdlV2lsbEJlTG9h ZGVkTGF0ZXIgPSBuZXdJbWFnZSAmJiAhbmV3SW1hZ2UtPmlzTG9hZGluZygpICYmIG5ld0ltYWdl LT5zdGlsbE5lZWRzTG9hZCgpOworCiAgICAgICAgIG1faW1hZ2UgPSBuZXdJbWFnZTsKLSAgICAg ICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gIWRvY3VtZW50LmlzSW1hZ2VEb2N1bWVu dCgpICYmIG5ld0ltYWdlOwotICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgPSBuZXdJbWFn ZTsKKyAgICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gIWRvY3VtZW50LmlzSW1h Z2VEb2N1bWVudCgpICYmIG5ld0ltYWdlICYmICFpbWFnZVdpbGxCZUxvYWRlZExhdGVyOworICAg ICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgPSBuZXdJbWFnZSAmJiAhaW1hZ2VXaWxsQmVMb2Fk ZWRMYXRlcjsKICAgICAgICAgbV9pbWFnZUNvbXBsZXRlID0gIW5ld0ltYWdlOwogCiAgICAgICAg IGlmIChuZXdJbWFnZSkgewpAQCAtMjY5LDggKzI4NywxMiBAQCB2b2lkIEltYWdlTG9hZGVyOjp1 cGRhdGVGcm9tRWxlbWVudChSZWxldmFudE11dGF0aW9uIHJlbGV2YW50TXV0YXRpb24pCiAgICAg ICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgdXBkYXRlUmVuZGVyZXIoKTsKIAotICAgICAg ICAgICAgaWYgKG1fbGF6eUltYWdlTG9hZFN0YXRlID09IExhenlJbWFnZUxvYWRTdGF0ZTo6RGVm ZXJyZWQpCi0gICAgICAgICAgICAgICAgTGF6eUxvYWRJbWFnZU9ic2VydmVyOjpvYnNlcnZlKGVs ZW1lbnQoKSk7CisgICAgICAgICAgICBpZiAobV9sYXp5SW1hZ2VMb2FkU3RhdGUgPT0gTGF6eUlt YWdlTG9hZFN0YXRlOjpEZWZlcnJlZCkgeworICAgICAgICAgICAgICAgIGlmIChpbWFnZVdpbGxC ZUxvYWRlZExhdGVyKQorICAgICAgICAgICAgICAgICAgICBMYXp5TG9hZEltYWdlT2JzZXJ2ZXI6 Om9ic2VydmUoZWxlbWVudCgpKTsKKyAgICAgICAgICAgICAgICBlbHNlIC8vIE5vIG5lZWQgdG8g c2V0IHVwIGEgTGF6eUxvYWRJbWFnZU9ic2VydmVyIGlmIHRoZSBpbWFnZSBpcyBhbHJlYWR5IGxv YWRlZCAoZS5nLiB3YXMgYWxyZWFkeSBjYWNoZWQpLgorICAgICAgICAgICAgICAgICAgICBtX2xh enlJbWFnZUxvYWRTdGF0ZSA9IExhenlJbWFnZUxvYWRTdGF0ZTo6Tm9uZTsKKyAgICAgICAgICAg IH0KIAogICAgICAgICAgICAgLy8gSWYgbmV3SW1hZ2UgaXMgY2FjaGVkLCBhZGRDbGllbnQoKSB3 aWxsIHJlc3VsdCBpbiB0aGUgbG9hZCBldmVudAogICAgICAgICAgICAgLy8gYmVpbmcgcXVldWVk IHRvIGZpcmUuIEVuc3VyZSB0aGlzIGhhcHBlbnMgYWZ0ZXIgYmVmb3JlbG9hZCBpcwpAQCAtNTc3 LDYgKzU5OSwxMyBAQCB2b2lkIEltYWdlTG9hZGVyOjpsb2FkRGVmZXJyZWRJbWFnZSgpCiAgICAg dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRhdGlvbjo6Tm8pOwogfQogCit2b2lkIEltYWdl TG9hZGVyOjp3aWxsU3RhcnRMb2FkaW5nKCkKK3sKKyAgICBpZiAobV9pblVwZGF0ZUZyb21FbGVt ZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBkaWRVcGRhdGVDYWNoZWRJbWFnZShSZWxldmFu dE11dGF0aW9uOjpObywgQ2FjaGVkUmVzb3VyY2VIYW5kbGUgeyBtX2ltYWdlIH0pOworfQogdm9p ZCBJbWFnZUxvYWRlcjo6cmVzZXRMYXp5SW1hZ2VMb2FkaW5nKERvY3VtZW50JiBkb2N1bWVudCkK IHsKICAgICBpZiAoaXNEZWZlcnJlZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ltYWdlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaApp bmRleCA5YTRkNDU4YTBkNGNjMTBiZjYwZjRmNDlhY2IzMTgyMmEyZjU2MjkyLi40NjQ1NDM0M2Rl NzlkMmM1YzM0MWJkYWMyMTljMjVhMzE2MzVjMTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VM b2FkZXIuaApAQCAtNDAsNyArNDAsNyBAQCBjbGFzcyBSZW5kZXJJbWFnZVJlc291cmNlOwogdGVt cGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgRXZlbnRTZW5kZXI7CiB1c2luZyBJbWFnZUV2ZW50U2Vu ZGVyID0gRXZlbnRTZW5kZXI8SW1hZ2VMb2FkZXI+OwogCi1lbnVtIGNsYXNzIFJlbGV2YW50TXV0 YXRpb24gOiBib29sIHsgWWVzLCBObyB9OworZW51bSBjbGFzcyBSZWxldmFudE11dGF0aW9uIDog Ym9vbCB7IE5vLCBZZXMgfTsKIAogY2xhc3MgSW1hZ2VMb2FkZXIgOiBwdWJsaWMgQ2FjaGVkSW1h Z2VDbGllbnQsIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxJbWFnZUxvYWRlcj4gewogICAgIFdURl9N QUtFX0ZBU1RfQUxMT0NBVEVEOwpAQCAtODksNiArODksNyBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6 CiAgICAgZXhwbGljaXQgSW1hZ2VMb2FkZXIoRWxlbWVudCYpOwogICAgIHZvaWQgbm90aWZ5Rmlu aXNoZWQoQ2FjaGVkUmVzb3VyY2UmLCBjb25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmKSBvdmVycmlk ZTsKKyAgICB2b2lkIHdpbGxTdGFydExvYWRpbmcoKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAg ICB2b2lkIHJlc2V0TGF6eUltYWdlTG9hZGluZyhEb2N1bWVudCYpOwpAQCAtOTgsNiArOTksNyBA QCBwcml2YXRlOgogICAgIHZpcnR1YWwgU3RyaW5nIHNvdXJjZVVSSShjb25zdCBBdG9tU3RyaW5n JikgY29uc3QgPSAwOwogCiAgICAgdm9pZCB1cGRhdGVkSGFzUGVuZGluZ0V2ZW50KCk7CisgICAg dm9pZCBkaWRVcGRhdGVDYWNoZWRJbWFnZShSZWxldmFudE11dGF0aW9uLCBDYWNoZWRSZXNvdXJj ZUhhbmRsZTxDYWNoZWRJbWFnZT4mJik7CiAKICAgICB2b2lkIGRpc3BhdGNoUGVuZGluZ0JlZm9y ZUxvYWRFdmVudCgpOwogICAgIHZvaWQgZGlzcGF0Y2hQZW5kaW5nTG9hZEV2ZW50KCk7CkBAIC0x MzAsNiArMTMyLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faW1hZ2VDb21wbGV0ZSA6IDE7CiAg ICAgYm9vbCBtX2xvYWRNYW51YWxseSA6IDE7CiAgICAgYm9vbCBtX2VsZW1lbnRJc1Byb3RlY3Rl ZCA6IDE7CisgICAgYm9vbCBtX2luVXBkYXRlRnJvbUVsZW1lbnQgOiAxOwogICAgIExhenlJbWFn ZUxvYWRTdGF0ZSBtX2xhenlJbWFnZUxvYWRTdGF0ZSB7IExhenlJbWFnZUxvYWRTdGF0ZTo6Tm9u ZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZEltYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAK aW5kZXggMjhmZmIyMDg5ZWVhNzYzMGFiMzE4MTk5YTRiNzM1ZTQ0NDRiMzI4NS4uMmY1MzIzMmI2 OWNkNDA0YWJkMDczMTI1YzNiMjAyNzZkZTFkMzNhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCkBAIC05OSw5ICs5OSwxMiBAQCBDYWNoZWRJbWFnZTo6 fkNhY2hlZEltYWdlKCkKIHZvaWQgQ2FjaGVkSW1hZ2U6OmxvYWQoQ2FjaGVkUmVzb3VyY2VMb2Fk ZXImIGxvYWRlcikKIHsKICAgICBtX3NraXBwaW5nUmV2YWxpZGF0aW9uRG9jdW1lbnQgPSBsb2Fk ZXIuZG9jdW1lbnQoKTsKLSAgICBpZiAobG9hZGVyLnNob3VsZFBlcmZvcm1JbWFnZUxvYWQodXJs KCkpKQorICAgIGlmIChsb2FkZXIuc2hvdWxkUGVyZm9ybUltYWdlTG9hZCh1cmwoKSkpIHsKKyAg ICAgICAgQ2FjaGVkUmVzb3VyY2VDbGllbnRXYWxrZXI8Q2FjaGVkSW1hZ2VDbGllbnQ+IHdhbGtl cihtX2NsaWVudHMpOworICAgICAgICB3aGlsZSAoYXV0byogY2xpZW50ID0gd2Fsa2VyLm5leHQo KSkKKyAgICAgICAgICAgIGNsaWVudC0+d2lsbFN0YXJ0TG9hZGluZygpOwogICAgICAgICBDYWNo ZWRSZXNvdXJjZTo6bG9hZChsb2FkZXIpOwotICAgIGVsc2UKKyAgICB9IGVsc2UKICAgICAgICAg c2V0TG9hZGluZyhmYWxzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZEltYWdlQ2xpZW50LmgKaW5kZXggZmQ1NThmMmYyOGQ3MTRjN2IyZTg5MWFkMjJhODYw ZDEzZGZkZjk0OC4uYTc0MzZiMDExYzdkOGZjOWU2MjNiMTkwNTI1MzE3Mzc2ODZlMDNmNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50LmgK KysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlQ2xpZW50LmgKQEAg LTQ5LDYgKzQ5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgVmlzaWJsZUluVmlld3BvcnRTdGF0 ZSBpbWFnZUZyYW1lQXZhaWxhYmxlKENhY2hlZEltYWdlJiBpbWFnZSwgSW1hZ2VBbmltYXRpbmdT dGF0ZSwgY29uc3QgSW50UmVjdCogY2hhbmdlUmVjdCkgeyBpbWFnZUNoYW5nZWQoJmltYWdlLCBj aGFuZ2VSZWN0KTsgcmV0dXJuIFZpc2libGVJblZpZXdwb3J0U3RhdGU6Ok5vOyB9CiAgICAgdmly dHVhbCBWaXNpYmxlSW5WaWV3cG9ydFN0YXRlIGltYWdlVmlzaWJsZUluVmlld3BvcnQoY29uc3Qg RG9jdW1lbnQmKSBjb25zdCB7IHJldHVybiBWaXNpYmxlSW5WaWV3cG9ydFN0YXRlOjpObzsgfQog CisgICAgdmlydHVhbCB2b2lkIHdpbGxTdGFydExvYWRpbmcoKSB7IH0KICAgICB2aXJ0dWFsIHZv aWQgZGlkUmVtb3ZlQ2FjaGVkSW1hZ2VDbGllbnQoQ2FjaGVkSW1hZ2UmKSB7IH0KIAogICAgIHZp cnR1YWwgdm9pZCBzY2hlZHVsZVJlbmRlcmluZ1VwZGF0ZUZvckltYWdlKENhY2hlZEltYWdlJikg eyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggYzZiYTgyNTI3ZjI5YTBmY2Q1ODdlMWU5YTA3YTA2NjViMmQzZWU0MS4uNWQx MDZkM2MzYzI5OTk4MmZjZWZjZDZkMWQwMjgwYjFjZDJhNzgyYyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDIyLTAzLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFpbiBkb2N1bWVudCBpcyBsZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkg aW1hZ2UgbG9hZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjM3NjYwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3Qg Y292ZXJhZ2UuCisKKyAgICAgICAgKiBmYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1l bnQtbGVhay1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZG9tL2xhenktaW1h Z2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZG9t L3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sOiBB ZGRlZC4KKwogMjAyMi0wMy0xMCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4K IAogICAgICAgICBbd2ViLWFuaW1hdGlvbnNdIGZvbnQtdmFyaWFudC1jYXBzIHNob3VsZCBzdXBw b3J0IGRpc2NyZXRlIGFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20v bGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvZmFzdC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjEyNjU4ZjFiYjQ3MjNjZmM5ODJkOWUzYTUxMTBjNjA1OTdjMTJlZjgKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmct ZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGVzdHMgdGhhdCBs YXp5IGltYWdlIGxvYWRpbmcgZG9lc24ndCBjYXVzZSBEb2N1bWVudCBsZWFrcy4KKworT24gc3Vj Y2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQg YnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgaW50ZXJuYWxzLmlzRG9jdW1lbnRBbGl2ZShm cmFtZURvY3VtZW50SUQpIGlzIHRydWUKK1BBU1MgVGhlIHBvcHVwIGRvY3VtZW50IGRpZG4ndCBs ZWFrLgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1 bWVudC1sZWFrLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmct ZG9jdW1lbnQtbGVhay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdmMGY3MzI0ZWM1YmQ5OTY4ZGVhYmNjMTU1 YTI4ODMwMWU1ZTk3MDEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9s YXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwh RE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJj ZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHRo YXQgbGF6eSBpbWFnZSBsb2FkaW5nIGRvZXNuJ3QgY2F1c2UgRG9jdW1lbnQgbGVha3MuIik7Citq c1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworZnJhbWVEb2N1bWVudElEID0gMDsKK2NoZWNrQ291bnQg PSAwOworcG9wdXAgPSBudWxsOworCitmdW5jdGlvbiBydW5UZXN0KCkKK3sKKyAgICBwb3B1cC5j bG9zZSgpOworICAgIHBvcHVwID0gbnVsbDsKKworICAgIGhhbmRsZSA9IHNldEludGVydmFsKCgp ID0+IHsKKyAgICAgICAgZ2MoKTsKKyAgICAgICAgaWYgKCFpbnRlcm5hbHMuaXNEb2N1bWVudEFs aXZlKGZyYW1lRG9jdW1lbnRJRCkpIHsKKyAgICAgICAgICAgIGNsZWFySW50ZXJ2YWwoaGFuZGxl KTsKKyAgICAgICAgICAgIHRlc3RQYXNzZWQoIlRoZSBwb3B1cCBkb2N1bWVudCBkaWRuJ3QgbGVh ay4iKTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9CisgICAgICAgIGNo ZWNrQ291bnQrKzsKKyAgICAgICAgaWYgKGNoZWNrQ291bnQgPiA1MDApIHsKKyAgICAgICAgICAg IGNsZWFySW50ZXJ2YWwoaGFuZGxlKTsKKyAgICAgICAgICAgIHRlc3RGYWlsZWQoIlRoZSBwb3B1 cCBkb2N1bWVudCBsZWFrZWQuIik7CisgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAg ICAgfQorICAgIH0sIDEwKTsKK30KKworb25sb2FkID0gKCkgPT4geworICAgIHBvcHVwID0gd2lu ZG93Lm9wZW4oInJlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1 cC5odG1sIik7CisgICAgcG9wdXAub25sb2FkID0gKCkgPT4geworICAgICAgICBwb3B1cC5vbmxv YWQgPSBudWxsOworICAgICAgICBmcmFtZURvY3VtZW50SUQgPSBpbnRlcm5hbHMuZG9jdW1lbnRJ ZGVudGlmaWVyKHBvcHVwLmRvY3VtZW50KTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCJpbnRlcm5h bHMuaXNEb2N1bWVudEFsaXZlKGZyYW1lRG9jdW1lbnRJRCkiKTsKKyAgICAgICAgc2V0VGltZW91 dChydW5UZXN0LCAwKTsKKyAgICB9Cit9OworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2Fk aW5nLWRvY3VtZW50LWxlYWstcG9wdXAuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291 cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLmE2ZTZhZmQwMGMyODYxNmJjZTU2NmQ1ODM5YWIwODZhOWFmNGVjOTAKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2FkaW5n LWRvY3VtZW50LWxlYWstcG9wdXAuaHRtbApAQCAtMCwwICsxLDEyIEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDMwMDBweCI+Cis8ZGl2IHN0 eWxlPSJoZWlnaHQ6IDIwMDBweCI+VGVzdCBsYXp5IGltYWdlIGxvYWRpbmc8L2Rpdj4KKzxkaXYg c3R5bGU9ImhlaWdodDogMTAwMHB4Ij4KKzxpbWcgbG9hZGluZz0ibGF6eSIgc3JjPSJhYmUucG5n PzAiPjxicj4KKzxpbWcgbG9hZGluZz0ibGF6eSIgc3JjPSJtb3ppbGxhLmdpZj8xIj48YnI+Cis8 L2Rpdj4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 454394 2022-03-10 13:35:48 -0800 2022-03-10 18:05:32 -0800 Patch bug-237660-20220310133548.patch text/plain 14027 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y3YmMxNDIxZjA3MGJi ZDcxODk3YzFhY2E3NDQzYmVhZTljNGZkMC4uZTA1ZmE1NzVjZWUzMDkwYjRiMGNlZjg4YmUyNTAx Mjg4NDc5YzE1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDIyLTAzLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBs ZWFraW5nIG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGVuIGFuIEhUTUwgaW1hZ2UgdXNlcyBgbG9hZGluZz1sYXp5 YCwgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkgbWF5IGdldAorICAgICAgICBjYWxs ZWQgdHdpY2UuIElmIHRoZSBpbWFnZSBpcyBvdXRzaWRlIHRoZSB2aWV3cG9ydCwgdGhlIGZpcnN0 IHRpbWUgSW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVk LCB3ZSdsbCByZXF1ZXN0IGEgQ2FjaGVkSW1hZ2UgYnV0IHdlJ2xsIHNldCBtX2xhenlJbWFnZUxv YWRTdGF0ZSB0byBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkCisgICAgICAgIGFuZCBub3Qg YXNrIHRoZSBDYWNoZWRJbWFnZSB0byBsb2FkLiBUaGVuLCBsYXRlciBvbiwgaWYgdGhlIEhUTUwg aW1hZ2UgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQsCisgICAgICAgIEltYWdlTG9hZGVyOjpsb2Fk RGVmZXJyZWRJbWFnZSgpIHdpbGwgZ2V0IGNhbGxlZC4gSXQgd2lsbCBzZXQgbV9sYXp5SW1hZ2VM b2FkU3RhdGUgdG8gTGF6eUltYWdlTG9hZFN0YXRlOjpMb2FkSW1tZWRpYXRlbHkKKyAgICAgICAg YW5kIGNhbGwgdXBkYXRlRnJvbUVsZW1lbnQoKSBhZ2Fpbi4gVGhpcyB0aW1lIGhvd2V2ZXIsIHVw ZGF0ZUZyb21FbGVtZW50KCkgd2lsbCBhY3R1YWxseSBhc2sgdGhlIENhY2hlZEltYWdlCisgICAg ICAgIHRvIGxvYWQuCisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyB0aGF0IHRoZSBmaXJzdCB0aW1l IEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCgpLCB3ZSB3b3VsZCBzZXQgbV9sYXp5SW1h Z2VMb2FkU3RhdGUgdG8gRGVmZXJyZWQKKyAgICAgICAgYW5kIG5vdCBhc2sgdGhlIENhY2hlZElt YWdlIHRvIGxvYWQgYnV0IHN0aWxsIHNldCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgdG8gdHJ1ZS4g VGhpcyBpcyBwcm9ibGVtYXRpYyBpZiB0aGUgQ2FjaGVkSW1hZ2UKKyAgICAgICAgaXMgbm90IGFs cmVhZHkgbG9hZGVkIHNpbmNlIG5vIHdhcyB3YXMgc3RhcnRlZCBhbmQgdGh1cyBubyBsb2FkIGV2 ZW50IGlzIGNvbWluZyAoYW5kIG5vIGxvYWQgZXZlbnQgbWF5IGV2ZXIgY29tZSBpZiB0aGUKKyAg ICAgICAgaW1hZ2UgbmV2ZXIgYXBwcm9hY2hlcyB0aGUgdmlld3BvcnQpLiBXaGVuIHVwZGF0ZWRI YXNQZW5kaW5nRXZlbnQoKSBpcyBjYWxsZWQsIGl0IHdpbGwgcHJvdGVjdCB0aGUgSFRNTEltYWdl RWxlbWVudCBpZgorICAgICAgICBtX2hhc1BlbmRpbmdMb2FkRXZlbnQgaXMgdHJ1ZSwgdG8gbWFr ZSBzdXJlIHRoZSBpbWFnZSBlbGVtZW50IHN0YXlzIGFsaXZlIGxvbmcgZW5vdWdoIGZvciB1cyB0 byBkaXNwYXRjaCB0aGUgbG9hZCBldmVudC4KKyAgICAgICAgV2l0aCBsYXp5IGxvYWRpbmcsIHRo aXMgbWVhbnQgdGhhdCB3ZSB3b3VsZCBwcm90ZWN0IHRoZSBIVE1MSW1hZ2VFbGVtZW50IHJpZ2h0 IGF3YXkgYW5kIHVuZGVmaW5pdGVseSBzaW5jZSBubyBsb2FkIGV2ZW50CisgICAgICAgIG1heSBl dmVyIGNvbWUuIFRoaXMgbWVhbnQgdGhhdCB3aGVuIG5hdmlnYXRpbmcgYXdheSBmcm9tIGEgcGFn ZSB3aXRoIGltYWdlcyB0aGF0IGFyZSBsYXppbHkgbG9hZGVkIChhbmQgbm90IGxvYWRlZCB5ZXQp LAorICAgICAgICB3ZSB3b3VsZCBsZWFrIHRoZSBIVE1MSW1hZ2VFbGVtZW50cyAoYW5kIEltYWdl TG9hZGVycyksIHdoaWNoIGluIHR1cm4gd291bGQga2VlcCB0aGUgRG9jdW1lbnQgYWxpdmUgdG9v LgorCisgICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB3ZSBub3cgbWFrZSBzdXJlIHRoYXQg bV9oYXNQZW5kaW5nTG9hZEV2ZW50IGlzIG5vIGxvbmdlciBzZXQgdG8gdHJ1ZSB3aGVuIHVwZGF0 ZUZyb21FbGVtZW50KCkKKyAgICAgICAgaXMgY2FsbGVkIGJ1dCB0aGUgQ2FjaGVkSW1hZ2UgaXMg bm90IGFscmVhZHkgbG9hZGVkIGFuZCBub3QgbG9hZGluZyAobGF6eSBsb2FkaW5nIGNhc2UpLiBX aGVuIHVwZGF0ZUZyb21FbGVtZW50KCkgZ2V0cworICAgICAgICBjYWxsZWQgdGhlIHNlY29uZCB0 aW1lICh3aGVuIHRoZSBsYXppbHkgbG9hZGVkIGltYWdlIGFwcHJvYWNoZXMgdGhlIHZpZXdwb3J0 KSwgd2UgbWFrZSBzdXJlIHRoYXQgdGhlIG1faGFzUGVuZGluZ0xvYWRFdmVudAorICAgICAgICBm bGFnIGdldHMgc2V0IHRvIHRydWUgdGhlbi4KKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9sYXp5 LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvSW1h Z2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OkltYWdlTG9hZGVy KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6ZGlkVXBkYXRlQ2FjaGVkSW1hZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OmRpZFN0YXJ0TG9hZGluZyk6CisgICAgICAgICog bG9hZGVyL0ltYWdlTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZEltYWdlOjpsb2FkKToKKyAgICAgICAgKiBs b2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2VDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hl ZEltYWdlQ2xpZW50OjpkaWRTdGFydExvYWRpbmcpOgorCiAyMDIyLTAzLTEwICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgT3B0aW1pemUgZnVydGhlciB0aGUgcGFz c2luZyBvZiBkYXRhIGFjcm9zcyB0aHJlYWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvSW1hZ2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVy LmNwcAppbmRleCA2NWZmNzAxNWZkZDAwOTUyY2I4NTk2NGNlYTg3ZDk5MGEzYjZmYTg4Li5jM2Ni NmQ0ODI5MGIyMWFiYTE4NjVlZGNhZDQ1M2VkZDZhNzczMzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9JbWFnZUxvYWRlci5jcHAKQEAgLTQ3LDYgKzQ3LDcgQEAKICNpbmNsdWRlICJSZW5kZXJTVkdJ bWFnZS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJv eWVkLmg+CisjaW5jbHVkZSA8d3RmL1Njb3BlLmg+CiAKICNpZiBFTkFCTEUoVklERU8pCiAjaW5j bHVkZSAiUmVuZGVyVmlkZW8uaCIKQEAgLTEwNiw2ICsxMDcsNyBAQCBJbWFnZUxvYWRlcjo6SW1h Z2VMb2FkZXIoRWxlbWVudCYgZWxlbWVudCkKICAgICAsIG1faW1hZ2VDb21wbGV0ZSh0cnVlKQog ICAgICwgbV9sb2FkTWFudWFsbHkoZmFsc2UpCiAgICAgLCBtX2VsZW1lbnRJc1Byb3RlY3RlZChm YWxzZSkKKyAgICAsIG1faW5VcGRhdGVGcm9tRWxlbWVudChmYWxzZSkKIHsKIH0KIApAQCAtMTc3 LDYgKzE3OSwxMSBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudChSZWxldmFu dE11dGF0aW9uIHJlbGV2YW50TXV0YXRpb24pCiAgICAgaWYgKCFtX2ZhaWxlZExvYWRVUkwuaXNF bXB0eSgpICYmIGF0dHIgPT0gbV9mYWlsZWRMb2FkVVJMKQogICAgICAgICByZXR1cm47CiAKKyAg ICBtX2luVXBkYXRlRnJvbUVsZW1lbnQgPSB0cnVlOworICAgIGF1dG8gaW5VcGRhdGVGcm9tRWxl bWVudFNjb3BlID0gbWFrZVNjb3BlRXhpdChbdGhpc10geworICAgICAgICBtX2luVXBkYXRlRnJv bUVsZW1lbnQgPSBmYWxzZTsKKyAgICB9KTsKKwogICAgIC8vIERvIG5vdCBsb2FkIGFueSBpbWFn ZSBpZiB0aGUgJ3NyYycgYXR0cmlidXRlIGlzIG1pc3Npbmcgb3IgaWYgaXQgaXMKICAgICAvLyBh biBlbXB0eSBzdHJpbmcuCiAgICAgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+IG5l d0ltYWdlID0gbnVsbHB0cjsKQEAgLTIzOCw4ICsyNDUsMTYgQEAgdm9pZCBJbWFnZUxvYWRlcjo6 dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZhbnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uKQogICAg ICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24oKnRoaXMpOwogICAgIH0K IAorICAgIGRpZFVwZGF0ZUNhY2hlZEltYWdlKHJlbGV2YW50TXV0YXRpb24sIFdURk1vdmUobmV3 SW1hZ2UpKTsKK30KKwordm9pZCBJbWFnZUxvYWRlcjo6ZGlkVXBkYXRlQ2FjaGVkSW1hZ2UoUmVs ZXZhbnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uLCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRJbWFnZT4mJiBuZXdJbWFnZSkKK3sKKyAgICBhdXRvJiBkb2N1bWVudCA9IGVsZW1lbnQoKS5k b2N1bWVudCgpOworCiAgICAgQ2FjaGVkSW1hZ2UqIG9sZEltYWdlID0gbV9pbWFnZS5nZXQoKTsK LSAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UgfHwgcmVsZXZhbnRNdXRhdGlvbiA9PSBSZWxl dmFudE11dGF0aW9uOjpZZXMpIHsKKyAgICBib29sIGxvYWRIYXNOb3dMYXppbHlTdGFydGVkID0g b2xkSW1hZ2UgPT0gbmV3SW1hZ2UgJiYgIW1faGFzUGVuZGluZ0xvYWRFdmVudCAmJiBuZXdJbWFn ZSAmJiBuZXdJbWFnZS0+aXNMb2FkaW5nKCk7CisgICAgaWYgKG5ld0ltYWdlICE9IG9sZEltYWdl IHx8IHJlbGV2YW50TXV0YXRpb24gPT0gUmVsZXZhbnRNdXRhdGlvbjo6WWVzIHx8IGxvYWRIYXNO b3dMYXppbHlTdGFydGVkKSB7CiAgICAgICAgIGlmIChtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZl bnQpIHsKICAgICAgICAgICAgIGJlZm9yZUxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KCp0 aGlzKTsKICAgICAgICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9IGZhbHNlOwpA QCAtMjU4LDkgKzI3MywxMiBAQCB2b2lkIEltYWdlTG9hZGVyOjp1cGRhdGVGcm9tRWxlbWVudChS ZWxldmFudE11dGF0aW9uIHJlbGV2YW50TXV0YXRpb24pCiAgICAgICAgICAgICBtX2hhc1BlbmRp bmdFcnJvckV2ZW50ID0gZmFsc2U7CiAgICAgICAgIH0KIAorICAgICAgICAvLyBEdWUgdG8gbGF6 eSBpbWFnZSBsb2FkaW5nIGFuZCB0aGUgbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5IHNldHRpbmcs IGl0IGlzIHBvc3NpYmxlIHRoYXQgd2UgZGlkIG5vdCBhY3R1YWxseSBzdGFydCB0aGUgaW1hZ2Ug bG9hZC4KKyAgICAgICAgYm9vbCBpbWFnZVdpbGxCZUxvYWRlZExhdGVyID0gbmV3SW1hZ2UgJiYg IW5ld0ltYWdlLT5pc0xvYWRpbmcoKSAmJiBuZXdJbWFnZS0+c3RpbGxOZWVkc0xvYWQoKTsKKwog ICAgICAgICBtX2ltYWdlID0gbmV3SW1hZ2U7Ci0gICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxv YWRFdmVudCA9ICFkb2N1bWVudC5pc0ltYWdlRG9jdW1lbnQoKSAmJiBuZXdJbWFnZTsKLSAgICAg ICAgbV9oYXNQZW5kaW5nTG9hZEV2ZW50ID0gbmV3SW1hZ2U7CisgICAgICAgIG1faGFzUGVuZGlu Z0JlZm9yZUxvYWRFdmVudCA9ICFkb2N1bWVudC5pc0ltYWdlRG9jdW1lbnQoKSAmJiBuZXdJbWFn ZSAmJiAhaW1hZ2VXaWxsQmVMb2FkZWRMYXRlcjsKKyAgICAgICAgbV9oYXNQZW5kaW5nTG9hZEV2 ZW50ID0gbmV3SW1hZ2UgJiYgIWltYWdlV2lsbEJlTG9hZGVkTGF0ZXI7CiAgICAgICAgIG1faW1h Z2VDb21wbGV0ZSA9ICFuZXdJbWFnZTsKIAogICAgICAgICBpZiAobmV3SW1hZ2UpIHsKQEAgLTI2 OSw4ICsyODcsMTIgQEAgdm9pZCBJbWFnZUxvYWRlcjo6dXBkYXRlRnJvbUVsZW1lbnQoUmVsZXZh bnRNdXRhdGlvbiByZWxldmFudE11dGF0aW9uKQogICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgIHVwZGF0ZVJlbmRlcmVyKCk7CiAKLSAgICAgICAgICAgIGlmIChtX2xhenlJbWFnZUxv YWRTdGF0ZSA9PSBMYXp5SW1hZ2VMb2FkU3RhdGU6OkRlZmVycmVkKQotICAgICAgICAgICAgICAg IExhenlMb2FkSW1hZ2VPYnNlcnZlcjo6b2JzZXJ2ZShlbGVtZW50KCkpOworICAgICAgICAgICAg aWYgKG1fbGF6eUltYWdlTG9hZFN0YXRlID09IExhenlJbWFnZUxvYWRTdGF0ZTo6RGVmZXJyZWQp IHsKKyAgICAgICAgICAgICAgICBpZiAoaW1hZ2VXaWxsQmVMb2FkZWRMYXRlcikKKyAgICAgICAg ICAgICAgICAgICAgTGF6eUxvYWRJbWFnZU9ic2VydmVyOjpvYnNlcnZlKGVsZW1lbnQoKSk7Cisg ICAgICAgICAgICAgICAgZWxzZSAvLyBObyBuZWVkIHRvIHNldCB1cCBhIExhenlMb2FkSW1hZ2VP YnNlcnZlciBpZiB0aGUgaW1hZ2UgaXMgYWxyZWFkeSBsb2FkZWQgKGUuZy4gd2FzIGFscmVhZHkg Y2FjaGVkKS4KKyAgICAgICAgICAgICAgICAgICAgbV9sYXp5SW1hZ2VMb2FkU3RhdGUgPSBMYXp5 SW1hZ2VMb2FkU3RhdGU6Ok5vbmU7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIElm IG5ld0ltYWdlIGlzIGNhY2hlZCwgYWRkQ2xpZW50KCkgd2lsbCByZXN1bHQgaW4gdGhlIGxvYWQg ZXZlbnQKICAgICAgICAgICAgIC8vIGJlaW5nIHF1ZXVlZCB0byBmaXJlLiBFbnN1cmUgdGhpcyBo YXBwZW5zIGFmdGVyIGJlZm9yZWxvYWQgaXMKQEAgLTU3Nyw2ICs1OTksMTMgQEAgdm9pZCBJbWFn ZUxvYWRlcjo6bG9hZERlZmVycmVkSW1hZ2UoKQogICAgIHVwZGF0ZUZyb21FbGVtZW50KFJlbGV2 YW50TXV0YXRpb246Ok5vKTsKIH0KIAordm9pZCBJbWFnZUxvYWRlcjo6ZGlkU3RhcnRMb2FkaW5n KCkKK3sKKyAgICBpZiAobV9pblVwZGF0ZUZyb21FbGVtZW50KQorICAgICAgICByZXR1cm47CisK KyAgICBkaWRVcGRhdGVDYWNoZWRJbWFnZShSZWxldmFudE11dGF0aW9uOjpObywgQ2FjaGVkUmVz b3VyY2VIYW5kbGUgeyBtX2ltYWdlIH0pOworfQogdm9pZCBJbWFnZUxvYWRlcjo6cmVzZXRMYXp5 SW1hZ2VMb2FkaW5nKERvY3VtZW50JiBkb2N1bWVudCkKIHsKICAgICBpZiAoaXNEZWZlcnJlZCgp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAppbmRleCA5YTRkNDU4YTBkNGNjMTBiZjYw ZjRmNDlhY2IzMTgyMmEyZjU2MjkyLi5hYWExNDE0OTg4ZWRjODY4MzU2MmNlN2M2MDAyMTRmZWU5 M2Y1MTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuaApAQCAtNDAsNyArNDAsNyBA QCBjbGFzcyBSZW5kZXJJbWFnZVJlc291cmNlOwogdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3Mg RXZlbnRTZW5kZXI7CiB1c2luZyBJbWFnZUV2ZW50U2VuZGVyID0gRXZlbnRTZW5kZXI8SW1hZ2VM b2FkZXI+OwogCi1lbnVtIGNsYXNzIFJlbGV2YW50TXV0YXRpb24gOiBib29sIHsgWWVzLCBObyB9 OworZW51bSBjbGFzcyBSZWxldmFudE11dGF0aW9uIDogYm9vbCB7IE5vLCBZZXMgfTsKIAogY2xh c3MgSW1hZ2VMb2FkZXIgOiBwdWJsaWMgQ2FjaGVkSW1hZ2VDbGllbnQsIHB1YmxpYyBDYW5NYWtl V2Vha1B0cjxJbWFnZUxvYWRlcj4gewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwpAQCAt ODksNiArODksNyBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgSW1hZ2VMb2Fk ZXIoRWxlbWVudCYpOwogICAgIHZvaWQgbm90aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UmLCBj b25zdCBOZXR3b3JrTG9hZE1ldHJpY3MmKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZFN0YXJ0TG9h ZGluZygpIG92ZXJyaWRlOwogCiBwcml2YXRlOgogICAgIHZvaWQgcmVzZXRMYXp5SW1hZ2VMb2Fk aW5nKERvY3VtZW50Jik7CkBAIC05OCw2ICs5OSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBT dHJpbmcgc291cmNlVVJJKGNvbnN0IEF0b21TdHJpbmcmKSBjb25zdCA9IDA7CiAKICAgICB2b2lk IHVwZGF0ZWRIYXNQZW5kaW5nRXZlbnQoKTsKKyAgICB2b2lkIGRpZFVwZGF0ZUNhY2hlZEltYWdl KFJlbGV2YW50TXV0YXRpb24sIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZEltYWdlPiYmKTsK IAogICAgIHZvaWQgZGlzcGF0Y2hQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KCk7CiAgICAgdm9pZCBk aXNwYXRjaFBlbmRpbmdMb2FkRXZlbnQoKTsKQEAgLTEzMCw2ICsxMzIsNyBAQCBwcml2YXRlOgog ICAgIGJvb2wgbV9pbWFnZUNvbXBsZXRlIDogMTsKICAgICBib29sIG1fbG9hZE1hbnVhbGx5IDog MTsKICAgICBib29sIG1fZWxlbWVudElzUHJvdGVjdGVkIDogMTsKKyAgICBib29sIG1faW5VcGRh dGVGcm9tRWxlbWVudCA6IDE7CiAgICAgTGF6eUltYWdlTG9hZFN0YXRlIG1fbGF6eUltYWdlTG9h ZFN0YXRlIHsgTGF6eUltYWdlTG9hZFN0YXRlOjpOb25lIH07CiB9OwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcAppbmRleCAyOGZmYjIwODllZWE3NjMwYWIz MTgxOTlhNGI3MzVlNDQ0NGIzMjg1Li5mZjAyMTUwYWYxNDRiMzEyZGQ4NTNmOTk4NDgxN2U0Yjk2 ZTMxNTdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1h Z2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAK QEAgLTk5LDkgKzk5LDEyIEBAIENhY2hlZEltYWdlOjp+Q2FjaGVkSW1hZ2UoKQogdm9pZCBDYWNo ZWRJbWFnZTo6bG9hZChDYWNoZWRSZXNvdXJjZUxvYWRlciYgbG9hZGVyKQogewogICAgIG1fc2tp cHBpbmdSZXZhbGlkYXRpb25Eb2N1bWVudCA9IGxvYWRlci5kb2N1bWVudCgpOwotICAgIGlmIChs b2FkZXIuc2hvdWxkUGVyZm9ybUltYWdlTG9hZCh1cmwoKSkpCisgICAgaWYgKGxvYWRlci5zaG91 bGRQZXJmb3JtSW1hZ2VMb2FkKHVybCgpKSkgewogICAgICAgICBDYWNoZWRSZXNvdXJjZTo6bG9h ZChsb2FkZXIpOwotICAgIGVsc2UKKyAgICAgICAgQ2FjaGVkUmVzb3VyY2VDbGllbnRXYWxrZXI8 Q2FjaGVkSW1hZ2VDbGllbnQ+IHdhbGtlcihtX2NsaWVudHMpOworICAgICAgICB3aGlsZSAoYXV0 byogY2xpZW50ID0gd2Fsa2VyLm5leHQoKSkKKyAgICAgICAgICAgIGNsaWVudC0+ZGlkU3RhcnRM b2FkaW5nKCk7CisgICAgfSBlbHNlCiAgICAgICAgIHNldExvYWRpbmcoZmFsc2UpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2VDbGllbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCmluZGV4 IGZkNTU4ZjJmMjhkNzE0YzdiMmU4OTFhZDIyYTg2MGQxM2RmZGY5NDguLjkxMDBiZjYyMmVhYWI1 OGY0YzgyYjQ1YzJkYzZlNmQ5MzE0Nzk0YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZUNsaWVudC5oCkBAIC00OSw2ICs0OSw3IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIFZpc2libGVJblZpZXdwb3J0U3RhdGUgaW1hZ2VGcmFtZUF2YWlsYWJsZShDYWNo ZWRJbWFnZSYgaW1hZ2UsIEltYWdlQW5pbWF0aW5nU3RhdGUsIGNvbnN0IEludFJlY3QqIGNoYW5n ZVJlY3QpIHsgaW1hZ2VDaGFuZ2VkKCZpbWFnZSwgY2hhbmdlUmVjdCk7IHJldHVybiBWaXNpYmxl SW5WaWV3cG9ydFN0YXRlOjpObzsgfQogICAgIHZpcnR1YWwgVmlzaWJsZUluVmlld3BvcnRTdGF0 ZSBpbWFnZVZpc2libGVJblZpZXdwb3J0KGNvbnN0IERvY3VtZW50JikgY29uc3QgeyByZXR1cm4g VmlzaWJsZUluVmlld3BvcnRTdGF0ZTo6Tm87IH0KIAorICAgIHZpcnR1YWwgdm9pZCBkaWRTdGFy dExvYWRpbmcoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVtb3ZlQ2FjaGVkSW1hZ2VDbGll bnQoQ2FjaGVkSW1hZ2UmKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBzY2hlZHVsZVJlbmRlcmlu Z1VwZGF0ZUZvckltYWdlKENhY2hlZEltYWdlJikgeyB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzZiYTgyNTI3ZjI5YTBm Y2Q1ODdlMWU5YTA3YTA2NjViMmQzZWU0MS4uNWQxMDZkM2MzYzI5OTk4MmZjZWZjZDZkMWQwMjgw YjFjZDJhNzgyYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAzLTEwICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFpbiBkb2N1bWVudCBpcyBsZWFraW5n IG9uIGhhYXJldHouY28uaWwgZHVlIHRvIGxhenkgaW1hZ2UgbG9hZGluZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3NjYwCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS85MDAzNTA3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3QgY292ZXJhZ2UuCisKKyAgICAgICAgKiBmYXN0 L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIGZhc3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRp bmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sOiBBZGRlZC4KKwogMjAyMi0wMy0xMCAgQW50b2lu ZSBRdWludCAgPGdyYW91dHNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbd2ViLWFuaW1hdGlvbnNd IGZvbnQtdmFyaWFudC1jYXBzIHNob3VsZCBzdXBwb3J0IGRpc2NyZXRlIGFuaW1hdGlvbgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50 LWxlYWstZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vbGF6eS1pbWFnZS1sb2Fk aW5nLWRvY3VtZW50LWxlYWstZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjEyNjU4ZjFiYjQ3MjNj ZmM5ODJkOWUzYTUxMTBjNjA1OTdjMTJlZjgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxMSBAQAorVGVzdHMgdGhhdCBsYXp5IGltYWdlIGxvYWRpbmcgZG9lc24ndCBj YXVzZSBEb2N1bWVudCBsZWFrcy4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVz IG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BB U1MgaW50ZXJuYWxzLmlzRG9jdW1lbnRBbGl2ZShmcmFtZURvY3VtZW50SUQpIGlzIHRydWUKK1BB U1MgVGhlIHBvcHVwIGRvY3VtZW50IGRpZG4ndCBsZWFrLgorUEFTUyBzdWNjZXNzZnVsbHlQYXJz ZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvZG9tL2xhenktaW1hZ2UtbG9hZGluZy1kb2N1bWVudC1sZWFrLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjdmMGY3MzI0ZWM1YmQ5OTY4ZGVhYmNjMTU1YTI4ODMwMWU1ZTk3MDEKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9sYXp5LWltYWdlLWxvYWRpbmctZG9jdW1lbnQt bGVhay5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9k eT4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8 c2NyaXB0PgorZGVzY3JpcHRpb24oIlRlc3RzIHRoYXQgbGF6eSBpbWFnZSBsb2FkaW5nIGRvZXNu J3QgY2F1c2UgRG9jdW1lbnQgbGVha3MuIik7Citqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworZnJh bWVEb2N1bWVudElEID0gMDsKK2NoZWNrQ291bnQgPSAwOworcG9wdXAgPSBudWxsOworCitmdW5j dGlvbiBydW5UZXN0KCkKK3sKKyAgICBwb3B1cC5jbG9zZSgpOworICAgIHBvcHVwID0gbnVsbDsK KworICAgIGhhbmRsZSA9IHNldEludGVydmFsKCgpID0+IHsKKyAgICAgICAgZ2MoKTsKKyAgICAg ICAgaWYgKCFpbnRlcm5hbHMuaXNEb2N1bWVudEFsaXZlKGZyYW1lRG9jdW1lbnRJRCkpIHsKKyAg ICAgICAgICAgIGNsZWFySW50ZXJ2YWwoaGFuZGxlKTsKKyAgICAgICAgICAgIHRlc3RQYXNzZWQo IlRoZSBwb3B1cCBkb2N1bWVudCBkaWRuJ3QgbGVhay4iKTsKKyAgICAgICAgICAgIGZpbmlzaEpT VGVzdCgpOworICAgICAgICB9CisgICAgICAgIGNoZWNrQ291bnQrKzsKKyAgICAgICAgaWYgKGNo ZWNrQ291bnQgPiA1MDApIHsKKyAgICAgICAgICAgIGNsZWFySW50ZXJ2YWwoaGFuZGxlKTsKKyAg ICAgICAgICAgIHRlc3RGYWlsZWQoIlRoZSBwb3B1cCBkb2N1bWVudCBsZWFrZWQuIik7CisgICAg ICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgfQorICAgIH0sIDEwKTsKK30KKworb25s b2FkID0gKCkgPT4geworICAgIHBvcHVwID0gd2luZG93Lm9wZW4oInJlc291cmNlcy9sYXp5LWlt YWdlLWxvYWRpbmctZG9jdW1lbnQtbGVhay1wb3B1cC5odG1sIik7CisgICAgcG9wdXAub25sb2Fk ID0gKCkgPT4geworICAgICAgICBwb3B1cC5vbmxvYWQgPSBudWxsOworICAgICAgICBmcmFtZURv Y3VtZW50SUQgPSBpbnRlcm5hbHMuZG9jdW1lbnRJZGVudGlmaWVyKHBvcHVwLmRvY3VtZW50KTsK KyAgICAgICAgc2hvdWxkQmVUcnVlKCJpbnRlcm5hbHMuaXNEb2N1bWVudEFsaXZlKGZyYW1lRG9j dW1lbnRJRCkiKTsKKyAgICAgICAgc2V0VGltZW91dChydW5UZXN0LCAwKTsKKyAgICB9Cit9Owor PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2RvbS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstcG9wdXAuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL3Jlc291cmNlcy9sYXp5LWltYWdlLWxvYWRpbmctZG9j dW1lbnQtbGVhay1wb3B1cC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE2ZTZhZmQwMGMyODYxNmJjZTU2NmQ1 ODM5YWIwODZhOWFmNGVjOTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Rv bS9yZXNvdXJjZXMvbGF6eS1pbWFnZS1sb2FkaW5nLWRvY3VtZW50LWxlYWstcG9wdXAuaHRtbApA QCAtMCwwICsxLDEyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8ZGl2IHN0 eWxlPSJoZWlnaHQ6IDMwMDBweCI+Cis8ZGl2IHN0eWxlPSJoZWlnaHQ6IDIwMDBweCI+VGVzdCBs YXp5IGltYWdlIGxvYWRpbmc8L2Rpdj4KKzxkaXYgc3R5bGU9ImhlaWdodDogMTAwMHB4Ij4KKzxp bWcgbG9hZGluZz0ibGF6eSIgc3JjPSJhYmUucG5nPzAiPjxicj4KKzxpbWcgbG9hZGluZz0ibGF6 eSIgc3JjPSJtb3ppbGxhLmdpZj8xIj48YnI+Cis8L2Rpdj4KKzwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgo=