120518 2013-08-30 02:33:29 -0700 Remove AttachContext 2013-08-30 05:32:37 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned cmarcelo commit-queue esprehn+autocc kangil.han kling oldest_to_newest 922859 0 koivisto 2013-08-30 02:33:29 -0700 Remove this now unnecessary type. 922877 1 210086 koivisto 2013-08-30 03:59:05 -0700 Created attachment 210086 patch 922896 2 koivisto 2013-08-30 05:32:37 -0700 https://trac.webkit.org/r154873 210086 2013-08-30 03:59:05 -0700 2013-08-30 05:14:11 -0700 patch remove-attachcontext.patch text/plain 10148 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDg3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA4LTMwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgQXR0YWNoQ29udGV4 dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNTE4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB0 eXBlIGlzIG5vdCB1c2VmdWwgYW55bW9yZS4gSnVzdCBwYXNzIHRoZSBwcmVjb21wdXRlZCBzdHls ZSB0byBhdHRhY2hSZW5kZXJUcmVlIGFuZCByZWF0dGFjaC1vci1ub3QgZmxhZyB0byBkZXRhY2hS ZW5kZXJUcmVlLgorCisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTdHlsZTo6Y3JlYXRlUmVuZGVyZXJJZk5lZWRlZCk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZTo6YXR0YWNoQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6 OmF0dGFjaFNoYWRvd1Jvb3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmF0dGFjaFJlbmRl clRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OmRldGFjaENoaWxkcmVuKToKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlOjpkZXRhY2hTaGFkb3dSb290KToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlOjpkZXRhY2hSZW5kZXJUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpyZWF0 dGFjaFJlbmRlclRyZWUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OnJlc29sdmVMb2NhbCk6 CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5oOgorCiAyMDEzLTA4LTMwICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTU0ODI2LgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkocmV2aXNp b24gMTU0ODY5KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMzc1LDExICsxMzc1LDggQEAgdm9pZCBFbGVtZW50Ojp1bnJlZ2lzdGVyTmFtZWRG bG93Q29udGVudAogCiB2b2lkIEVsZW1lbnQ6OmxhenlSZWF0dGFjaChTaG91bGRTZXRBdHRhY2hl ZCBzaG91bGRTZXRBdHRhY2hlZCkKIHsKLSAgICBTdHlsZTo6QXR0YWNoQ29udGV4dCBjb250ZXh0 OwotICAgIGNvbnRleHQucGVyZm9ybWluZ1JlYXR0YWNoID0gdHJ1ZTsKLQogICAgIGlmIChhdHRh Y2hlZCgpKQotICAgICAgICBTdHlsZTo6ZGV0YWNoUmVuZGVyVHJlZSh0aGlzLCBjb250ZXh0KTsK KyAgICAgICAgU3R5bGU6OmRldGFjaFJlbmRlclRyZWVJblJlYXR0YWNoTW9kZSh0aGlzKTsKICAg ICBsYXp5QXR0YWNoKHNob3VsZFNldEF0dGFjaGVkKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAJKHJldmlzaW9uIDE1NDg2OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 NCw2ICs1NCwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFjZSBTdHlsZSB7CiAK K2VudW0gRGV0YWNoVHlwZSB7IE5vcm1hbERldGFjaCwgUmVhdHRhY2hEZXRhY2ggfTsKKworc3Rh dGljIHZvaWQgYXR0YWNoUmVuZGVyVHJlZShFbGVtZW50KiwgUmVuZGVyU3R5bGUqIHJlc29sdmVk U3R5bGUpOworc3RhdGljIHZvaWQgZGV0YWNoUmVuZGVyVHJlZShFbGVtZW50KiwgRGV0YWNoVHlw ZSk7CisKIENoYW5nZSBkZXRlcm1pbmVDaGFuZ2UoY29uc3QgUmVuZGVyU3R5bGUqIHMxLCBjb25z dCBSZW5kZXJTdHlsZSogczIsIFNldHRpbmdzKiBzZXR0aW5ncykKIHsKICAgICBpZiAoIXMxIHx8 ICFzMikKQEAgLTE4OCwxNCArMTkzLDE0IEBAIHN0YXRpYyBSZW5kZXJOYW1lZEZsb3dUaHJlYWQq IG1vdmVUb0Zsb3cKIH0KICNlbmRpZgogCi1zdGF0aWMgdm9pZCBjcmVhdGVSZW5kZXJlcklmTmVl ZGVkKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEF0dGFjaENvbnRleHQmIGNvbnRleHQpCitzdGF0 aWMgdm9pZCBjcmVhdGVSZW5kZXJlcklmTmVlZGVkKEVsZW1lbnQmIGVsZW1lbnQsIFJlbmRlclN0 eWxlKiByZXNvbHZlZFN0eWxlKQogewogICAgIEFTU0VSVCghZWxlbWVudC5yZW5kZXJlcigpKTsK IAogICAgIERvY3VtZW50JiBkb2N1bWVudCA9ICplbGVtZW50LmRvY3VtZW50KCk7CiAgICAgQ29u dGFpbmVyTm9kZSogcmVuZGVyaW5nUGFyZW50Tm9kZSA9IE5vZGVSZW5kZXJpbmdUcmF2ZXJzYWw6 OnBhcmVudCgmZWxlbWVudCk7CiAKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlID0gY29u dGV4dC5yZXNvbHZlZFN0eWxlOworICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUgPSByZXNv bHZlZFN0eWxlOwogCiAgICAgZWxlbWVudC5zZXRJc0luc2lkZVJlZ2lvbihmYWxzZSk7CiAKQEAg LTQzMSwxMSArNDM2LDggQEAgc3RhdGljIGJvb2wgY2hpbGRBdHRhY2hlZEFsbG93ZWRXaGVuQXR0 YQogfQogI2VuZGlmCiAKLXN0YXRpYyB2b2lkIGF0dGFjaENoaWxkcmVuKENvbnRhaW5lck5vZGUm IGN1cnJlbnQsIGNvbnN0IEF0dGFjaENvbnRleHQmIGNvbnRleHQpCitzdGF0aWMgdm9pZCBhdHRh Y2hDaGlsZHJlbihDb250YWluZXJOb2RlJiBjdXJyZW50KQogewotICAgIEF0dGFjaENvbnRleHQg Y2hpbGRyZW5Db250ZXh0KGNvbnRleHQpOwotICAgIGNoaWxkcmVuQ29udGV4dC5yZXNvbHZlZFN0 eWxlID0gMDsKLQogICAgIGZvciAoTm9kZSogY2hpbGQgPSBjdXJyZW50LmZpcnN0Q2hpbGQoKTsg Y2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgQVNTRVJUKCFj aGlsZC0+YXR0YWNoZWQoKSB8fCBjaGlsZEF0dGFjaGVkQWxsb3dlZFdoZW5BdHRhY2hpbmdDaGls ZHJlbihjdXJyZW50KSk7CiAgICAgICAgIGlmIChjaGlsZC0+YXR0YWNoZWQoKSkKQEAgLTQ0NSwx OCArNDQ3LDE4IEBAIHN0YXRpYyB2b2lkIGF0dGFjaENoaWxkcmVuKENvbnRhaW5lck5vZGUKICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChjaGlsZC0+aXNFbGVt ZW50Tm9kZSgpKQotICAgICAgICAgICAgYXR0YWNoUmVuZGVyVHJlZSh0b0VsZW1lbnQoY2hpbGQp LCBjaGlsZHJlbkNvbnRleHQpOworICAgICAgICAgICAgYXR0YWNoUmVuZGVyVHJlZSh0b0VsZW1l bnQoY2hpbGQpLCBudWxscHRyKTsKICAgICB9CiB9CiAKLXN0YXRpYyB2b2lkIGF0dGFjaFNoYWRv d1Jvb3QoU2hhZG93Um9vdCYgc2hhZG93Um9vdCwgY29uc3QgQXR0YWNoQ29udGV4dCYgY29udGV4 dCkKK3N0YXRpYyB2b2lkIGF0dGFjaFNoYWRvd1Jvb3QoU2hhZG93Um9vdCYgc2hhZG93Um9vdCkK IHsKICAgICBpZiAoc2hhZG93Um9vdC5hdHRhY2hlZCgpKQogICAgICAgICByZXR1cm47CiAgICAg U3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciA9IHNoYWRvd1Jvb3QuZG9jdW1lbnQoKS0+ZW5z dXJlU3R5bGVSZXNvbHZlcigpOwogICAgIHN0eWxlUmVzb2x2ZXIucHVzaFBhcmVudFNoYWRvd1Jv b3QoJnNoYWRvd1Jvb3QpOwogCi0gICAgYXR0YWNoQ2hpbGRyZW4oc2hhZG93Um9vdCwgY29udGV4 dCk7CisgICAgYXR0YWNoQ2hpbGRyZW4oc2hhZG93Um9vdCk7CiAKICAgICBzdHlsZVJlc29sdmVy LnBvcFBhcmVudFNoYWRvd1Jvb3QoJnNoYWRvd1Jvb3QpOwogCkBAIC00NjQsNyArNDY2LDcgQEAg c3RhdGljIHZvaWQgYXR0YWNoU2hhZG93Um9vdChTaGFkb3dSb290JgogICAgIHNoYWRvd1Jvb3Qu c2V0QXR0YWNoZWQodHJ1ZSk7CiB9CiAKLXZvaWQgYXR0YWNoUmVuZGVyVHJlZShFbGVtZW50KiBj dXJyZW50LCBjb25zdCBBdHRhY2hDb250ZXh0JiBjb250ZXh0KQorc3RhdGljIHZvaWQgYXR0YWNo UmVuZGVyVHJlZShFbGVtZW50KiBjdXJyZW50LCBSZW5kZXJTdHlsZSogcmVzb2x2ZWRTdHlsZSkK IHsKICAgICBQb3N0QXR0YWNoQ2FsbGJhY2tEaXNhYmxlciBjYWxsYmFja0Rpc2FibGVyKGN1cnJl bnQpOwogICAgIFdpZGdldEhpZXJhcmNoeVVwZGF0ZXNTdXNwZW5zaW9uU2NvcGUgc3VzcGVuZFdp ZGdldEhpZXJhcmNoeVVwZGF0ZXM7CkBAIC00NzIsNyArNDc0LDcgQEAgdm9pZCBhdHRhY2hSZW5k ZXJUcmVlKEVsZW1lbnQqIGN1cnJlbnQsIAogICAgIGlmIChjdXJyZW50LT5oYXNDdXN0b21TdHls ZVJlc29sdmVDYWxsYmFja3MoKSkKICAgICAgICAgY3VycmVudC0+d2lsbEF0dGFjaFJlbmRlcmVy cygpOwogCi0gICAgY3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgqY3VycmVudCwgY29udGV4dCk7Cisg ICAgY3JlYXRlUmVuZGVyZXJJZk5lZWRlZCgqY3VycmVudCwgcmVzb2x2ZWRTdHlsZSk7CiAKICAg ICBpZiAoY3VycmVudC0+cGFyZW50RWxlbWVudCgpICYmIGN1cnJlbnQtPnBhcmVudEVsZW1lbnQo KS0+aXNJbkNhbnZhc1N1YnRyZWUoKSkKICAgICAgICAgY3VycmVudC0+c2V0SXNJbkNhbnZhc1N1 YnRyZWUodHJ1ZSk7CkBAIC00ODQsMTEgKzQ4NiwxMSBAQCB2b2lkIGF0dGFjaFJlbmRlclRyZWUo RWxlbWVudCogY3VycmVudCwgCiAgICAgLy8gV2hlbiBhIHNoYWRvdyByb290IGV4aXN0cywgaXQg ZG9lcyB0aGUgd29yayBvZiBhdHRhY2hpbmcgdGhlIGNoaWxkcmVuLgogICAgIGlmIChTaGFkb3dS b290KiBzaGFkb3dSb290ID0gY3VycmVudC0+c2hhZG93Um9vdCgpKSB7CiAgICAgICAgIHBhcmVu dFB1c2hlci5wdXNoKCk7Ci0gICAgICAgIGF0dGFjaFNoYWRvd1Jvb3QoKnNoYWRvd1Jvb3QsIGNv bnRleHQpOworICAgICAgICBhdHRhY2hTaGFkb3dSb290KCpzaGFkb3dSb290KTsKICAgICB9IGVs c2UgaWYgKGN1cnJlbnQtPmZpcnN0Q2hpbGQoKSkKICAgICAgICAgcGFyZW50UHVzaGVyLnB1c2go KTsKIAotICAgIGF0dGFjaENoaWxkcmVuKCpjdXJyZW50LCBjb250ZXh0KTsKKyAgICBhdHRhY2hD aGlsZHJlbigqY3VycmVudCk7CiAKICAgICBOb2RlKiBzaWJsaW5nID0gY3VycmVudC0+bmV4dFNp YmxpbmcoKTsKICAgICBpZiAoY3VycmVudC0+cmVuZGVyZXIoKSAmJiBzaWJsaW5nICYmICFzaWJs aW5nLT5yZW5kZXJlcigpICYmIHNpYmxpbmctPmF0dGFjaGVkKCkpCkBAIC01MTAsMzIgKzUxMiwy OSBAQCB2b2lkIGF0dGFjaFJlbmRlclRyZWUoRWxlbWVudCogY3VycmVudCwgCiAgICAgICAgIGN1 cnJlbnQtPmRpZEF0dGFjaFJlbmRlcmVycygpOwogfQogCi1zdGF0aWMgdm9pZCBkZXRhY2hDaGls ZHJlbihDb250YWluZXJOb2RlJiBjdXJyZW50LCBjb25zdCBBdHRhY2hDb250ZXh0JiBjb250ZXh0 KQorc3RhdGljIHZvaWQgZGV0YWNoQ2hpbGRyZW4oQ29udGFpbmVyTm9kZSYgY3VycmVudCwgRGV0 YWNoVHlwZSBkZXRhY2hUeXBlKQogewotICAgIEF0dGFjaENvbnRleHQgY2hpbGRyZW5Db250ZXh0 KGNvbnRleHQpOwotICAgIGNoaWxkcmVuQ29udGV4dC5yZXNvbHZlZFN0eWxlID0gMDsKLQogICAg IGZvciAoTm9kZSogY2hpbGQgPSBjdXJyZW50LmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0g Y2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKICAgICAgICAgaWYgKGNoaWxkLT5pc1RleHROb2RlKCkp IHsKICAgICAgICAgICAgIFN0eWxlOjpkZXRhY2hUZXh0UmVuZGVyZXIoKnRvVGV4dChjaGlsZCkp OwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGNoaWxkLT5p c0VsZW1lbnROb2RlKCkpCi0gICAgICAgICAgICBkZXRhY2hSZW5kZXJUcmVlKHRvRWxlbWVudChj aGlsZCksIGNoaWxkcmVuQ29udGV4dCk7CisgICAgICAgICAgICBkZXRhY2hSZW5kZXJUcmVlKHRv RWxlbWVudChjaGlsZCksIGRldGFjaFR5cGUpOwogICAgIH0KICAgICBjdXJyZW50LmNsZWFyQ2hp bGROZWVkc1N0eWxlUmVjYWxjKCk7CiB9CiAKLXN0YXRpYyB2b2lkIGRldGFjaFNoYWRvd1Jvb3Qo U2hhZG93Um9vdCYgc2hhZG93Um9vdCwgY29uc3QgQXR0YWNoQ29udGV4dCYgY29udGV4dCkKK3N0 YXRpYyB2b2lkIGRldGFjaFNoYWRvd1Jvb3QoU2hhZG93Um9vdCYgc2hhZG93Um9vdCwgRGV0YWNo VHlwZSBkZXRhY2hUeXBlKQogewogICAgIGlmICghc2hhZG93Um9vdC5hdHRhY2hlZCgpKQogICAg ICAgICByZXR1cm47Ci0gICAgZGV0YWNoQ2hpbGRyZW4oc2hhZG93Um9vdCwgY29udGV4dCk7Cisg ICAgZGV0YWNoQ2hpbGRyZW4oc2hhZG93Um9vdCwgZGV0YWNoVHlwZSk7CiAKICAgICBzaGFkb3dS b290LnNldEF0dGFjaGVkKGZhbHNlKTsKIH0KIAotdm9pZCBkZXRhY2hSZW5kZXJUcmVlKEVsZW1l bnQqIGN1cnJlbnQsIGNvbnN0IEF0dGFjaENvbnRleHQmIGNvbnRleHQpCitzdGF0aWMgdm9pZCBk ZXRhY2hSZW5kZXJUcmVlKEVsZW1lbnQqIGN1cnJlbnQsIERldGFjaFR5cGUgZGV0YWNoVHlwZSkK IHsKICAgICBXaWRnZXRIaWVyYXJjaHlVcGRhdGVzU3VzcGVuc2lvblNjb3BlIHN1c3BlbmRXaWRn ZXRIaWVyYXJjaHlVcGRhdGVzOwogCkBAIC01NDYsMTMgKzU0NSwxMyBAQCB2b2lkIGRldGFjaFJl bmRlclRyZWUoRWxlbWVudCogY3VycmVudCwgCiAKICAgICAvLyBEbyBub3QgcmVtb3ZlIHRoZSBl bGVtZW50J3MgaG92ZXJlZCBhbmQgYWN0aXZlIHN0YXR1cwogICAgIC8vIGlmIHBlcmZvcm1pbmcg YSByZWF0dGFjaC4KLSAgICBpZiAoIWNvbnRleHQucGVyZm9ybWluZ1JlYXR0YWNoKQorICAgIGlm IChkZXRhY2hUeXBlICE9IFJlYXR0YWNoRGV0YWNoKQogICAgICAgICBjdXJyZW50LT5jbGVhckhv dmVyQW5kQWN0aXZlU3RhdHVzQmVmb3JlRGV0YWNoaW5nUmVuZGVyZXIoKTsKIAogICAgIGlmIChT aGFkb3dSb290KiBzaGFkb3dSb290ID0gY3VycmVudC0+c2hhZG93Um9vdCgpKQotICAgICAgICBk ZXRhY2hTaGFkb3dSb290KCpzaGFkb3dSb290LCBjb250ZXh0KTsKKyAgICAgICAgZGV0YWNoU2hh ZG93Um9vdCgqc2hhZG93Um9vdCwgZGV0YWNoVHlwZSk7CiAKLSAgICBkZXRhY2hDaGlsZHJlbigq Y3VycmVudCwgY29udGV4dCk7CisgICAgZGV0YWNoQ2hpbGRyZW4oKmN1cnJlbnQsIGRldGFjaFR5 cGUpOwogCiAgICAgaWYgKGN1cnJlbnQtPnJlbmRlcmVyKCkpCiAgICAgICAgIGN1cnJlbnQtPnJl bmRlcmVyKCktPmRlc3Ryb3lBbmRDbGVhbnVwQW5vbnltb3VzV3JhcHBlcnMoKTsKQEAgLTU2NCwx NyArNTYzLDYgQEAgdm9pZCBkZXRhY2hSZW5kZXJUcmVlKEVsZW1lbnQqIGN1cnJlbnQsIAogICAg ICAgICBjdXJyZW50LT5kaWREZXRhY2hSZW5kZXJlcnMoKTsKIH0KIAotdm9pZCByZWF0dGFjaFJl bmRlclRyZWUoRWxlbWVudCogY3VycmVudCwgY29uc3QgQXR0YWNoQ29udGV4dCYgY29udGV4dCkK LXsKLSAgICBBdHRhY2hDb250ZXh0IHJlYXR0YWNoQ29udGV4dChjb250ZXh0KTsKLSAgICByZWF0 dGFjaENvbnRleHQucGVyZm9ybWluZ1JlYXR0YWNoID0gdHJ1ZTsKLQotICAgIGlmIChjdXJyZW50 LT5hdHRhY2hlZCgpKQotICAgICAgICBkZXRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIHJlYXR0YWNo Q29udGV4dCk7Ci0KLSAgICBhdHRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIHJlYXR0YWNoQ29udGV4 dCk7Ci19Ci0KIHN0YXRpYyBib29sIHBzZXVkb1N0eWxlQ2FjaGVJc0ludmFsaWQoUmVuZGVyT2Jq ZWN0KiByZW5kZXJlciwgUmVuZGVyU3R5bGUqIG5ld1N0eWxlKQogewogICAgIGNvbnN0IFJlbmRl clN0eWxlKiBjdXJyZW50U3R5bGUgPSByZW5kZXJlci0+c3R5bGUoKTsKQEAgLTYyMSw5ICs2MDks OSBAQCBzdGF0aWMgQ2hhbmdlIHJlc29sdmVMb2NhbChFbGVtZW50KiBjdXJyCiAgICAgICAgIGxv Y2FsQ2hhbmdlID0gZGV0ZXJtaW5lQ2hhbmdlKGN1cnJlbnRTdHlsZS5nZXQoKSwgbmV3U3R5bGUu Z2V0KCksIGRvY3VtZW50LT5zZXR0aW5ncygpKTsKICAgICB9CiAgICAgaWYgKGxvY2FsQ2hhbmdl ID09IERldGFjaCkgewotICAgICAgICBBdHRhY2hDb250ZXh0IHJlYXR0YWNoQ29udGV4dDsKLSAg ICAgICAgcmVhdHRhY2hDb250ZXh0LnJlc29sdmVkU3R5bGUgPSBuZXdTdHlsZS5nZXQoKTsKLSAg ICAgICAgcmVhdHRhY2hSZW5kZXJUcmVlKGN1cnJlbnQsIHJlYXR0YWNoQ29udGV4dCk7CisgICAg ICAgIGlmIChjdXJyZW50LT5hdHRhY2hlZCgpKQorICAgICAgICAgICAgZGV0YWNoUmVuZGVyVHJl ZShjdXJyZW50LCBSZWF0dGFjaERldGFjaCk7CisgICAgICAgIGF0dGFjaFJlbmRlclRyZWUoY3Vy cmVudCwgbmV3U3R5bGUuZ2V0KCkpOwogICAgICAgICByZXR1cm4gRGV0YWNoOwogICAgIH0KIApA QCAtODQ0LDUgKzgzMiwyNyBAQCB2b2lkIHJlc29sdmVUcmVlKERvY3VtZW50KiBkb2N1bWVudCwg Q2hhCiAgICAgfQogfQogCit2b2lkIGF0dGFjaFJlbmRlclRyZWUoRWxlbWVudCogZWxlbWVudCkK K3sKKyAgICBhdHRhY2hSZW5kZXJUcmVlKGVsZW1lbnQsIG51bGxwdHIpOworfQorCit2b2lkIGRl dGFjaFJlbmRlclRyZWUoRWxlbWVudCogZWxlbWVudCkKK3sKKyAgICBkZXRhY2hSZW5kZXJUcmVl KGVsZW1lbnQsIE5vcm1hbERldGFjaCk7Cit9CisKK3ZvaWQgZGV0YWNoUmVuZGVyVHJlZUluUmVh dHRhY2hNb2RlKEVsZW1lbnQqIGVsZW1lbnQpCit7CisgICAgZGV0YWNoUmVuZGVyVHJlZShlbGVt ZW50LCBSZWF0dGFjaERldGFjaCk7Cit9CisKK3ZvaWQgcmVhdHRhY2hSZW5kZXJUcmVlKEVsZW1l bnQqIGN1cnJlbnQpCit7CisgICAgaWYgKGN1cnJlbnQtPmF0dGFjaGVkKCkpCisgICAgICAgIGRl dGFjaFJlbmRlclRyZWUoY3VycmVudCwgUmVhdHRhY2hEZXRhY2gpOworICAgIGF0dGFjaFJlbmRl clRyZWUoY3VycmVudCwgbnVsbHB0cik7Cit9CisKIH0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVJlc29sdmVUcmVlLmgJKHJldmlzaW9uIDE1NDg2OSkKKysrIFNvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsMTUgKzQx LDExIEBAIGVudW0gQ2hhbmdlIHsgTm9DaGFuZ2UsIE5vSW5oZXJpdCwgSW5oZXIKIHZvaWQgcmVz b2x2ZVRyZWUoRWxlbWVudCosIENoYW5nZSk7CiB2b2lkIHJlc29sdmVUcmVlKERvY3VtZW50Kiwg Q2hhbmdlKTsKIAotc3RydWN0IEF0dGFjaENvbnRleHQgewotICAgIFJlbmRlclN0eWxlKiByZXNv bHZlZFN0eWxlOwotICAgIGJvb2wgcGVyZm9ybWluZ1JlYXR0YWNoOwotCi0gICAgQXR0YWNoQ29u dGV4dCgpIDogcmVzb2x2ZWRTdHlsZSgwKSwgcGVyZm9ybWluZ1JlYXR0YWNoKGZhbHNlKSB7IH0K LX07Ci12b2lkIGF0dGFjaFJlbmRlclRyZWUoRWxlbWVudCosIGNvbnN0IEF0dGFjaENvbnRleHQm ID0gQXR0YWNoQ29udGV4dCgpKTsKLXZvaWQgZGV0YWNoUmVuZGVyVHJlZShFbGVtZW50KiwgY29u c3QgQXR0YWNoQ29udGV4dCYgPSBBdHRhY2hDb250ZXh0KCkpOwotdm9pZCByZWF0dGFjaFJlbmRl clRyZWUoRWxlbWVudCosIGNvbnN0IEF0dGFjaENvbnRleHQmID0gQXR0YWNoQ29udGV4dCgpKTsK K3ZvaWQgYXR0YWNoUmVuZGVyVHJlZShFbGVtZW50Kik7Cit2b2lkIGRldGFjaFJlbmRlclRyZWUo RWxlbWVudCopOwordm9pZCByZWF0dGFjaFJlbmRlclRyZWUoRWxlbWVudCopOworLy8gRklYTUU6 IFRoaXMgaXMgb25seSB1c2VkIGZvciAibGF6eSByZWF0dGFjaCIgZm9yIHNoYWRvdyB0cmVlcy4K K3ZvaWQgZGV0YWNoUmVuZGVyVHJlZUluUmVhdHRhY2hNb2RlKEVsZW1lbnQqKTsKIAogdm9pZCBh dHRhY2hUZXh0UmVuZGVyZXIoVGV4dCYpOwogdm9pZCBkZXRhY2hUZXh0UmVuZGVyZXIoVGV4dCYp Owo=