219173 2020-11-19 11:46:00 -0800 [macOS] Adopt SPI to prevent establishing XPC connections to Launch Services 2020-11-30 22:49:27 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen bfulgham darin webkit-bug-importer oldest_to_newest 1709210 0 pvollan 2020-11-19 11:46:00 -0800 Adopt SPI to prevent establishing XPC connections to Launch Services in the WebContent process on macOS. 1709211 1 webkit-bug-importer 2020-11-19 11:46:20 -0800 <rdar://problem/71595536> 1709280 2 414621 pvollan 2020-11-19 14:29:49 -0800 Created attachment 414621 Patch 1709490 3 414676 pvollan 2020-11-20 08:15:45 -0800 Created attachment 414676 Patch 1709492 4 414678 pvollan 2020-11-20 08:31:05 -0800 Created attachment 414678 Patch 1709496 5 414682 pvollan 2020-11-20 08:40:02 -0800 Created attachment 414682 Patch 1709578 6 414676 darin 2020-11-20 11:52:44 -0800 Comment on attachment 414676 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414676&action=review > Source/WebKit/UIProcess/WebProcessProxy.cpp:280 > + Optional<WebKit::SandboxExtension::Handle> extension; > +#if PLATFORM(MAC) Should add a blank line here to make the formatting match the function below. > Source/WebKit/WebProcess/WebProcess.h:518 > + void updateProcessName(Optional<WebKit::SandboxExtension::Handle> = WTF::nullopt); Why doesn’t this function take an rvalue reference? > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:451 > + if (handle) { Since Handle already has a null value, we do not need to use Optional<>. If we used just Handle everywhere, not Optional<Handle>, and took out this null check, the code would work fine. SandboxExtension::create already does nothing and returns nullptr if you call it with a null Handle. 1709579 7 darin 2020-11-20 11:53:18 -0800 Not sure I should have reviewed that older patch? 1709671 8 pvollan 2020-11-20 14:54:22 -0800 (In reply to Darin Adler from comment #6) > Comment on attachment 414676 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414676&action=review > > > Source/WebKit/UIProcess/WebProcessProxy.cpp:280 > > + Optional<WebKit::SandboxExtension::Handle> extension; > > +#if PLATFORM(MAC) > > Should add a blank line here to make the formatting match the function below. > Will fix. > > Source/WebKit/WebProcess/WebProcess.h:518 > > + void updateProcessName(Optional<WebKit::SandboxExtension::Handle> = WTF::nullopt); > > Why doesn’t this function take an rvalue reference? > I believe it can, will change! > > Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm:451 > > + if (handle) { > > Since Handle already has a null value, we do not need to use Optional<>. If > we used just Handle everywhere, not Optional<Handle>, and took out this null > check, the code would work fine. SandboxExtension::create already does > nothing and returns nullptr if you call it with a null Handle. That is a good point, I will remove the Optional. Thanks for reviewing! 1709673 9 pvollan 2020-11-20 14:55:49 -0800 (In reply to Darin Adler from comment #7) > Not sure I should have reviewed that older patch? I am currently working on some minor modifications. I will possibly upload another revised patch for review. Thanks! 1709677 10 414735 pvollan 2020-11-20 15:09:39 -0800 Created attachment 414735 Patch 1710532 11 415005 pvollan 2020-11-29 23:08:34 -0800 Created attachment 415005 Patch 1710715 12 achristensen 2020-11-30 12:39:45 -0800 How will _LSSetApplicationInformationItem work with this? 1710721 13 pvollan 2020-11-30 13:02:26 -0800 (In reply to Alex Christensen from comment #12) > How will _LSSetApplicationInformationItem work with this? These calls will be forwarded to the Networking process. Thanks for reviewing! 1710741 14 415005 achristensen 2020-11-30 13:32:06 -0800 Comment on attachment 415005 Patch Oh I see ENABLE(SET_WEBCONTENT_PROCESS_INFORMATION_IN_NETWORK_PROCESS) now 1710938 15 415005 pvollan 2020-11-30 22:36:58 -0800 Comment on attachment 415005 Patch Thanks for reviewing! 1710942 16 ews-feeder 2020-11-30 22:49:26 -0800 Committed r270284: <https://trac.webkit.org/changeset/270284> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415005. 414621 2020-11-19 14:29:49 -0800 2020-11-20 08:15:42 -0800 Patch bug-219173-20201119142948.patch text/plain 10357 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjcwMDQwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEx LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY2xhcmUgZW51bSB2 YWx1ZSB0byBiZSB1c2VkIHdoZW4gYWRvcHRpbmcgdGhlIFNQSS4KKworICAgICAgICAqIHBhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoKKwogMjAyMC0xMS0xNyAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBQZXJmb3JtIEFYIFRD QyBjaGVjayBpbiB0aGUgVUkgcHJvY2VzcwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCShyZXZpc2lvbiAyNzAwMzIp CisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5o CSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxMCBAQCB0eXBlZGVmIHZvaWQgKF5MU0FwcExp bmtPcGVuQ29tcGxldGlvbkhhCiBlbnVtIExTU2Vzc2lvbklEIHsKICAgICBrTFNEZWZhdWx0U2Vz c2lvbklEID0gLTIsCiB9OworCitlbnVtIHsKKyAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVz RG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAorfTsKICNlbmRpZgogCiAjaWYgSEFW RShMU0RBVEFCQVNFQ09OVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAwNDkpCisrKyBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisy MDIwLTExLTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBbbWFjT1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlv bnMgdG8gTGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IFNQ SSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8gTGF1bmNoIFNlcnZp Y2VzIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgb24gbWFjT1MuCisgICAgICAgIFRoaXMgU1BJ IHdpbGwgYmUgY2FsbGVkIHdoZW4gdXBkYXRpbmcgdGhlIFdlYkNvbnRlbnQgYXBwbGljYXRpb24g aW5mb3JtYXRpb24gd2l0aCBMYXVuY2ggU2VydmljZXMuIEJlZm9yZQorICAgICAgICBzZXR0aW5n IHRoaXMgaW5mb3JtYXRpb24gdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBhbGxvdyBjb25uZWN0 aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgcHJvdmlkZWQKKyAgICAgICAgc2FuZGJv eCBleHRlbnNpb24gd2lsbCBiZSBjb25zdW1lZC4gQWZ0ZXIgdGhlIGluZm9ybWF0aW9uIGhhcyBi ZWVuIHNldCwgdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBwcmV2ZW50CisgICAgICAgIFhQQyBj b25uZWN0aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgc2FuZGJveCBleHRlbnNpb24g d2lsbCBiZSByZXZva2VkLgorIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnNldElzSW5Qcm9jZXNzQ2Fj aGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Om1hcmtJc05vTG9uZ2VySW5Q cmV3YXJtZWRQb29sKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzczo6bWFya0lzTm9Mb25nZXJQcmV3YXJtZWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2Vi UHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1l KToKKwogMjAyMC0xMS0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW21hY09TXSBJc3N1ZSBzYW5kYm94IGV4dGVuc2lvbiB0byBXZWIgSW5zcGVjdG9y IHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc2LDcgKzI3NiwxNCBAQCB2b2lkIFdl YlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoCiAgICAgQVNTRVJUKG1faXNJblByb2Nl c3NDYWNoZSAhPSB2YWx1ZSk7CiAgICAgbV9pc0luUHJvY2Vzc0NhY2hlID0gdmFsdWU7CiAKLSAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblBy b2Nlc3NDYWNoZSksIDApOworICAgIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlPiBleHRlbnNpb247CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBoYW5kbGU7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9y TWFjaExvb2t1cCgiY29tLmFwcGxlLmNvcmVzZXJ2aWNlcy5sYXVuY2hzZXJ2aWNlc2QiX3MsIFdU Rjo6bnVsbG9wdCwgaGFuZGxlKTsKKyAgICBleHRlbnNpb24gPSBXVEZNb3ZlKGhhbmRsZSk7Cisj ZW5kaWYKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldElzSW5Qcm9jZXNzQ2Fj aGUobV9pc0luUHJvY2Vzc0NhY2hlLCBleHRlbnNpb24pLCAwKTsKIAogICAgIGlmIChtX2lzSW5Q cm9jZXNzQ2FjaGUpIHsKICAgICAgICAgLy8gV2ViUHJvY2Vzc1Byb3h5IG9iamVjdHMgbm9ybWFs bHkga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlIGJ1dCB3ZSBkbyBub3Qgd2FudCB0aGlzIHRv IGJlIHRoZSBjYXNlCkBAIC01MzEsNyArNTM4LDE1IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpt YXJrSXNOb0xvbmdlckluUHIKICAgICBSRUxFQVNFX0FTU0VSVChtX3Byb2Nlc3NQb29sKTsKICAg ICBtX3Byb2Nlc3NQb29sLnNldElzV2VhayhJc1dlYWs6Ok5vKTsKIAotICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6Ok1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCksIDApOworICAgIE9wdGlv bmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBleHRlbnNpb247CisKKyNpZiBQ TEFURk9STShNQUMpCisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGhhbmRsZTsKKyAgICBT YW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUuY29y ZXNlcnZpY2VzLmxhdW5jaHNlcnZpY2VzZCJfcywgV1RGOjpudWxsb3B0LCBoYW5kbGUpOworICAg IGV4dGVuc2lvbiA9IFdURk1vdmUoaGFuZGxlKTsKKyNlbmRpZgorCisgICAgc2VuZChNZXNzYWdl czo6V2ViUHJvY2Vzczo6TWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoZXh0ZW5zaW9uKSwgMCk7CiB9 CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2Vi UGFnZSwgRW5kc1VzaW5nRGF0YVN0b3JlIGVuZHNVc2luZ0RhdGFTdG9yZSkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI3MDAzMikKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTQ2LDcgKzU0Niw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SGFzU3VzcGVuZGVkUGFnZVByb3gK ICAgICBtX2hhc1N1c3BlbmRlZFBhZ2VQcm94eSA9IGhhc1N1c3BlbmRlZFBhZ2VQcm94eTsKIH0K IAotdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3ND YWNoZSkKK3ZvaWQgV2ViUHJvY2Vzczo6c2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9j ZXNzQ2FjaGUsIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhh bmRsZSkKIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBpZiAoaXNJblByb2Nlc3NDYWNoZSkg ewpAQCAtNTU3LDE5ICs1NTcsMTkgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0Nh Y2hlKGJvbwogICAgICAgICBtX3Byb2Nlc3NUeXBlID0gUHJvY2Vzc1R5cGU6OldlYkNvbnRlbnQ7 CiAgICAgfQogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShXVEZNb3ZlKGhhbmRsZSkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oaXNJblByb2Nlc3ND YWNoZSk7CiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjptYXJrSXNOb0xvbmdlclByZXdh cm1lZCgpCit2b2lkIFdlYlByb2Nlc3M6Om1hcmtJc05vTG9uZ2VyUHJld2FybWVkKE9wdGlvbmFs PFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhhbmRsZSkKIHsKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBBU1NFUlQobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJl d2FybWVkV2ViQ29udGVudCk7CiAgICAgbV9wcm9jZXNzVHlwZSA9IFByb2Nlc3NUeXBlOjpXZWJD b250ZW50OwogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShXVEZNb3ZlKGhhbmRsZSkpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzg3LDggKzM4Nyw4IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybVRlcm1pbmF0ZSgpOwogCiAgICAgdm9pZCBzZXRIYXNT dXNwZW5kZWRQYWdlUHJveHkoYm9vbCk7Ci0gICAgdm9pZCBzZXRJc0luUHJvY2Vzc0NhY2hlKGJv b2wpOwotICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoKTsKKyAgICB2b2lkIHNldElz SW5Qcm9jZXNzQ2FjaGUoYm9vbCwgT3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGU+JiYpOworICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoT3B0aW9uYWw8V2Vi S2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+JiYpOwogCiAgICAgdm9pZCByZWdpc3RlclVS TFNjaGVtZUFzRW1wdHlEb2N1bWVudChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHJlZ2lzdGVy VVJMU2NoZW1lQXNTZWN1cmUoY29uc3QgU3RyaW5nJikgY29uc3Q7CkBAIC01MTUsNyArNTE1LDcg QEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIHZvaWQgc2V0U2NyZWVuUHJv cGVydGllcyhjb25zdCBXZWJDb3JlOjpTY3JlZW5Qcm9wZXJ0aWVzJik7Ci0gICAgdm9pZCB1cGRh dGVQcm9jZXNzTmFtZSgpOworICAgIHZvaWQgdXBkYXRlUHJvY2Vzc05hbWUoT3B0aW9uYWw8V2Vi S2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+ID0gV1RGOjpudWxsb3B0KTsKICNlbmRpZgog CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgIVBMQVRGT1JNKE1BQ0NBVEFMWVNUKQpJbmRl eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4J KHJldmlzaW9uIDI3MDAzMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNz Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDgsOCArMTA4LDggQEAgbWVzc2FnZXMg LT4gV2ViUHJvY2VzcyBMZWdhY3lSZWNlaXZlciBObwogI2VuZGlmCiAKICAgICBTZXRIYXNTdXNw ZW5kZWRQYWdlUHJveHkoYm9vbCBoYXNTdXNwZW5kZWRQYWdlUHJveHkpOwotICAgIFNldElzSW5Q cm9jZXNzQ2FjaGUoYm9vbCBpc0luUHJvY2Vzc0NhY2hlKQotICAgIE1hcmtJc05vTG9uZ2VyUHJl d2FybWVkKCkKKyAgICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3NDYWNoZSwg T3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IGhhbmRsZSkKKyAgICBN YXJrSXNOb0xvbmdlclByZXdhcm1lZChPcHRpb25hbDxXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246 OkhhbmRsZT4gaGFuZGxlKQogICAgIEdldEFjdGl2ZVBhZ2VzT3JpZ2luc0ZvclRlc3RpbmcoKSAt PiAoVmVjdG9yPFN0cmluZz4gYWN0aXZlT3JpZ2lucykgQXN5bmMKIAogI2lmIFBMQVRGT1JNKENP Q09BKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJv Y2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNzAwMzIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMDYsNyArMzA2 LDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIC8vIGNo ZWNrIGluIHdpdGggTGF1bmNoIFNlcnZpY2VzCiAgICAgW05TQXBwbGljYXRpb24gX2FjY2Vzc2li aWxpdHlJbml0aWFsaXplXTsKIAotICAgIC8vIEZJWE1FOiAoPHJkYXI6Ly9wcm9ibGVtLzcwMzQ1 MzEyKTogTm90aWZ5IExhdW5jaFNlcnZpY2VzIHRoYXQgd2Ugd2lsbCBiZSBkaXNjb25uZWN0aW5n LgorICAgIHVwZGF0ZVByb2Nlc3NOYW1lKCk7CisKICAgICBpZiAobGF1bmNoU2VydmljZXNFeHRl bnNpb24pCiAgICAgICAgIGxhdW5jaFNlcnZpY2VzRXh0ZW5zaW9uLT5yZXZva2UoKTsKICNlbmRp ZgpAQCAtMzczLDggKzM3NCw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXpl V2ViUHIKICAgICAgICAgUEFMOjpzb2Z0TGlua01lZGlhVG9vbGJveEZpZ1Bob3RvRGVjb21wcmVz c2lvblNldEhhcmR3YXJlQ3V0b2ZmKGtQQUxGaWdQaG90b0NvbnRhaW5lckZvcm1hdF9KRklGLCBJ TlRfTUFYKTsKICNlbmRpZgogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKLSAgICAKICAgICBT eXN0ZW1Tb3VuZE1hbmFnZXI6OnNpbmdsZXRvbigpLnNldFN5c3RlbVNvdW5kRGVsZWdhdGUobWFr ZVVuaXF1ZTxXZWJTeXN0ZW1Tb3VuZERlbGVnYXRlPigpKTsKIAogI2lmIFBMQVRGT1JNKE1BQykK QEAgLTQwOCw3ICs0MDcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFt ZShjCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9jZXNzTmFtZSgpCit2 b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKE9wdGlvbmFsPFdlYktpdDo6U2FuZGJv eEV4dGVuc2lvbjo6SGFuZGxlPiBoYW5kbGUpCiB7CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJl dGFpblB0cjxOU1N0cmluZz4gYXBwbGljYXRpb25OYW1lOwpAQCAtNDMwLDkgKzQyOSwxMSBAQCB2 b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKCkKICAgICAgICAgYnJlYWs7CiAgICAg fQogCi0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUg PSBXVEZNb3ZlKGFwcGxpY2F0aW9uTmFtZSldIHsKKyAgICBhdXRvIHNldExTQXBwbGljYXRpb25J bmZvcm1hdGlvbiA9IFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUgPSBXVEZNb3ZlKGFwcGxpY2F0aW9u TmFtZSldIHsKKyAgICAgICAgCiAgICAgICAgIC8vIE5vdGUgdGhhdCBpdCBpcyBpbXBvcnRhbnQg Zm9yIF9SZWdpc3RlckFwcGxpY2F0aW9uKCkgdG8gaGF2ZSBiZWVuIGNhbGxlZCBiZWZvcmUgc2V0 dGluZyB0aGUgZGlzcGxheSBuYW1lLgogICAgICAgICBhdXRvIGVycm9yID0gX0xTU2V0QXBwbGlj YXRpb25JbmZvcm1hdGlvbkl0ZW0oa0xTRGVmYXVsdFNlc3Npb25JRCwgX0xTR2V0Q3VycmVudEFw cGxpY2F0aW9uQVNOKCksIF9rTFNEaXNwbGF5TmFtZUtleSwgKENGU3RyaW5nUmVmKWFwcGxpY2F0 aW9uTmFtZS5nZXQoKSwgbnVsbHB0cik7CisKICAgICAgICAgQVNTRVJUKCFlcnJvcik7CiAgICAg ICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dF RChQcm9jZXNzLCAidXBkYXRlUHJvY2Vzc05hbWU6IEZhaWxlZCB0byBzZXQgdGhlIGRpc3BsYXkg bmFtZSBvZiB0aGUgV2ViQ29udGVudCBwcm9jZXNzLCBlcnJvciBjb2RlOiAlbGQiLCBzdGF0aWNf Y2FzdDxsb25nPihlcnJvcikpOwpAQCAtNDQzLDcgKzQ0NCwyNiBAQCB2b2lkIFdlYlByb2Nlc3M6 OnVwZGF0ZVByb2Nlc3NOYW1lKCkKICAgICAgICAgU3RyaW5nIGFjdHVhbEFwcGxpY2F0aW9uTmFt ZSA9IGFkb3B0Q0YoKENGU3RyaW5nUmVmKV9MU0NvcHlBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRl bShrTFNEZWZhdWx0U2Vzc2lvbklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tM U0Rpc3BsYXlOYW1lS2V5KSkuZ2V0KCk7CiAgICAgICAgIEFTU0VSVCghYWN0dWFsQXBwbGljYXRp b25OYW1lLmlzRW1wdHkoKSk7CiAjZW5kaWYKLSAgICB9KTsKKyAgICB9OworICAgIAorICAgIFJl ZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBleHRlbnNpb247CisgICAgCisgICAgaWYgKGhhbmRsZSkg eworICAgICAgICBpZiAoKGV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZN b3ZlKCpoYW5kbGUpKSkpIHsKKyAgICAgICAgICAgIGJvb2wgb2sgPSBleHRlbnNpb24tPmNvbnN1 bWUoKTsKKyAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQob2ssIG9rKTsKKyAgICAgICAgfQorICAg IH0KKworICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0aW9u U3RhdHVzKDAsIG51bGxwdHIpOworCisgICAgc2V0TFNBcHBsaWNhdGlvbkluZm9ybWF0aW9uKCk7 CisKKyAgICBfTFNTZXRBcHBsaWNhdGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0 YXR1cyhrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzRG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrLCBu dWxscHRyKTsKKworICAgIGlmIChleHRlbnNpb24pCisgICAgICAgIGV4dGVuc2lvbi0+cmV2b2tl KCk7CisgICAgCiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogfQogCg== 414676 2020-11-20 08:15:45 -0800 2020-11-29 23:08:24 -0800 Patch bug-219173-20201120081543.patch text/plain 11443 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjcwMDQwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEx LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY2xhcmUgZW51bSB2 YWx1ZSB0byBiZSB1c2VkIHdoZW4gYWRvcHRpbmcgdGhlIFNQSS4KKworICAgICAgICAqIHBhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoKKwogMjAyMC0xMS0xNyAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBQZXJmb3JtIEFYIFRD QyBjaGVjayBpbiB0aGUgVUkgcHJvY2VzcwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCShyZXZpc2lvbiAyNzAwMzIp CisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5o CSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxMCBAQCB0eXBlZGVmIHZvaWQgKF5MU0FwcExp bmtPcGVuQ29tcGxldGlvbkhhCiBlbnVtIExTU2Vzc2lvbklEIHsKICAgICBrTFNEZWZhdWx0U2Vz c2lvbklEID0gLTIsCiB9OworCitlbnVtIHsKKyAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVz RG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAorfTsKICNlbmRpZgogCiAjaWYgSEFW RShMU0RBVEFCQVNFQ09OVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAwNDkpCisrKyBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisy MDIwLTExLTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBbbWFjT1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlv bnMgdG8gTGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IFNQ SSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8gTGF1bmNoIFNlcnZp Y2VzIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgb24gbWFjT1MuCisgICAgICAgIFRoaXMgU1BJ IHdpbGwgYmUgY2FsbGVkIHdoZW4gdXBkYXRpbmcgdGhlIFdlYkNvbnRlbnQgYXBwbGljYXRpb24g aW5mb3JtYXRpb24gd2l0aCBMYXVuY2ggU2VydmljZXMuIEJlZm9yZQorICAgICAgICBzZXR0aW5n IHRoaXMgaW5mb3JtYXRpb24gdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBhbGxvdyBjb25uZWN0 aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgcHJvdmlkZWQKKyAgICAgICAgc2FuZGJv eCBleHRlbnNpb24gd2lsbCBiZSBjb25zdW1lZC4gQWZ0ZXIgdGhlIGluZm9ybWF0aW9uIGhhcyBi ZWVuIHNldCwgdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBwcmV2ZW50CisgICAgICAgIFhQQyBj b25uZWN0aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgc2FuZGJveCBleHRlbnNpb24g d2lsbCBiZSByZXZva2VkLgorIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnNldElzSW5Qcm9jZXNzQ2Fj aGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Om1hcmtJc05vTG9uZ2VySW5Q cmV3YXJtZWRQb29sKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzczo6bWFya0lzTm9Mb25nZXJQcmV3YXJtZWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2Vi UHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1l KToKKwogMjAyMC0xMS0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW21hY09TXSBJc3N1ZSBzYW5kYm94IGV4dGVuc2lvbiB0byBXZWIgSW5zcGVjdG9y IHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc2LDcgKzI3NiwxNCBAQCB2b2lkIFdl YlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoCiAgICAgQVNTRVJUKG1faXNJblByb2Nl c3NDYWNoZSAhPSB2YWx1ZSk7CiAgICAgbV9pc0luUHJvY2Vzc0NhY2hlID0gdmFsdWU7CiAKLSAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblBy b2Nlc3NDYWNoZSksIDApOworICAgIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlPiBleHRlbnNpb247CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBoYW5kbGU7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9y TWFjaExvb2t1cCgiY29tLmFwcGxlLmNvcmVzZXJ2aWNlcy5sYXVuY2hzZXJ2aWNlc2QiX3MsIFdU Rjo6bnVsbG9wdCwgaGFuZGxlKTsKKyAgICBleHRlbnNpb24gPSBXVEZNb3ZlKGhhbmRsZSk7Cisj ZW5kaWYKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldElzSW5Qcm9jZXNzQ2Fj aGUobV9pc0luUHJvY2Vzc0NhY2hlLCBleHRlbnNpb24pLCAwKTsKIAogICAgIGlmIChtX2lzSW5Q cm9jZXNzQ2FjaGUpIHsKICAgICAgICAgLy8gV2ViUHJvY2Vzc1Byb3h5IG9iamVjdHMgbm9ybWFs bHkga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlIGJ1dCB3ZSBkbyBub3Qgd2FudCB0aGlzIHRv IGJlIHRoZSBjYXNlCkBAIC01MzEsNyArNTM4LDE1IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpt YXJrSXNOb0xvbmdlckluUHIKICAgICBSRUxFQVNFX0FTU0VSVChtX3Byb2Nlc3NQb29sKTsKICAg ICBtX3Byb2Nlc3NQb29sLnNldElzV2VhayhJc1dlYWs6Ok5vKTsKIAotICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6Ok1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCksIDApOworICAgIE9wdGlv bmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBleHRlbnNpb247CisKKyNpZiBQ TEFURk9STShNQUMpCisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGhhbmRsZTsKKyAgICBT YW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUuY29y ZXNlcnZpY2VzLmxhdW5jaHNlcnZpY2VzZCJfcywgV1RGOjpudWxsb3B0LCBoYW5kbGUpOworICAg IGV4dGVuc2lvbiA9IFdURk1vdmUoaGFuZGxlKTsKKyNlbmRpZgorCisgICAgc2VuZChNZXNzYWdl czo6V2ViUHJvY2Vzczo6TWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoZXh0ZW5zaW9uKSwgMCk7CiB9 CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2Vi UGFnZSwgRW5kc1VzaW5nRGF0YVN0b3JlIGVuZHNVc2luZ0RhdGFTdG9yZSkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI3MDAzMikKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTQ2LDcgKzU0Niw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SGFzU3VzcGVuZGVkUGFnZVByb3gK ICAgICBtX2hhc1N1c3BlbmRlZFBhZ2VQcm94eSA9IGhhc1N1c3BlbmRlZFBhZ2VQcm94eTsKIH0K IAotdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3ND YWNoZSkKK3ZvaWQgV2ViUHJvY2Vzczo6c2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9j ZXNzQ2FjaGUsIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhh bmRsZSkKIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBpZiAoaXNJblByb2Nlc3NDYWNoZSkg ewpAQCAtNTU3LDE5ICs1NTcsMTkgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0Nh Y2hlKGJvbwogICAgICAgICBtX3Byb2Nlc3NUeXBlID0gUHJvY2Vzc1R5cGU6OldlYkNvbnRlbnQ7 CiAgICAgfQogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShXVEZNb3ZlKGhhbmRsZSkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oaXNJblByb2Nlc3ND YWNoZSk7CiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjptYXJrSXNOb0xvbmdlclByZXdh cm1lZCgpCit2b2lkIFdlYlByb2Nlc3M6Om1hcmtJc05vTG9uZ2VyUHJld2FybWVkKE9wdGlvbmFs PFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhhbmRsZSkKIHsKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBBU1NFUlQobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJl d2FybWVkV2ViQ29udGVudCk7CiAgICAgbV9wcm9jZXNzVHlwZSA9IFByb2Nlc3NUeXBlOjpXZWJD b250ZW50OwogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShXVEZNb3ZlKGhhbmRsZSkpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzg3LDggKzM4Nyw4IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybVRlcm1pbmF0ZSgpOwogCiAgICAgdm9pZCBzZXRIYXNT dXNwZW5kZWRQYWdlUHJveHkoYm9vbCk7Ci0gICAgdm9pZCBzZXRJc0luUHJvY2Vzc0NhY2hlKGJv b2wpOwotICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoKTsKKyAgICB2b2lkIHNldElz SW5Qcm9jZXNzQ2FjaGUoYm9vbCwgT3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGU+JiYpOworICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoT3B0aW9uYWw8V2Vi S2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+JiYpOwogCiAgICAgdm9pZCByZWdpc3RlclVS TFNjaGVtZUFzRW1wdHlEb2N1bWVudChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHJlZ2lzdGVy VVJMU2NoZW1lQXNTZWN1cmUoY29uc3QgU3RyaW5nJikgY29uc3Q7CkBAIC01MTUsNyArNTE1LDcg QEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIHZvaWQgc2V0U2NyZWVuUHJv cGVydGllcyhjb25zdCBXZWJDb3JlOjpTY3JlZW5Qcm9wZXJ0aWVzJik7Ci0gICAgdm9pZCB1cGRh dGVQcm9jZXNzTmFtZSgpOworICAgIHZvaWQgdXBkYXRlUHJvY2Vzc05hbWUoT3B0aW9uYWw8V2Vi S2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+ID0gV1RGOjpudWxsb3B0KTsKICNlbmRpZgog CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgIVBMQVRGT1JNKE1BQ0NBVEFMWVNUKQpJbmRl eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4J KHJldmlzaW9uIDI3MDAzMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNz Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDgsOCArMTA4LDggQEAgbWVzc2FnZXMg LT4gV2ViUHJvY2VzcyBMZWdhY3lSZWNlaXZlciBObwogI2VuZGlmCiAKICAgICBTZXRIYXNTdXNw ZW5kZWRQYWdlUHJveHkoYm9vbCBoYXNTdXNwZW5kZWRQYWdlUHJveHkpOwotICAgIFNldElzSW5Q cm9jZXNzQ2FjaGUoYm9vbCBpc0luUHJvY2Vzc0NhY2hlKQotICAgIE1hcmtJc05vTG9uZ2VyUHJl d2FybWVkKCkKKyAgICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3NDYWNoZSwg T3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IGhhbmRsZSkKKyAgICBN YXJrSXNOb0xvbmdlclByZXdhcm1lZChPcHRpb25hbDxXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246 OkhhbmRsZT4gaGFuZGxlKQogICAgIEdldEFjdGl2ZVBhZ2VzT3JpZ2luc0ZvclRlc3RpbmcoKSAt PiAoVmVjdG9yPFN0cmluZz4gYWN0aXZlT3JpZ2lucykgQXN5bmMKIAogI2lmIFBMQVRGT1JNKENP Q09BKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJv Y2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNzAwMzIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMDYsNyArMzA2 LDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIC8vIGNo ZWNrIGluIHdpdGggTGF1bmNoIFNlcnZpY2VzCiAgICAgW05TQXBwbGljYXRpb24gX2FjY2Vzc2li aWxpdHlJbml0aWFsaXplXTsKIAotICAgIC8vIEZJWE1FOiAoPHJkYXI6Ly9wcm9ibGVtLzcwMzQ1 MzEyKTogTm90aWZ5IExhdW5jaFNlcnZpY2VzIHRoYXQgd2Ugd2lsbCBiZSBkaXNjb25uZWN0aW5n LgorICAgIHVwZGF0ZVByb2Nlc3NOYW1lKCk7CisKICAgICBpZiAobGF1bmNoU2VydmljZXNFeHRl bnNpb24pCiAgICAgICAgIGxhdW5jaFNlcnZpY2VzRXh0ZW5zaW9uLT5yZXZva2UoKTsKICNlbmRp ZgpAQCAtMzczLDggKzM3NCw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXpl V2ViUHIKICAgICAgICAgUEFMOjpzb2Z0TGlua01lZGlhVG9vbGJveEZpZ1Bob3RvRGVjb21wcmVz c2lvblNldEhhcmR3YXJlQ3V0b2ZmKGtQQUxGaWdQaG90b0NvbnRhaW5lckZvcm1hdF9KRklGLCBJ TlRfTUFYKTsKICNlbmRpZgogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKLSAgICAKICAgICBT eXN0ZW1Tb3VuZE1hbmFnZXI6OnNpbmdsZXRvbigpLnNldFN5c3RlbVNvdW5kRGVsZWdhdGUobWFr ZVVuaXF1ZTxXZWJTeXN0ZW1Tb3VuZERlbGVnYXRlPigpKTsKIAogI2lmIFBMQVRGT1JNKE1BQykK QEAgLTQwOCw3ICs0MDcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFt ZShjCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9jZXNzTmFtZSgpCit2 b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKE9wdGlvbmFsPFdlYktpdDo6U2FuZGJv eEV4dGVuc2lvbjo6SGFuZGxlPiBoYW5kbGUpCiB7CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJl dGFpblB0cjxOU1N0cmluZz4gYXBwbGljYXRpb25OYW1lOwpAQCAtNDMwLDkgKzQyOSwxMSBAQCB2 b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKCkKICAgICAgICAgYnJlYWs7CiAgICAg fQogCi0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUg PSBXVEZNb3ZlKGFwcGxpY2F0aW9uTmFtZSldIHsKKyAgICBhdXRvIHNldExTQXBwbGljYXRpb25J bmZvcm1hdGlvbiA9IFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUgPSBXVEZNb3ZlKGFwcGxpY2F0aW9u TmFtZSldIHsKKyAgICAgICAgCiAgICAgICAgIC8vIE5vdGUgdGhhdCBpdCBpcyBpbXBvcnRhbnQg Zm9yIF9SZWdpc3RlckFwcGxpY2F0aW9uKCkgdG8gaGF2ZSBiZWVuIGNhbGxlZCBiZWZvcmUgc2V0 dGluZyB0aGUgZGlzcGxheSBuYW1lLgogICAgICAgICBhdXRvIGVycm9yID0gX0xTU2V0QXBwbGlj YXRpb25JbmZvcm1hdGlvbkl0ZW0oa0xTRGVmYXVsdFNlc3Npb25JRCwgX0xTR2V0Q3VycmVudEFw cGxpY2F0aW9uQVNOKCksIF9rTFNEaXNwbGF5TmFtZUtleSwgKENGU3RyaW5nUmVmKWFwcGxpY2F0 aW9uTmFtZS5nZXQoKSwgbnVsbHB0cik7CisKICAgICAgICAgQVNTRVJUKCFlcnJvcik7CiAgICAg ICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dF RChQcm9jZXNzLCAidXBkYXRlUHJvY2Vzc05hbWU6IEZhaWxlZCB0byBzZXQgdGhlIGRpc3BsYXkg bmFtZSBvZiB0aGUgV2ViQ29udGVudCBwcm9jZXNzLCBlcnJvciBjb2RlOiAlbGQiLCBzdGF0aWNf Y2FzdDxsb25nPihlcnJvcikpOwpAQCAtNDQzLDcgKzQ0NCwyNiBAQCB2b2lkIFdlYlByb2Nlc3M6 OnVwZGF0ZVByb2Nlc3NOYW1lKCkKICAgICAgICAgU3RyaW5nIGFjdHVhbEFwcGxpY2F0aW9uTmFt ZSA9IGFkb3B0Q0YoKENGU3RyaW5nUmVmKV9MU0NvcHlBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRl bShrTFNEZWZhdWx0U2Vzc2lvbklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tM U0Rpc3BsYXlOYW1lS2V5KSkuZ2V0KCk7CiAgICAgICAgIEFTU0VSVCghYWN0dWFsQXBwbGljYXRp b25OYW1lLmlzRW1wdHkoKSk7CiAjZW5kaWYKLSAgICB9KTsKKyAgICB9OworICAgIAorICAgIFJl ZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBleHRlbnNpb247CisgICAgCisgICAgaWYgKGhhbmRsZSkg eworICAgICAgICBpZiAoKGV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZN b3ZlKCpoYW5kbGUpKSkpIHsKKyAgICAgICAgICAgIGJvb2wgb2sgPSBleHRlbnNpb24tPmNvbnN1 bWUoKTsKKyAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQob2ssIG9rKTsKKyAgICAgICAgfQorICAg IH0KKworICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0aW9u U3RhdHVzKDAsIG51bGxwdHIpOworCisgICAgc2V0TFNBcHBsaWNhdGlvbkluZm9ybWF0aW9uKCk7 CisKKyAgICBfTFNTZXRBcHBsaWNhdGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0 YXR1cyhrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzRG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrLCBu dWxscHRyKTsKKworICAgIGlmIChleHRlbnNpb24pCisgICAgICAgIGV4dGVuc2lvbi0+cmV2b2tl KCk7CisgICAgCiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogfQogCkBAIC02OTksMTEgKzcxOSwx NSBAQCB2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZUFjdGl2ZVBhZ2VzKGNvbnN0CiAjaWYgUExBVEZP Uk0oTUFDKQogICAgIGlmICghb3ZlcnJpZGVEaXNwbGF5TmFtZSkgewogICAgICAgICBSdW5Mb29w OjptYWluKCkuZGlzcGF0Y2goW2FjdGl2ZU9yaWdpbnMgPSBhY3RpdmVQYWdlc09yaWdpbnMobV9w YWdlTWFwKV0geworICAgICAgICAgICAgX0xTU2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNlc1Nl cnZlckNvbm5lY3Rpb25TdGF0dXMoMCwgbnVsbHB0cik7CiAgICAgICAgICAgICBfTFNTZXRBcHBs aWNhdGlvbkluZm9ybWF0aW9uSXRlbShrTFNEZWZhdWx0U2Vzc2lvbklELCBfTFNHZXRDdXJyZW50 QXBwbGljYXRpb25BU04oKSwgQ0ZTVFIoIkxTQWN0aXZlUGFnZVVzZXJWaXNpYmxlT3JpZ2luc0tl eSIpLCAoX19icmlkZ2UgQ0ZBcnJheVJlZilhY3RpdmVPcmlnaW5zLmdldCgpLCBudWxscHRyKTsK KyAgICAgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0 aW9uU3RhdHVzKGtMU1NlcnZlckNvbm5lY3Rpb25TdGF0dXNEb05vdENvbm5lY3RUb1NlcnZlck1h c2ssIG51bGxwdHIpOwogICAgICAgICB9KTsKICAgICB9IGVsc2UgewogICAgICAgICBSdW5Mb29w OjptYWluKCkuZGlzcGF0Y2goW25hbWUgPSBvdmVycmlkZURpc3BsYXlOYW1lLmNyZWF0ZUNGU3Ry aW5nKCldIHsKKyAgICAgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2 ZXJDb25uZWN0aW9uU3RhdHVzKDAsIG51bGxwdHIpOwogICAgICAgICAgICAgX0xTU2V0QXBwbGlj YXRpb25JbmZvcm1hdGlvbkl0ZW0oa0xTRGVmYXVsdFNlc3Npb25JRCwgX0xTR2V0Q3VycmVudEFw cGxpY2F0aW9uQVNOKCksIF9rTFNEaXNwbGF5TmFtZUtleSwgbmFtZS5nZXQoKSwgbnVsbHB0cik7 CisgICAgICAgICAgICBfTFNTZXRBcHBsaWNhdGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVj dGlvblN0YXR1cyhrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzRG9Ob3RDb25uZWN0VG9TZXJ2ZXJN YXNrLCBudWxscHRyKTsKICAgICAgICAgfSk7CiAgICAgfQogI2VuZGlmCg== 414678 2020-11-20 08:31:05 -0800 2020-11-20 14:23:40 -0800 Patch bug-219173-20201120083104.patch text/plain 12053 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjcwMDQwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEx LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY2xhcmUgZW51bSB2 YWx1ZSB0byBiZSB1c2VkIHdoZW4gYWRvcHRpbmcgdGhlIFNQSS4KKworICAgICAgICAqIHBhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoKKwogMjAyMC0xMS0xNyAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBQZXJmb3JtIEFYIFRD QyBjaGVjayBpbiB0aGUgVUkgcHJvY2VzcwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCShyZXZpc2lvbiAyNzAwMzIp CisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5o CSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxMCBAQCB0eXBlZGVmIHZvaWQgKF5MU0FwcExp bmtPcGVuQ29tcGxldGlvbkhhCiBlbnVtIExTU2Vzc2lvbklEIHsKICAgICBrTFNEZWZhdWx0U2Vz c2lvbklEID0gLTIsCiB9OworCitlbnVtIHsKKyAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVz RG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAorfTsKICNlbmRpZgogCiAjaWYgSEFW RShMU0RBVEFCQVNFQ09OVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAwNDkpCisrKyBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisy MDIwLTExLTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBbbWFjT1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlv bnMgdG8gTGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IFNQ SSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8gTGF1bmNoIFNlcnZp Y2VzIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgb24gbWFjT1MuCisgICAgICAgIFRoaXMgU1BJ IHdpbGwgYmUgY2FsbGVkIHdoZW4gdXBkYXRpbmcgdGhlIFdlYkNvbnRlbnQgYXBwbGljYXRpb24g aW5mb3JtYXRpb24gd2l0aCBMYXVuY2ggU2VydmljZXMuIEJlZm9yZQorICAgICAgICBzZXR0aW5n IHRoaXMgaW5mb3JtYXRpb24gdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBhbGxvdyBjb25uZWN0 aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgcHJvdmlkZWQKKyAgICAgICAgc2FuZGJv eCBleHRlbnNpb24gd2lsbCBiZSBjb25zdW1lZC4gQWZ0ZXIgdGhlIGluZm9ybWF0aW9uIGhhcyBi ZWVuIHNldCwgdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBwcmV2ZW50CisgICAgICAgIFhQQyBj b25uZWN0aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgc2FuZGJveCBleHRlbnNpb24g d2lsbCBiZSByZXZva2VkLgorIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnNldElzSW5Qcm9jZXNzQ2Fj aGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Om1hcmtJc05vTG9uZ2VySW5Q cmV3YXJtZWRQb29sKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzczo6bWFya0lzTm9Mb25nZXJQcmV3YXJtZWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2Vi UHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1l KToKKwogMjAyMC0xMS0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW21hY09TXSBJc3N1ZSBzYW5kYm94IGV4dGVuc2lvbiB0byBXZWIgSW5zcGVjdG9y IHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc2LDcgKzI3NiwxNCBAQCB2b2lkIFdl YlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoCiAgICAgQVNTRVJUKG1faXNJblByb2Nl c3NDYWNoZSAhPSB2YWx1ZSk7CiAgICAgbV9pc0luUHJvY2Vzc0NhY2hlID0gdmFsdWU7CiAKLSAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblBy b2Nlc3NDYWNoZSksIDApOworICAgIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlPiBleHRlbnNpb247CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBoYW5kbGU7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9y TWFjaExvb2t1cCgiY29tLmFwcGxlLmNvcmVzZXJ2aWNlcy5sYXVuY2hzZXJ2aWNlc2QiX3MsIFdU Rjo6bnVsbG9wdCwgaGFuZGxlKTsKKyAgICBleHRlbnNpb24gPSBXVEZNb3ZlKGhhbmRsZSk7Cisj ZW5kaWYKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldElzSW5Qcm9jZXNzQ2Fj aGUobV9pc0luUHJvY2Vzc0NhY2hlLCBleHRlbnNpb24pLCAwKTsKIAogICAgIGlmIChtX2lzSW5Q cm9jZXNzQ2FjaGUpIHsKICAgICAgICAgLy8gV2ViUHJvY2Vzc1Byb3h5IG9iamVjdHMgbm9ybWFs bHkga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlIGJ1dCB3ZSBkbyBub3Qgd2FudCB0aGlzIHRv IGJlIHRoZSBjYXNlCkBAIC01MzEsNyArNTM4LDE1IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpt YXJrSXNOb0xvbmdlckluUHIKICAgICBSRUxFQVNFX0FTU0VSVChtX3Byb2Nlc3NQb29sKTsKICAg ICBtX3Byb2Nlc3NQb29sLnNldElzV2VhayhJc1dlYWs6Ok5vKTsKIAotICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6Ok1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCksIDApOworICAgIE9wdGlv bmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBleHRlbnNpb247CisKKyNpZiBQ TEFURk9STShNQUMpCisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGhhbmRsZTsKKyAgICBT YW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUuY29y ZXNlcnZpY2VzLmxhdW5jaHNlcnZpY2VzZCJfcywgV1RGOjpudWxsb3B0LCBoYW5kbGUpOworICAg IGV4dGVuc2lvbiA9IFdURk1vdmUoaGFuZGxlKTsKKyNlbmRpZgorCisgICAgc2VuZChNZXNzYWdl czo6V2ViUHJvY2Vzczo6TWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoZXh0ZW5zaW9uKSwgMCk7CiB9 CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2Vi UGFnZSwgRW5kc1VzaW5nRGF0YVN0b3JlIGVuZHNVc2luZ0RhdGFTdG9yZSkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI3MDAzMikKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTQ2LDcgKzU0Niw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SGFzU3VzcGVuZGVkUGFnZVByb3gK ICAgICBtX2hhc1N1c3BlbmRlZFBhZ2VQcm94eSA9IGhhc1N1c3BlbmRlZFBhZ2VQcm94eTsKIH0K IAotdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3ND YWNoZSkKK3ZvaWQgV2ViUHJvY2Vzczo6c2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9j ZXNzQ2FjaGUsIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhh bmRsZSkKIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBpZiAoaXNJblByb2Nlc3NDYWNoZSkg ewpAQCAtNTU3LDE5ICs1NTcsMTkgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0Nh Y2hlKGJvbwogICAgICAgICBtX3Byb2Nlc3NUeXBlID0gUHJvY2Vzc1R5cGU6OldlYkNvbnRlbnQ7 CiAgICAgfQogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShXVEZNb3ZlKGhhbmRsZSkpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oaXNJblByb2Nlc3ND YWNoZSk7CiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjptYXJrSXNOb0xvbmdlclByZXdh cm1lZCgpCit2b2lkIFdlYlByb2Nlc3M6Om1hcmtJc05vTG9uZ2VyUHJld2FybWVkKE9wdGlvbmFs PFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhhbmRsZSkKIHsKICNpZiBQTEFU Rk9STShDT0NPQSkKICAgICBBU1NFUlQobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJl d2FybWVkV2ViQ29udGVudCk7CiAgICAgbV9wcm9jZXNzVHlwZSA9IFByb2Nlc3NUeXBlOjpXZWJD b250ZW50OwogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShXVEZNb3ZlKGhhbmRsZSkpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzg3LDggKzM4Nyw4IEBAIHBy aXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybVRlcm1pbmF0ZSgpOwogCiAgICAgdm9pZCBzZXRIYXNT dXNwZW5kZWRQYWdlUHJveHkoYm9vbCk7Ci0gICAgdm9pZCBzZXRJc0luUHJvY2Vzc0NhY2hlKGJv b2wpOwotICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoKTsKKyAgICB2b2lkIHNldElz SW5Qcm9jZXNzQ2FjaGUoYm9vbCwgT3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGU+JiYpOworICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoT3B0aW9uYWw8V2Vi S2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+JiYpOwogCiAgICAgdm9pZCByZWdpc3RlclVS TFNjaGVtZUFzRW1wdHlEb2N1bWVudChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHJlZ2lzdGVy VVJMU2NoZW1lQXNTZWN1cmUoY29uc3QgU3RyaW5nJikgY29uc3Q7CkBAIC01MTUsNyArNTE1LDcg QEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIHZvaWQgc2V0U2NyZWVuUHJv cGVydGllcyhjb25zdCBXZWJDb3JlOjpTY3JlZW5Qcm9wZXJ0aWVzJik7Ci0gICAgdm9pZCB1cGRh dGVQcm9jZXNzTmFtZSgpOworICAgIHZvaWQgdXBkYXRlUHJvY2Vzc05hbWUoT3B0aW9uYWw8V2Vi S2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+ID0gV1RGOjpudWxsb3B0KTsKICNlbmRpZgog CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgIVBMQVRGT1JNKE1BQ0NBVEFMWVNUKQpJbmRl eDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4J KHJldmlzaW9uIDI3MDAzMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNz Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDgsOCArMTA4LDggQEAgbWVzc2FnZXMg LT4gV2ViUHJvY2VzcyBMZWdhY3lSZWNlaXZlciBObwogI2VuZGlmCiAKICAgICBTZXRIYXNTdXNw ZW5kZWRQYWdlUHJveHkoYm9vbCBoYXNTdXNwZW5kZWRQYWdlUHJveHkpOwotICAgIFNldElzSW5Q cm9jZXNzQ2FjaGUoYm9vbCBpc0luUHJvY2Vzc0NhY2hlKQotICAgIE1hcmtJc05vTG9uZ2VyUHJl d2FybWVkKCkKKyAgICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3NDYWNoZSwg T3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IGhhbmRsZSkKKyAgICBN YXJrSXNOb0xvbmdlclByZXdhcm1lZChPcHRpb25hbDxXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246 OkhhbmRsZT4gaGFuZGxlKQogICAgIEdldEFjdGl2ZVBhZ2VzT3JpZ2luc0ZvclRlc3RpbmcoKSAt PiAoVmVjdG9yPFN0cmluZz4gYWN0aXZlT3JpZ2lucykgQXN5bmMKIAogI2lmIFBMQVRGT1JNKENP Q09BKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJv Y2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyNzAwMzIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMDYsNyArMzA2 LDggQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIC8vIGNo ZWNrIGluIHdpdGggTGF1bmNoIFNlcnZpY2VzCiAgICAgW05TQXBwbGljYXRpb24gX2FjY2Vzc2li aWxpdHlJbml0aWFsaXplXTsKIAotICAgIC8vIEZJWE1FOiAoPHJkYXI6Ly9wcm9ibGVtLzcwMzQ1 MzEyKTogTm90aWZ5IExhdW5jaFNlcnZpY2VzIHRoYXQgd2Ugd2lsbCBiZSBkaXNjb25uZWN0aW5n LgorICAgIHVwZGF0ZVByb2Nlc3NOYW1lKCk7CisKICAgICBpZiAobGF1bmNoU2VydmljZXNFeHRl bnNpb24pCiAgICAgICAgIGxhdW5jaFNlcnZpY2VzRXh0ZW5zaW9uLT5yZXZva2UoKTsKICNlbmRp ZgpAQCAtMzczLDggKzM3NCw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXpl V2ViUHIKICAgICAgICAgUEFMOjpzb2Z0TGlua01lZGlhVG9vbGJveEZpZ1Bob3RvRGVjb21wcmVz c2lvblNldEhhcmR3YXJlQ3V0b2ZmKGtQQUxGaWdQaG90b0NvbnRhaW5lckZvcm1hdF9KRklGLCBJ TlRfTUFYKTsKICNlbmRpZgogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKLSAgICAKICAgICBT eXN0ZW1Tb3VuZE1hbmFnZXI6OnNpbmdsZXRvbigpLnNldFN5c3RlbVNvdW5kRGVsZWdhdGUobWFr ZVVuaXF1ZTxXZWJTeXN0ZW1Tb3VuZERlbGVnYXRlPigpKTsKIAogI2lmIFBMQVRGT1JNKE1BQykK QEAgLTQwOCw3ICs0MDcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzTmFt ZShjCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9jZXNzTmFtZSgpCit2 b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKE9wdGlvbmFsPFdlYktpdDo6U2FuZGJv eEV4dGVuc2lvbjo6SGFuZGxlPiBoYW5kbGUpCiB7CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJl dGFpblB0cjxOU1N0cmluZz4gYXBwbGljYXRpb25OYW1lOwpAQCAtNDMwLDE5ICs0MjksMzYgQEAg dm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9jZXNzTmFtZSgpCiAgICAgICAgIGJyZWFrOwogICAg IH0KIAotICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgYXBwbGljYXRpb25OYW1l ID0gV1RGTW92ZShhcHBsaWNhdGlvbk5hbWUpXSB7CisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3Bh dGNoKFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUgPSBXVEZNb3ZlKGFwcGxpY2F0aW9uTmFtZSksIGhh bmRsZSA9IFdURk1vdmUoaGFuZGxlKV0geworCisgICAgICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5z aW9uPiBleHRlbnNpb247CisKKyAgICAgICAgaWYgKGhhbmRsZSkgeworICAgICAgICAgICAgaWYg KChleHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92ZSgqaGFuZGxlKSkp KSB7CisgICAgICAgICAgICAgICAgYm9vbCBvayA9IGV4dGVuc2lvbi0+Y29uc3VtZSgpOworICAg ICAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQob2ssIG9rKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgfQorCisgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25u ZWN0aW9uU3RhdHVzKDAsIG51bGxwdHIpOworCiAgICAgICAgIC8vIE5vdGUgdGhhdCBpdCBpcyBp bXBvcnRhbnQgZm9yIF9SZWdpc3RlckFwcGxpY2F0aW9uKCkgdG8gaGF2ZSBiZWVuIGNhbGxlZCBi ZWZvcmUgc2V0dGluZyB0aGUgZGlzcGxheSBuYW1lLgogICAgICAgICBhdXRvIGVycm9yID0gX0xT U2V0QXBwbGljYXRpb25JbmZvcm1hdGlvbkl0ZW0oa0xTRGVmYXVsdFNlc3Npb25JRCwgX0xTR2V0 Q3VycmVudEFwcGxpY2F0aW9uQVNOKCksIF9rTFNEaXNwbGF5TmFtZUtleSwgKENGU3RyaW5nUmVm KWFwcGxpY2F0aW9uTmFtZS5nZXQoKSwgbnVsbHB0cik7CisKICAgICAgICAgQVNTRVJUKCFlcnJv cik7Ci0gICAgICAgIGlmIChlcnJvcikgeworICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAg ICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3MsICJ1cGRhdGVQcm9jZXNzTmFt ZTogRmFpbGVkIHRvIHNldCB0aGUgZGlzcGxheSBuYW1lIG9mIHRoZSBXZWJDb250ZW50IHByb2Nl c3MsIGVycm9yIGNvZGU6ICVsZCIsIHN0YXRpY19jYXN0PGxvbmc+KGVycm9yKSk7Ci0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICAgICAgZWxzZSB7CiAjaWYgQVNTRVJUX0VOQUJM RUQKLSAgICAgICAgLy8gSXQgaXMgcG9zc2libGUgZm9yIF9MU1NldEFwcGxpY2F0aW9uSW5mb3Jt YXRpb25JdGVtKCkgdG8gcmV0dXJuIDAgYW5kIHlldCBmYWlsIHRvIHNldCB0aGUgZGlzcGxheSBu YW1lIHNvIHdlIG1ha2Ugc3VyZSB0aGUgZGlzcGxheSBuYW1lIGhhcyBhY3R1YWxseSBiZWVuIHNl dC4KLSAgICAgICAgU3RyaW5nIGFjdHVhbEFwcGxpY2F0aW9uTmFtZSA9IGFkb3B0Q0YoKENGU3Ry aW5nUmVmKV9MU0NvcHlBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRlbShrTFNEZWZhdWx0U2Vzc2lv bklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tMU0Rpc3BsYXlOYW1lS2V5KSku Z2V0KCk7Ci0gICAgICAgIEFTU0VSVCghYWN0dWFsQXBwbGljYXRpb25OYW1lLmlzRW1wdHkoKSk7 CisgICAgICAgICAgICAvLyBJdCBpcyBwb3NzaWJsZSBmb3IgX0xTU2V0QXBwbGljYXRpb25JbmZv cm1hdGlvbkl0ZW0oKSB0byByZXR1cm4gMCBhbmQgeWV0IGZhaWwgdG8gc2V0IHRoZSBkaXNwbGF5 IG5hbWUgc28gd2UgbWFrZSBzdXJlIHRoZSBkaXNwbGF5IG5hbWUgaGFzIGFjdHVhbGx5IGJlZW4g c2V0LgorICAgICAgICAgICAgU3RyaW5nIGFjdHVhbEFwcGxpY2F0aW9uTmFtZSA9IGFkb3B0Q0Yo KENGU3RyaW5nUmVmKV9MU0NvcHlBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRlbShrTFNEZWZhdWx0 U2Vzc2lvbklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tMU0Rpc3BsYXlOYW1l S2V5KSkuZ2V0KCk7CisgICAgICAgICAgICBBU1NFUlQoIWFjdHVhbEFwcGxpY2F0aW9uTmFtZS5p c0VtcHR5KCkpOwogI2VuZGlmCisgICAgICAgIH0KKworICAgICAgICBfTFNTZXRBcHBsaWNhdGlv bkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1cyhrTFNTZXJ2ZXJDb25uZWN0aW9u U3RhdHVzRG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrLCBudWxscHRyKTsKKyAgICAgICAgaWYgKGV4 dGVuc2lvbikKKyAgICAgICAgICAgIGV4dGVuc2lvbi0+cmV2b2tlKCk7CiAgICAgfSk7CiAjZW5k aWYgLy8gUExBVEZPUk0oTUFDKQogfQpAQCAtNjk5LDExICs3MTUsMTUgQEAgdm9pZCBXZWJQcm9j ZXNzOjp1cGRhdGVBY3RpdmVQYWdlcyhjb25zdAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAo IW92ZXJyaWRlRGlzcGxheU5hbWUpIHsKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNo KFthY3RpdmVPcmlnaW5zID0gYWN0aXZlUGFnZXNPcmlnaW5zKG1fcGFnZU1hcCldIHsKKyAgICAg ICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0aW9uU3Rh dHVzKDAsIG51bGxwdHIpOwogICAgICAgICAgICAgX0xTU2V0QXBwbGljYXRpb25JbmZvcm1hdGlv bkl0ZW0oa0xTRGVmYXVsdFNlc3Npb25JRCwgX0xTR2V0Q3VycmVudEFwcGxpY2F0aW9uQVNOKCks IENGU1RSKCJMU0FjdGl2ZVBhZ2VVc2VyVmlzaWJsZU9yaWdpbnNLZXkiKSwgKF9fYnJpZGdlIENG QXJyYXlSZWYpYWN0aXZlT3JpZ2lucy5nZXQoKSwgbnVsbHB0cik7CisgICAgICAgICAgICBfTFNT ZXRBcHBsaWNhdGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1cyhrTFNTZXJ2 ZXJDb25uZWN0aW9uU3RhdHVzRG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrLCBudWxscHRyKTsKICAg ICAgICAgfSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNo KFtuYW1lID0gb3ZlcnJpZGVEaXNwbGF5TmFtZS5jcmVhdGVDRlN0cmluZygpXSB7CisgICAgICAg ICAgICBfTFNTZXRBcHBsaWNhdGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1 cygwLCBudWxscHRyKTsKICAgICAgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uSW5mb3JtYXRpb25J dGVtKGtMU0RlZmF1bHRTZXNzaW9uSUQsIF9MU0dldEN1cnJlbnRBcHBsaWNhdGlvbkFTTigpLCBf a0xTRGlzcGxheU5hbWVLZXksIG5hbWUuZ2V0KCksIG51bGxwdHIpOworICAgICAgICAgICAgX0xT U2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNlc1NlcnZlckNvbm5lY3Rpb25TdGF0dXMoa0xTU2Vy dmVyQ29ubmVjdGlvblN0YXR1c0RvTm90Q29ubmVjdFRvU2VydmVyTWFzaywgbnVsbHB0cik7CiAg ICAgICAgIH0pOwogICAgIH0KICNlbmRpZgo= 414682 2020-11-20 08:40:02 -0800 2020-11-29 23:08:27 -0800 Patch bug-219173-20201120083959.patch text/plain 11970 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjcwMDQwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEx LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY2xhcmUgZW51bSB2 YWx1ZSB0byBiZSB1c2VkIHdoZW4gYWRvcHRpbmcgdGhlIFNQSS4KKworICAgICAgICAqIHBhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoKKwogMjAyMC0xMS0xNyAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBQZXJmb3JtIEFYIFRD QyBjaGVjayBpbiB0aGUgVUkgcHJvY2VzcwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCShyZXZpc2lvbiAyNzAwMzIp CisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5o CSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxMCBAQCB0eXBlZGVmIHZvaWQgKF5MU0FwcExp bmtPcGVuQ29tcGxldGlvbkhhCiBlbnVtIExTU2Vzc2lvbklEIHsKICAgICBrTFNEZWZhdWx0U2Vz c2lvbklEID0gLTIsCiB9OworCitlbnVtIHsKKyAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVz RG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAorfTsKICNlbmRpZgogCiAjaWYgSEFW RShMU0RBVEFCQVNFQ09OVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAwNDkpCisrKyBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisy MDIwLTExLTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBbbWFjT1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlv bnMgdG8gTGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IFNQ SSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8gTGF1bmNoIFNlcnZp Y2VzIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgb24gbWFjT1MuCisgICAgICAgIFRoaXMgU1BJ IHdpbGwgYmUgY2FsbGVkIHdoZW4gdXBkYXRpbmcgdGhlIFdlYkNvbnRlbnQgYXBwbGljYXRpb24g aW5mb3JtYXRpb24gd2l0aCBMYXVuY2ggU2VydmljZXMuIEJlZm9yZQorICAgICAgICBzZXR0aW5n IHRoaXMgaW5mb3JtYXRpb24gdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBhbGxvdyBjb25uZWN0 aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgcHJvdmlkZWQKKyAgICAgICAgc2FuZGJv eCBleHRlbnNpb24gd2lsbCBiZSBjb25zdW1lZC4gQWZ0ZXIgdGhlIGluZm9ybWF0aW9uIGhhcyBi ZWVuIHNldCwgdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBwcmV2ZW50CisgICAgICAgIFhQQyBj b25uZWN0aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgc2FuZGJveCBleHRlbnNpb24g d2lsbCBiZSByZXZva2VkLgorIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnNldElzSW5Qcm9jZXNzQ2Fj aGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Om1hcmtJc05vTG9uZ2VySW5Q cmV3YXJtZWRQb29sKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzczo6bWFya0lzTm9Mb25nZXJQcmV3YXJtZWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2Vi UHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1l KToKKwogMjAyMC0xMS0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW21hY09TXSBJc3N1ZSBzYW5kYm94IGV4dGVuc2lvbiB0byBXZWIgSW5zcGVjdG9y IHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc2LDcgKzI3NiwxNCBAQCB2b2lkIFdl YlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoCiAgICAgQVNTRVJUKG1faXNJblByb2Nl c3NDYWNoZSAhPSB2YWx1ZSk7CiAgICAgbV9pc0luUHJvY2Vzc0NhY2hlID0gdmFsdWU7CiAKLSAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblBy b2Nlc3NDYWNoZSksIDApOworICAgIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlPiBleHRlbnNpb247CisjaWYgUExBVEZPUk0oTUFDKQorICAgIFNhbmRib3hFeHRlbnNp b246OkhhbmRsZSBoYW5kbGU7CisgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlRm9y TWFjaExvb2t1cCgiY29tLmFwcGxlLmNvcmVzZXJ2aWNlcy5sYXVuY2hzZXJ2aWNlc2QiX3MsIFdU Rjo6bnVsbG9wdCwgaGFuZGxlKTsKKyAgICBleHRlbnNpb24gPSBXVEZNb3ZlKGhhbmRsZSk7Cisj ZW5kaWYKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldElzSW5Qcm9jZXNzQ2Fj aGUobV9pc0luUHJvY2Vzc0NhY2hlLCBleHRlbnNpb24pLCAwKTsKIAogICAgIGlmIChtX2lzSW5Q cm9jZXNzQ2FjaGUpIHsKICAgICAgICAgLy8gV2ViUHJvY2Vzc1Byb3h5IG9iamVjdHMgbm9ybWFs bHkga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlIGJ1dCB3ZSBkbyBub3Qgd2FudCB0aGlzIHRv IGJlIHRoZSBjYXNlCkBAIC01MzEsNyArNTM4LDE1IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpt YXJrSXNOb0xvbmdlckluUHIKICAgICBSRUxFQVNFX0FTU0VSVChtX3Byb2Nlc3NQb29sKTsKICAg ICBtX3Byb2Nlc3NQb29sLnNldElzV2VhayhJc1dlYWs6Ok5vKTsKIAotICAgIHNlbmQoTWVzc2Fn ZXM6OldlYlByb2Nlc3M6Ok1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCksIDApOworICAgIE9wdGlv bmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBleHRlbnNpb247CisKKyNpZiBQ TEFURk9STShNQUMpCisgICAgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIGhhbmRsZTsKKyAgICBT YW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVGb3JNYWNoTG9va3VwKCJjb20uYXBwbGUuY29y ZXNlcnZpY2VzLmxhdW5jaHNlcnZpY2VzZCJfcywgV1RGOjpudWxsb3B0LCBoYW5kbGUpOworICAg IGV4dGVuc2lvbiA9IFdURk1vdmUoaGFuZGxlKTsKKyNlbmRpZgorCisgICAgc2VuZChNZXNzYWdl czo6V2ViUHJvY2Vzczo6TWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoZXh0ZW5zaW9uKSwgMCk7CiB9 CiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZW1vdmVXZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2Vi UGFnZSwgRW5kc1VzaW5nRGF0YVN0b3JlIGVuZHNVc2luZ0RhdGFTdG9yZSkKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDI3MDAzMikKKysrIFNv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NTQ2LDcgKzU0Niw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6c2V0SGFzU3VzcGVuZGVkUGFnZVByb3gK ICAgICBtX2hhc1N1c3BlbmRlZFBhZ2VQcm94eSA9IGhhc1N1c3BlbmRlZFBhZ2VQcm94eTsKIH0K IAotdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nlc3ND YWNoZSkKK3ZvaWQgV2ViUHJvY2Vzczo6c2V0SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9j ZXNzQ2FjaGUsIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmIGhh bmRsZSkKIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBpZiAoaXNJblByb2Nlc3NDYWNoZSkg ewpAQCAtNTU3LDE5ICs1NTcsMTkgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0Nh Y2hlKGJvbwogICAgICAgICBtX3Byb2Nlc3NUeXBlID0gUHJvY2Vzc1R5cGU6OldlYkNvbnRlbnQ7 CiAgICAgfQogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKKyAgICB1cGRhdGVQcm9jZXNzTmFt ZShTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92ZShoYW5kbGUpKSk7CiAjZWxzZQogICAg IFVOVVNFRF9QQVJBTShpc0luUHJvY2Vzc0NhY2hlKTsKICNlbmRpZgogfQogCi12b2lkIFdlYlBy b2Nlc3M6Om1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCkKK3ZvaWQgV2ViUHJvY2Vzczo6bWFya0lz Tm9Mb25nZXJQcmV3YXJtZWQoT3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5k bGU+JiYgaGFuZGxlKQogewogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIEFTU0VSVChtX3Byb2Nl c3NUeXBlID09IFByb2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KTsKICAgICBtX3Byb2Nl c3NUeXBlID0gUHJvY2Vzc1R5cGU6OldlYkNvbnRlbnQ7CiAKLSAgICB1cGRhdGVQcm9jZXNzTmFt ZSgpOworICAgIHVwZGF0ZVByb2Nlc3NOYW1lKFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZShXVEZN b3ZlKGhhbmRsZSkpKTsKICNlbmRpZgogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmgJKHJldmlzaW9uIDI3MDAzMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQcm9jZXNzLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4Nyw4ICszODcsOCBAQCBwcml2YXRl OgogICAgIHZvaWQgcGxhdGZvcm1UZXJtaW5hdGUoKTsKIAogICAgIHZvaWQgc2V0SGFzU3VzcGVu ZGVkUGFnZVByb3h5KGJvb2wpOwotICAgIHZvaWQgc2V0SXNJblByb2Nlc3NDYWNoZShib29sKTsK LSAgICB2b2lkIG1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCk7CisgICAgdm9pZCBzZXRJc0luUHJv Y2Vzc0NhY2hlKGJvb2wsIE9wdGlvbmFsPFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxl PiYmKTsKKyAgICB2b2lkIG1hcmtJc05vTG9uZ2VyUHJld2FybWVkKE9wdGlvbmFsPFdlYktpdDo6 U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlPiYmKTsKIAogICAgIHZvaWQgcmVnaXN0ZXJVUkxTY2hl bWVBc0VtcHR5RG9jdW1lbnQoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCByZWdpc3RlclVSTFNj aGVtZUFzU2VjdXJlKGNvbnN0IFN0cmluZyYpIGNvbnN0OwpAQCAtNTE1LDcgKzUxNSw3IEBAIHBy aXZhdGU6CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICB2b2lkIHNldFNjcmVlblByb3BlcnRp ZXMoY29uc3QgV2ViQ29yZTo6U2NyZWVuUHJvcGVydGllcyYpOwotICAgIHZvaWQgdXBkYXRlUHJv Y2Vzc05hbWUoKTsKKyAgICB2b2lkIHVwZGF0ZVByb2Nlc3NOYW1lKFJlZlB0cjxXZWJLaXQ6OlNh bmRib3hFeHRlbnNpb24+ID0gbnVsbHB0cik7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpICYmICFQTEFURk9STShNQUNDQVRBTFlTVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyNzAwMzIpCisr KyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgkod29ya2lu ZyBjb3B5KQpAQCAtMTA4LDggKzEwOCw4IEBAIG1lc3NhZ2VzIC0+IFdlYlByb2Nlc3MgTGVnYWN5 UmVjZWl2ZXIgTm8KICNlbmRpZgogCiAgICAgU2V0SGFzU3VzcGVuZGVkUGFnZVByb3h5KGJvb2wg aGFzU3VzcGVuZGVkUGFnZVByb3h5KTsKLSAgICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJ blByb2Nlc3NDYWNoZSkKLSAgICBNYXJrSXNOb0xvbmdlclByZXdhcm1lZCgpCisgICAgU2V0SXNJ blByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9jZXNzQ2FjaGUsIE9wdGlvbmFsPFdlYktpdDo6U2Fu ZGJveEV4dGVuc2lvbjo6SGFuZGxlPiBoYW5kbGUpCisgICAgTWFya0lzTm9Mb25nZXJQcmV3YXJt ZWQoT3B0aW9uYWw8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGU+IGhhbmRsZSkKICAg ICBHZXRBY3RpdmVQYWdlc09yaWdpbnNGb3JUZXN0aW5nKCkgLT4gKFZlY3RvcjxTdHJpbmc+IGFj dGl2ZU9yaWdpbnMpIEFzeW5jCiAKICNpZiBQTEFURk9STShDT0NPQSkKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2NvYS5tbQkocmV2aXNp b24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3ND b2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzA2LDcgKzMwNiw4IEBAIHZvaWQgV2ViUHJvY2Vz czo6cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICAvLyBjaGVjayBpbiB3aXRoIExhdW5jaCBT ZXJ2aWNlcwogICAgIFtOU0FwcGxpY2F0aW9uIF9hY2Nlc3NpYmlsaXR5SW5pdGlhbGl6ZV07CiAK LSAgICAvLyBGSVhNRTogKDxyZGFyOi8vcHJvYmxlbS83MDM0NTMxMik6IE5vdGlmeSBMYXVuY2hT ZXJ2aWNlcyB0aGF0IHdlIHdpbGwgYmUgZGlzY29ubmVjdGluZy4KKyAgICB1cGRhdGVQcm9jZXNz TmFtZShsYXVuY2hTZXJ2aWNlc0V4dGVuc2lvbik7CisKICAgICBpZiAobGF1bmNoU2VydmljZXNF eHRlbnNpb24pCiAgICAgICAgIGxhdW5jaFNlcnZpY2VzRXh0ZW5zaW9uLT5yZXZva2UoKTsKICNl bmRpZgpAQCAtMzczLDggKzM3NCw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFs aXplV2ViUHIKICAgICAgICAgUEFMOjpzb2Z0TGlua01lZGlhVG9vbGJveEZpZ1Bob3RvRGVjb21w cmVzc2lvblNldEhhcmR3YXJlQ3V0b2ZmKGtQQUxGaWdQaG90b0NvbnRhaW5lckZvcm1hdF9KRklG LCBJTlRfTUFYKTsKICNlbmRpZgogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUoKTsKLSAgICAKICAg ICBTeXN0ZW1Tb3VuZE1hbmFnZXI6OnNpbmdsZXRvbigpLnNldFN5c3RlbVNvdW5kRGVsZWdhdGUo bWFrZVVuaXF1ZTxXZWJTeXN0ZW1Tb3VuZERlbGVnYXRlPigpKTsKIAogI2lmIFBMQVRGT1JNKE1B QykKQEAgLTQwOCw3ICs0MDcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNz TmFtZShjCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9jZXNzTmFtZSgp Cit2b2lkIFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKFJlZlB0cjxXZWJLaXQ6OlNhbmRi b3hFeHRlbnNpb24+IGV4dGVuc2lvbikKIHsKICNpZiBQTEFURk9STShNQUMpCiAgICAgUmV0YWlu UHRyPE5TU3RyaW5nPiBhcHBsaWNhdGlvbk5hbWU7CkBAIC00MzAsMTkgKzQyOSwzMyBAQCB2b2lk IFdlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1lKCkKICAgICAgICAgYnJlYWs7CiAgICAgfQog Ci0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUgPSBX VEZNb3ZlKGFwcGxpY2F0aW9uTmFtZSldIHsKKyAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2go W3RoaXMsIGFwcGxpY2F0aW9uTmFtZSA9IFdURk1vdmUoYXBwbGljYXRpb25OYW1lKSwgZXh0ZW5z aW9uID0gV1RGTW92ZShleHRlbnNpb24pXSB7CisKKyAgICAgICAgaWYgKGV4dGVuc2lvbikgewor ICAgICAgICAgICAgYm9vbCBvayA9IGV4dGVuc2lvbi0+Y29uc3VtZSgpOworICAgICAgICAgICAg QVNTRVJUX1VOVVNFRChvaywgb2spOworICAgICAgICB9CisKKyAgICAgICAgX0xTU2V0QXBwbGlj YXRpb25MYXVuY2hTZXJ2aWNlc1NlcnZlckNvbm5lY3Rpb25TdGF0dXMoMCwgbnVsbHB0cik7CisK ICAgICAgICAgLy8gTm90ZSB0aGF0IGl0IGlzIGltcG9ydGFudCBmb3IgX1JlZ2lzdGVyQXBwbGlj YXRpb24oKSB0byBoYXZlIGJlZW4gY2FsbGVkIGJlZm9yZSBzZXR0aW5nIHRoZSBkaXNwbGF5IG5h bWUuCiAgICAgICAgIGF1dG8gZXJyb3IgPSBfTFNTZXRBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRl bShrTFNEZWZhdWx0U2Vzc2lvbklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tM U0Rpc3BsYXlOYW1lS2V5LCAoQ0ZTdHJpbmdSZWYpYXBwbGljYXRpb25OYW1lLmdldCgpLCBudWxs cHRyKTsKKwogICAgICAgICBBU1NFUlQoIWVycm9yKTsKLSAgICAgICAgaWYgKGVycm9yKSB7Cisg ICAgICAgIGlmIChlcnJvcikKICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9X RUQoUHJvY2VzcywgInVwZGF0ZVByb2Nlc3NOYW1lOiBGYWlsZWQgdG8gc2V0IHRoZSBkaXNwbGF5 IG5hbWUgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcywgZXJyb3IgY29kZTogJWxkIiwgc3RhdGlj X2Nhc3Q8bG9uZz4oZXJyb3IpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAg ICAgICBlbHNlIHsKICNpZiBBU1NFUlRfRU5BQkxFRAotICAgICAgICAvLyBJdCBpcyBwb3NzaWJs ZSBmb3IgX0xTU2V0QXBwbGljYXRpb25JbmZvcm1hdGlvbkl0ZW0oKSB0byByZXR1cm4gMCBhbmQg eWV0IGZhaWwgdG8gc2V0IHRoZSBkaXNwbGF5IG5hbWUgc28gd2UgbWFrZSBzdXJlIHRoZSBkaXNw bGF5IG5hbWUgaGFzIGFjdHVhbGx5IGJlZW4gc2V0LgotICAgICAgICBTdHJpbmcgYWN0dWFsQXBw bGljYXRpb25OYW1lID0gYWRvcHRDRigoQ0ZTdHJpbmdSZWYpX0xTQ29weUFwcGxpY2F0aW9uSW5m b3JtYXRpb25JdGVtKGtMU0RlZmF1bHRTZXNzaW9uSUQsIF9MU0dldEN1cnJlbnRBcHBsaWNhdGlv bkFTTigpLCBfa0xTRGlzcGxheU5hbWVLZXkpKS5nZXQoKTsKLSAgICAgICAgQVNTRVJUKCFhY3R1 YWxBcHBsaWNhdGlvbk5hbWUuaXNFbXB0eSgpKTsKKyAgICAgICAgICAgIC8vIEl0IGlzIHBvc3Np YmxlIGZvciBfTFNTZXRBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRlbSgpIHRvIHJldHVybiAwIGFu ZCB5ZXQgZmFpbCB0byBzZXQgdGhlIGRpc3BsYXkgbmFtZSBzbyB3ZSBtYWtlIHN1cmUgdGhlIGRp c3BsYXkgbmFtZSBoYXMgYWN0dWFsbHkgYmVlbiBzZXQuCisgICAgICAgICAgICBTdHJpbmcgYWN0 dWFsQXBwbGljYXRpb25OYW1lID0gYWRvcHRDRigoQ0ZTdHJpbmdSZWYpX0xTQ29weUFwcGxpY2F0 aW9uSW5mb3JtYXRpb25JdGVtKGtMU0RlZmF1bHRTZXNzaW9uSUQsIF9MU0dldEN1cnJlbnRBcHBs aWNhdGlvbkFTTigpLCBfa0xTRGlzcGxheU5hbWVLZXkpKS5nZXQoKTsKKyAgICAgICAgICAgIEFT U0VSVCghYWN0dWFsQXBwbGljYXRpb25OYW1lLmlzRW1wdHkoKSk7CiAjZW5kaWYKKyAgICAgICAg fQorCisgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJDb25uZWN0 aW9uU3RhdHVzKGtMU1NlcnZlckNvbm5lY3Rpb25TdGF0dXNEb05vdENvbm5lY3RUb1NlcnZlck1h c2ssIG51bGxwdHIpOworCisgICAgICAgIGlmIChleHRlbnNpb24pCisgICAgICAgICAgICBleHRl bnNpb24tPnJldm9rZSgpOwogICAgIH0pOwogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIH0KQEAg LTY5OSwxMSArNzEyLDE1IEBAIHZvaWQgV2ViUHJvY2Vzczo6dXBkYXRlQWN0aXZlUGFnZXMoY29u c3QKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKCFvdmVycmlkZURpc3BsYXlOYW1lKSB7CiAg ICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbYWN0aXZlT3JpZ2lucyA9IGFjdGl2ZVBh Z2VzT3JpZ2lucyhtX3BhZ2VNYXApXSB7CisgICAgICAgICAgICBfTFNTZXRBcHBsaWNhdGlvbkxh dW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1cygwLCBudWxscHRyKTsKICAgICAgICAg ICAgIF9MU1NldEFwcGxpY2F0aW9uSW5mb3JtYXRpb25JdGVtKGtMU0RlZmF1bHRTZXNzaW9uSUQs IF9MU0dldEN1cnJlbnRBcHBsaWNhdGlvbkFTTigpLCBDRlNUUigiTFNBY3RpdmVQYWdlVXNlclZp c2libGVPcmlnaW5zS2V5IiksIChfX2JyaWRnZSBDRkFycmF5UmVmKWFjdGl2ZU9yaWdpbnMuZ2V0 KCksIG51bGxwdHIpOworICAgICAgICAgICAgX0xTU2V0QXBwbGljYXRpb25MYXVuY2hTZXJ2aWNl c1NlcnZlckNvbm5lY3Rpb25TdGF0dXMoa0xTU2VydmVyQ29ubmVjdGlvblN0YXR1c0RvTm90Q29u bmVjdFRvU2VydmVyTWFzaywgbnVsbHB0cik7CiAgICAgICAgIH0pOwogICAgIH0gZWxzZSB7CiAg ICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbbmFtZSA9IG92ZXJyaWRlRGlzcGxheU5h bWUuY3JlYXRlQ0ZTdHJpbmcoKV0geworICAgICAgICAgICAgX0xTU2V0QXBwbGljYXRpb25MYXVu Y2hTZXJ2aWNlc1NlcnZlckNvbm5lY3Rpb25TdGF0dXMoMCwgbnVsbHB0cik7CiAgICAgICAgICAg ICBfTFNTZXRBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRlbShrTFNEZWZhdWx0U2Vzc2lvbklELCBf TFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tMU0Rpc3BsYXlOYW1lS2V5LCBuYW1lLmdl dCgpLCBudWxscHRyKTsKKyAgICAgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2Vydmlj ZXNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzKGtMU1NlcnZlckNvbm5lY3Rpb25TdGF0dXNEb05vdENv bm5lY3RUb1NlcnZlck1hc2ssIG51bGxwdHIpOwogICAgICAgICB9KTsKICAgICB9CiAjZW5kaWYK 414735 2020-11-20 15:09:39 -0800 2020-11-29 23:08:30 -0800 Patch bug-219173-20201120150937.patch text/plain 10630 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjcwMDQwKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEx LTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY2xhcmUgZW51bSB2 YWx1ZSB0byBiZSB1c2VkIHdoZW4gYWRvcHRpbmcgdGhlIFNQSS4KKworICAgICAgICAqIHBhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoKKwogMjAyMC0xMS0xNyAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBQZXJmb3JtIEFYIFRD QyBjaGVjayBpbiB0aGUgVUkgcHJvY2VzcwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCShyZXZpc2lvbiAyNzAwMzIp CisrKyBTb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5o CSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxMCBAQCB0eXBlZGVmIHZvaWQgKF5MU0FwcExp bmtPcGVuQ29tcGxldGlvbkhhCiBlbnVtIExTU2Vzc2lvbklEIHsKICAgICBrTFNEZWZhdWx0U2Vz c2lvbklEID0gLTIsCiB9OworCitlbnVtIHsKKyAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVz RG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAorfTsKICNlbmRpZgogCiAjaWYgSEFW RShMU0RBVEFCQVNFQ09OVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAwNDkpCisrKyBT b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisy MDIwLTExLTE5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBbbWFjT1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlv bnMgdG8gTGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IFNQ SSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8gTGF1bmNoIFNlcnZp Y2VzIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgb24gbWFjT1MuCisgICAgICAgIFRoaXMgU1BJ IHdpbGwgYmUgY2FsbGVkIHdoZW4gdXBkYXRpbmcgdGhlIFdlYkNvbnRlbnQgYXBwbGljYXRpb24g aW5mb3JtYXRpb24gd2l0aCBMYXVuY2ggU2VydmljZXMuIEJlZm9yZQorICAgICAgICBzZXR0aW5n IHRoaXMgaW5mb3JtYXRpb24gdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBhbGxvdyBjb25uZWN0 aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgcHJvdmlkZWQKKyAgICAgICAgc2FuZGJv eCBleHRlbnNpb24gd2lsbCBiZSBjb25zdW1lZC4gQWZ0ZXIgdGhlIGluZm9ybWF0aW9uIGhhcyBi ZWVuIHNldCwgdGhlIFNQSSB3aWxsIGJlIGNhbGxlZCB0byBwcmV2ZW50CisgICAgICAgIFhQQyBj b25uZWN0aW9ucyB0byBMYXVuY2ggU2VydmljZXMsIGFuZCB0aGUgc2FuZGJveCBleHRlbnNpb24g d2lsbCBiZSByZXZva2VkLgorIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OnNldElzSW5Qcm9jZXNzQ2Fj aGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Om1hcmtJc05vTG9uZ2VySW5Q cmV3YXJtZWRQb29sKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzczo6bWFya0lzTm9Mb25nZXJQcmV3YXJtZWQpOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vz cy5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL2NvY29hL1dlYlByb2Nlc3NDb2Nv YS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplV2Vi UHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnVwZGF0ZVByb2Nlc3NOYW1l KToKKwogMjAyMC0xMS0xOSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW21hY09TXSBJc3N1ZSBzYW5kYm94IGV4dGVuc2lvbiB0byBXZWIgSW5zcGVjdG9y IHNlcnZpY2UKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc2LDcgKzI3NiwxMiBAQCB2b2lkIFdl YlByb2Nlc3NQcm94eTo6c2V0SXNJblByb2Nlc3NDYWNoCiAgICAgQVNTRVJUKG1faXNJblByb2Nl c3NDYWNoZSAhPSB2YWx1ZSk7CiAgICAgbV9pc0luUHJvY2Vzc0NhY2hlID0gdmFsdWU7CiAKLSAg ICBzZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRJc0luUHJvY2Vzc0NhY2hlKG1faXNJblBy b2Nlc3NDYWNoZSksIDApOworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBoYW5kbGU7Cisj aWYgUExBVEZPUk0oTUFDKQorICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1h Y2hMb29rdXAoImNvbS5hcHBsZS5jb3Jlc2VydmljZXMubGF1bmNoc2VydmljZXNkIl9zLCBXVEY6 Om51bGxvcHQsIGhhbmRsZSk7CisjZW5kaWYKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nl c3M6OlNldElzSW5Qcm9jZXNzQ2FjaGUobV9pc0luUHJvY2Vzc0NhY2hlLCBoYW5kbGUpLCAwKTsK IAogICAgIGlmIChtX2lzSW5Qcm9jZXNzQ2FjaGUpIHsKICAgICAgICAgLy8gV2ViUHJvY2Vzc1By b3h5IG9iamVjdHMgbm9ybWFsbHkga2VlcCB0aGUgcHJvY2VzcyBwb29sIGFsaXZlIGJ1dCB3ZSBk byBub3Qgd2FudCB0aGlzIHRvIGJlIHRoZSBjYXNlCkBAIC01MzEsNyArNTM2LDEyIEBAIHZvaWQg V2ViUHJvY2Vzc1Byb3h5OjptYXJrSXNOb0xvbmdlckluUHIKICAgICBSRUxFQVNFX0FTU0VSVCht X3Byb2Nlc3NQb29sKTsKICAgICBtX3Byb2Nlc3NQb29sLnNldElzV2VhayhJc1dlYWs6Ok5vKTsK IAotICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6Ok1hcmtJc05vTG9uZ2VyUHJld2FybWVk KCksIDApOworICAgIFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBoYW5kbGU7CisjaWYgUExBVEZP Uk0oTUFDKQorICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZvck1hY2hMb29rdXAo ImNvbS5hcHBsZS5jb3Jlc2VydmljZXMubGF1bmNoc2VydmljZXNkIl9zLCBXVEY6Om51bGxvcHQs IGhhbmRsZSk7CisjZW5kaWYKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6Ok1hcmtJ c05vTG9uZ2VyUHJld2FybWVkKGhhbmRsZSksIDApOwogfQogCiB2b2lkIFdlYlByb2Nlc3NQcm94 eTo6cmVtb3ZlV2ViUGFnZShXZWJQYWdlUHJveHkmIHdlYlBhZ2UsIEVuZHNVc2luZ0RhdGFTdG9y ZSBlbmRzVXNpbmdEYXRhU3RvcmUpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwCShyZXZpc2lvbiAyNzAwMzIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU0Niw3ICs1NDYsNyBAQCB2b2lkIFdl YlByb2Nlc3M6OnNldEhhc1N1c3BlbmRlZFBhZ2VQcm94CiAgICAgbV9oYXNTdXNwZW5kZWRQYWdl UHJveHkgPSBoYXNTdXNwZW5kZWRQYWdlUHJveHk7CiB9CiAKLXZvaWQgV2ViUHJvY2Vzczo6c2V0 SXNJblByb2Nlc3NDYWNoZShib29sIGlzSW5Qcm9jZXNzQ2FjaGUpCit2b2lkIFdlYlByb2Nlc3M6 OnNldElzSW5Qcm9jZXNzQ2FjaGUoYm9vbCBpc0luUHJvY2Vzc0NhY2hlLCBXZWJLaXQ6OlNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSYmIGhhbmRsZSkKIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAg ICBpZiAoaXNJblByb2Nlc3NDYWNoZSkgewpAQCAtNTU3LDE5ICs1NTcsMTkgQEAgdm9pZCBXZWJQ cm9jZXNzOjpzZXRJc0luUHJvY2Vzc0NhY2hlKGJvbwogICAgICAgICBtX3Byb2Nlc3NUeXBlID0g UHJvY2Vzc1R5cGU6OldlYkNvbnRlbnQ7CiAgICAgfQogCi0gICAgdXBkYXRlUHJvY2Vzc05hbWUo KTsKKyAgICB1cGRhdGVQcm9jZXNzTmFtZShTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoV1RGTW92 ZShoYW5kbGUpKSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShpc0luUHJvY2Vzc0NhY2hlKTsK ICNlbmRpZgogfQogCi12b2lkIFdlYlByb2Nlc3M6Om1hcmtJc05vTG9uZ2VyUHJld2FybWVkKCkK K3ZvaWQgV2ViUHJvY2Vzczo6bWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoV2ViS2l0OjpTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGUmJiBoYW5kbGUpCiB7CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAg QVNTRVJUKG1fcHJvY2Vzc1R5cGUgPT0gUHJvY2Vzc1R5cGU6OlByZXdhcm1lZFdlYkNvbnRlbnQp OwogICAgIG1fcHJvY2Vzc1R5cGUgPSBQcm9jZXNzVHlwZTo6V2ViQ29udGVudDsKIAotICAgIHVw ZGF0ZVByb2Nlc3NOYW1lKCk7CisgICAgdXBkYXRlUHJvY2Vzc05hbWUoU2FuZGJveEV4dGVuc2lv bjo6Y3JlYXRlKFdURk1vdmUoaGFuZGxlKSkpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMjcwMDMyKQorKysgU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzg3LDggKzM4 Nyw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwbGF0Zm9ybVRlcm1pbmF0ZSgpOwogCiAgICAgdm9p ZCBzZXRIYXNTdXNwZW5kZWRQYWdlUHJveHkoYm9vbCk7Ci0gICAgdm9pZCBzZXRJc0luUHJvY2Vz c0NhY2hlKGJvb2wpOwotICAgIHZvaWQgbWFya0lzTm9Mb25nZXJQcmV3YXJtZWQoKTsKKyAgICB2 b2lkIHNldElzSW5Qcm9jZXNzQ2FjaGUoYm9vbCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUmJik7CisgICAgdm9pZCBtYXJrSXNOb0xvbmdlclByZXdhcm1lZChXZWJLaXQ6OlNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSYmKTsKIAogICAgIHZvaWQgcmVnaXN0ZXJVUkxTY2hlbWVBc0Vt cHR5RG9jdW1lbnQoY29uc3QgU3RyaW5nJik7CiAgICAgdm9pZCByZWdpc3RlclVSTFNjaGVtZUFz U2VjdXJlKGNvbnN0IFN0cmluZyYpIGNvbnN0OwpAQCAtNTE1LDcgKzUxNSw3IEBAIHByaXZhdGU6 CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICB2b2lkIHNldFNjcmVlblByb3BlcnRpZXMoY29u c3QgV2ViQ29yZTo6U2NyZWVuUHJvcGVydGllcyYpOwotICAgIHZvaWQgdXBkYXRlUHJvY2Vzc05h bWUoKTsKKyAgICB2b2lkIHVwZGF0ZVByb2Nlc3NOYW1lKFJlZlB0cjxXZWJLaXQ6OlNhbmRib3hF eHRlbnNpb24+ID0gbnVsbHB0cik7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp ICYmICFQTEFURk9STShNQUNDQVRBTFlTVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyNzAwMzIpCisrKyBTb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5 KQpAQCAtMTA4LDggKzEwOCw4IEBAIG1lc3NhZ2VzIC0+IFdlYlByb2Nlc3MgTGVnYWN5UmVjZWl2 ZXIgTm8KICNlbmRpZgogCiAgICAgU2V0SGFzU3VzcGVuZGVkUGFnZVByb3h5KGJvb2wgaGFzU3Vz cGVuZGVkUGFnZVByb3h5KTsKLSAgICBTZXRJc0luUHJvY2Vzc0NhY2hlKGJvb2wgaXNJblByb2Nl c3NDYWNoZSkKLSAgICBNYXJrSXNOb0xvbmdlclByZXdhcm1lZCgpCisgICAgU2V0SXNJblByb2Nl c3NDYWNoZShib29sIGlzSW5Qcm9jZXNzQ2FjaGUsIFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlIGhhbmRsZSkKKyAgICBNYXJrSXNOb0xvbmdlclByZXdhcm1lZChXZWJLaXQ6OlNhbmRi b3hFeHRlbnNpb246OkhhbmRsZSBoYW5kbGUpCiAgICAgR2V0QWN0aXZlUGFnZXNPcmlnaW5zRm9y VGVzdGluZygpIC0+IChWZWN0b3I8U3RyaW5nPiBhY3RpdmVPcmlnaW5zKSBBc3luYwogCiAjaWYg UExBVEZPUk0oQ09DT0EpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2Vi UHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9j b2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI3MDAzMikKKysrIFNvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAg LTMwNiw3ICszMDYsOCBAQCB2b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlBy CiAgICAgLy8gY2hlY2sgaW4gd2l0aCBMYXVuY2ggU2VydmljZXMKICAgICBbTlNBcHBsaWNhdGlv biBfYWNjZXNzaWJpbGl0eUluaXRpYWxpemVdOwogCi0gICAgLy8gRklYTUU6ICg8cmRhcjovL3By b2JsZW0vNzAzNDUzMTIpOiBOb3RpZnkgTGF1bmNoU2VydmljZXMgdGhhdCB3ZSB3aWxsIGJlIGRp c2Nvbm5lY3RpbmcuCisgICAgdXBkYXRlUHJvY2Vzc05hbWUobGF1bmNoU2VydmljZXNFeHRlbnNp b24pOworCiAgICAgaWYgKGxhdW5jaFNlcnZpY2VzRXh0ZW5zaW9uKQogICAgICAgICBsYXVuY2hT ZXJ2aWNlc0V4dGVuc2lvbi0+cmV2b2tlKCk7CiAjZW5kaWYKQEAgLTM3Myw4ICszNzQsNiBAQCB2 b2lkIFdlYlByb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByCiAgICAgICAgIFBBTDo6c29m dExpbmtNZWRpYVRvb2xib3hGaWdQaG90b0RlY29tcHJlc3Npb25TZXRIYXJkd2FyZUN1dG9mZihr UEFMRmlnUGhvdG9Db250YWluZXJGb3JtYXRfSkZJRiwgSU5UX01BWCk7CiAjZW5kaWYKIAotICAg IHVwZGF0ZVByb2Nlc3NOYW1lKCk7Ci0gICAgCiAgICAgU3lzdGVtU291bmRNYW5hZ2VyOjpzaW5n bGV0b24oKS5zZXRTeXN0ZW1Tb3VuZERlbGVnYXRlKG1ha2VVbmlxdWU8V2ViU3lzdGVtU291bmRE ZWxlZ2F0ZT4oKSk7CiAKICNpZiBQTEFURk9STShNQUMpCkBAIC00MDgsNyArNDA3LDcgQEAgdm9p ZCBXZWJQcm9jZXNzOjppbml0aWFsaXplUHJvY2Vzc05hbWUoYwogI2VuZGlmCiB9CiAKLXZvaWQg V2ViUHJvY2Vzczo6dXBkYXRlUHJvY2Vzc05hbWUoKQordm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQ cm9jZXNzTmFtZShSZWZQdHI8V2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uPiBleHRlbnNpb24pCiB7 CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFJldGFpblB0cjxOU1N0cmluZz4gYXBwbGljYXRpb25O YW1lOwpAQCAtNDMwLDE5ICs0MjksMzMgQEAgdm9pZCBXZWJQcm9jZXNzOjp1cGRhdGVQcm9jZXNz TmFtZSgpCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChbdGhpcywgYXBwbGljYXRpb25OYW1lID0gV1RGTW92ZShhcHBsaWNhdGlvbk5hbWUpXSB7 CisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFt0aGlzLCBhcHBsaWNhdGlvbk5hbWUgPSBX VEZNb3ZlKGFwcGxpY2F0aW9uTmFtZSksIGV4dGVuc2lvbiA9IFdURk1vdmUoZXh0ZW5zaW9uKV0g eworCisgICAgICAgIGlmIChleHRlbnNpb24pIHsKKyAgICAgICAgICAgIGJvb2wgb2sgPSBleHRl bnNpb24tPmNvbnN1bWUoKTsKKyAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQob2ssIG9rKTsKKyAg ICAgICAgfQorCisgICAgICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNoU2VydmljZXNTZXJ2ZXJD b25uZWN0aW9uU3RhdHVzKDAsIG51bGxwdHIpOworCiAgICAgICAgIC8vIE5vdGUgdGhhdCBpdCBp cyBpbXBvcnRhbnQgZm9yIF9SZWdpc3RlckFwcGxpY2F0aW9uKCkgdG8gaGF2ZSBiZWVuIGNhbGxl ZCBiZWZvcmUgc2V0dGluZyB0aGUgZGlzcGxheSBuYW1lLgogICAgICAgICBhdXRvIGVycm9yID0g X0xTU2V0QXBwbGljYXRpb25JbmZvcm1hdGlvbkl0ZW0oa0xTRGVmYXVsdFNlc3Npb25JRCwgX0xT R2V0Q3VycmVudEFwcGxpY2F0aW9uQVNOKCksIF9rTFNEaXNwbGF5TmFtZUtleSwgKENGU3RyaW5n UmVmKWFwcGxpY2F0aW9uTmFtZS5nZXQoKSwgbnVsbHB0cik7CisKICAgICAgICAgQVNTRVJUKCFl cnJvcik7Ci0gICAgICAgIGlmIChlcnJvcikgeworICAgICAgICBpZiAoZXJyb3IpCiAgICAgICAg ICAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKFByb2Nlc3MsICJ1cGRhdGVQcm9jZXNz TmFtZTogRmFpbGVkIHRvIHNldCB0aGUgZGlzcGxheSBuYW1lIG9mIHRoZSBXZWJDb250ZW50IHBy b2Nlc3MsIGVycm9yIGNvZGU6ICVsZCIsIHN0YXRpY19jYXN0PGxvbmc+KGVycm9yKSk7Ci0gICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICAgICAgZWxzZSB7CiAjaWYgQVNTRVJUX0VO QUJMRUQKLSAgICAgICAgLy8gSXQgaXMgcG9zc2libGUgZm9yIF9MU1NldEFwcGxpY2F0aW9uSW5m b3JtYXRpb25JdGVtKCkgdG8gcmV0dXJuIDAgYW5kIHlldCBmYWlsIHRvIHNldCB0aGUgZGlzcGxh eSBuYW1lIHNvIHdlIG1ha2Ugc3VyZSB0aGUgZGlzcGxheSBuYW1lIGhhcyBhY3R1YWxseSBiZWVu IHNldC4KLSAgICAgICAgU3RyaW5nIGFjdHVhbEFwcGxpY2F0aW9uTmFtZSA9IGFkb3B0Q0YoKENG U3RyaW5nUmVmKV9MU0NvcHlBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRlbShrTFNEZWZhdWx0U2Vz c2lvbklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tMU0Rpc3BsYXlOYW1lS2V5 KSkuZ2V0KCk7Ci0gICAgICAgIEFTU0VSVCghYWN0dWFsQXBwbGljYXRpb25OYW1lLmlzRW1wdHko KSk7CisgICAgICAgICAgICAvLyBJdCBpcyBwb3NzaWJsZSBmb3IgX0xTU2V0QXBwbGljYXRpb25J bmZvcm1hdGlvbkl0ZW0oKSB0byByZXR1cm4gMCBhbmQgeWV0IGZhaWwgdG8gc2V0IHRoZSBkaXNw bGF5IG5hbWUgc28gd2UgbWFrZSBzdXJlIHRoZSBkaXNwbGF5IG5hbWUgaGFzIGFjdHVhbGx5IGJl ZW4gc2V0LgorICAgICAgICAgICAgU3RyaW5nIGFjdHVhbEFwcGxpY2F0aW9uTmFtZSA9IGFkb3B0 Q0YoKENGU3RyaW5nUmVmKV9MU0NvcHlBcHBsaWNhdGlvbkluZm9ybWF0aW9uSXRlbShrTFNEZWZh dWx0U2Vzc2lvbklELCBfTFNHZXRDdXJyZW50QXBwbGljYXRpb25BU04oKSwgX2tMU0Rpc3BsYXlO YW1lS2V5KSkuZ2V0KCk7CisgICAgICAgICAgICBBU1NFUlQoIWFjdHVhbEFwcGxpY2F0aW9uTmFt ZS5pc0VtcHR5KCkpOwogI2VuZGlmCisgICAgICAgIH0KKworICAgICAgICBfTFNTZXRBcHBsaWNh dGlvbkxhdW5jaFNlcnZpY2VzU2VydmVyQ29ubmVjdGlvblN0YXR1cyhrTFNTZXJ2ZXJDb25uZWN0 aW9uU3RhdHVzRG9Ob3RDb25uZWN0VG9TZXJ2ZXJNYXNrLCBudWxscHRyKTsKKworICAgICAgICBp ZiAoZXh0ZW5zaW9uKQorICAgICAgICAgICAgZXh0ZW5zaW9uLT5yZXZva2UoKTsKICAgICB9KTsK ICNlbmRpZiAvLyBQTEFURk9STShNQUMpCiB9Cg== 415005 2020-11-29 23:08:34 -0800 2020-11-30 22:49:26 -0800 Patch bug-219173-20201129230917.patch text/plain 2941 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvUEFML0NoYW5nZUxvZwkocmV2aXNpb24gMjcwMjMzKQorKysgU291cmNlL1dlYkNv cmUvUEFML0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEx LTI5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlY2xhcmUgZW51bSB2 YWx1ZSB0byBiZSB1c2VkIHdoZW4gYWRvcHRpbmcgdGhlIFNQSS4KKworICAgICAgICAqIHBhbC9z cGkvY29jb2EvTGF1bmNoU2VydmljZXNTUEkuaDoKKwogMjAyMC0xMS0yOCAgUGVyIEFybmUgVm9s bGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBTZXQgYXBwbGljYXRp b24gaW5mb3JtYXRpb24gaW4gdGhlIE5ldHdvcmtpbmcgcHJvY2VzcyBvbiBiZWhhbGYgb2YgdGhl IFdlYkNvbnRlbnQgcHJvY2VzcwpJbmRleDogU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvY29j b2EvTGF1bmNoU2VydmljZXNTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9QQUwv cGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCShyZXZpc2lvbiAyNzAyMzMpCisrKyBT b3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9jb2NvYS9MYXVuY2hTZXJ2aWNlc1NQSS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxMCBAQCB0eXBlZGVmIHZvaWQgKF5MU0FwcExpbmtPcGVu Q29tcGxldGlvbkhhCiBlbnVtIExTU2Vzc2lvbklEIHsKICAgICBrTFNEZWZhdWx0U2Vzc2lvbklE ID0gLTIsCiB9OworCitlbnVtIHsKKyAgICBrTFNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzRG9Ob3RD b25uZWN0VG9TZXJ2ZXJNYXNrID0gMHgxVUxMLAorfTsKICNlbmRpZgogCiAjaWYgSEFWRShMU0RB VEFCQVNFQ09OVEVYVCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAyMzMpCisrKyBTb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEx LTI5ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIEFkb3B0IFNQSSB0byBwcmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8g TGF1bmNoIFNlcnZpY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTkxNzMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcxNTk1NTM2PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IFNQSSB0byBw cmV2ZW50IGVzdGFibGlzaGluZyBYUEMgY29ubmVjdGlvbnMgdG8gTGF1bmNoIFNlcnZpY2VzIGlu IHRoZSBXZWJDb250ZW50IHByb2Nlc3Mgb24gbWFjT1MuCisgCisgICAgICAgICogV2ViUHJvY2Vz cy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6 OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorCiAyMDIwLTExLTI4ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIFNldCBhcHBsaWNh dGlvbiBpbmZvcm1hdGlvbiBpbiB0aGUgTmV0d29ya2luZyBwcm9jZXNzIG9uIGJlaGFsZiBvZiB0 aGUgV2ViQ29udGVudCBwcm9jZXNzCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29j b2EvV2ViUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHJldmlzaW9uIDI3MDIzMykKKysrIFNvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0JKHdvcmtpbmcgY29w eSkKQEAgLTM4NCw2ICszODQsMTAgQEAgdm9pZCBXZWJQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxp emVXZWJQcgogICAgIGlmIChjYW5Mb2FkX0hJU2VydmljZXNfX0FYU2V0QXVkaXRUb2tlbklzQXV0 aGVudGljYXRlZENhbGxiYWNrKCkpCiAgICAgICAgIHNvZnRMaW5rX0hJU2VydmljZXNfX0FYU2V0 QXVkaXRUb2tlbklzQXV0aGVudGljYXRlZENhbGxiYWNrKGlzQVhBdXRoZW50aWNhdGVkQ2FsbGJh Y2spOwogI2VuZGlmCisgICAgCisjaWYgRU5BQkxFKFNFVF9XRUJDT05URU5UX1BST0NFU1NfSU5G T1JNQVRJT05fSU5fTkVUV09SS19QUk9DRVNTKQorICAgIF9MU1NldEFwcGxpY2F0aW9uTGF1bmNo U2VydmljZXNTZXJ2ZXJDb25uZWN0aW9uU3RhdHVzKGtMU1NlcnZlckNvbm5lY3Rpb25TdGF0dXNE b05vdENvbm5lY3RUb1NlcnZlck1hc2ssIG51bGxwdHIpOworI2VuZGlmCiB9CiAKIHZvaWQgV2Vi UHJvY2Vzczo6cGxhdGZvcm1TZXRXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyhXZWJQcm9jZXNz RGF0YVN0b3JlUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCg==