154829 2016-02-29 12:02:55 -0800 Don't call NetworkProcess::singleton from WebProcess when using NetworkSession 2016-02-29 15:40:01 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen andersca beidson oldest_to_newest 1169227 0 achristensen 2016-02-29 12:02:55 -0800 Don't call NetworkProcess::singleton from WebProcess when using NetworkSession 1169230 1 272509 achristensen 2016-02-29 12:08:55 -0800 Created attachment 272509 Patch 1169235 2 272511 achristensen 2016-02-29 12:33:36 -0800 Created attachment 272511 Patch 1169238 3 272511 achristensen 2016-02-29 12:43:34 -0800 Comment on attachment 272511 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272511&action=review > Source/WebKit2/WebProcess/WebProcess.cpp:194 > + NetworkSession::setCustomProtocolManager(nullptr); This doesn't do anything. Will land without it. 1169239 4 achristensen 2016-02-29 12:47:52 -0800 http://trac.webkit.org/changeset/197362 1169291 5 272511 darin 2016-02-29 15:36:04 -0800 Comment on attachment 272511 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272511&action=review > Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm:221 > + NeverDestroyed<RefPtr<CustomProtocolManager>> gCustomProtocolManager; You really need “static” here. I’m not sure exactly what this will do without the static, but nothing good. I think in practice it means we will leak all the CustomProtocolManager objects and always have null for the protocol manager. Also, I don’t think you should name this local variable with a "g" prefix. 1169292 6 achristensen 2016-02-29 15:40:01 -0800 Sure enough. This regressed WebKit2CustomProtocolsTest when using NetworkSession for that very reason. Will fix. 272509 2016-02-29 12:08:55 -0800 2016-02-29 12:33:34 -0800 Patch bug-154829-20160229120839.patch text/plain 4913 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzM2MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE2LTAyLTI5ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgY2Fs bCBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uIGZyb20gV2ViUHJvY2VzcyB3aGVuIHVzaW5nIE5l dHdvcmtTZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTQ4MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZSB3ZXJlIGNhbGxpbmcgTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbiB3aGVuIG1ha2lu ZyB0aGUgZGVmYXVsdCBzZXNzaW9uIGluIHRoZSAKKyAgICAgICAgV2ViUHJvY2Vzcywgd2hpY2gg Y2F1c2VkIGJhZCB0aGluZ3MgdG8gaGFwcGVuLiAgV2UgYWxzbyB3ZXJlIG5ldmVyIGNsZWFyaW5n IHRoZSAKKyAgICAgICAgY3JlZGVudGlhbHMgaW4gdGhlIFdlYlByb2Nlc3MgYmV0d2VlbiB0ZXN0 cyBiZWNhdXNlIGl0IHVzZWQgdG8gYWx3YXlzIGNhbGwKKyAgICAgICAgTmV0d29ya1Byb2Nlc3M6 OnNpbmdsZXRvbiwgd2hpY2ggY2F1c2VkIGZsYWt5IHRlc3RzLgorCisgICAgICAgIFRoaXMgZml4 ZXMgcmVwZWF0YWJsZSBjcmFzaGVzIGluIGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtZG9jdW1lbnQt cmVmZXJlci5odG1sIGFuZCAKKyAgICAgICAgaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1kb2N1bWVu dC5odG1sIHdoZW4gdXNpbmcgTmV0d29ya1Nlc3Npb24uCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNz OjpOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp+TmV0 d29ya1Byb2Nlc3MpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmg6 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToK KyAgICAgICAgKFdlYktpdDo6Y29uZmlndXJhdGlvbkZvclR5cGUpOgorICAgICAgICAoV2ViS2l0 OjpnbG9iYWxDdXN0b21Qcm90b2NvbE1hbmFnZXIpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr U2Vzc2lvbjo6c2V0Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Nlc3Npb246OmRlZmF1bHRTZXNzaW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjptX3dlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcik6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmNsZWFyQ2FjaGVkQ3JlZGVudGlhbHMpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpmb2N1c2VkV2ViUGFnZSk6CisKIDIwMTYtMDIt MjkgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAg IFJlZkNvdW50ZXI8VD46OkV2ZW50IC0+IFJlZkNvdW50ZXJFdmVudApJbmRleDogU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAkocmV2aXNpb24g MTk3MjIzKQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw3IEBAIE5ldHdvcmtQcm9jZXNzOjpOZXR3 b3JrUHJvY2VzcygpCiAgICAgYWRkU3VwcGxlbWVudDxBdXRoZW50aWNhdGlvbk1hbmFnZXI+KCk7 CiAgICAgYWRkU3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpOwogICAgIGFkZFN1cHBsZW1l bnQ8Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPigpOworICAgIE5ldHdvcmtTZXNzaW9uOjpzZXRDdXN0 b21Qcm90b2NvbE1hbmFnZXIoc3VwcGxlbWVudDxDdXN0b21Qcm90b2NvbE1hbmFnZXI+KCkpOwog fQogCiBOZXR3b3JrUHJvY2Vzczo6fk5ldHdvcmtQcm9jZXNzKCkKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAkocmV2aXNpb24gMTk3MjIz KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAkod29y a2luZyBjb3B5KQpAQCAtNTMsNiArNTMsNyBAQCBwdWJsaWM6CiAgICAgTmV0d29ya1Nlc3Npb24o VHlwZSwgV2ViQ29yZTo6U2Vzc2lvbklELCBDdXN0b21Qcm90b2NvbE1hbmFnZXIqKTsKICAgICB+ TmV0d29ya1Nlc3Npb24oKTsKIAorICAgIHN0YXRpYyB2b2lkIHNldEN1c3RvbVByb3RvY29sTWFu YWdlcihDdXN0b21Qcm90b2NvbE1hbmFnZXIqKTsKICAgICBzdGF0aWMgTmV0d29ya1Nlc3Npb24m IGRlZmF1bHRTZXNzaW9uKCk7CiAgICAgdm9pZCBjbGVhckNyZWRlbnRpYWxzKCk7CiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2Eu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0 d29ya1Nlc3Npb25Db2NvYS5tbQkocmV2aXNpb24gMTk3MjIzKQorKysgU291cmNlL1dlYktpdDIv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkod29ya2luZyBjb3B5 KQpAQCAtMjE2LDEwICsyMTYsMjEgQEAgc3RhdGljIE5TVVJMU2Vzc2lvbkNvbmZpZ3VyYXRpb24g KmNvbmZpZwogICAgIH0KIH0KIAorc3RhdGljIFJlZlB0cjxDdXN0b21Qcm90b2NvbE1hbmFnZXI+ JiBnbG9iYWxDdXN0b21Qcm90b2NvbE1hbmFnZXIoKQoreworICAgIE5ldmVyRGVzdHJveWVkPFJl ZlB0cjxDdXN0b21Qcm90b2NvbE1hbmFnZXI+PiBnQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOworICAg IHJldHVybiBnQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyLmdldCgpOworfQorCit2b2lkIE5ldHdvcmtT ZXNzaW9uOjpzZXRDdXN0b21Qcm90b2NvbE1hbmFnZXIoQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyKiBj dXN0b21Qcm90b2NvbE1hbmFnZXIpCit7CisgICAgZ2xvYmFsQ3VzdG9tUHJvdG9jb2xNYW5hZ2Vy KCkgPSBjdXN0b21Qcm90b2NvbE1hbmFnZXI7Cit9CisKIE5ldHdvcmtTZXNzaW9uJiBOZXR3b3Jr U2Vzc2lvbjo6ZGVmYXVsdFNlc3Npb24oKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7 Ci0gICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPE5ldHdvcmtTZXNzaW9uPiBzZXNzaW9uKE5ldHdv cmtTZXNzaW9uOjpUeXBlOjpOb3JtYWwsIFdlYkNvcmU6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Np b25JRCgpLCBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuc3VwcGxlbWVudDxDdXN0b21Qcm90 b2NvbE1hbmFnZXI+KCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxOZXR3b3JrU2Vzc2lv bj4gc2Vzc2lvbihOZXR3b3JrU2Vzc2lvbjo6VHlwZTo6Tm9ybWFsLCBXZWJDb3JlOjpTZXNzaW9u SUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSwgZ2xvYmFsQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyKCkuZ2V0 KCkpOwogICAgIHJldHVybiBzZXNzaW9uOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDE5NzIyMykKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5MCw2ICsxOTAs NyBAQCBXZWJQcm9jZXNzOjpXZWJQcm9jZXNzKCkKICAgICBhZGRTdXBwbGVtZW50PFdlYk1lZGlh S2V5U3RvcmFnZU1hbmFnZXI+KCk7CiAjZW5kaWYKICAgICBtX3BsdWdJbkF1dG9TdGFydE9yaWdp bkhhc2hlcy5hZGQoU2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCksIEhhc2hNYXA8dW5zaWdu ZWQsIGRvdWJsZT4oKSk7CisgICAgTmV0d29ya1Nlc3Npb246OnNldEN1c3RvbVByb3RvY29sTWFu YWdlcihudWxscHRyKTsKIAogI2lmIEVOQUJMRShJTkRFWEVEX0RBVEFCQVNFKQogICAgIFJ1bnRp bWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuc2V0V2Via2l0SW5kZXhlZERCRW5h YmxlZCh0cnVlKTsKQEAgLTUwMSw2ICs1MDIsOSBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldENhY2hl TW9kZWwodWludDMyX3QgCiB2b2lkIFdlYlByb2Nlc3M6OmNsZWFyQ2FjaGVkQ3JlZGVudGlhbHMo KQogewogICAgIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6ZGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCku Y3JlZGVudGlhbFN0b3JhZ2UoKS5jbGVhckNyZWRlbnRpYWxzKCk7CisjaWYgVVNFKE5FVFdPUktf U0VTU0lPTikKKyAgICBOZXR3b3JrU2Vzc2lvbjo6ZGVmYXVsdFNlc3Npb24oKS5jbGVhckNyZWRl bnRpYWxzKCk7CisjZW5kaWYKIH0KIAogV2ViUGFnZSogV2ViUHJvY2Vzczo6Zm9jdXNlZFdlYlBh Z2UoKSBjb25zdAo= 272511 2016-02-29 12:33:36 -0800 2016-02-29 12:42:53 -0800 Patch bug-154829-20160229123321.patch text/plain 4981 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzM2MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE2LTAyLTI5ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgY2Fs bCBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uIGZyb20gV2ViUHJvY2VzcyB3aGVuIHVzaW5nIE5l dHdvcmtTZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTQ4MjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZSB3ZXJlIGNhbGxpbmcgTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbiB3aGVuIG1ha2lu ZyB0aGUgZGVmYXVsdCBzZXNzaW9uIGluIHRoZSAKKyAgICAgICAgV2ViUHJvY2Vzcywgd2hpY2gg Y2F1c2VkIGJhZCB0aGluZ3MgdG8gaGFwcGVuLiAgV2UgYWxzbyB3ZXJlIG5ldmVyIGNsZWFyaW5n IHRoZSAKKyAgICAgICAgY3JlZGVudGlhbHMgaW4gdGhlIFdlYlByb2Nlc3MgYmV0d2VlbiB0ZXN0 cyBiZWNhdXNlIGl0IHVzZWQgdG8gYWx3YXlzIGNhbGwKKyAgICAgICAgTmV0d29ya1Byb2Nlc3M6 OnNpbmdsZXRvbiwgd2hpY2ggY2F1c2VkIGZsYWt5IHRlc3RzLgorCisgICAgICAgIFRoaXMgZml4 ZXMgcmVwZWF0YWJsZSBjcmFzaGVzIGluIGh0dHAvdGVzdHMvbWVkaWEvbWVkaWEtZG9jdW1lbnQt cmVmZXJlci5odG1sIGFuZCAKKyAgICAgICAgaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1kb2N1bWVu dC5odG1sIHdoZW4gdXNpbmcgTmV0d29ya1Nlc3Npb24uCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNz OjpOZXR3b3JrUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjp+TmV0 d29ya1Byb2Nlc3MpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmg6 CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToK KyAgICAgICAgKFdlYktpdDo6Y29uZmlndXJhdGlvbkZvclR5cGUpOgorICAgICAgICAoV2ViS2l0 OjpnbG9iYWxDdXN0b21Qcm90b2NvbE1hbmFnZXIpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr U2Vzc2lvbjo6c2V0Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Nlc3Npb246OmRlZmF1bHRTZXNzaW9uKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjptX3dlYlNRTGl0ZURhdGFiYXNlVHJhY2tlcik6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmNsZWFyQ2FjaGVkQ3JlZGVudGlhbHMpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpmb2N1c2VkV2ViUGFnZSk6CisKIDIwMTYtMDIt MjkgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAg IFJlZkNvdW50ZXI8VD46OkV2ZW50IC0+IFJlZkNvdW50ZXJFdmVudApJbmRleDogU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcAkocmV2aXNpb24g MTk3MjIzKQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw5IEBAIE5ldHdvcmtQcm9jZXNzOjpOZXR3 b3JrUHJvY2VzcygpCiAgICAgYWRkU3VwcGxlbWVudDxBdXRoZW50aWNhdGlvbk1hbmFnZXI+KCk7 CiAgICAgYWRkU3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpOwogICAgIGFkZFN1cHBsZW1l bnQ8Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPigpOworI2lmIFVTRShORVRXT1JLX1NFU1NJT04pCisg ICAgTmV0d29ya1Nlc3Npb246OnNldEN1c3RvbVByb3RvY29sTWFuYWdlcihzdXBwbGVtZW50PEN1 c3RvbVByb3RvY29sTWFuYWdlcj4oKSk7CisjZW5kaWYKIH0KIAogTmV0d29ya1Byb2Nlc3M6On5O ZXR3b3JrUHJvY2VzcygpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrU2Vzc2lvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L05ldHdvcmtTZXNzaW9uLmgJKHJldmlzaW9uIDE5NzIyMykKKysrIFNvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzLDYgKzUz LDcgQEAgcHVibGljOgogICAgIE5ldHdvcmtTZXNzaW9uKFR5cGUsIFdlYkNvcmU6OlNlc3Npb25J RCwgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyKik7CiAgICAgfk5ldHdvcmtTZXNzaW9uKCk7CiAKKyAg ICBzdGF0aWMgdm9pZCBzZXRDdXN0b21Qcm90b2NvbE1hbmFnZXIoQ3VzdG9tUHJvdG9jb2xNYW5h Z2VyKik7CiAgICAgc3RhdGljIE5ldHdvcmtTZXNzaW9uJiBkZWZhdWx0U2Vzc2lvbigpOwogICAg IHZvaWQgY2xlYXJDcmVkZW50aWFscygpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHJl dmlzaW9uIDE5NzIyMykKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05l dHdvcmtTZXNzaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTIxNiwxMCArMjE2LDIxIEBA IHN0YXRpYyBOU1VSTFNlc3Npb25Db25maWd1cmF0aW9uICpjb25maWcKICAgICB9CiB9CiAKK3N0 YXRpYyBSZWZQdHI8Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPiYgZ2xvYmFsQ3VzdG9tUHJvdG9jb2xN YW5hZ2VyKCkKK3sKKyAgICBOZXZlckRlc3Ryb3llZDxSZWZQdHI8Q3VzdG9tUHJvdG9jb2xNYW5h Z2VyPj4gZ0N1c3RvbVByb3RvY29sTWFuYWdlcjsKKyAgICByZXR1cm4gZ0N1c3RvbVByb3RvY29s TWFuYWdlci5nZXQoKTsKK30KKwordm9pZCBOZXR3b3JrU2Vzc2lvbjo6c2V0Q3VzdG9tUHJvdG9j b2xNYW5hZ2VyKEN1c3RvbVByb3RvY29sTWFuYWdlciogY3VzdG9tUHJvdG9jb2xNYW5hZ2VyKQor eworICAgIGdsb2JhbEN1c3RvbVByb3RvY29sTWFuYWdlcigpID0gY3VzdG9tUHJvdG9jb2xNYW5h Z2VyOworfQorCiBOZXR3b3JrU2Vzc2lvbiYgTmV0d29ya1Nlc3Npb246OmRlZmF1bHRTZXNzaW9u KCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHN0YXRpYyBOZXZlckRlc3Ry b3llZDxOZXR3b3JrU2Vzc2lvbj4gc2Vzc2lvbihOZXR3b3JrU2Vzc2lvbjo6VHlwZTo6Tm9ybWFs LCBXZWJDb3JlOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9uSUQoKSwgTmV0d29ya1Byb2Nlc3M6 OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPigpKTsKKyAgICBz dGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TmV0d29ya1Nlc3Npb24+IHNlc3Npb24oTmV0d29ya1Nlc3Np b246OlR5cGU6Ok5vcm1hbCwgV2ViQ29yZTo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCks IGdsb2JhbEN1c3RvbVByb3RvY29sTWFuYWdlcigpLmdldCgpKTsKICAgICByZXR1cm4gc2Vzc2lv bjsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCShy ZXZpc2lvbiAxOTcyMjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTAsNiArMTkwLDkgQEAgV2ViUHJvY2Vzczo6V2ViUHJv Y2VzcygpCiAgICAgYWRkU3VwcGxlbWVudDxXZWJNZWRpYUtleVN0b3JhZ2VNYW5hZ2VyPigpOwog I2VuZGlmCiAgICAgbV9wbHVnSW5BdXRvU3RhcnRPcmlnaW5IYXNoZXMuYWRkKFNlc3Npb25JRDo6 ZGVmYXVsdFNlc3Npb25JRCgpLCBIYXNoTWFwPHVuc2lnbmVkLCBkb3VibGU+KCkpOworI2lmIFVT RShORVRXT1JLX1NFU1NJT04pCisgICAgTmV0d29ya1Nlc3Npb246OnNldEN1c3RvbVByb3RvY29s TWFuYWdlcihudWxscHRyKTsKKyNlbmRpZgogCiAjaWYgRU5BQkxFKElOREVYRURfREFUQUJBU0Up CiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRXZWJraXRJ bmRleGVkREJFbmFibGVkKHRydWUpOwpAQCAtNTAxLDYgKzUwNCw5IEBAIHZvaWQgV2ViUHJvY2Vz czo6c2V0Q2FjaGVNb2RlbCh1aW50MzJfdCAKIHZvaWQgV2ViUHJvY2Vzczo6Y2xlYXJDYWNoZWRD cmVkZW50aWFscygpCiB7CiAgICAgTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFn ZVNlc3Npb24oKS5jcmVkZW50aWFsU3RvcmFnZSgpLmNsZWFyQ3JlZGVudGlhbHMoKTsKKyNpZiBV U0UoTkVUV09SS19TRVNTSU9OKQorICAgIE5ldHdvcmtTZXNzaW9uOjpkZWZhdWx0U2Vzc2lvbigp LmNsZWFyQ3JlZGVudGlhbHMoKTsKKyNlbmRpZgogfQogCiBXZWJQYWdlKiBXZWJQcm9jZXNzOjpm b2N1c2VkV2ViUGFnZSgpIGNvbnN0Cg==