140085 2015-01-05 10:59:16 -0800 Change more connection pointers to references 2015-01-05 11:00:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1058742 0 andersca 2015-01-05 10:59:16 -0800 Change more connection pointers to references 1058743 1 243983 andersca 2015-01-05 10:59:26 -0800 Created attachment 243983 Patch 1058744 2 243983 kling 2015-01-05 11:00:14 -0800 Comment on attachment 243983 Patch Delightful! rs=me 1058745 3 andersca 2015-01-05 11:00:55 -0800 Committed r177920: <http://trac.webkit.org/changeset/177920> 243983 2015-01-05 10:59:26 -0800 2015-01-05 11:00:14 -0800 Patch bug-140085-20150105105929.patch text/plain 9868 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTFjN2NiZmRhMGMyMGEx NDdmMjU2ZDQ2ZjY1OWU1YTY2MGJjZmZhOC4uYTJlMWQ0MmVhZTdmZGI1YTc5Y2RmYTM3Y2EyMzBh ZjE4NTE1YmNjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE1LTAxLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2hhbmdlIG1vcmUg Y29ubmVjdGlvbiBwb2ludGVycyB0byByZWZlcmVuY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDAwODUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjph ZGRMaXN0ZW5lcik6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJl YTo6cmVtb3ZlTGlzdGVuZXIpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y3Jl YXRlTG9jYWxTdG9yYWdlTWFwKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmNy ZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VN YW5hZ2VyOjpjcmVhdGVTZXNzaW9uU3RvcmFnZU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3Jh Z2VNYW5hZ2VyOjpkZXN0cm95U3RvcmFnZU1hcCk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VN YW5hZ2VyOjpnZXRWYWx1ZXMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6c2V0 SXRlbSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpyZW1vdmVJdGVtKToKKyAg ICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmNsZWFyKToKKyAgICAgICAgKFdlYktpdDo6 U3RvcmFnZU1hbmFnZXI6OmFwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZSk6CisgICAgICAgIChXZWJL aXQ6OlN0b3JhZ2VNYW5hZ2VyOjppbnZhbGlkYXRlQ29ubmVjdGlvbkludGVybmFsKToKKyAgICAg ICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OmZpbmRTdG9yYWdlQXJlYSk6CisgICAgICAgICog VUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoKKworMjAxNS0wMS0wNSAgQW5kZXJz IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIENoYW5nZSBtb3JlIG9m IHRoZSBJUEMgY29kZSB0byB0YWtlIGNvbm5lY3Rpb25zIGJ5IHJlZmVyZW5jZQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMDgzCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRl eCBkZGM4N2YwYTVjN2M3MGJmYTA3MzA5MjQxYjEwNWQ4OTI4YmExM2IxLi4wNDU2MGZhOGM1NDAz MjIwZjhkOTA1MTczZGE4ZTA4MzFlNzMzODVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC01MSw4ICs1MSw4IEBAIHB1 YmxpYzoKIAogICAgIFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdpbigpIGNvbnN0IHsgcmV0 dXJuIG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCk7IH0KIAotICAgIHZvaWQgYWRkTGlzdGVuZXIoSVBD OjpDb25uZWN0aW9uKiwgdWludDY0X3Qgc3RvcmFnZU1hcElEKTsKLSAgICB2b2lkIHJlbW92ZUxp c3RlbmVyKElQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCk7CisgICAgdm9p ZCBhZGRMaXN0ZW5lcihJUEM6OkNvbm5lY3Rpb24mLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQpOwor ICAgIHZvaWQgcmVtb3ZlTGlzdGVuZXIoSVBDOjpDb25uZWN0aW9uJiwgdWludDY0X3Qgc3RvcmFn ZU1hcElEKTsKIAogICAgIFJlZjxTdG9yYWdlQXJlYT4gY2xvbmUoKSBjb25zdDsKIApAQCAtMTc4 LDE2ICsxNzgsMTYgQEAgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjp+U3RvcmFnZUFyZWEo KQogICAgICAgICBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZS0+ZGlkRGVzdHJveVN0b3JhZ2VBcmVh KHRoaXMpOwogfQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6YWRkTGlzdGVu ZXIoSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQpCit2 b2lkIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6YWRkTGlzdGVuZXIoSVBDOjpDb25uZWN0 aW9uJiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG9yYWdlTWFwSUQpCiB7Ci0gICAgQVNTRVJUKCFt X2V2ZW50TGlzdGVuZXJzLmNvbnRhaW5zKHN0ZDo6bWFrZV9wYWlyKGNvbm5lY3Rpb24sIHN0b3Jh Z2VNYXBJRCkpKTsKLSAgICBtX2V2ZW50TGlzdGVuZXJzLmFkZChzdGQ6Om1ha2VfcGFpcihjb25u ZWN0aW9uLCBzdG9yYWdlTWFwSUQpKTsKKyAgICBBU1NFUlQoIW1fZXZlbnRMaXN0ZW5lcnMuY29u dGFpbnMoc3RkOjptYWtlX3BhaXIoJmNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCkpKTsKKyAgICBt X2V2ZW50TGlzdGVuZXJzLmFkZChzdGQ6Om1ha2VfcGFpcigmY29ubmVjdGlvbiwgc3RvcmFnZU1h cElEKSk7CiB9CiAKLXZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpyZW1vdmVMaXN0 ZW5lcihJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCkK K3ZvaWQgU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjpyZW1vdmVMaXN0ZW5lcihJUEM6OkNv bm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCkKIHsKLSAgICBBU1NF UlQobV9ldmVudExpc3RlbmVycy5jb250YWlucyhzdGQ6Om1ha2VfcGFpcihjb25uZWN0aW9uLCBz dG9yYWdlTWFwSUQpKSk7Ci0gICAgbV9ldmVudExpc3RlbmVycy5yZW1vdmUoc3RkOjptYWtlX3Bh aXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKSk7CisgICAgQVNTRVJUKG1fZXZlbnRMaXN0ZW5l cnMuY29udGFpbnMoc3RkOjptYWtlX3BhaXIoJmNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCkpKTsK KyAgICBtX2V2ZW50TGlzdGVuZXJzLnJlbW92ZShzdGQ6Om1ha2VfcGFpcigmY29ubmVjdGlvbiwg c3RvcmFnZU1hcElEKSk7CiB9CiAKIFJlZjxTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE+IFN0 b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y2xvbmUoKSBjb25zdApAQCAtNTYwLDcgKzU2MCw3 IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNyZWF0ZUxvY2FsU3RvcmFnZU1hcChJUEM6OkNvbm5l Y3Rpb24mIGNvbm5lY3Rpb24sIHVpbnQ2NF90CiAgICAgQVNTRVJUKGxvY2FsU3RvcmFnZU5hbWVz cGFjZSk7CiAKICAgICBSZWZQdHI8U3RvcmFnZUFyZWE+IHN0b3JhZ2VBcmVhID0gbG9jYWxTdG9y YWdlTmFtZXNwYWNlLT5nZXRPckNyZWF0ZVN0b3JhZ2VBcmVhKHNlY3VyaXR5T3JpZ2luRGF0YS5z ZWN1cml0eU9yaWdpbigpKTsKLSAgICBzdG9yYWdlQXJlYS0+YWRkTGlzdGVuZXIoJmNvbm5lY3Rp b24sIHN0b3JhZ2VNYXBJRCk7CisgICAgc3RvcmFnZUFyZWEtPmFkZExpc3RlbmVyKGNvbm5lY3Rp b24sIHN0b3JhZ2VNYXBJRCk7CiAKICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gc3RvcmFn ZUFyZWEucmVsZWFzZSgpOwogfQpAQCAtNTc4LDcgKzU3OCw3IEBAIHZvaWQgU3RvcmFnZU1hbmFn ZXI6OmNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU1hcChJUEM6OkNvbm5lY3Rpb24mIGNvbm5l Y3Rpb24sCiAgICAgVHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlKiB0cmFuc2llbnRMb2Nh bFN0b3JhZ2VOYW1lc3BhY2UgPSBnZXRPckNyZWF0ZVRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVz cGFjZShzdG9yYWdlTmFtZXNwYWNlSUQsICp0b3BMZXZlbE9yaWdpbkRhdGEuc2VjdXJpdHlPcmln aW4oKSk7CiAKICAgICBhdXRvIHN0b3JhZ2VBcmVhID0gdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFt ZXNwYWNlLT5nZXRPckNyZWF0ZVN0b3JhZ2VBcmVhKHNlY3VyaXR5T3JpZ2luRGF0YS5zZWN1cml0 eU9yaWdpbigpKTsKLSAgICBzdG9yYWdlQXJlYS0+YWRkTGlzdGVuZXIoJmNvbm5lY3Rpb24sIHN0 b3JhZ2VNYXBJRCk7CisgICAgc3RvcmFnZUFyZWEtPmFkZExpc3RlbmVyKGNvbm5lY3Rpb24sIHN0 b3JhZ2VNYXBJRCk7CiAKICAgICBzbG90ID0gV1RGOjptb3ZlKHN0b3JhZ2VBcmVhKTsKIH0KQEAg LTYwNyw3ICs2MDcsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpjcmVhdGVTZXNzaW9uU3RvcmFn ZU1hcChJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVpbnQ2NAogICAgIEFTU0VSVCgmY29u bmVjdGlvbiA9PSBzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZS0+YWxsb3dlZENvbm5lY3Rpb24oKSk7 CiAKICAgICBhdXRvIHN0b3JhZ2VBcmVhID0gc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UtPmdldE9y Q3JlYXRlU3RvcmFnZUFyZWEoc2VjdXJpdHlPcmlnaW5EYXRhLnNlY3VyaXR5T3JpZ2luKCkpOwot ICAgIHN0b3JhZ2VBcmVhLT5hZGRMaXN0ZW5lcigmY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsK KyAgICBzdG9yYWdlQXJlYS0+YWRkTGlzdGVuZXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsK IAogICAgIHNsb3QgPSBXVEY6Om1vdmUoc3RvcmFnZUFyZWEpOwogfQpAQCAtNjI1LDEzICs2MjUs MTMgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVzdHJveVN0b3JhZ2VNYXAoSVBDOjpDb25uZWN0 aW9uJiBjb25uZWN0aW9uLCB1aW50NjRfdCBzdG8KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIGl0LT52YWx1ZS0+cmVtb3ZlTGlzdGVuZXIoJmNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7 CisgICAgaXQtPnZhbHVlLT5yZW1vdmVMaXN0ZW5lcihjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQp OwogICAgIG1fc3RvcmFnZUFyZWFzQnlDb25uZWN0aW9uLnJlbW92ZShjb25uZWN0aW9uQW5kU3Rv cmFnZU1hcElEUGFpcik7CiB9CiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldFZhbHVlcyhJUEM6 OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qg c3RvcmFnZU1hcFNlZWQsIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+JiB2YWx1ZXMpCiB7Ci0gICAg U3RvcmFnZUFyZWEqIHN0b3JhZ2VBcmVhID0gZmluZFN0b3JhZ2VBcmVhKCZjb25uZWN0aW9uLCBz dG9yYWdlTWFwSUQpOworICAgIFN0b3JhZ2VBcmVhKiBzdG9yYWdlQXJlYSA9IGZpbmRTdG9yYWdl QXJlYShjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQpOwogICAgIGlmICghc3RvcmFnZUFyZWEpIHsK ICAgICAgICAgLy8gVGhpcyBpcyBhIHNlc3Npb24gc3RvcmFnZSBhcmVhIGZvciBhIHBhZ2UgdGhh dCBoYXMgYWxyZWFkeSBiZWVuIGNsb3NlZC4gSWdub3JlIGl0LgogICAgICAgICByZXR1cm47CkBA IC02NDMsNyArNjQzLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0VmFsdWVzKElQQzo6Q29u bmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcEkKIAogdm9pZCBTdG9yYWdl TWFuYWdlcjo6c2V0SXRlbShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHN0 b3JhZ2VNYXBJRCwgdWludDY0X3Qgc291cmNlU3RvcmFnZUFyZWFJRCwgdWludDY0X3Qgc3RvcmFn ZU1hcFNlZWQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlLCBjb25zdCBT dHJpbmcmIHVybFN0cmluZykKIHsKLSAgICBTdG9yYWdlQXJlYSogc3RvcmFnZUFyZWEgPSBmaW5k U3RvcmFnZUFyZWEoJmNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7CisgICAgU3RvcmFnZUFyZWEq IHN0b3JhZ2VBcmVhID0gZmluZFN0b3JhZ2VBcmVhKGNvbm5lY3Rpb24sIHN0b3JhZ2VNYXBJRCk7 CiAgICAgaWYgKCFzdG9yYWdlQXJlYSkgewogICAgICAgICAvLyBUaGlzIGlzIGEgc2Vzc2lvbiBz dG9yYWdlIGFyZWEgZm9yIGEgcGFnZSB0aGF0IGhhcyBhbHJlYWR5IGJlZW4gY2xvc2VkLiBJZ25v cmUgaXQuCiAgICAgICAgIHJldHVybjsKQEAgLTY1Niw3ICs2NTYsNyBAQCB2b2lkIFN0b3JhZ2VN YW5hZ2VyOjpzZXRJdGVtKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0X3Qgc3Rv cmFnZU1hcElELAogCiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpyZW1vdmVJdGVtKElQQzo6Q29ubmVj dGlvbiYgY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzb3VyY2VT dG9yYWdlQXJlYUlELCB1aW50NjRfdCBzdG9yYWdlTWFwU2VlZCwgY29uc3QgU3RyaW5nJiBrZXks IGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKQogewotICAgIFN0b3JhZ2VBcmVhKiBzdG9yYWdlQXJl YSA9IGZpbmRTdG9yYWdlQXJlYSgmY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsKKyAgICBTdG9y YWdlQXJlYSogc3RvcmFnZUFyZWEgPSBmaW5kU3RvcmFnZUFyZWEoY29ubmVjdGlvbiwgc3RvcmFn ZU1hcElEKTsKICAgICBpZiAoIXN0b3JhZ2VBcmVhKSB7CiAgICAgICAgIC8vIFRoaXMgaXMgYSBz ZXNzaW9uIHN0b3JhZ2UgYXJlYSBmb3IgYSBwYWdlIHRoYXQgaGFzIGFscmVhZHkgYmVlbiBjbG9z ZWQuIElnbm9yZSBpdC4KICAgICAgICAgcmV0dXJuOwpAQCAtNjY4LDcgKzY2OCw3IEBAIHZvaWQg U3RvcmFnZU1hbmFnZXI6OnJlbW92ZUl0ZW0oSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCB1 aW50NjRfdCBzdG9yYWdlTWFwCiAKIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmNsZWFyKElQQzo6Q29u bmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0X3Qgc3RvcmFnZU1hcElELCB1aW50NjRfdCBzb3Vy Y2VTdG9yYWdlQXJlYUlELCB1aW50NjRfdCBzdG9yYWdlTWFwU2VlZCwgY29uc3QgU3RyaW5nJiB1 cmxTdHJpbmcpCiB7Ci0gICAgU3RvcmFnZUFyZWEqIHN0b3JhZ2VBcmVhID0gZmluZFN0b3JhZ2VB cmVhKCZjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQpOworICAgIFN0b3JhZ2VBcmVhKiBzdG9yYWdl QXJlYSA9IGZpbmRTdG9yYWdlQXJlYShjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQpOwogICAgIGlm ICghc3RvcmFnZUFyZWEpIHsKICAgICAgICAgLy8gVGhpcyBpcyBhIHNlc3Npb24gc3RvcmFnZSBh cmVhIGZvciBhIHBhZ2UgdGhhdCBoYXMgYWxyZWFkeSBiZWVuIGNsb3NlZC4gSWdub3JlIGl0Lgog ICAgICAgICByZXR1cm47CkBAIC03MjAsNyArNzIwLDcgQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6 YXBwbGljYXRpb25XaWxsVGVybWluYXRlKCkKICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywg JnNlbWFwaG9yZV0gewogICAgICAgICBWZWN0b3I8c3RkOjpwYWlyPFJlZlB0cjxJUEM6OkNvbm5l Y3Rpb24+LCB1aW50NjRfdD4+IGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyc1RvUmVtb3Zl OwogICAgICAgICBmb3IgKGF1dG8mIGNvbm5lY3Rpb25TdG9yYWdlQXJlYVBhaXIgOiBtX3N0b3Jh Z2VBcmVhc0J5Q29ubmVjdGlvbikgewotICAgICAgICAgICAgY29ubmVjdGlvblN0b3JhZ2VBcmVh UGFpci52YWx1ZS0+cmVtb3ZlTGlzdGVuZXIoY29ubmVjdGlvblN0b3JhZ2VBcmVhUGFpci5rZXku Zmlyc3QuZ2V0KCksIGNvbm5lY3Rpb25TdG9yYWdlQXJlYVBhaXIua2V5LnNlY29uZCk7CisgICAg ICAgICAgICBjb25uZWN0aW9uU3RvcmFnZUFyZWFQYWlyLnZhbHVlLT5yZW1vdmVMaXN0ZW5lcigq Y29ubmVjdGlvblN0b3JhZ2VBcmVhUGFpci5rZXkuZmlyc3QsIGNvbm5lY3Rpb25TdG9yYWdlQXJl YVBhaXIua2V5LnNlY29uZCk7CiAgICAgICAgICAgICBjb25uZWN0aW9uQW5kU3RvcmFnZU1hcElE UGFpcnNUb1JlbW92ZS5hcHBlbmQoY29ubmVjdGlvblN0b3JhZ2VBcmVhUGFpci5rZXkpOwogICAg ICAgICB9CiAKQEAgLTc0MCw3ICs3NDAsNyBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjppbnZhbGlk YXRlQ29ubmVjdGlvbkludGVybmFsKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbikKICAgICAg ICAgaWYgKGl0LT5rZXkuZmlyc3QgIT0gY29ubmVjdGlvbikKICAgICAgICAgICAgIGNvbnRpbnVl OwogCi0gICAgICAgIGl0LT52YWx1ZS0+cmVtb3ZlTGlzdGVuZXIoaXQtPmtleS5maXJzdC5nZXQo KSwgaXQtPmtleS5zZWNvbmQpOworICAgICAgICBpdC0+dmFsdWUtPnJlbW92ZUxpc3RlbmVyKCpp dC0+a2V5LmZpcnN0LCBpdC0+a2V5LnNlY29uZCk7CiAgICAgICAgIGNvbm5lY3Rpb25BbmRTdG9y YWdlTWFwSURQYWlyc1RvUmVtb3ZlLmFwcGVuZChpdC0+a2V5KTsKICAgICB9CiAKQEAgLTc0OCw5 ICs3NDgsOSBAQCB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjppbnZhbGlkYXRlQ29ubmVjdGlvbkludGVy bmFsKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbikKICAgICAgICAgbV9zdG9yYWdlQXJlYXNC eUNvbm5lY3Rpb24ucmVtb3ZlKGNvbm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyc1RvUmVtb3Zl W2ldKTsKIH0KIAotU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhKiBTdG9yYWdlTWFuYWdlcjo6 ZmluZFN0b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qgc3Rv cmFnZU1hcElEKSBjb25zdAorU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhKiBTdG9yYWdlTWFu YWdlcjo6ZmluZFN0b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgdWludDY0 X3Qgc3RvcmFnZU1hcElEKSBjb25zdAogewotICAgIHN0ZDo6cGFpcjxJUEM6OkNvbm5lY3Rpb24q LCB1aW50NjRfdD4gY29ubmVjdGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIoY29ubmVjdGlvbiwgc3Rv cmFnZU1hcElEKTsKKyAgICBzdGQ6OnBhaXI8SVBDOjpDb25uZWN0aW9uKiwgdWludDY0X3Q+IGNv bm5lY3Rpb25BbmRTdG9yYWdlTWFwSURQYWlyKCZjb25uZWN0aW9uLCBzdG9yYWdlTWFwSUQpOwog CiAgICAgaWYgKCFtX3N0b3JhZ2VBcmVhc0J5Q29ubmVjdGlvbi5pc1ZhbGlkS2V5KGNvbm5lY3Rp b25BbmRTdG9yYWdlTWFwSURQYWlyKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAppbmRleCBk YjIxZGQyNTJkMGE1ZDNiY2UwNmU0MzI4ZTlhZDRhMzY3NjUwOTExLi42MmI5OThmOWU5ODY2Mzdl YzY0MjRjZTZmMzY0YWUzMTU4OTdiNTY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTkyLDcgKzkyLDcgQEAgcHJpdmF0ZToK ICAgICB2b2lkIGludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwoSVBDOjpDb25uZWN0aW9uKik7 CiAKICAgICBjbGFzcyBTdG9yYWdlQXJlYTsKLSAgICBTdG9yYWdlQXJlYSogZmluZFN0b3JhZ2VB cmVhKElQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90KSBjb25zdDsKKyAgICBTdG9yYWdlQXJlYSog ZmluZFN0b3JhZ2VBcmVhKElQQzo6Q29ubmVjdGlvbiYsIHVpbnQ2NF90KSBjb25zdDsKIAogICAg IGNsYXNzIExvY2FsU3RvcmFnZU5hbWVzcGFjZTsKICAgICBMb2NhbFN0b3JhZ2VOYW1lc3BhY2Uq IGdldE9yQ3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IHN0b3JhZ2VOYW1lc3Bh Y2VJRCk7Cg==