182161 2018-01-25 17:26:49 -0800 Clean up more networking code 2018-01-26 10:37:55 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen andersca webkit-bug-importer oldest_to_newest 1393373 0 achristensen 2018-01-25 17:26:49 -0800 Clean up more networking code 1393374 1 332339 achristensen 2018-01-25 17:28:52 -0800 Created attachment 332339 Patch 1393561 2 achristensen 2018-01-26 10:36:44 -0800 trac.webkit.org/r227682 1393562 3 webkit-bug-importer 2018-01-26 10:37:55 -0800 <rdar://problem/36914816> 332339 2018-01-25 17:28:52 -0800 2018-01-26 09:01:58 -0800 Patch bug-182161-20180125172851.patch text/plain 12414 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjc2NDYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE4LTAxLTI1ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ2xlYW4gdXAgbW9y ZSBuZXR3b3JraW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4MjE2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFR3byBjbGVhbnVwczoKKyAgICAgICAgMS4gVGhlIFdlYlByb2Nlc3MgZG9lc24n dCBuZWVkIHRvIGluaXRpYWxpemUgTmV0d29ya1Nlc3Npb25zLgorICAgICAgICAyLiBXZWJGcmFt ZU5ldHdvcmtpbmdDb250ZXh0IGRvZXNuJ3QgbmVlZCB0byBoYXZlIHRoZSBOZXR3b3JraW5nQ29u dGV4dCBmdW5jdGlvbnMgdG8gc3VwcG9ydCBSZXNvdXJjZUhhbmRsZXMgaW4gV2ViS2l0IGFueSBt b3JlLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlBy b2Nlc3MuY3BwOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmg6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQuaDoKKyAgICAgICAg KCk6IERlbGV0ZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nl c3NDb2NvYS5tbToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL1JlbW90ZU5ldHdvcmtp bmdDb250ZXh0Q3VybC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250 ZXh0Ojp+UmVtb3RlTmV0d29ya2luZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6aXNWYWxpZCBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0OjpzdG9yYWdlU2Vzc2lvbiBjb25z dCk6IERlbGV0ZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtp bmdDb250ZXh0Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6 flJlbW90ZU5ldHdvcmtpbmdDb250ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6UmVt b3RlTmV0d29ya2luZ0NvbnRleHQ6OmlzVmFsaWQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6bG9jYWxGaWxlQ29udGVudFNuaWZmaW5n RW5hYmxlZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZU5ldHdvcmtp bmdDb250ZXh0OjpzdG9yYWdlU2Vzc2lvbiBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0 Ojpzb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViS2l0OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6YmxvY2tlZEVycm9yIGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9zb3VwL1JlbW90ZU5ldHdvcmtpbmdDb250 ZXh0U291cC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojp+ UmVtb3RlTmV0d29ya2luZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVOZXR3b3JraW5nQ29udGV4dDo6aXNWYWxpZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0OjpzdG9yYWdlU2Vzc2lvbiBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVO ZXR3b3JraW5nQ29udGV4dC5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVOZXR3b3JraW5n Q29udGV4dDo6ZW5zdXJlV2Vic2l0ZURhdGFTdG9yZVNlc3Npb24pOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRp YWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6Y2xlYXJDYWNo ZWRDcmVkZW50aWFscyk6CisKIDIwMTgtMDEtMjUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gW1dLMl0gSW50cm9kdWNlIG5ldyB2aWV3cyBh bmQgdmlldyBjb250cm9sbGVycyB0byBzdXBwb3J0IGV4dHJhLXpvb21lZCB0ZXh0IGZvcm0gY29u dHJvbHMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rp b25Ub1dlYlByb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCShyZXZpc2lvbiAyMjc1OTAp CisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQ cm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUgIk5l dHdvcmtTb2NrZXRTdHJlYW1NZXNzYWdlcy5oIgogI2luY2x1ZGUgIlBpbmdMb2FkLmgiCiAjaW5j bHVkZSAiUHJlY29ubmVjdFRhc2suaCIKLSNpbmNsdWRlICJSZW1vdGVOZXR3b3JraW5nQ29udGV4 dC5oIgogI2luY2x1ZGUgIlNlc3Npb25UcmFja2VyLmgiCiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzLmgiCiAjaW5jbHVkZSAiV2ViRXJyb3JzLmgiCkluZGV4OiBTb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5oCShyZXZpc2lvbiAyMjc1OTApCisrKyBTb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgJKHdvcmtpbmcgY29weSkKQEAg LTI5LDcgKzI5LDYgQEAKICNpbmNsdWRlICJOZXR3b3JrRGF0YVRhc2suaCIKICNpbmNsdWRlICJO ZXR3b3JrTG9hZENsaWVudC5oIgogI2luY2x1ZGUgIk5ldHdvcmtMb2FkUGFyYW1ldGVycy5oIgot I2luY2x1ZGUgIlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9B dXRoZW50aWNhdGlvbkNoYWxsZW5nZS5oPgogI2luY2x1ZGUgPHd0Zi9Db21wbGV0aW9uSGFuZGxl ci5oPgogI2luY2x1ZGUgPHd0Zi9PcHRpb25hbC5oPgpJbmRleDogU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQuaAkocmV2aXNp b24gMjI3NTkwKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9SZW1vdGVOZXR3b3Jr aW5nQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw4ICsyNCw3IEBACiAgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBSZW1vdGVOZXR3b3JraW5n Q29udGV4dF9oCi0jZGVmaW5lIFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0X2gKKyNwcmFnbWEgb25j ZQogCiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JraW5nQ29udGV4dC5oPgogI2luY2x1ZGUgPHBh bC9TZXNzaW9uSUQuaD4KQEAgLTM0LDQ1ICszMywxMCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAog c3RydWN0IFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzOwogCi1jbGFzcyBSZW1vdGVOZXR3b3Jr aW5nQ29udGV4dCBmaW5hbCA6IHB1YmxpYyBXZWJDb3JlOjpOZXR3b3JraW5nQ29udGV4dCB7Citj bGFzcyBSZW1vdGVOZXR3b3JraW5nQ29udGV4dCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxS ZW1vdGVOZXR3b3JraW5nQ29udGV4dD4gY3JlYXRlKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwg Ym9vbCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KQotICAgIHsKLSAg ICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUmVtb3RlTmV0d29ya2luZ0NvbnRleHQoc2Vzc2lv bklELCBzaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KSk7Ci0gICAgfQot ICAgIHZpcnR1YWwgflJlbW90ZU5ldHdvcmtpbmdDb250ZXh0KCk7Ci0KICAgICAvLyBGSVhNRTog UmVtb3ZlIHBsYXRmb3JtLXNwZWNpZmljIGNvZGUgYW5kIHVzZSBTZXNzaW9uVHJhY2tlci4KICAg ICBzdGF0aWMgdm9pZCBlbnN1cmVXZWJzaXRlRGF0YVN0b3JlU2Vzc2lvbihXZWJzaXRlRGF0YVN0 b3JlUGFyYW1ldGVycyYmKTsKLQotICAgIGJvb2wgc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNU b0hUVFBSZWRpcmVjdCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fc2hvdWxkQ2xlYXJSZWZl cnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdDsgfQotCi1wcml2YXRlOgotICAgIFJlbW90ZU5ldHdv cmtpbmdDb250ZXh0KFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgYm9vbCBzaG91bGRDbGVhclJl ZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KQotICAgICAgICA6IG1fc2Vzc2lvbklEKHNlc3Np b25JRCkKLSAgICAgICAgLCBtX3Nob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJl Y3Qoc2hvdWxkQ2xlYXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCkKLSAgICB7Ci0gICAg fQotCi0gICAgYm9vbCBpc1ZhbGlkKCkgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgV2ViQ29yZTo6TmV0 d29ya1N0b3JhZ2VTZXNzaW9uJiBzdG9yYWdlU2Vzc2lvbigpIGNvbnN0IG92ZXJyaWRlOwotCi0j aWYgUExBVEZPUk0oQ09DT0EpCi0gICAgdm9pZCBzZXRMb2NhbEZpbGVDb250ZW50U25pZmZpbmdF bmFibGVkKGJvb2wgdmFsdWUpIHsgbV9sb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkID0g dmFsdWU7IH0KLSAgICBib29sIGxvY2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWQoKSBjb25z dCBvdmVycmlkZTsKLSAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1 ZGl0RGF0YSgpIGNvbnN0IG92ZXJyaWRlOwotICAgIFN0cmluZyBzb3VyY2VBcHBsaWNhdGlvbklk ZW50aWZpZXIoKSBjb25zdCBvdmVycmlkZTsKLSAgICBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGJs b2NrZWRFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKSBjb25zdCBvdmVycmlk ZTsKLSNlbmRpZgotCi0gICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7Ci0gICAgYm9vbCBt X3Nob3VsZENsZWFyUmVmZXJyZXJPbkhUVFBTVG9IVFRQUmVkaXJlY3Q7Ci0KLSNpZiBQTEFURk9S TShDT0NPQSkKLSAgICBib29sIG1fbG9jYWxGaWxlQ29udGVudFNuaWZmaW5nRW5hYmxlZCA9IGZh bHNlOwotI2VuZGlmCiB9OwogCiB9Ci0KLSNlbmRpZiAvLyBSZW1vdGVOZXR3b3JraW5nQ29udGV4 dF9oCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9j ZXNzQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9j b2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAyMjc1OTApCisrKyBTb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW0JKHdvcmtp bmcgY29weSkKQEAgLTMwLDcgKzMwLDYgQEAKICNpbXBvcnQgIk5ldHdvcmtQcm9jZXNzQ3JlYXRp b25QYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJOZXR3b3JrUmVzb3VyY2VMb2FkZXIuaCIKICNpbXBv cnQgIk5ldHdvcmtTZXNzaW9uQ29jb2EuaCIKLSNpbXBvcnQgIlJlbW90ZU5ldHdvcmtpbmdDb250 ZXh0LmgiCiAjaW1wb3J0ICJTYW5kYm94RXh0ZW5zaW9uLmgiCiAjaW1wb3J0ICJTZXNzaW9uVHJh Y2tlci5oIgogI2ltcG9ydCA8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9SZW1vdGVOZXR3b3JraW5nQ29udGV4 dEN1cmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3Vy bC9SZW1vdGVOZXR3b3JraW5nQ29udGV4dEN1cmwuY3BwCShyZXZpc2lvbiAyMjc1OTApCisrKyBT b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvUmVtb3RlTmV0d29ya2luZ0NvbnRleHRD dXJsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMzUgKzI2LDE2IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiUmVtb3RlTmV0d29ya2luZ0NvbnRleHQuaCIKIAotI2luY2x1ZGUg Ik5ldHdvcmtTZXNzaW9uLmgiCi0jaW5jbHVkZSAiU2Vzc2lvblRyYWNrZXIuaCIKICNpbmNsdWRl ICJXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycy5oIgotI2luY2x1ZGUgPFdlYkNvcmUvTmV0d29y a1N0b3JhZ2VTZXNzaW9uLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgot I2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VFcnJvci5oPgotI2luY2x1ZGUgPFdlYkNvcmUvUmVz b3VyY2VIYW5kbGUuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCi1SZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6flJlbW90ZU5ldHdvcmtpbmdDb250 ZXh0KCkKLXsKLX0KLQotYm9vbCBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6aXNWYWxpZCgpIGNv bnN0Ci17Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgUmVtb3RlTmV0d29ya2luZ0NvbnRl eHQ6OmVuc3VyZVdlYnNpdGVEYXRhU3RvcmVTZXNzaW9uKFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0 ZXJzJiYpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotTmV0d29ya1N0b3JhZ2VTZXNz aW9uJiBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6c3RvcmFnZVNlc3Npb24oKSBjb25zdAotewot ICAgIHJldHVybiBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigp OwotfQotCiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL21hYy9SZW1vdGVO ZXR3b3JraW5nQ29udGV4dC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5tbQkocmV2aXNpb24gMjI3NTkwKQor KysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2luZ0NvbnRl eHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyLDQ1ICs0Miw2IEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotCi1SZW1vdGVOZXR3b3JraW5nQ29udGV4 dDo6flJlbW90ZU5ldHdvcmtpbmdDb250ZXh0KCkKLXsKLX0KLQotYm9vbCBSZW1vdGVOZXR3b3Jr aW5nQ29udGV4dDo6aXNWYWxpZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLWJv b2wgUmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OmxvY2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJs ZWQoKSBjb25zdAotewotICAgIHJldHVybiBtX2xvY2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJs ZWQ7Ci19Ci0KLU5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgUmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6 OnN0b3JhZ2VTZXNzaW9uKCkgY29uc3QKLXsKLSAgICBpZiAoYXV0byBzZXNzaW9uID0gTmV0d29y a1N0b3JhZ2VTZXNzaW9uOjpzdG9yYWdlU2Vzc2lvbihtX3Nlc3Npb25JRCkpCi0gICAgICAgIHJl dHVybiAqc2Vzc2lvbjsKLSAgICAvLyBTb21lIHJlcXVlc3RzIG1heSBzdGlsbCBiZSBjb21pbmcg c2hvcnRseSBhZnRlciBOZXR3b3JrUHJvY2VzcyB3YXMgdG9sZCB0byBkZXN0cm95IGl0cyBzZXNz aW9uLgotICAgIExPR19FUlJPUigiSW52YWxpZCBzZXNzaW9uIElELiBQbGVhc2UgZmlsZSBhIGJ1 ZyB1bmxlc3MgeW91IGp1c3QgZGlzYWJsZWQgcHJpdmF0ZSBicm93c2luZywgaW4gd2hpY2ggY2Fz ZSBpdCdzIGFuIGV4cGVjdGVkIHJhY2UuIik7Ci0gICAgcmV0dXJuIE5ldHdvcmtTdG9yYWdlU2Vz c2lvbjo6ZGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCk7Ci19Ci0KLVJldGFpblB0cjxDRkRhdGFSZWY+ IFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNv bnN0Ci17Ci0gICAgcmV0dXJuIE5ldHdvcmtQcm9jZXNzOjpzaW5nbGV0b24oKS5zb3VyY2VBcHBs aWNhdGlvbkF1ZGl0RGF0YSgpOwotfQotCi1TdHJpbmcgUmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6 OnNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFNlc3Np b25UcmFja2VyOjpnZXRJZGVudGlmaWVyQmFzZSgpOwotfQotCi1SZXNvdXJjZUVycm9yIFJlbW90 ZU5ldHdvcmtpbmdDb250ZXh0OjpibG9ja2VkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0KSBjb25zdAotewotICAgIHJldHVybiBXZWJLaXQ6OmJsb2NrZWRFcnJvcihyZXF1ZXN0 KTsKLX0KLQogdm9pZCBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6ZW5zdXJlV2Vic2l0ZURhdGFT dG9yZVNlc3Npb24oV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogewog ICAgIGF1dG8gc2Vzc2lvbklEID0gcGFyYW1ldGVycy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMu c2Vzc2lvbklEOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL1JlbW90 ZU5ldHdvcmtpbmdDb250ZXh0U291cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9zb3VwL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0U291cC5jcHAJKHJldmlz aW9uIDIyNzU5MCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9SZW1vdGVO ZXR3b3JraW5nQ29udGV4dFNvdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwyMiArMzIsMTEg QEAKICNpbmNsdWRlICJTZXNzaW9uVHJhY2tlci5oIgogI2luY2x1ZGUgIldlYnNpdGVEYXRhU3Rv cmVQYXJhbWV0ZXJzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24u aD4KLSNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+Ci0jaW5jbHVkZSA8V2ViQ29y ZS9SZXNvdXJjZUhhbmRsZS5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNw YWNlIFdlYktpdCB7CiAKLVJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojp+UmVtb3RlTmV0d29ya2lu Z0NvbnRleHQoKQotewotfQotCi1ib29sIFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojppc1ZhbGlk KCkgY29uc3QKLXsKLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQogdm9pZCBSZW1vdGVOZXR3b3JraW5n Q29udGV4dDo6ZW5zdXJlV2Vic2l0ZURhdGFTdG9yZVNlc3Npb24oV2Vic2l0ZURhdGFTdG9yZVBh cmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogewogICAgIGF1dG8gc2Vzc2lvbklEID0gcGFyYW1ldGVy cy5uZXR3b3JrU2Vzc2lvblBhcmFtZXRlcnMuc2Vzc2lvbklEOwpAQCAtNTgsMTEgKzQ3LDQgQEAg dm9pZCBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6ZW5zdXJlV2VicwogICAgIFNlc3Npb25UcmFj a2VyOjpzZXRTZXNzaW9uKHNlc3Npb25JRCwgTmV0d29ya1Nlc3Npb246OmNyZWF0ZShXVEZNb3Zl KHBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzKSkpOwogfQogCi1OZXR3b3JrU3Rv cmFnZVNlc3Npb24mIFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0OjpzdG9yYWdlU2Vzc2lvbigpIGNv bnN0Ci17Ci0gICAgaWYgKGF1dG8gc2Vzc2lvbiA9IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c3Rv cmFnZVNlc3Npb24obV9zZXNzaW9uSUQpKQotICAgICAgICByZXR1cm4gKnNlc3Npb247Ci0gICAg cmV0dXJuIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6ZGVmYXVsdFN0b3JhZ2VTZXNzaW9uKCk7Ci19 Ci0KIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlz aW9uIDIyNzU5MCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjczLDggKzI3Myw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlh bGl6ZVdlYlByb2Nlc3MoV2UKIAogICAgIHBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV1RG TW92ZShwYXJhbWV0ZXJzKSk7CiAKLSAgICBTZXNzaW9uVHJhY2tlcjo6c2V0U2Vzc2lvbihQQUw6 OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpLCBOZXR3b3JrU2Vzc2lvbjo6Y3JlYXRlKHsg fSkpOwotCiAgICAgLy8gTWF0Y2ggdGhlIFFvUyBvZiB0aGUgVUlQcm9jZXNzIGFuZCB0aGUgc2Ny b2xsaW5nIHRocmVhZCBidXQgdXNlIGEgc2xpZ2h0bHkgbG93ZXIgcHJpb3JpdHkuCiAgICAgV1RG OjpUaHJlYWQ6OnNldEN1cnJlbnRUaHJlYWRJc1VzZXJJbnRlcmFjdGl2ZSgtMSk7CiAKQEAgLTU1 MiwxMCArNTUwLDYgQEAgdm9pZCBXZWJQcm9jZXNzOjpzZXRDYWNoZU1vZGVsKHVpbnQzMl90IAog dm9pZCBXZWJQcm9jZXNzOjpjbGVhckNhY2hlZENyZWRlbnRpYWxzKCkKIHsKICAgICBOZXR3b3Jr U3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpLmNyZWRlbnRpYWxTdG9yYWdl KCkuY2xlYXJDcmVkZW50aWFscygpOwotICAgIGlmIChhdXRvKiBuZXR3b3JrU2Vzc2lvbiA9IFNl c3Npb25UcmFja2VyOjpuZXR3b3JrU2Vzc2lvbihQQUw6OlNlc3Npb25JRDo6ZGVmYXVsdFNlc3Np b25JRCgpKSkKLSAgICAgICAgbmV0d29ya1Nlc3Npb24tPmNsZWFyQ3JlZGVudGlhbHMoKTsKLSAg ICBlbHNlCi0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCiBXZWJQYWdlKiBXZWJQ cm9jZXNzOjpmb2N1c2VkV2ViUGFnZSgpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9X ZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCShyZXZpc2lvbiAyMjc1OTApCisrKyBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0Nv bnRleHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTY2LDggKzY2LDYgQEAgdm9pZCBXZWJGcmFtZU5l dHdvcmtpbmdDb250ZXh0OjplbnN1cmVXZQogICAgICAgICB1aVByb2Nlc3NDb29raWVTdG9yYWdl ID0gY29va2llU3RvcmFnZUZyb21JZGVudGlmeWluZ0RhdGEocGFyYW1ldGVycy51aVByb2Nlc3ND b29raWVTdG9yYWdlSWRlbnRpZmllcik7CiAKICAgICBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmVu c3VyZVNlc3Npb24oc2Vzc2lvbklELCBiYXNlICsgJy4nICsgU3RyaW5nOjpudW1iZXIoc2Vzc2lv bklELnNlc3Npb25JRCgpKSwgV1RGTW92ZSh1aVByb2Nlc3NDb29raWVTdG9yYWdlKSk7Ci0KLSAg ICBTZXNzaW9uVHJhY2tlcjo6c2V0U2Vzc2lvbihzZXNzaW9uSUQsIE5ldHdvcmtTZXNzaW9uOjpj cmVhdGUoV1RGTW92ZShwYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycykpKTsKIH0K IAogdm9pZCBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0OjpzZXRDb29raWVBY2NlcHRQb2xpY3lG b3JBbGxDb250ZXh0cyhIVFRQQ29va2llQWNjZXB0UG9saWN5IHBvbGljeSkK