152724 2016-01-04 18:17:13 -0800 Use unique_ptr for NetworkDataTasks and references for NetworkSessionTaskClients 2016-01-04 18:26:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1152602 0 achristensen 2016-01-04 18:17:13 -0800 Use unique_ptr for NetworkDataTasks and references for NetworkSessionTaskClients 1152603 1 268255 achristensen 2016-01-04 18:18:42 -0800 Created attachment 268255 Patch 1152606 2 268255 aestes 2016-01-04 18:24:06 -0800 Comment on attachment 268255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268255&action=review > Source/WebKit2/ChangeLog:9 > + NetworkSessionTaskClients& just so we can clear it in the destructor. Typo: NetworkSessionTaskClients 1152609 3 achristensen 2016-01-04 18:26:15 -0800 r194570 268255 2016-01-04 18:18:42 -0800 2016-01-04 18:24:06 -0800 Patch bug-152724-20160104181809.patch text/plain 13696 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDU2OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE2LTAxLTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIHVuaXF1 ZV9wdHIgZm9yIE5ldHdvcmtEYXRhVGFza3MgYW5kIHJlZmVyZW5jZXMgZm9yIE5ldHdvcmtTZXNz aW9uVGFza0NsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MjcyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZXJlIGlzIG5vIHJlYXNvbiB0byBoYXZlIGEgTmV0d29ya1Nlc3Npb25UYXNrQ2xp ZW50KiBpbnN0ZWFkIG9mIGEgCisgICAgICAgIE5ldHdvcmtTZXNzaW9uVGFza0NsaWVudHMmIGp1 c3Qgc28gd2UgY2FuIGNsZWFyIGl0IGluIHRoZSBkZXN0cnVjdG9yLgorICAgICAgICBBbHNvLCBO ZXR3b3JrRGF0YVRhc2tzIGFyZSBvd25lZCBvbmx5IGJ5IHRoZSBOZXR3b3JrTG9hZCwgc28gdGhl cmUncyBubyByZWFzb24gdG8gcmVmY291bnQgdGhlbS4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZC5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0Rvd25s b2Fkcy9Eb3dubG9hZE1hbmFnZXIuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr TG9hZC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtMb2FkOjp+TmV0d29ya0xvYWQpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmg6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Np b25UYXNrQ2xpZW50Ojp+TmV0d29ya1Nlc3Npb25UYXNrQ2xpZW50KToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya0RhdGFUYXNrOjpjbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0 YVRhc2s6OmRvd25sb2FkSUQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6OnNl dERvd25sb2FkSUQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6OmNsZWFyQ2xp ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vz c2lvbkNvY29hLm1tOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vz c2lvbjp0YXNrOndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uOm5ld1JlcXVlc3Q6Y29tcGxldGlv bkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNz aW9uOnRhc2s6ZGlkUmVjZWl2ZUNoYWxsZW5nZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAg ICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRDb21wbGV0 ZVdpdGhFcnJvcjpdKToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNl c3Npb246ZGF0YVRhc2s6ZGlkUmVjZWl2ZVJlc3BvbnNlOmNvbXBsZXRpb25IYW5kbGVyOl0pOgor ICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjpkYXRhVGFzazpk aWRSZWNlaXZlRGF0YTpdKToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVS TFNlc3Npb246ZG93bmxvYWRUYXNrOmRpZEZpbmlzaERvd25sb2FkaW5nVG9VUkw6XSk6CisgICAg ICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZEJl Y29tZURvd25sb2FkVGFzazpdKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246On5O ZXR3b3JrU2Vzc2lvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjpjcmVhdGVE YXRhVGFza1dpdGhSZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246OmRh dGFUYXNrRm9ySWRlbnRpZmllcik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtEYXRhVGFzazo6 TmV0d29ya0RhdGFUYXNrKToKKwogMjAxNi0wMS0wNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFByb2dyZXNzIHRvd2FyZHMgaW1wbGVtZW50 aW5nIGRvd25sb2FkcyB3aXRoIE5ldHdvcmtTZXNzaW9uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCShyZXZpc2lvbiAxOTQ1MzYpCisrKyBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTY1LDcgKzY1LDYgQEAgTmV0d29ya0xvYWQ6On5OZXR3b3JrTG9hZCgpCiAjaWYgVVNF KE5FVFdPUktfU0VTU0lPTikKICAgICBpZiAobV9yZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyKQog ICAgICAgICBtX3Jlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIoUG9saWN5SWdub3JlKTsKLSAgICBt X3Rhc2stPmNsZWFyQ2xpZW50KCk7CiAjZWxzZQogICAgIGlmIChtX2hhbmRsZSkKICAgICAgICAg bV9oYW5kbGUtPmNsZWFyQ2xpZW50KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL05ldHdvcmtMb2FkLmgJKHJldmlzaW9uIDE5NDUzNikKKysrIFNvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw3ICsx MjAsNyBAQCBwcml2YXRlOgogICAgIGNvbnN0IE5ldHdvcmtMb2FkUGFyYW1ldGVycyBtX3BhcmFt ZXRlcnM7CiAgICAgUmVmUHRyPFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0PiBtX25ldHdvcmtpbmdD b250ZXh0OwogI2lmIFVTRShORVRXT1JLX1NFU1NJT04pCi0gICAgUmVmPE5ldHdvcmtEYXRhVGFz az4gbV90YXNrOworICAgIHN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrRGF0YVRhc2s+IG1fdGFzazsK ICAgICBXZWJDb3JlOjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSBtX2NoYWxsZW5nZTsKICAgICBD aGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciBtX2NoYWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyOwog ICAgIFJlc3BvbnNlQ29tcGxldGlvbkhhbmRsZXIgbV9yZXNwb25zZUNvbXBsZXRpb25IYW5kbGVy OwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv bi5oCShyZXZpc2lvbiAxOTQ1NjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrU2Vzc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC03Nyw5ICs3NywxNSBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB+TmV0d29ya1Nlc3Npb25UYXNrQ2xpZW50KCkgeyB9CiB9OwogCi1jbGFz cyBOZXR3b3JrRGF0YVRhc2sgOiBwdWJsaWMgUmVmQ291bnRlZDxOZXR3b3JrRGF0YVRhc2s+IHsK K2NsYXNzIE5ldHdvcmtEYXRhVGFzayB7CiAgICAgZnJpZW5kIGNsYXNzIE5ldHdvcmtTZXNzaW9u OwogcHVibGljOgorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGV4cGxpY2l0IE5ldHdvcmtEYXRh VGFzayhOZXR3b3JrU2Vzc2lvbiYsIE5ldHdvcmtTZXNzaW9uVGFza0NsaWVudCYsIFJldGFpblB0 cjxOU1VSTFNlc3Npb25EYXRhVGFzaz4mJik7CisjZWxzZQorICAgIGV4cGxpY2l0IE5ldHdvcmtE YXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYsIE5ldHdvcmtTZXNzaW9uVGFza0NsaWVudCYpOworI2Vu ZGlmCisKICAgICB2b2lkIGNhbmNlbCgpOwogICAgIHZvaWQgcmVzdW1lKCk7CiAKQEAgLTg4LDgg Kzk0LDcgQEAgcHVibGljOgogCiAgICAgfk5ldHdvcmtEYXRhVGFzaygpOwogCi0gICAgTmV0d29y a1Nlc3Npb25UYXNrQ2xpZW50KiBjbGllbnQoKSB7IHJldHVybiBtX2NsaWVudDsgfQotICAgIHZv aWQgY2xlYXJDbGllbnQoKSB7IG1fY2xpZW50ID0gbnVsbHB0cjsgfQorICAgIE5ldHdvcmtTZXNz aW9uVGFza0NsaWVudCYgY2xpZW50KCkgeyByZXR1cm4gbV9jbGllbnQ7IH0KIAogICAgIERvd25s b2FkSUQgZG93bmxvYWRJRCgpIHsgcmV0dXJuIG1fZG93bmxvYWRJRDsgfQogICAgIHZvaWQgc2V0 RG93bmxvYWRJRChEb3dubG9hZElEIGRvd25sb2FkSUQpCkBAIC0xMDEsMTMgKzEwNiwxMCBAQCBw dWJsaWM6CiAgICAgCiBwcml2YXRlOgogICAgIE5ldHdvcmtTZXNzaW9uJiBtX3Nlc3Npb247Ci0g ICAgTmV0d29ya1Nlc3Npb25UYXNrQ2xpZW50KiBtX2NsaWVudDsKKyAgICBOZXR3b3JrU2Vzc2lv blRhc2tDbGllbnQmIG1fY2xpZW50OwogICAgIERvd25sb2FkSUQgbV9kb3dubG9hZElEOwogI2lm IFBMQVRGT1JNKENPQ09BKQotICAgIGV4cGxpY2l0IE5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vz c2lvbiYsIE5ldHdvcmtTZXNzaW9uVGFza0NsaWVudCYsIFJldGFpblB0cjxOU1VSTFNlc3Npb25E YXRhVGFzaz4mJik7CiAgICAgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbkRhdGFUYXNrPiBtX3Rhc2s7 Ci0jZWxzZQotICAgIGV4cGxpY2l0IE5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYsIE5l dHdvcmtTZXNzaW9uVGFza0NsaWVudCYpOwogI2VuZGlmCiB9OwogCkBAIC0xMjMsNyArMTI1LDcg QEAgcHVibGljOgogCiAgICAgc3RhdGljIE5ldHdvcmtTZXNzaW9uJiBkZWZhdWx0U2Vzc2lvbigp OwogICAgIAotICAgIFJlZjxOZXR3b3JrRGF0YVRhc2s+IGNyZWF0ZURhdGFUYXNrV2l0aFJlcXVl c3QoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgTmV0d29ya1Nlc3Npb25UYXNrQ2xp ZW50Jik7CisgICAgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtEYXRhVGFzaz4gY3JlYXRlRGF0YVRh c2tXaXRoUmVxdWVzdChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBOZXR3b3JrU2Vz c2lvblRhc2tDbGllbnQmKTsKIAogICAgIE5ldHdvcmtEYXRhVGFzayogZGF0YVRhc2tGb3JJZGVu dGlmaWVyKE5ldHdvcmtEYXRhVGFzazo6VGFza0lkZW50aWZpZXIpOwogCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWQuaAkocmV2 aXNpb24gMTk0NTYyKQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRz L0Rvd25sb2FkLmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDcgKzY5LDYgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiAKIGNsYXNzIERvd25sb2FkQXV0aGVudGljYXRpb25DbGllbnQ7CiBjbGFzcyBEb3du bG9hZE1hbmFnZXI7Ci1jbGFzcyBOZXR3b3JrRGF0YVRhc2s7CiBjbGFzcyBOZXR3b3JrU2Vzc2lv bjsKIGNsYXNzIFdlYlBhZ2U7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgJKHJldmlzaW9uIDE5 NDU2MikKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9h ZE1hbmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNiBAQCBuYW1lc3BhY2UgV2Vi S2l0IHsKIAogY2xhc3MgQXV0aGVudGljYXRpb25NYW5hZ2VyOwogY2xhc3MgRG93bmxvYWQ7Ci1j bGFzcyBOZXR3b3JrRGF0YVRhc2s7CiBjbGFzcyBXZWJQYWdlOwogCiBjbGFzcyBEb3dubG9hZE1h bmFnZXIgewpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCShyZXZpc2lvbiAxOTQ1NjIpCisrKyBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1t CSh3b3JraW5nIGNvcHkpCkBAIC05NCw2NiArOTQsNTAgQEAgLSAoaWQpaW5pdFdpdGhOZXR3b3Jr U2Vzc2lvbjooV2ViS2l0OjpOZQogCiAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAq KXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFzayAqKXRhc2sgd2lsbFBlcmZvcm1IVFRQUmVk aXJlY3Rpb246KE5TSFRUUFVSTFJlc3BvbnNlICopcmVzcG9uc2UgbmV3UmVxdWVzdDooTlNVUkxS ZXF1ZXN0ICopcmVxdWVzdCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxSZXF1ZXN0 ICopKWNvbXBsZXRpb25IYW5kbGVyCiB7Ci0gICAgaWYgKGF1dG8qIG5ldHdvcmtpbmdUYXNrID0g X3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVyKSkgewot ICAgICAgICBpZiAoYXV0byogY2xpZW50ID0gbmV0d29ya2luZ1Rhc2stPmNsaWVudCgpKSB7Ci0g ICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyQ29weSA9IEJsb2NrX2NvcHkoY29tcGxl dGlvbkhhbmRsZXIpOwotICAgICAgICAgICAgY2xpZW50LT53aWxsUGVyZm9ybUhUVFBSZWRpcmVj dGlvbihyZXNwb25zZSwgcmVxdWVzdCwgW2NvbXBsZXRpb25IYW5kbGVyQ29weV0oY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQotICAgICAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJDb3B5KHJlcXVlc3QubnNVUkxSZXF1ZXN0 KFdlYkNvcmU6OlVwZGF0ZUhUVFBCb2R5KSk7Ci0gICAgICAgICAgICAgICAgICAgIEJsb2NrX3Jl bGVhc2UoY29tcGxldGlvbkhhbmRsZXJDb3B5KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICApOwotICAgICAgICB9CisgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNz aW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIodGFzay50YXNrSWRlbnRpZmllcikpIHsKKyAgICAg ICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25IYW5k bGVyKTsKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5jbGllbnQoKS53aWxsUGVyZm9ybUhUVFBS ZWRpcmVjdGlvbihyZXNwb25zZSwgcmVxdWVzdCwgW2NvbXBsZXRpb25IYW5kbGVyQ29weV0oY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KSB7CisgICAgICAgICAgICBjb21w bGV0aW9uSGFuZGxlckNvcHkocmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6VXBkYXRlSFRU UEJvZHkpKTsKKyAgICAgICAgICAgIEJsb2NrX3JlbGVhc2UoY29tcGxldGlvbkhhbmRsZXJDb3B5 KTsKKyAgICAgICAgfSk7CiAgICAgfQogfQogCiAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vz c2lvbiAqKXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFzayAqKXRhc2sgZGlkUmVjZWl2ZUNo YWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZSBjb21wbGV0 aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9u IGRpc3Bvc2l0aW9uLCBOU1VSTENyZWRlbnRpYWwgKmNyZWRlbnRpYWwpKWNvbXBsZXRpb25IYW5k bGVyCiB7Ci0gICAgaWYgKGF1dG8qIG5ldHdvcmtpbmdUYXNrID0gX3Nlc3Npb24tPmRhdGFUYXNr Rm9ySWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVyKSkgewotICAgICAgICBpZiAoYXV0byog Y2xpZW50ID0gbmV0d29ya2luZ1Rhc2stPmNsaWVudCgpKSB7Ci0gICAgICAgICAgICBhdXRvIGNv bXBsZXRpb25IYW5kbGVyQ29weSA9IEJsb2NrX2NvcHkoY29tcGxldGlvbkhhbmRsZXIpOwotICAg ICAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlQ2hhbGxlbmdlKGNoYWxsZW5nZSwgW2NvbXBsZXRp b25IYW5kbGVyQ29weV0oV2ViS2l0OjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZURpc3Bvc2l0aW9u IGRpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVkZW50aWFsJiBjcmVkZW50aWFsKQotICAg ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJDb3B5 KHRvTlNVUkxTZXNzaW9uQXV0aENoYWxsZW5nZURpc3Bvc2l0aW9uKGRpc3Bvc2l0aW9uKSwgY3Jl ZGVudGlhbC5uc0NyZWRlbnRpYWwoKSk7Ci0gICAgICAgICAgICAgICAgICAgIEJsb2NrX3JlbGVh c2UoY29tcGxldGlvbkhhbmRsZXJDb3B5KTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICApOwotICAgICAgICB9CisgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNzaW9u LT5kYXRhVGFza0ZvcklkZW50aWZpZXIodGFzay50YXNrSWRlbnRpZmllcikpIHsKKyAgICAgICAg YXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25IYW5kbGVy KTsKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5jbGllbnQoKS5kaWRSZWNlaXZlQ2hhbGxlbmdl KGNoYWxsZW5nZSwgW2NvbXBsZXRpb25IYW5kbGVyQ29weV0oV2ViS2l0OjpBdXRoZW50aWNhdGlv bkNoYWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVkZW50 aWFsJiBjcmVkZW50aWFsKSB7CisgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlckNvcHkodG9O U1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24oZGlzcG9zaXRpb24pLCBjcmVkZW50 aWFsLm5zQ3JlZGVudGlhbCgpKTsKKyAgICAgICAgICAgIEJsb2NrX3JlbGVhc2UoY29tcGxldGlv bkhhbmRsZXJDb3B5KTsKKyAgICAgICAgfSk7CiAgICAgfQogfQogCiAtICh2b2lkKVVSTFNlc3Np b246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFzayAqKXRhc2sg ZGlkQ29tcGxldGVXaXRoRXJyb3I6KE5TRXJyb3IgKillcnJvcgogewotICAgIGlmIChhdXRvKiBu ZXR3b3JraW5nVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIodGFzay50YXNr SWRlbnRpZmllcikpIHsKLSAgICAgICAgaWYgKGF1dG8qIGNsaWVudCA9IG5ldHdvcmtpbmdUYXNr LT5jbGllbnQoKSkKLSAgICAgICAgICAgIGNsaWVudC0+ZGlkQ29tcGxldGVXaXRoRXJyb3IoZXJy b3IpOwotICAgIH0KKyAgICBpZiAoYXV0byogbmV0d29ya0RhdGFUYXNrID0gX3Nlc3Npb24tPmRh dGFUYXNrRm9ySWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVyKSkKKyAgICAgICAgbmV0d29y a0RhdGFUYXNrLT5jbGllbnQoKS5kaWRDb21wbGV0ZVdpdGhFcnJvcihlcnJvcik7CiB9CiAKIC0g KHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiBkYXRhVGFzazooTlNVUkxT ZXNzaW9uRGF0YVRhc2sgKilkYXRhVGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6KE5TVVJMUmVzcG9u c2UgKilyZXNwb25zZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxTZXNzaW9uUmVz cG9uc2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbikpY29tcGxldGlvbkhhbmRsZXIKIHsKLSAgICBp ZiAoYXV0byogbmV0d29ya2luZ1Rhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVy KGRhdGFUYXNrLnRhc2tJZGVudGlmaWVyKSkgewotICAgICAgICBpZiAoYXV0byogY2xpZW50ID0g bmV0d29ya2luZ1Rhc2stPmNsaWVudCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwotICAgICAgICAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSByZXNvdXJjZVJl c3BvbnNlKHJlc3BvbnNlKTsKLSAgICAgICAgICAgIGNvcHlUaW1pbmdEYXRhKFtkYXRhVGFzayBf dGltaW5nRGF0YV0sIHJlc291cmNlUmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkpOwotICAg ICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRp b25IYW5kbGVyKTsKLSAgICAgICAgICAgIGNsaWVudC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc291 cmNlUmVzcG9uc2UsIFtjb21wbGV0aW9uSGFuZGxlckNvcHldKFdlYkNvcmU6OlBvbGljeUFjdGlv biBwb2xpY3lBY3Rpb24pCi0gICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBj b21wbGV0aW9uSGFuZGxlckNvcHkodG9OU1VSTFNlc3Npb25SZXNwb25zZURpc3Bvc2l0aW9uKHBv bGljeUFjdGlvbikpOwotICAgICAgICAgICAgICAgICAgICBCbG9ja19yZWxlYXNlKGNvbXBsZXRp b25IYW5kbGVyQ29weSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgKTsKLSAgICAg ICAgfQorICAgIGlmIChhdXRvKiBuZXR3b3JrRGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tG b3JJZGVudGlmaWVyKGRhdGFUYXNrLnRhc2tJZGVudGlmaWVyKSkgeworICAgICAgICBBU1NFUlQo aXNNYWluVGhyZWFkKCkpOworICAgICAgICBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlIHJlc291 cmNlUmVzcG9uc2UocmVzcG9uc2UpOworICAgICAgICBjb3B5VGltaW5nRGF0YShbZGF0YVRhc2sg X3RpbWluZ0RhdGFdLCByZXNvdXJjZVJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKTsKKyAg ICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25I YW5kbGVyKTsKKyAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5jbGllbnQoKS5kaWRSZWNlaXZlUmVz cG9uc2UocmVzb3VyY2VSZXNwb25zZSwgW2NvbXBsZXRpb25IYW5kbGVyQ29weV0oV2ViQ29yZTo6 UG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRs ZXJDb3B5KHRvTlNVUkxTZXNzaW9uUmVzcG9uc2VEaXNwb3NpdGlvbihwb2xpY3lBY3Rpb24pKTsK KyAgICAgICAgICAgIEJsb2NrX3JlbGVhc2UoY29tcGxldGlvbkhhbmRsZXJDb3B5KTsKKyAgICAg ICAgfSk7CiAgICAgfQogfQogCiAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNl c3Npb24gZGF0YVRhc2s6KE5TVVJMU2Vzc2lvbkRhdGFUYXNrICopZGF0YVRhc2sgZGlkUmVjZWl2 ZURhdGE6KE5TRGF0YSAqKWRhdGEKIHsKLSAgICBpZiAoYXV0byogbmV0d29ya2luZ1Rhc2sgPSBf c2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKGRhdGFUYXNrLnRhc2tJZGVudGlmaWVyKSkg ewotICAgICAgICBpZiAoYXV0byogY2xpZW50ID0gbmV0d29ya2luZ1Rhc2stPmNsaWVudCgpKQot ICAgICAgICAgICAgY2xpZW50LT5kaWRSZWNlaXZlRGF0YShXZWJDb3JlOjpTaGFyZWRCdWZmZXI6 OndyYXBOU0RhdGEoZGF0YSkpOwotICAgIH0KKyAgICBpZiAoYXV0byogbmV0d29ya0RhdGFUYXNr ID0gX3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcihkYXRhVGFzay50YXNrSWRlbnRpZmll cikpCisgICAgICAgIG5ldHdvcmtEYXRhVGFzay0+Y2xpZW50KCkuZGlkUmVjZWl2ZURhdGEoV2Vi Q29yZTo6U2hhcmVkQnVmZmVyOjp3cmFwTlNEYXRhKGRhdGEpKTsKIH0KIAogLSAodm9pZClVUkxT ZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIGRvd25sb2FkVGFzazooTlNVUkxTZXNzaW9u RG93bmxvYWRUYXNrICopZG93bmxvYWRUYXNrIGRpZEZpbmlzaERvd25sb2FkaW5nVG9VUkw6KE5T VVJMICopbG9jYXRpb24KQEAgLTE4OCw4ICsxNzIsNyBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5T VVJMU2Vzc2lvbiAqKXNlc3NpCiAgICAgICAgIGRvd25sb2FkLT5kaWRSZWNlaXZlUmVzcG9uc2Uo W2Rvd25sb2FkVGFzayByZXNwb25zZV0pOwogICAgICAgICBkb3dubG9hZE1hbmFnZXIuZGF0YVRh c2tCZWNhbWVEb3dubG9hZFRhc2soZG93bmxvYWRJRCwgV1RGTW92ZShkb3dubG9hZCkpOwogCi0g ICAgICAgIGlmIChhdXRvKiBjbGllbnQgPSBuZXR3b3JrRGF0YVRhc2stPmNsaWVudCgpKQotICAg ICAgICAgICAgY2xpZW50LT5kaWRCZWNvbWVEb3dubG9hZCgpOworICAgICAgICBuZXR3b3JrRGF0 YVRhc2stPmNsaWVudCgpLmRpZEJlY29tZURvd25sb2FkKCk7CiAKICAgICAgICAgX3Nlc3Npb24t PmFkZERvd25sb2FkSUQoW2Rvd25sb2FkVGFzayB0YXNrSWRlbnRpZmllcl0sIGRvd25sb2FkSUQp OwogICAgIH0KQEAgLTI0MSw5ICsyMjQsOSBAQCBOZXR3b3JrU2Vzc2lvbjo6fk5ldHdvcmtTZXNz aW9uKCkKICAgICBbbV9zZXNzaW9uIGludmFsaWRhdGVBbmRDYW5jZWxdOwogfQogCi1SZWY8TmV0 d29ya0RhdGFUYXNrPiBOZXR3b3JrU2Vzc2lvbjo6Y3JlYXRlRGF0YVRhc2tXaXRoUmVxdWVzdChj b25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIE5ldHdvcmtTZXNzaW9uVGFz a0NsaWVudCYgY2xpZW50KQorc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtEYXRhVGFzaz4gTmV0d29y a1Nlc3Npb246OmNyZWF0ZURhdGFUYXNrV2l0aFJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBOZXR3b3JrU2Vzc2lvblRhc2tDbGllbnQmIGNsaWVudCkKIHsK LSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBOZXR3b3JrRGF0YVRhc2soKnRoaXMsIGNsaWVudCwg W21fc2Vzc2lvbiBkYXRhVGFza1dpdGhSZXF1ZXN0OnJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNv cmU6OlVwZGF0ZUhUVFBCb2R5KV0pKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxOZXR3 b3JrRGF0YVRhc2s+KCp0aGlzLCBjbGllbnQsIFttX3Nlc3Npb24gZGF0YVRhc2tXaXRoUmVxdWVz dDpyZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpVcGRhdGVIVFRQQm9keSldKTsKIH0KIAog TmV0d29ya0RhdGFUYXNrKiBOZXR3b3JrU2Vzc2lvbjo6ZGF0YVRhc2tGb3JJZGVudGlmaWVyKE5l dHdvcmtEYXRhVGFzazo6VGFza0lkZW50aWZpZXIgdGFza0lkZW50aWZpZXIpCkBAIC0yNzcsNyAr MjYwLDcgQEAgRG93bmxvYWRJRCBOZXR3b3JrU2Vzc2lvbjo6dGFrZURvd25sb2FkSQogCiBOZXR3 b3JrRGF0YVRhc2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0 d29ya1Nlc3Npb25UYXNrQ2xpZW50JiBjbGllbnQsIFJldGFpblB0cjxOU1VSTFNlc3Npb25EYXRh VGFzaz4mJiB0YXNrKQogICAgIDogbV9zZXNzaW9uKHNlc3Npb24pCi0gICAgLCBtX2NsaWVudCgm Y2xpZW50KQorICAgICwgbV9jbGllbnQoY2xpZW50KQogICAgICwgbV90YXNrKFdURk1vdmUodGFz aykpCiB7CiAgICAgQVNTRVJUKCFtX3Nlc3Npb24ubV9kYXRhVGFza01hcC5jb250YWlucyh0YXNr SWRlbnRpZmllcigpKSk7Cg==