184463 2018-04-10 13:00:05 -0700 Avoid constructing a service worker RegistrationStore for private sessions 2022-10-18 09:26:56 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez beidson commit-queue dbates ews-watchlist mkwst nishan.unilex webkit-bug-importer youennf oldest_to_newest 1413359 0 cdumez 2018-04-10 13:00:05 -0700 Avoid constructing a service worker RegistrationStore from private sessions since there is no need for persistence and the registrationDatabaseDirectory is the empty string in such cases. 1413360 1 cdumez 2018-04-10 13:00:24 -0700 <rdar://problem/36613948> 1413362 2 337627 cdumez 2018-04-10 13:04:20 -0700 Created attachment 337627 Patch 1413374 3 337627 youennf 2018-04-10 13:51:42 -0700 Comment on attachment 337627 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337627&action=review > Source/WebCore/workers/service/server/SWServer.h:231 > + std::unique_ptr<RegistrationStore> m_registrationStore; Might be able to forward-declare RegistrationStore now? 1413431 4 337645 cdumez 2018-04-10 15:28:11 -0700 Created attachment 337645 Patch 1413449 5 337645 commit-queue 2018-04-10 16:19:59 -0700 Comment on attachment 337645 Patch Clearing flags on attachment: 337645 Committed r230500: <https://trac.webkit.org/changeset/230500> 1413450 6 commit-queue 2018-04-10 16:20:00 -0700 All reviewed patches have been landed. Closing bug. 1413571 7 337645 dbates 2018-04-10 21:47:44 -0700 Comment on attachment 337645 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337645&action=review > Source/WebCore/workers/service/server/SWServerWorker.h:30 > +#include "ContentSecurityPolicyResponseHeaders.h" Is it necessary to includ this header? > Source/WebKit/StorageProcess/StorageProcess.cpp:197 > + if (!parameters.indexedDatabaseDirectory.isEmpty()) How is this change related to the related to this bug? > Source/WebKit/StorageProcess/StorageProcess.cpp:210 > + if (!parameters.serviceWorkerRegistrationDirectory.isEmpty()) Ditto. 1413572 8 dbates 2018-04-10 21:49:11 -0700 (In reply to Daniel Bates from comment #7) > Comment on attachment 337645 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=337645&action=review > > > Source/WebCore/workers/service/server/SWServerWorker.h:30 > > +#include "ContentSecurityPolicyResponseHeaders.h" > > Is it necessary to includ this header? Is it necessary to include this header? > > > Source/WebKit/StorageProcess/StorageProcess.cpp:197 > > + if (!parameters.indexedDatabaseDirectory.isEmpty()) > > How is this change related to the related to this bug? Never mind. > > > Source/WebKit/StorageProcess/StorageProcess.cpp:210 > > + if (!parameters.serviceWorkerRegistrationDirectory.isEmpty()) > > Ditto. Never mind. 1413704 9 337645 cdumez 2018-04-11 09:20:31 -0700 Comment on attachment 337645 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=337645&action=review >>> Source/WebCore/workers/service/server/SWServerWorker.h:30 >>> +#include "ContentSecurityPolicyResponseHeaders.h" >> >> Is it necessary to includ this header? > > Is it necessary to include this header? Yes due to the following data member in this class: ContentSecurityPolicyResponseHeaders m_contentSecurityPolicy; 337627 2018-04-10 13:04:20 -0700 2018-04-10 15:28:10 -0700 Patch bug-184463-20180410130420.patch text/plain 7430 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhhYWQzNGU3YjlmYTkx ZjAwODBhMDg0NmJjODdhOWVmNDU2NDNjZi4uMGQ0NDhmMWU2ZDMxYzZlZDNhN2JkZTdlYTk0MmMw MzIyMzhiOTI4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA0LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgY29uc3RydWN0aW5n IGEgc2VydmljZSB3b3JrZXIgUmVnaXN0cmF0aW9uU3RvcmUgZm9yIHByaXZhdGUgc2Vzc2lvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDQ2Mwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY2MTM5NDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgY29uc3RydWN0aW5nIGEgc2VydmljZSB3 b3JrZXIgUmVnaXN0cmF0aW9uU3RvcmUgZm9yIHByaXZhdGUgc2Vzc2lvbnMgc2luY2UgdGhlcmUK KyAgICAgICAgaXMgbm8gbmVlZCBmb3IgcGVyc2lzdGVuY2UgYW5kIHRoZSByZWdpc3RyYXRpb25E YXRhYmFzZURpcmVjdG9yeSBpcyB0aGUgZW1wdHkgc3RyaW5nIGluCisgICAgICAgIHN1Y2ggY2Fz ZXMuCisKKyAgICAgICAgKiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNXU2VydmVyOjpyZW1vdmVSZWdpc3RyYXRpb24pOgorICAgICAgICAo V2ViQ29yZTo6U1dTZXJ2ZXI6OmNsZWFyQWxsKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVy OjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpTV1NlcnZlcjo6U1dTZXJ2ZXIpOgorICAgICAg ICAoV2ViQ29yZTo6U1dTZXJ2ZXI6OmRpZEZpbmlzaEFjdGl2YXRpb24pOgorICAgICAgICAqIHdv cmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuaDoKKwogMjAxOC0wNC0wOSAgTWljaGFlbCBD YXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjIzMDM5MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZmQwMmQ5OGI5N2NmMmZlNTMxZmZmYmE0 ZTVmMzVkOGY2ZTliODZhNi4uNzU4MGQxN2Q3ZWU0MTcwOGMwNmI4NjA1NTRlN2EyYTg5MTI0NmI1 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOC0wNC0xMCAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIEF2b2lkIGNvbnN0cnVjdGluZyBhIHNlcnZpY2Ug d29ya2VyIFJlZ2lzdHJhdGlvblN0b3JlIGZvciBwcml2YXRlIHNlc3Npb25zCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ0NjMKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzM2NjEzOTQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEF2b2lkIGNvbnN0cnVjdGluZyBhIHNlcnZpY2Ugd29ya2VyIFJlZ2lz dHJhdGlvblN0b3JlIGZvciBwcml2YXRlIHNlc3Npb25zIHNpbmNlIHRoZXJlCisgICAgICAgIGlz IG5vIG5lZWQgZm9yIHBlcnNpc3RlbmNlIGFuZCB0aGUgcmVnaXN0cmF0aW9uRGF0YWJhc2VEaXJl Y3RvcnkgaXMgdGhlIGVtcHR5IHN0cmluZyBpbgorICAgICAgICBzdWNoIGNhc2VzLgorCisgICAg ICAgICogU3RvcmFnZVByb2Nlc3MvU3RvcmFnZVByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYnNpdGVEYXRhU3RvcmUpOgorCiAyMDE4LTA0 LTA5ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV1BFXSBBZGQgQVBJIHZlcnNpb24gdG8gbGlicmFyeSBzb25hbWUgYW5kIHBrZy1jb25maWcg ZmlsZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1Nl cnZlci5jcHAKaW5kZXggYTBiN2ZjMmU4MTQxN2E3ZjNhYzgxMTFkOGE0NzM0YWUwYjRkYjhiNS4u MTUyMWJmMzkxYmY3Y2Q1NmQxOGRmYzUzN2FjOGM3N2ZiZWM0YzEwNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5jcHAKQEAgLTE2NSw3 ICsxNjUsOCBAQCB2b2lkIFNXU2VydmVyOjpyZW1vdmVSZWdpc3RyYXRpb24oY29uc3QgU2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbktleSYga2V5KQogICAgIEFTU0VSVF9VTlVTRUQod2FzUmVtb3Zl ZCwgd2FzUmVtb3ZlZCk7CiAKICAgICBtX29yaWdpblN0b3JlLT5yZW1vdmUodG9wT3JpZ2luKTsK LSAgICBtX3JlZ2lzdHJhdGlvblN0b3JlLnJlbW92ZVJlZ2lzdHJhdGlvbigqcmVnaXN0cmF0aW9u KTsKKyAgICBpZiAobV9yZWdpc3RyYXRpb25TdG9yZSkKKyAgICAgICAgbV9yZWdpc3RyYXRpb25T dG9yZS0+cmVtb3ZlUmVnaXN0cmF0aW9uKCpyZWdpc3RyYXRpb24pOwogfQogCiBWZWN0b3I8U2Vy dmljZVdvcmtlclJlZ2lzdHJhdGlvbkRhdGE+IFNXU2VydmVyOjpnZXRSZWdpc3RyYXRpb25zKGNv bnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgdG9wT3JpZ2luLCBjb25zdCBVUkwmIGNsaWVudFVSTCkK QEAgLTIwMiw3ICsyMDMsOCBAQCB2b2lkIFNXU2VydmVyOjpjbGVhckFsbChDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiAgICAgQVNTRVJUKG1fcmVnaXN0cmF0 aW9uc0J5SUQuaXNFbXB0eSgpKTsKICAgICBtX3BlbmRpbmdDb250ZXh0RGF0YXMuY2xlYXIoKTsK ICAgICBtX29yaWdpblN0b3JlLT5jbGVhckFsbCgpOwotICAgIG1fcmVnaXN0cmF0aW9uU3RvcmUu Y2xlYXJBbGwoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIGlmIChtX3JlZ2lzdHJh dGlvblN0b3JlKQorICAgICAgICBtX3JlZ2lzdHJhdGlvblN0b3JlLT5jbGVhckFsbChXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKIHZvaWQgU1dTZXJ2ZXI6OmNsZWFyKGNvbnN0IFNl Y3VyaXR5T3JpZ2luRGF0YSYgc2VjdXJpdHlPcmlnaW4sIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo KT4mJiBjb21wbGV0aW9uSGFuZGxlcikKQEAgLTI0MCw3ICsyNDIsOCBAQCB2b2lkIFNXU2VydmVy OjpjbGVhcihjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luLCBDb21wbGV0 aW9uSGFuZGxlcgogICAgIGZvciAoYXV0byogcmVnaXN0cmF0aW9uIDogcmVnaXN0cmF0aW9uc1Rv UmVtb3ZlKQogICAgICAgICByZWdpc3RyYXRpb24tPmNsZWFyKCk7CiAKLSAgICBtX3JlZ2lzdHJh dGlvblN0b3JlLmZsdXNoQ2hhbmdlcyhXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAg aWYgKG1fcmVnaXN0cmF0aW9uU3RvcmUpCisgICAgICAgIG1fcmVnaXN0cmF0aW9uU3RvcmUtPmZs dXNoQ2hhbmdlcyhXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKIHZvaWQgU1dTZXJ2 ZXI6OkNvbm5lY3Rpb246OmZpbmlzaEZldGNoaW5nU2NyaXB0SW5TZXJ2ZXIoY29uc3QgU2Vydmlj ZVdvcmtlckZldGNoUmVzdWx0JiByZXN1bHQpCkBAIC0yNzEsOSArMjc0LDE0IEBAIHZvaWQgU1dT ZXJ2ZXI6OkNvbm5lY3Rpb246OnN5bmNUZXJtaW5hdGVXb3JrZXIoU2VydmljZVdvcmtlcklkZW50 aWZpZXIgaWRlbnRpZmllCiAKIFNXU2VydmVyOjpTV1NlcnZlcihVbmlxdWVSZWY8U1dPcmlnaW5T dG9yZT4mJiBvcmlnaW5TdG9yZSwgU3RyaW5nJiYgcmVnaXN0cmF0aW9uRGF0YWJhc2VEaXJlY3Rv cnksIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICA6IG1fb3JpZ2luU3RvcmUoV1RGTW92 ZShvcmlnaW5TdG9yZSkpCi0gICAgLCBtX3JlZ2lzdHJhdGlvblN0b3JlKCp0aGlzLCBXVEZNb3Zl KHJlZ2lzdHJhdGlvbkRhdGFiYXNlRGlyZWN0b3J5KSkKICAgICAsIG1fc2Vzc2lvbklEKHNlc3Np b25JRCkKIHsKKyAgICBBU1NFUlQoIXJlZ2lzdHJhdGlvbkRhdGFiYXNlRGlyZWN0b3J5LmlzRW1w dHkoKSB8fCBtX3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgpKTsKKyAgICBpZiAoIW1fc2Vzc2lvbklE LmlzRXBoZW1lcmFsKCkpCisgICAgICAgIG1fcmVnaXN0cmF0aW9uU3RvcmUgPSBzdGQ6Om1ha2Vf dW5pcXVlPFJlZ2lzdHJhdGlvblN0b3JlPigqdGhpcywgV1RGTW92ZShyZWdpc3RyYXRpb25EYXRh YmFzZURpcmVjdG9yeSkpOworICAgIGVsc2UKKyAgICAgICAgcmVnaXN0cmF0aW9uU3RvcmVJbXBv cnRDb21wbGV0ZSgpOworCiAgICAgVU5VU0VEX1BBUkFNKHJlZ2lzdHJhdGlvbkRhdGFiYXNlRGly ZWN0b3J5KTsKICAgICBhbGxTZXJ2ZXJzKCkuYWRkKHRoaXMpOwogfQpAQCAtNDA2LDcgKzQxNCw4 IEBAIHZvaWQgU1dTZXJ2ZXI6OmRpZEZpbmlzaEFjdGl2YXRpb24oU1dTZXJ2ZXJXb3JrZXImIHdv cmtlcikKICAgICBpZiAoIXJlZ2lzdHJhdGlvbikKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9y ZWdpc3RyYXRpb25TdG9yZS51cGRhdGVSZWdpc3RyYXRpb24od29ya2VyLmNvbnRleHREYXRhKCkp OworICAgIGlmIChtX3JlZ2lzdHJhdGlvblN0b3JlKQorICAgICAgICBtX3JlZ2lzdHJhdGlvblN0 b3JlLT51cGRhdGVSZWdpc3RyYXRpb24od29ya2VyLmNvbnRleHREYXRhKCkpOwogICAgIHJlZ2lz dHJhdGlvbi0+ZGlkRmluaXNoQWN0aXZhdGlvbih3b3JrZXIuaWRlbnRpZmllcigpKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZl ci5oIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5oCmlu ZGV4IGMxM2Y0ODI0NzMzNzJlMjZlZmM4NDc2NDc5N2ZlZmE2YWIyMGVlOTQuLmQ5ZDY1YWJmOTZj ODA2NDQ1YTY1NDhmY2NhZGFkOTJiNTFjYTRlOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS93 b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmgKQEAgLTIyOCw3ICsyMjgsNyBAQCBwcml2 YXRlOgogICAgIEhhc2hNYXA8U2VydmljZVdvcmtlckNsaWVudElkZW50aWZpZXIsIFNlcnZpY2VX b3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyPiBtX2NsaWVudFRvQ29udHJvbGxpbmdSZWdpc3Ry YXRpb247CiAKICAgICBVbmlxdWVSZWY8U1dPcmlnaW5TdG9yZT4gbV9vcmlnaW5TdG9yZTsKLSAg ICBSZWdpc3RyYXRpb25TdG9yZSBtX3JlZ2lzdHJhdGlvblN0b3JlOworICAgIHN0ZDo6dW5pcXVl X3B0cjxSZWdpc3RyYXRpb25TdG9yZT4gbV9yZWdpc3RyYXRpb25TdG9yZTsKICAgICBIYXNoTWFw PFNlY3VyaXR5T3JpZ2luRGF0YSwgVmVjdG9yPFNlcnZpY2VXb3JrZXJDb250ZXh0RGF0YT4+IG1f cGVuZGluZ0NvbnRleHREYXRhczsKICAgICBIYXNoTWFwPFNlY3VyaXR5T3JpZ2luRGF0YSwgSGFz aE1hcDxTZXJ2aWNlV29ya2VySWRlbnRpZmllciwgVmVjdG9yPFJ1blNlcnZpY2VXb3JrZXJDYWxs YmFjaz4+PiBtX3NlcnZpY2VXb3JrZXJSdW5SZXF1ZXN0czsKICAgICBQQUw6OlNlc3Npb25JRCBt X3Nlc3Npb25JRDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU3Rv cmFnZVByb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJv Y2Vzcy5jcHAKaW5kZXggZTI3NGM3NjNiMTNlMTI2ZGExZThmOTQ2MTUzMjM3NTc0NGNkZGYyOS4u OWJiYmJhYWM1NTIxN2M0OTMxMWNmZmFkY2MzNzhhYTVjMzcwNDIzMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJvY2Vzcy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJvY2Vzcy5jcHAKQEAgLTE5NCw3ICsxOTQs OCBAQCB2b2lkIFN0b3JhZ2VQcm9jZXNzOjppbml0aWFsaXplV2Vic2l0ZURhdGFTdG9yZShjb25z dCBTdG9yYWdlUHJvY2Vzc0NyZWF0aW9uUGFyYQogICAgIH0pOwogICAgIGlmIChhZGRSZXN1bHQu aXNOZXdFbnRyeSkgewogICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50 bHkocGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwot ICAgICAgICBwb3N0U3RvcmFnZVRhc2soY3JlYXRlQ3Jvc3NUaHJlYWRUYXNrKCp0aGlzLCAmU3Rv cmFnZVByb2Nlc3M6OmVuc3VyZVBhdGhFeGlzdHMsIHBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNl RGlyZWN0b3J5KSk7CisgICAgICAgIGlmICghcGFyYW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJl Y3RvcnkuaXNFbXB0eSgpKQorICAgICAgICAgICAgcG9zdFN0b3JhZ2VUYXNrKGNyZWF0ZUNyb3Nz VGhyZWFkVGFzaygqdGhpcywgJlN0b3JhZ2VQcm9jZXNzOjplbnN1cmVQYXRoRXhpc3RzLCBwYXJh bWV0ZXJzLmluZGV4ZWREYXRhYmFzZURpcmVjdG9yeSkpOwogICAgIH0KICNlbmRpZgogI2lmIEVO QUJMRShTRVJWSUNFX1dPUktFUikKQEAgLTIwNiw3ICsyMDcsOCBAQCB2b2lkIFN0b3JhZ2VQcm9j ZXNzOjppbml0aWFsaXplV2Vic2l0ZURhdGFTdG9yZShjb25zdCBTdG9yYWdlUHJvY2Vzc0NyZWF0 aW9uUGFyYQogICAgIH0pOwogICAgIGlmIChhZGRSZXN1bHQuaXNOZXdFbnRyeSkgewogICAgICAg ICBTYW5kYm94RXh0ZW5zaW9uOjpjb25zdW1lUGVybWFuZW50bHkocGFyYW1ldGVycy5zZXJ2aWNl V29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsKLSAgICAgICAgcG9z dFN0b3JhZ2VUYXNrKGNyZWF0ZUNyb3NzVGhyZWFkVGFzaygqdGhpcywgJlN0b3JhZ2VQcm9jZXNz OjplbnN1cmVQYXRoRXhpc3RzLCBwYXJhbWV0ZXJzLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25E aXJlY3RvcnkpKTsKKyAgICAgICAgaWYgKCFwYXJhbWV0ZXJzLnNlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25EaXJlY3RvcnkuaXNFbXB0eSgpKQorICAgICAgICAgICAgcG9zdFN0b3JhZ2VUYXNrKGNy ZWF0ZUNyb3NzVGhyZWFkVGFzaygqdGhpcywgJlN0b3JhZ2VQcm9jZXNzOjplbnN1cmVQYXRoRXhp c3RzLCBwYXJhbWV0ZXJzLnNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EaXJlY3RvcnkpKTsKICAg ICB9CiAKICAgICBmb3IgKGF1dG8mIHNjaGVtZSA6IHBhcmFtZXRlcnMudXJsU2NoZW1lc1NlcnZp Y2VXb3JrZXJzQ2FuSGFuZGxlKQo= 337645 2018-04-10 15:28:11 -0700 2018-04-10 16:19:59 -0700 Patch bug-184463-20180410152811.patch text/plain 8457 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzdiNDhmNjk1ODlmMDcw ODJjYTAzMzYzOTQzNDdkZWJjNzBjZGMyOC4uOWI0MDIxMGQ0MGYxNWU0OWI4MjMyMDM4ZmZmMjYz YjY1MGE1ZjVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA0LTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgY29uc3RydWN0aW5n IGEgc2VydmljZSB3b3JrZXIgUmVnaXN0cmF0aW9uU3RvcmUgZm9yIHByaXZhdGUgc2Vzc2lvbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDQ2Mwor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzY2MTM5NDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg WW91ZW5uIEZhYmxldC4KKworICAgICAgICBBdm9pZCBjb25zdHJ1Y3RpbmcgYSBzZXJ2aWNlIHdv cmtlciBSZWdpc3RyYXRpb25TdG9yZSBmb3IgcHJpdmF0ZSBzZXNzaW9ucyBzaW5jZSB0aGVyZQor ICAgICAgICBpcyBubyBuZWVkIGZvciBwZXJzaXN0ZW5jZSBhbmQgdGhlIHJlZ2lzdHJhdGlvbkRh dGFiYXNlRGlyZWN0b3J5IGlzIHRoZSBlbXB0eSBzdHJpbmcgaW4KKyAgICAgICAgc3VjaCBjYXNl cy4KKworICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXI6OnJlbW92ZVJlZ2lzdHJhdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpTV1NlcnZlcjo6Y2xlYXJBbGwpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXI6 OmNsZWFyKToKKyAgICAgICAgKFdlYkNvcmU6OlNXU2VydmVyOjpTV1NlcnZlcik6CisgICAgICAg IChXZWJDb3JlOjpTV1NlcnZlcjo6ZGlkRmluaXNoQWN0aXZhdGlvbik6CisgICAgICAgICogd29y a2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5oOgorCiAyMDE4LTA0LTEwICBKZXJlbXkgSm9u ZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYVNlc3Npb25NYW5hZ2VyaU9T IHNob3VsZCBkZWZlciBjcmVhdGlvbiBvZiBNUFZvbHVtZVZpZXcgdW50aWwgaXQgbmVlZHMgdG8g bW9uaXRvciBBaXJQbGF5IHJvdXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBlZjNiMGY3ZDFhMjA2M2MxMmIxNzVj YzY0Mzg3ZjY2MGY1ZjM4ZmExLi4zMWJlYWY1NjA2ZTMxYzY1NWIwZGVmY2JkNzIwNTQ4ZmUyZTRm YzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA0LTEwICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgY29uc3RydWN0aW5nIGEgc2Vydmlj ZSB3b3JrZXIgUmVnaXN0cmF0aW9uU3RvcmUgZm9yIHByaXZhdGUgc2Vzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDQ2MworICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzY2MTM5NDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZh YmxldC4KKworICAgICAgICBBdm9pZCBjb25zdHJ1Y3RpbmcgYSBzZXJ2aWNlIHdvcmtlciBSZWdp c3RyYXRpb25TdG9yZSBmb3IgcHJpdmF0ZSBzZXNzaW9ucyBzaW5jZSB0aGVyZQorICAgICAgICBp cyBubyBuZWVkIGZvciBwZXJzaXN0ZW5jZSBhbmQgdGhlIHJlZ2lzdHJhdGlvbkRhdGFiYXNlRGly ZWN0b3J5IGlzIHRoZSBlbXB0eSBzdHJpbmcgaW4KKyAgICAgICAgc3VjaCBjYXNlcy4KKworICAg ICAgICAqIFN0b3JhZ2VQcm9jZXNzL1N0b3JhZ2VQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktp dDo6U3RvcmFnZVByb2Nlc3M6OmluaXRpYWxpemVXZWJzaXRlRGF0YVN0b3JlKToKKwogMjAxOC0w NC0xMCAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBMb2FkaW5n IG9mIG11bHRpcGFydCByZXNwb25zZSB3YXMgY2FuY2VsbGVkIGJlY2F1c2Ugb2YgY29udGVudCBw b2xpY3kgc2V0IGluIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZv clJlc3BvbnNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2Vy dmVyL1NXU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIv U1dTZXJ2ZXIuY3BwCmluZGV4IGEwYjdmYzJlODE0MTdhN2YzYWM4MTExZDhhNDczNGFlMGI0ZGI4 YjUuLjE1MjFiZjM5MWJmN2NkNTZkMThkZmM1MzdhYzhjNzdmYmVjNGMxMDQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCkBAIC0x NjUsNyArMTY1LDggQEAgdm9pZCBTV1NlcnZlcjo6cmVtb3ZlUmVnaXN0cmF0aW9uKGNvbnN0IFNl cnZpY2VXb3JrZXJSZWdpc3RyYXRpb25LZXkmIGtleSkKICAgICBBU1NFUlRfVU5VU0VEKHdhc1Jl bW92ZWQsIHdhc1JlbW92ZWQpOwogCiAgICAgbV9vcmlnaW5TdG9yZS0+cmVtb3ZlKHRvcE9yaWdp bik7Ci0gICAgbV9yZWdpc3RyYXRpb25TdG9yZS5yZW1vdmVSZWdpc3RyYXRpb24oKnJlZ2lzdHJh dGlvbik7CisgICAgaWYgKG1fcmVnaXN0cmF0aW9uU3RvcmUpCisgICAgICAgIG1fcmVnaXN0cmF0 aW9uU3RvcmUtPnJlbW92ZVJlZ2lzdHJhdGlvbigqcmVnaXN0cmF0aW9uKTsKIH0KIAogVmVjdG9y PFNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25EYXRhPiBTV1NlcnZlcjo6Z2V0UmVnaXN0cmF0aW9u cyhjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHRvcE9yaWdpbiwgY29uc3QgVVJMJiBjbGllbnRV UkwpCkBAIC0yMDIsNyArMjAzLDggQEAgdm9pZCBTV1NlcnZlcjo6Y2xlYXJBbGwoQ29tcGxldGlv bkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogICAgIEFTU0VSVChtX3JlZ2lz dHJhdGlvbnNCeUlELmlzRW1wdHkoKSk7CiAgICAgbV9wZW5kaW5nQ29udGV4dERhdGFzLmNsZWFy KCk7CiAgICAgbV9vcmlnaW5TdG9yZS0+Y2xlYXJBbGwoKTsKLSAgICBtX3JlZ2lzdHJhdGlvblN0 b3JlLmNsZWFyQWxsKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICBpZiAobV9yZWdp c3RyYXRpb25TdG9yZSkKKyAgICAgICAgbV9yZWdpc3RyYXRpb25TdG9yZS0+Y2xlYXJBbGwoV1RG TW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCiB2b2lkIFNXU2VydmVyOjpjbGVhcihjb25z dCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luLCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCkBAIC0yNDAsNyArMjQyLDggQEAgdm9pZCBTV1Nl cnZlcjo6Y2xlYXIoY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBzZWN1cml0eU9yaWdpbiwgQ29t cGxldGlvbkhhbmRsZXIKICAgICBmb3IgKGF1dG8qIHJlZ2lzdHJhdGlvbiA6IHJlZ2lzdHJhdGlv bnNUb1JlbW92ZSkKICAgICAgICAgcmVnaXN0cmF0aW9uLT5jbGVhcigpOwogCi0gICAgbV9yZWdp c3RyYXRpb25TdG9yZS5mbHVzaENoYW5nZXMoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor ICAgIGlmIChtX3JlZ2lzdHJhdGlvblN0b3JlKQorICAgICAgICBtX3JlZ2lzdHJhdGlvblN0b3Jl LT5mbHVzaENoYW5nZXMoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCiB2b2lkIFNX U2VydmVyOjpDb25uZWN0aW9uOjpmaW5pc2hGZXRjaGluZ1NjcmlwdEluU2VydmVyKGNvbnN0IFNl cnZpY2VXb3JrZXJGZXRjaFJlc3VsdCYgcmVzdWx0KQpAQCAtMjcxLDkgKzI3NCwxNCBAQCB2b2lk IFNXU2VydmVyOjpDb25uZWN0aW9uOjpzeW5jVGVybWluYXRlV29ya2VyKFNlcnZpY2VXb3JrZXJJ ZGVudGlmaWVyIGlkZW50aWZpZQogCiBTV1NlcnZlcjo6U1dTZXJ2ZXIoVW5pcXVlUmVmPFNXT3Jp Z2luU3RvcmU+JiYgb3JpZ2luU3RvcmUsIFN0cmluZyYmIHJlZ2lzdHJhdGlvbkRhdGFiYXNlRGly ZWN0b3J5LCBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAgICAgOiBtX29yaWdpblN0b3JlKFdU Rk1vdmUob3JpZ2luU3RvcmUpKQotICAgICwgbV9yZWdpc3RyYXRpb25TdG9yZSgqdGhpcywgV1RG TW92ZShyZWdpc3RyYXRpb25EYXRhYmFzZURpcmVjdG9yeSkpCiAgICAgLCBtX3Nlc3Npb25JRChz ZXNzaW9uSUQpCiB7CisgICAgQVNTRVJUKCFyZWdpc3RyYXRpb25EYXRhYmFzZURpcmVjdG9yeS5p c0VtcHR5KCkgfHwgbV9zZXNzaW9uSUQuaXNFcGhlbWVyYWwoKSk7CisgICAgaWYgKCFtX3Nlc3Np b25JRC5pc0VwaGVtZXJhbCgpKQorICAgICAgICBtX3JlZ2lzdHJhdGlvblN0b3JlID0gc3RkOjpt YWtlX3VuaXF1ZTxSZWdpc3RyYXRpb25TdG9yZT4oKnRoaXMsIFdURk1vdmUocmVnaXN0cmF0aW9u RGF0YWJhc2VEaXJlY3RvcnkpKTsKKyAgICBlbHNlCisgICAgICAgIHJlZ2lzdHJhdGlvblN0b3Jl SW1wb3J0Q29tcGxldGUoKTsKKwogICAgIFVOVVNFRF9QQVJBTShyZWdpc3RyYXRpb25EYXRhYmFz ZURpcmVjdG9yeSk7CiAgICAgYWxsU2VydmVycygpLmFkZCh0aGlzKTsKIH0KQEAgLTQwNiw3ICs0 MTQsOCBAQCB2b2lkIFNXU2VydmVyOjpkaWRGaW5pc2hBY3RpdmF0aW9uKFNXU2VydmVyV29ya2Vy JiB3b3JrZXIpCiAgICAgaWYgKCFyZWdpc3RyYXRpb24pCiAgICAgICAgIHJldHVybjsKIAotICAg IG1fcmVnaXN0cmF0aW9uU3RvcmUudXBkYXRlUmVnaXN0cmF0aW9uKHdvcmtlci5jb250ZXh0RGF0 YSgpKTsKKyAgICBpZiAobV9yZWdpc3RyYXRpb25TdG9yZSkKKyAgICAgICAgbV9yZWdpc3RyYXRp b25TdG9yZS0+dXBkYXRlUmVnaXN0cmF0aW9uKHdvcmtlci5jb250ZXh0RGF0YSgpKTsKICAgICBy ZWdpc3RyYXRpb24tPmRpZEZpbmlzaEFjdGl2YXRpb24od29ya2VyLmlkZW50aWZpZXIoKSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIu aAppbmRleCBjMTNmNDgyNDczMzcyZTI2ZWZjODQ3NjQ3OTdmZWZhNmFiMjBlZTk0Li5kYThmOGY4 NDI3MTA5NWMwMmFjMjZiNjRlNzQyYjRhZTI1ZjFhZDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvd29ya2Vycy9zZXJ2aWNlL3NlcnZlci9TV1NlcnZlci5oCkBAIC0yOSw3ICsyOSw2IEBACiAK ICNpbmNsdWRlICJDbGllbnRPcmlnaW4uaCIKICNpbmNsdWRlICJEb2N1bWVudElkZW50aWZpZXIu aCIKLSNpbmNsdWRlICJSZWdpc3RyYXRpb25TdG9yZS5oIgogI2luY2x1ZGUgIlNXU2VydmVyV29y a2VyLmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5EYXRhLmgiCiAjaW5jbHVkZSAiU2Vydmlj ZVdvcmtlckNsaWVudERhdGEuaCIKQEAgLTQ5LDYgKzQ4LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCitjbGFzcyBSZWdpc3RyYXRpb25TdG9yZTsKIGNsYXNzIFNXT3JpZ2luU3RvcmU7CiBj bGFzcyBTV1NlcnZlckpvYlF1ZXVlOwogY2xhc3MgU1dTZXJ2ZXJSZWdpc3RyYXRpb247CkBAIC0y MjgsNyArMjI4LDcgQEAgcHJpdmF0ZToKICAgICBIYXNoTWFwPFNlcnZpY2VXb3JrZXJDbGllbnRJ ZGVudGlmaWVyLCBTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcj4gbV9jbGllbnRU b0NvbnRyb2xsaW5nUmVnaXN0cmF0aW9uOwogCiAgICAgVW5pcXVlUmVmPFNXT3JpZ2luU3RvcmU+ IG1fb3JpZ2luU3RvcmU7Ci0gICAgUmVnaXN0cmF0aW9uU3RvcmUgbV9yZWdpc3RyYXRpb25TdG9y ZTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8UmVnaXN0cmF0aW9uU3RvcmU+IG1fcmVnaXN0cmF0aW9u U3RvcmU7CiAgICAgSGFzaE1hcDxTZWN1cml0eU9yaWdpbkRhdGEsIFZlY3RvcjxTZXJ2aWNlV29y a2VyQ29udGV4dERhdGE+PiBtX3BlbmRpbmdDb250ZXh0RGF0YXM7CiAgICAgSGFzaE1hcDxTZWN1 cml0eU9yaWdpbkRhdGEsIEhhc2hNYXA8U2VydmljZVdvcmtlcklkZW50aWZpZXIsIFZlY3RvcjxS dW5TZXJ2aWNlV29ya2VyQ2FsbGJhY2s+Pj4gbV9zZXJ2aWNlV29ya2VyUnVuUmVxdWVzdHM7CiAg ICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyV29ya2VyLmggYi9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyV29ya2VyLmgKaW5kZXggZDkzZjUwMDBh YWI5ZWIwMWJlNGNiOGM0ZGQwYWIxYjYzZmQ4NmRlYS4uODViOGIwZjE0MmE3YjNhY2RiNThiYmVl NGMzOGJhYjYwNDgxY2JjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9zZXJ2 aWNlL3NlcnZlci9TV1NlcnZlcldvcmtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMv c2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJXb3JrZXIuaApAQCAtMjcsNiArMjcsNyBAQAogCiAjaWYg RU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogCisjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5 UmVzcG9uc2VIZWFkZXJzLmgiCiAjaW5jbHVkZSAiU2VydmljZVdvcmtlckNsaWVudERhdGEuaCIK ICNpbmNsdWRlICJTZXJ2aWNlV29ya2VyRGF0YS5oIgogI2luY2x1ZGUgIlNlcnZpY2VXb3JrZXJJ ZGVudGlmaWVyLmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1N0 b3JhZ2VQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU3RvcmFnZVBy b2Nlc3MuY3BwCmluZGV4IGUyNzRjNzYzYjEzZTEyNmRhMWU4Zjk0NjE1MzIzNzU3NDRjZGRmMjku LjliYmJiYWFjNTUyMTdjNDkzMTFjZmZhZGNjMzc4YWE1YzM3MDQyMzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU3RvcmFnZVByb2Nlc3MuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU3RvcmFnZVByb2Nlc3MuY3BwCkBAIC0xOTQsNyArMTk0 LDggQEAgdm9pZCBTdG9yYWdlUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYnNpdGVEYXRhU3RvcmUoY29u c3QgU3RvcmFnZVByb2Nlc3NDcmVhdGlvblBhcmEKICAgICB9KTsKICAgICBpZiAoYWRkUmVzdWx0 LmlzTmV3RW50cnkpIHsKICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVu dGx5KHBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlKTsK LSAgICAgICAgcG9zdFN0b3JhZ2VUYXNrKGNyZWF0ZUNyb3NzVGhyZWFkVGFzaygqdGhpcywgJlN0 b3JhZ2VQcm9jZXNzOjplbnN1cmVQYXRoRXhpc3RzLCBwYXJhbWV0ZXJzLmluZGV4ZWREYXRhYmFz ZURpcmVjdG9yeSkpOworICAgICAgICBpZiAoIXBhcmFtZXRlcnMuaW5kZXhlZERhdGFiYXNlRGly ZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHBvc3RTdG9yYWdlVGFzayhjcmVhdGVDcm9z c1RocmVhZFRhc2soKnRoaXMsICZTdG9yYWdlUHJvY2Vzczo6ZW5zdXJlUGF0aEV4aXN0cywgcGFy YW1ldGVycy5pbmRleGVkRGF0YWJhc2VEaXJlY3RvcnkpKTsKICAgICB9CiAjZW5kaWYKICNpZiBF TkFCTEUoU0VSVklDRV9XT1JLRVIpCkBAIC0yMDYsNyArMjA3LDggQEAgdm9pZCBTdG9yYWdlUHJv Y2Vzczo6aW5pdGlhbGl6ZVdlYnNpdGVEYXRhU3RvcmUoY29uc3QgU3RvcmFnZVByb2Nlc3NDcmVh dGlvblBhcmEKICAgICB9KTsKICAgICBpZiAoYWRkUmVzdWx0LmlzTmV3RW50cnkpIHsKICAgICAg ICAgU2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZVBlcm1hbmVudGx5KHBhcmFtZXRlcnMuc2Vydmlj ZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7Ci0gICAgICAgIHBv c3RTdG9yYWdlVGFzayhjcmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZTdG9yYWdlUHJvY2Vz czo6ZW5zdXJlUGF0aEV4aXN0cywgcGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9u RGlyZWN0b3J5KSk7CisgICAgICAgIGlmICghcGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0 cmF0aW9uRGlyZWN0b3J5LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHBvc3RTdG9yYWdlVGFzayhj cmVhdGVDcm9zc1RocmVhZFRhc2soKnRoaXMsICZTdG9yYWdlUHJvY2Vzczo6ZW5zdXJlUGF0aEV4 aXN0cywgcGFyYW1ldGVycy5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uRGlyZWN0b3J5KSk7CiAg ICAgfQogCiAgICAgZm9yIChhdXRvJiBzY2hlbWUgOiBwYXJhbWV0ZXJzLnVybFNjaGVtZXNTZXJ2 aWNlV29ya2Vyc0NhbkhhbmRsZSkK