193484 2019-01-15 20:10:20 -0800 Remove more NetworkProcess::singleton use 2019-01-15 20:58:28 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 1 achristensen achristensen beidson ggaren oldest_to_newest 1494995 0 achristensen 2019-01-15 20:10:20 -0800 Remove more NetworkProcess::singleton use 1494997 1 359251 achristensen 2019-01-15 20:13:40 -0800 Created attachment 359251 Patch 1495004 2 359251 ggaren 2019-01-15 20:40:12 -0800 Comment on attachment 359251 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359251&action=review r=me > Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm:51 > +void LegacyCustomProtocolManager::networkProcessCreated(NetworkProcess& networkProcess) > +{ > + newestNetworkProcess() = &networkProcess; > +} I think we expect clients that use LegacyCustomProtocolManager never to make more than one NetworkProcess, and we expect clients that make more than one NetworkProcess never to use LegacyCustomProtocolManager. Is that right? If so, I think it would be clearer to remember the *first* NetworkProcess created, and ASSERT that, if another one is created, LegacyCustomProtocolManager has no registered protocols. 1495009 3 achristensen 2019-01-15 20:58:28 -0800 (In reply to Geoffrey Garen from comment #2) > Comment on attachment 359251 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=359251&action=review > > r=me > > > Source/WebKit/NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm:51 > > +void LegacyCustomProtocolManager::networkProcessCreated(NetworkProcess& networkProcess) > > +{ > > + newestNetworkProcess() = &networkProcess; > > +} > > I think we expect clients that use LegacyCustomProtocolManager never to make > more than one NetworkProcess, and we expect clients that make more than one > NetworkProcess never to use LegacyCustomProtocolManager. Is that right? That will be right. > > If so, I think it would be clearer to remember the *first* NetworkProcess > created, and ASSERT that, if another one is created, > LegacyCustomProtocolManager has no registered protocols. Done! http://trac.webkit.org/r240030 359251 2019-01-15 20:13:40 -0800 2019-01-15 20:40:12 -0800 Patch bug-193484-20190115201339.patch text/plain 8373 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDAwMjcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE5LTAxLTE1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIG1vcmUg TmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbiB1c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzQ4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcmVtb3ZlcyB0aGUgdXNlIG9mIE5ldHdvcmtQcm9j ZXNzOjpzaW5nbGV0b24gaW4gdGhlIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlci4KKyAgICAg ICAgVGhpcyBpcyB0aGUga2luZCBvZiBhd2Z1bCBkdWN0IHRhcGUgY29kZSB0aGF0IGtlZXBzIG1l IGF3YWtlIGF0IG5pZ2h0LCBidXQgaXQncyBuZWNlc3NhcnkKKyAgICAgICAgYmVjYXVzZSB3ZSBj YW4ndCBxdWl0ZSByZW1vdmUgTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyIHlldCBidXQgd2Ug bmVlZCB0byBhbGxvdyBtb3JlIHRoYW4KKyAgICAgICAgb25lIE5ldHdvcmtQcm9jZXNzIG9iamVj dC4gIFRvIG1ha2UgaXQgd29yayB3ZWxsIGVub3VnaCB1bnRpbCB3ZSByZW1vdmUgTGVnYWN5Q3Vz dG9tUHJvdG9jb2xNYW5hZ2VyLAorICAgICAgICB1c2UgdGhlIGxhc3QgTmV0d29ya1Byb2Nlc3Mg b2JqZWN0IHRoYXQgaGFzIGJlZW4gY3JlYXRlZC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L0N1c3RvbVByb3RvY29scy9Db2NvYS9MZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXJDb2NvYS5t bToKKyAgICAgICAgKG5ld2VzdE5ldHdvcmtQcm9jZXNzKToKKyAgICAgICAgKExlZ2FjeUN1c3Rv bVByb3RvY29sTWFuYWdlcjo6bmV0d29ya1Byb2Nlc3NDcmVhdGVkKToKKyAgICAgICAgKCtbV0tD dXN0b21Qcm90b2NvbCBjYW5Jbml0V2l0aFJlcXVlc3Q6XSk6CisgICAgICAgICgtW1dLQ3VzdG9t UHJvdG9jb2wgaW5pdFdpdGhSZXF1ZXN0OmNhY2hlZFJlc3BvbnNlOmNsaWVudDpdKToKKyAgICAg ICAgKC1bV0tDdXN0b21Qcm90b2NvbCBzdGFydExvYWRpbmddKToKKyAgICAgICAgKC1bV0tDdXN0 b21Qcm90b2NvbCBzdG9wTG9hZGluZ10pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0N1c3Rv bVByb3RvY29scy9MZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXI6OkxlZ2FjeUN1c3RvbVByb3RvY29sTWFu YWdlcik6CisgICAgICAgIChXZWJLaXQ6OkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcjo6c3Rh cnRMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2Vy OjpzdG9wTG9hZGluZyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xz L0xlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlci5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6Ok5l dHdvcmtQcm9jZXNzKToKKwogMjAxOS0wMS0xNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBWaXN1YWxWaWV3cG9ydCBBUEkgc2hvdWxkIGJlIHVwZGF0ZWQgdXBv biBvcGVuaW5nIG9mIGtleWJvYXJkCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAkocmV2aXNpb24gMjQwMDEzKQorKysgU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTE0Miw2ICsxNDIsOSBAQCBOZXR3b3JrUHJvY2Vzczo6TmV0d29ya1Byb2Nlc3MoKQogICAgIGFk ZFN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlcj4oKTsKICNpZiBFTkFCTEUoTEVHQUNZX0NVU1RP TV9QUk9UT0NPTF9NQU5BR0VSKQogICAgIGFkZFN1cHBsZW1lbnQ8TGVnYWN5Q3VzdG9tUHJvdG9j b2xNYW5hZ2VyPigpOworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIExlZ2FjeUN1c3RvbVByb3Rv Y29sTWFuYWdlcjo6bmV0d29ya1Byb2Nlc3NDcmVhdGVkKCp0aGlzKTsKKyNlbmRpZgogI2VuZGlm CiAjaWYgRU5BQkxFKFBST1hJTUlUWV9ORVRXT1JLSU5HKQogICAgIGFkZFN1cHBsZW1lbnQ8TmV0 d29ya1Byb3hpbWl0eU1hbmFnZXI+KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL0N1c3RvbVByb3RvY29scy9MZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXIuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0xl Z2FjeUN1c3RvbVByb3RvY29sTWFuYWdlci5jcHAJKHJldmlzaW9uIDI0MDAxMykKKysrIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0xlZ2FjeUN1c3RvbVByb3Rv Y29sTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDkgKzI3LDkgQEAKICNpbmNsdWRl ICJjb25maWcuaCIKICNpbmNsdWRlICJMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXIuaCIKIAot I2luY2x1ZGUgIkNoaWxkUHJvY2Vzcy5oIgogI2luY2x1ZGUgIkxlZ2FjeUN1c3RvbVByb3RvY29s TWFuYWdlck1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2Vy UHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzLmgiCiAjaW5jbHVkZSAi TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKICNpbmNsdWRlICJXZWJDb3JlQXJn dW1lbnRDb2RlcnMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVxdWVzdC5oPgpAQCAt NDcsMTAgKzQ3LDEwIEBAIGNvbnN0IGNoYXIqIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcjoK ICAgICByZXR1cm4gIkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlciI7CiB9CiAKLUxlZ2FjeUN1 c3RvbVByb3RvY29sTWFuYWdlcjo6TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyKENoaWxkUHJv Y2VzcyYgY2hpbGRQcm9jZXNzKQotICAgIDogbV9jaGlsZFByb2Nlc3MoY2hpbGRQcm9jZXNzKQor TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXIo TmV0d29ya1Byb2Nlc3MmIG5ldHdvcmtQcm9jZXNzKQorICAgIDogbV9uZXR3b3JrUHJvY2Vzcyhu ZXR3b3JrUHJvY2VzcykKIHsKLSAgICBtX2NoaWxkUHJvY2Vzcy5hZGRNZXNzYWdlUmVjZWl2ZXIo TWVzc2FnZXM6OkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcjo6bWVzc2FnZVJlY2VpdmVyTmFt ZSgpLCAqdGhpcyk7CisgICAgbV9uZXR3b3JrUHJvY2Vzcy5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVz c2FnZXM6OkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp LCAqdGhpcyk7CiB9CiAKIHZvaWQgTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjppbml0aWFs aXplKGNvbnN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQpA QCAtNzcsMTIgKzc3LDEyIEBAIHZvaWQgTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpyZW1v dmUKIAogdm9pZCBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnN0YXJ0TG9hZGluZyh1aW50 NjRfdCBjdXN0b21Qcm90b2NvbElELCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QpCiB7Ci0gICAgbV9jaGlsZFByb2Nlc3Muc2VuZChNZXNzYWdlczo6TGVnYWN5Q3VzdG9t UHJvdG9jb2xNYW5hZ2VyUHJveHk6OlN0YXJ0TG9hZGluZyhjdXN0b21Qcm90b2NvbElELCByZXF1 ZXN0KSk7CisgICAgbV9uZXR3b3JrUHJvY2Vzcy5zZW5kKE1lc3NhZ2VzOjpMZWdhY3lDdXN0b21Q cm90b2NvbE1hbmFnZXJQcm94eTo6U3RhcnRMb2FkaW5nKGN1c3RvbVByb3RvY29sSUQsIHJlcXVl c3QpKTsKIH0KIAogdm9pZCBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXI6OnN0b3BMb2FkaW5n KHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCiB7Ci0gICAgbV9jaGlsZFByb2Nlc3Muc2VuZChN ZXNzYWdlczo6TGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHk6OlN0b3BMb2FkaW5nKGN1 c3RvbVByb3RvY29sSUQpLCAwKTsKKyAgICBtX25ldHdvcmtQcm9jZXNzLnNlbmQoTWVzc2FnZXM6 OkxlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5OjpTdG9wTG9hZGluZyhjdXN0b21Qcm90 b2NvbElEKSwgMCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvTGVnYWN5Q3VzdG9tUHJvdG9jb2xN YW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DdXN0 b21Qcm90b2NvbHMvTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyLmgJKHJldmlzaW9uIDI0MDAx MykKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0xlZ2Fj eUN1c3RvbVByb3RvY29sTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSwxMyArNTksMTMg QEAgY2xhc3MgUmVzb3VyY2VSZXNwb25zZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNz IENoaWxkUHJvY2VzczsKK2NsYXNzIE5ldHdvcmtQcm9jZXNzOwogc3RydWN0IE5ldHdvcmtQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOwogCiBjbGFzcyBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFn ZXIgOiBwdWJsaWMgTmV0d29ya1Byb2Nlc3NTdXBwbGVtZW50LCBwdWJsaWMgSVBDOjpNZXNzYWdl UmVjZWl2ZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKExlZ2FjeUN1c3RvbVByb3RvY29s TWFuYWdlcik7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgTGVnYWN5Q3VzdG9tUHJvdG9jb2xNYW5h Z2VyKENoaWxkUHJvY2VzcyYpOworICAgIGV4cGxpY2l0IExlZ2FjeUN1c3RvbVByb3RvY29sTWFu YWdlcihOZXR3b3JrUHJvY2VzcyYpOwogCiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIHN1cHBsZW1l bnROYW1lKCk7CiAKQEAgLTk2LDYgKzk2LDcgQEAgcHVibGljOgogCiAjaWYgUExBVEZPUk0oQ09D T0EpCiAgICAgdm9pZCByZWdpc3RlclByb3RvY29sQ2xhc3MoTlNVUkxTZXNzaW9uQ29uZmlndXJh dGlvbiopOworICAgIHN0YXRpYyB2b2lkIG5ldHdvcmtQcm9jZXNzQ3JlYXRlZChOZXR3b3JrUHJv Y2VzcyYpOwogI2VuZGlmCiAKIHByaXZhdGU6CkBAIC0xMTMsNyArMTE0LDcgQEAgcHJpdmF0ZToK IAogICAgIHZvaWQgcmVnaXN0ZXJQcm90b2NvbENsYXNzKCk7CiAKLSAgICBDaGlsZFByb2Nlc3Mm IG1fY2hpbGRQcm9jZXNzOworICAgIE5ldHdvcmtQcm9jZXNzJiBtX25ldHdvcmtQcm9jZXNzOwog CiAgICAgdHlwZWRlZiBIYXNoTWFwPHVpbnQ2NF90LCBDdXN0b21Qcm90b2NvbD4gQ3VzdG9tUHJv dG9jb2xNYXA7CiAgICAgQ3VzdG9tUHJvdG9jb2xNYXAgbV9jdXN0b21Qcm90b2NvbE1hcDsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0xl Z2FjeUN1c3RvbVByb3RvY29sTWFuYWdlckNvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0xlZ2FjeUN1c3RvbVBy b3RvY29sTWFuYWdlckNvY29hLm1tCShyZXZpc2lvbiAyNDAwMTMpCisrKyBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9Db2NvYS9MZWdhY3lDdXN0b21Qcm90b2Nv bE1hbmFnZXJDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksMTcgQEAKIAogdXNp bmcgbmFtZXNwYWNlIFdlYktpdDsKIAorc3RhdGljIFJlZlB0cjxOZXR3b3JrUHJvY2Vzcz4mIG5l d2VzdE5ldHdvcmtQcm9jZXNzKCkKK3sKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8UmVmUHRy PE5ldHdvcmtQcm9jZXNzPj4gbmV0d29ya1Byb2Nlc3M7CisgICAgcmV0dXJuIG5ldHdvcmtQcm9j ZXNzLmdldCgpOworfQorCit2b2lkIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcjo6bmV0d29y a1Byb2Nlc3NDcmVhdGVkKE5ldHdvcmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcykKK3sKKyAgICBu ZXdlc3ROZXR3b3JrUHJvY2VzcygpID0gJm5ldHdvcmtQcm9jZXNzOworfQorCiBAaW50ZXJmYWNl IFdLQ3VzdG9tUHJvdG9jb2wgOiBOU1VSTFByb3RvY29sIHsKIEBwcml2YXRlCiAgICAgdWludDY0 X3QgX2N1c3RvbVByb3RvY29sSUQ7CkBAIC01NCw3ICs2NSw3IEBAIEBpbnRlcmZhY2UgV0tDdXN0 b21Qcm90b2NvbCA6IE5TVVJMUHJvdG8KIAogKyAoQk9PTCljYW5Jbml0V2l0aFJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlcXVlc3QKIHsKLSAgICBpZiAoYXV0byogY3VzdG9tUHJvdG9jb2xNYW5h Z2VyID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8TGVnYWN5Q3VzdG9t UHJvdG9jb2xNYW5hZ2VyPigpKQorICAgIGlmIChhdXRvKiBjdXN0b21Qcm90b2NvbE1hbmFnZXIg PSBuZXdlc3ROZXR3b3JrUHJvY2VzcygpLT5zdXBwbGVtZW50PExlZ2FjeUN1c3RvbVByb3RvY29s TWFuYWdlcj4oKSkKICAgICAgICAgcmV0dXJuIGN1c3RvbVByb3RvY29sTWFuYWdlci0+c3VwcG9y dHNTY2hlbWUoW1tbcmVxdWVzdCBVUkxdIHNjaGVtZV0gbG93ZXJjYXNlU3RyaW5nXSk7CiAgICAg cmV0dXJuIE5POwogfQpAQCAtNzUsNyArODYsNyBAQCAtIChpZClpbml0V2l0aFJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlCiAgICAgaWYgKCFzZWxmKQogICAgICAgICByZXR1cm4gbmlsOwogCi0g ICAgaWYgKGF1dG8qIGN1c3RvbVByb3RvY29sTWFuYWdlciA9IE5ldHdvcmtQcm9jZXNzOjpzaW5n bGV0b24oKS5zdXBwbGVtZW50PExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlcj4oKSkKKyAgICBp ZiAoYXV0byogY3VzdG9tUHJvdG9jb2xNYW5hZ2VyID0gbmV3ZXN0TmV0d29ya1Byb2Nlc3MoKS0+ c3VwcGxlbWVudDxMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXI+KCkpCiAgICAgICAgIF9jdXN0 b21Qcm90b2NvbElEID0gY3VzdG9tUHJvdG9jb2xNYW5hZ2VyLT5hZGRDdXN0b21Qcm90b2NvbChz ZWxmKTsKICAgICBfaW5pdGlhbGl6YXRpb25SdW5Mb29wID0gQ0ZSdW5Mb29wR2V0Q3VycmVudCgp OwogCkBAIC04OSwxMyArMTAwLDEzIEBAIC0gKENGUnVuTG9vcFJlZilpbml0aWFsaXphdGlvblJ1 bkxvb3AKIAogLSAodm9pZClzdGFydExvYWRpbmcKIHsKLSAgICBpZiAoYXV0byogY3VzdG9tUHJv dG9jb2xNYW5hZ2VyID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8TGVn YWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPigpKQorICAgIGlmIChhdXRvKiBjdXN0b21Qcm90b2Nv bE1hbmFnZXIgPSBuZXdlc3ROZXR3b3JrUHJvY2VzcygpLT5zdXBwbGVtZW50PExlZ2FjeUN1c3Rv bVByb3RvY29sTWFuYWdlcj4oKSkKICAgICAgICAgY3VzdG9tUHJvdG9jb2xNYW5hZ2VyLT5zdGFy dExvYWRpbmcoc2VsZi5jdXN0b21Qcm90b2NvbElELCBbc2VsZiByZXF1ZXN0XSk7CiB9CiAKIC0g KHZvaWQpc3RvcExvYWRpbmcKIHsKLSAgICBpZiAoYXV0byogY3VzdG9tUHJvdG9jb2xNYW5hZ2Vy ID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8TGVnYWN5Q3VzdG9tUHJv dG9jb2xNYW5hZ2VyPigpKSB7CisgICAgaWYgKGF1dG8qIGN1c3RvbVByb3RvY29sTWFuYWdlciA9 IG5ld2VzdE5ldHdvcmtQcm9jZXNzKCktPnN1cHBsZW1lbnQ8TGVnYWN5Q3VzdG9tUHJvdG9jb2xN YW5hZ2VyPigpKSB7CiAgICAgICAgIGN1c3RvbVByb3RvY29sTWFuYWdlci0+c3RvcExvYWRpbmco c2VsZi5jdXN0b21Qcm90b2NvbElEKTsKICAgICAgICAgY3VzdG9tUHJvdG9jb2xNYW5hZ2VyLT5y ZW1vdmVDdXN0b21Qcm90b2NvbChzZWxmLmN1c3RvbVByb3RvY29sSUQpOwogICAgIH0K