130458 2014-03-19 10:02:24 -0700 JSC bindings should use the passed-in global object for wrapper caching. 2014-03-19 13:43:32 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling barraclough cdumez cgarcia commit-queue kling sam oldest_to_newest 992140 0 kling 2014-03-19 10:02:24 -0700 Let's do this. 992142 1 227189 kling 2014-03-19 10:04:17 -0700 Created attachment 227189 Patch for EWS 992216 2 227211 kling 2014-03-19 12:41:26 -0700 Created attachment 227211 Patch 992226 3 227211 ggaren 2014-03-19 13:26:18 -0700 Comment on attachment 227211 Patch r=me Fix build please. 992235 4 kling 2014-03-19 13:43:32 -0700 Committed r165914: <http://trac.webkit.org/changeset/165914> 227189 2014-03-19 10:04:17 -0700 2014-03-19 12:41:26 -0700 Patch for EWS ews-130458.diff text/plain 17842 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTUnVsZUN1c3RvbS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1J1bGVDdXN0b20uY3BwCmluZGV4 IDE3YWVkZDMuLjVjMjAwODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTQ1NTUnVsZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlND U1NSdWxlQ3VzdG9tLmNwcApAQCAtNzAsNyArNzAsNyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRl KiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDU1NSdWxlKiBydWxlKQog ICAgIGlmICghcnVsZSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgSlNPYmplY3Qq IHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgcnVsZSk7Cisg ICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29y bGQoKSwgcnVsZSk7CiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1N0eWxlRGVjbGFy YXRpb25DdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NTdHlsZURl Y2xhcmF0aW9uQ3VzdG9tLmNwcAppbmRleCBlNzVhMmQxLi44MGY3MmVjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1N0eWxlRGVjbGFyYXRpb25DdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTU3R5bGVEZWNsYXJhdGlvbkN1 c3RvbS5jcHAKQEAgLTM3Niw3ICszNzYsNyBAQCBKU1ZhbHVlIEpTQ1NTU3R5bGVEZWNsYXJhdGlv bjo6Z2V0UHJvcGVydHlDU1NWYWx1ZShFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKCFjc3NWYWx1 ZSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgY3VycmVudFdvcmxkKGV4ZWMpLm1f Y3NzVmFsdWVSb290cy5hZGQoY3NzVmFsdWUuZ2V0KCksIHJvb3QoJmltcGwoKSkpOyAvLyBCYWxh bmNlZCBieSBKU0NTU1ZhbHVlT3duZXI6OmZpbmFsaXplKCkuCisgICAgZ2xvYmFsT2JqZWN0KCkt PndvcmxkKCkubV9jc3NWYWx1ZVJvb3RzLmFkZChjc3NWYWx1ZS5nZXQoKSwgcm9vdCgmaW1wbCgp KSk7IC8vIEJhbGFuY2VkIGJ5IEpTQ1NTVmFsdWVPd25lcjo6ZmluYWxpemUoKS4KICAgICByZXR1 cm4gdG9KUyhleGVjLCBnbG9iYWxPYmplY3QoKSwgV1RGOjpnZXRQdHIoY3NzVmFsdWUpKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NWYWx1ZUN1c3Rv bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1ZhbHVlQ3VzdG9tLmNwcApp bmRleCBlNjE0ZDQzLi4wYjJkYWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0NTU1ZhbHVlQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0NTU1ZhbHVlQ3VzdG9tLmNwcApAQCAtODAsNyArODAsNyBAQCBKU1ZhbHVlIHRvSlMoRXhl Y1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDU1NWYWx1ZSog dmFsdWUpCiAgICAgaWYgKCF2YWx1ZS0+aXNDU1NPTVNhZmUoKSkKICAgICAgICAgcmV0dXJuIGpz TnVsbCgpOwogCi0gICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJl bnRXb3JsZChleGVjKSwgdmFsdWUpOworICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVk V3JhcHBlcihnbG9iYWxPYmplY3QtPndvcmxkKCksIHZhbHVlKTsKIAogICAgIGlmICh3cmFwcGVy KQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRE9NQmluZGluZy5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNE T01CaW5kaW5nLmgKaW5kZXggZWVhOTc3Mi4uOGY4ODFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNET01CaW5kaW5nLmgKQEAgLTE5OSwxMSArMTk5LDExIEBAIHRlbXBsYXRlIDx0 eXBlbmFtZSBET01DbGFzcywgdHlwZW5hbWUgV3JhcHBlckNsYXNzPiBpbmxpbmUgdm9pZCB1bmNh Y2hlV3JhcHBlcihECiB0ZW1wbGF0ZTxjbGFzcyBXcmFwcGVyQ2xhc3MsIGNsYXNzIERPTUNsYXNz PiBpbmxpbmUgSlNET01XcmFwcGVyKiBjcmVhdGVXcmFwcGVyKEpTQzo6RXhlY1N0YXRlKiBleGVj LCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBET01DbGFzcyogbm9kZSkKIHsKICAg ICBBU1NFUlQobm9kZSk7Ci0gICAgQVNTRVJUKCFnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3Js ZChleGVjKSwgbm9kZSkpOworICAgIEFTU0VSVCghZ2V0Q2FjaGVkV3JhcHBlcihnbG9iYWxPYmpl Y3QtPndvcmxkKCksIG5vZGUpKTsKICAgICBXcmFwcGVyQ2xhc3MqIHdyYXBwZXIgPSBXcmFwcGVy Q2xhc3M6OmNyZWF0ZShnZXRET01TdHJ1Y3R1cmU8V3JhcHBlckNsYXNzPihleGVjLT52bSgpLCBn bG9iYWxPYmplY3QpLCBnbG9iYWxPYmplY3QsIG5vZGUpOwogICAgIC8vIEZJWE1FOiBUaGUgZW50 aXJlIGZ1bmN0aW9uIGNhbiBiZSByZW1vdmVkLCBvbmNlIHdlIGZpeCBjYWNoaW5nLgogICAgIC8v IFRoaXMgZnVuY3Rpb24gaXMgYSBvbmUtb2ZmIGhhY2sgdG8gbWFrZSBOb2RlcyBjYWNoZSBpbiB0 aGUgcmlnaHQgZ2xvYmFsIG9iamVjdC4KLSAgICBjYWNoZVdyYXBwZXIoY3VycmVudFdvcmxkKGV4 ZWMpLCBub2RlLCB3cmFwcGVyKTsKKyAgICBjYWNoZVdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3Js ZCgpLCBub2RlLCB3cmFwcGVyKTsKICAgICByZXR1cm4gd3JhcHBlcjsKIH0KIApAQCAtMjExLDIx ICsyMTEsMjEgQEAgdGVtcGxhdGU8Y2xhc3MgV3JhcHBlckNsYXNzLCBjbGFzcyBET01DbGFzcz4g aW5saW5lIEpTQzo6SlNWYWx1ZSB3cmFwKEpTQzo6RXhlY1MKIHsKICAgICBpZiAoIWRvbU9iamVj dCkKICAgICAgICAgcmV0dXJuIEpTQzo6anNOdWxsKCk7Ci0gICAgaWYgKEpTQzo6SlNPYmplY3Qq IHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgZG9tT2JqZWN0 KSkKKyAgICBpZiAoSlNDOjpKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xv YmFsT2JqZWN0LT53b3JsZCgpLCBkb21PYmplY3QpKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsK ICAgICByZXR1cm4gY3JlYXRlV3JhcHBlcjxXcmFwcGVyQ2xhc3M+KGV4ZWMsIGdsb2JhbE9iamVj dCwgZG9tT2JqZWN0KTsKIH0KIAotdGVtcGxhdGU8Y2xhc3MgV3JhcHBlckNsYXNzLCBjbGFzcyBE T01DbGFzcz4gaW5saW5lIEpTQzo6SlNWYWx1ZSBnZXRFeGlzdGluZ1dyYXBwZXIoSlNDOjpFeGVj U3RhdGUqIGV4ZWMsIERPTUNsYXNzKiBkb21PYmplY3QpCit0ZW1wbGF0ZTxjbGFzcyBXcmFwcGVy Q2xhc3MsIGNsYXNzIERPTUNsYXNzPiBpbmxpbmUgSlNDOjpKU1ZhbHVlIGdldEV4aXN0aW5nV3Jh cHBlcihKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBET01DbGFzcyogZG9tT2JqZWN0 KQogewogICAgIEFTU0VSVChkb21PYmplY3QpOwotICAgIHJldHVybiBnZXRDYWNoZWRXcmFwcGVy KGN1cnJlbnRXb3JsZChleGVjKSwgZG9tT2JqZWN0KTsKKyAgICByZXR1cm4gZ2V0Q2FjaGVkV3Jh cHBlcihnbG9iYWxPYmplY3QtPndvcmxkKCksIGRvbU9iamVjdCk7CiB9CiAKIHRlbXBsYXRlPGNs YXNzIFdyYXBwZXJDbGFzcywgY2xhc3MgRE9NQ2xhc3M+IGlubGluZSBKU0M6OkpTVmFsdWUgY3Jl YXRlTmV3V3JhcHBlcihKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCwgRE9NQ2xhc3MqIGRvbU9iamVjdCkKIHsKICAgICBBU1NFUlQoZG9tT2JqZWN0 KTsKLSAgICBBU1NFUlQoIWdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBkb21P YmplY3QpKTsKKyAgICBBU1NFUlQoIWdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3Js ZCgpLCBkb21PYmplY3QpKTsKICAgICByZXR1cm4gY3JlYXRlV3JhcHBlcjxXcmFwcGVyQ2xhc3M+ KGV4ZWMsIGdsb2JhbE9iamVjdCwgZG9tT2JqZWN0KTsKIH0KIApAQCAtMzQ4LDExICszNDgsMTEg QEAgaW5saW5lIEpTQzo6SlNWYWx1ZSB0b0pTKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0RPTUds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LAogewogICAgIGlmICghYnVmZmVyKQogICAgICAgICBy ZXR1cm4gSlNDOjpqc051bGwoKTsKLSAgICBpZiAoSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IGdldEV4 aXN0aW5nV3JhcHBlcjxKU0M6OkpTQXJyYXlCdWZmZXI+KGV4ZWMsIGJ1ZmZlcikpCisgICAgaWYg KEpTQzo6SlNWYWx1ZSByZXN1bHQgPSBnZXRFeGlzdGluZ1dyYXBwZXI8SlNDOjpKU0FycmF5QnVm ZmVyPihnbG9iYWxPYmplY3QsIGJ1ZmZlcikpCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAg YnVmZmVyLT5yZWYoKTsKICAgICBKU0M6OkpTQXJyYXlCdWZmZXIqIHdyYXBwZXIgPSBKU0M6OkpT QXJyYXlCdWZmZXI6OmNyZWF0ZShleGVjLT52bSgpLCBnbG9iYWxPYmplY3QtPmFycmF5QnVmZmVy U3RydWN0dXJlKCksIGJ1ZmZlcik7Ci0gICAgY2FjaGVXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVj KSwgYnVmZmVyLCB3cmFwcGVyKTsKKyAgICBjYWNoZVdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3Js ZCgpLCBidWZmZXIsIHdyYXBwZXIpOwogICAgIHJldHVybiB3cmFwcGVyOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKaW5kZXggZTky NjMxOS4uOTRiNzVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNE T01XaW5kb3dDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9N V2luZG93Q3VzdG9tLmNwcApAQCAtNTk0LDcgKzU5NCw3IEBAIEpTVmFsdWUgSlNET01XaW5kb3c6 OnBvc3RNZXNzYWdlKEV4ZWNTdGF0ZSogZXhlYykKIEpTVmFsdWUgSlNET01XaW5kb3c6OnNldFRp bWVvdXQoRXhlY1N0YXRlKiBleGVjKQogewogICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSogY29u dGVudFNlY3VyaXR5UG9saWN5ID0gaW1wbCgpLmRvY3VtZW50KCkgPyBpbXBsKCkuZG9jdW1lbnQo KS0+Y29udGVudFNlY3VyaXR5UG9saWN5KCkgOiAwOwotICAgIE93blB0cjxTY2hlZHVsZWRBY3Rp b24+IGFjdGlvbiA9IFNjaGVkdWxlZEFjdGlvbjo6Y3JlYXRlKGV4ZWMsIGN1cnJlbnRXb3JsZChl eGVjKSwgY29udGVudFNlY3VyaXR5UG9saWN5KTsKKyAgICBPd25QdHI8U2NoZWR1bGVkQWN0aW9u PiBhY3Rpb24gPSBTY2hlZHVsZWRBY3Rpb246OmNyZWF0ZShleGVjLCBnbG9iYWxPYmplY3QoKS0+ d29ybGQoKSwgY29udGVudFNlY3VyaXR5UG9saWN5KTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0 aW9uKCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCkBAIC02MTMsNyArNjEzLDcg QEAgSlNWYWx1ZSBKU0RPTVdpbmRvdzo6c2V0VGltZW91dChFeGVjU3RhdGUqIGV4ZWMpCiBKU1Zh bHVlIEpTRE9NV2luZG93OjpzZXRJbnRlcnZhbChFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgQ29u dGVudFNlY3VyaXR5UG9saWN5KiBjb250ZW50U2VjdXJpdHlQb2xpY3kgPSBpbXBsKCkuZG9jdW1l bnQoKSA/IGltcGwoKS5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKSA6IDA7Ci0g ICAgT3duUHRyPFNjaGVkdWxlZEFjdGlvbj4gYWN0aW9uID0gU2NoZWR1bGVkQWN0aW9uOjpjcmVh dGUoZXhlYywgY3VycmVudFdvcmxkKGV4ZWMpLCBjb250ZW50U2VjdXJpdHlQb2xpY3kpOworICAg IE93blB0cjxTY2hlZHVsZWRBY3Rpb24+IGFjdGlvbiA9IFNjaGVkdWxlZEFjdGlvbjo6Y3JlYXRl KGV4ZWMsIGdsb2JhbE9iamVjdCgpLT53b3JsZCgpLCBjb250ZW50U2VjdXJpdHlQb2xpY3kpOwog ICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVk KCk7CiAgICAgaW50IGRlbGF5ID0gZXhlYy0+YXJndW1lbnQoMSkudG9JbnQzMihleGVjKTsKQEAg LTYzOCw3ICs2MzgsNyBAQCBKU1ZhbHVlIEpTRE9NV2luZG93OjphZGRFdmVudExpc3RlbmVyKEV4 ZWNTdGF0ZSogZXhlYykKICAgICBpZiAoIWxpc3RlbmVyLmlzT2JqZWN0KCkpCiAgICAgICAgIHJl dHVybiBqc1VuZGVmaW5lZCgpOwogCi0gICAgaW1wbCgpLmFkZEV2ZW50TGlzdGVuZXIoZXhlYy0+ YXJndW1lbnQoMCkudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpLCBKU0V2ZW50TGlzdGVuZXI6 OmNyZWF0ZShhc09iamVjdChsaXN0ZW5lciksIHRoaXMsIGZhbHNlLCBjdXJyZW50V29ybGQoZXhl YykpLCBleGVjLT5hcmd1bWVudCgyKS50b0Jvb2xlYW4oZXhlYykpOworICAgIGltcGwoKS5hZGRF dmVudExpc3RlbmVyKGV4ZWMtPmFyZ3VtZW50KDApLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVj KSwgSlNFdmVudExpc3RlbmVyOjpjcmVhdGUoYXNPYmplY3QobGlzdGVuZXIpLCB0aGlzLCBmYWxz ZSwgZ2xvYmFsT2JqZWN0KCktPndvcmxkKCkpLCBleGVjLT5hcmd1bWVudCgyKS50b0Jvb2xlYW4o ZXhlYykpOwogICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogfQogCkBAIC02NTIsNyArNjUyLDcg QEAgSlNWYWx1ZSBKU0RPTVdpbmRvdzo6cmVtb3ZlRXZlbnRMaXN0ZW5lcihFeGVjU3RhdGUqIGV4 ZWMpCiAgICAgaWYgKCFsaXN0ZW5lci5pc09iamVjdCgpKQogICAgICAgICByZXR1cm4ganNVbmRl ZmluZWQoKTsKIAotICAgIGltcGwoKS5yZW1vdmVFdmVudExpc3RlbmVyKGV4ZWMtPmFyZ3VtZW50 KDApLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSwgSlNFdmVudExpc3RlbmVyOjpjcmVhdGUo YXNPYmplY3QobGlzdGVuZXIpLCB0aGlzLCBmYWxzZSwgY3VycmVudFdvcmxkKGV4ZWMpKS5nZXQo KSwgZXhlYy0+YXJndW1lbnQoMikudG9Cb29sZWFuKGV4ZWMpKTsKKyAgICBpbXBsKCkucmVtb3Zl RXZlbnRMaXN0ZW5lcihleGVjLT5hcmd1bWVudCgwKS50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhl YyksIEpTRXZlbnRMaXN0ZW5lcjo6Y3JlYXRlKGFzT2JqZWN0KGxpc3RlbmVyKSwgdGhpcywgZmFs c2UsIGdsb2JhbE9iamVjdCgpLT53b3JsZCgpKS5nZXQoKSwgZXhlYy0+YXJndW1lbnQoMikudG9C b29sZWFuKGV4ZWMpKTsKICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RvY3VtZW50Q3VzdG9tLmNwcAppbmRleCA4ZjY5ZWI4 Li4xY2M1ODViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RvY3Vt ZW50Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RvY3VtZW50 Q3VzdG9tLmNwcApAQCAtNTMsMTEgKzUzLDExIEBAIEpTVmFsdWUgSlNEb2N1bWVudDo6bG9jYXRp b24oRXhlY1N0YXRlKiBleGVjKSBjb25zdAogICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAKICAg ICBMb2NhdGlvbiogbG9jYXRpb24gPSBmcmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPmxv Y2F0aW9uKCk7Ci0gICAgaWYgKEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihj dXJyZW50V29ybGQoZXhlYyksIGxvY2F0aW9uKSkKKyAgICBpZiAoSlNPYmplY3QqIHdyYXBwZXIg PSBnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdCgpLT53b3JsZCgpLCBsb2NhdGlvbikpCiAg ICAgICAgIHJldHVybiB3cmFwcGVyOwogCiAgICAgSlNMb2NhdGlvbioganNMb2NhdGlvbiA9IEpT TG9jYXRpb246OmNyZWF0ZShnZXRET01TdHJ1Y3R1cmU8SlNMb2NhdGlvbj4oZXhlYy0+dm0oKSwg Z2xvYmFsT2JqZWN0KCkpLCBnbG9iYWxPYmplY3QoKSwgbG9jYXRpb24pOwotICAgIGNhY2hlV3Jh cHBlcihjdXJyZW50V29ybGQoZXhlYyksIGxvY2F0aW9uLCBqc0xvY2F0aW9uKTsKKyAgICBjYWNo ZVdyYXBwZXIoZ2xvYmFsT2JqZWN0KCktPndvcmxkKCksIGxvY2F0aW9uLCBqc0xvY2F0aW9uKTsK ICAgICByZXR1cm4ganNMb2NhdGlvbjsKIH0KIApAQCAtODAsMTQgKzgwLDE0IEBAIEpTVmFsdWUg dG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIERv Y3VtZW50KiBkb2N1bWVuCiAgICAgaWYgKCFkb2N1bWVudCkKICAgICAgICAgcmV0dXJuIGpzTnVs bCgpOwogCi0gICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRX b3JsZChleGVjKSwgZG9jdW1lbnQpOworICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVk V3JhcHBlcihnbG9iYWxPYmplY3QtPndvcmxkKCksIGRvY3VtZW50KTsKICAgICBpZiAod3JhcHBl cikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAKICAgICBpZiAoRE9NV2luZG93KiBkb21XaW5k b3cgPSBkb2N1bWVudC0+ZG9tV2luZG93KCkpIHsKICAgICAgICAgZ2xvYmFsT2JqZWN0ID0gdG9K U0RPTVdpbmRvdyh0b0pTKGV4ZWMsIGRvbVdpbmRvdykpOwogICAgICAgICAvLyBDcmVhdGluZyBh IHdyYXBwZXIgZm9yIGRvbVdpbmRvdyBtaWdodCBoYXZlIGNyZWF0ZWQgYSB3cmFwcGVyIGZvciBk b2N1bWVudCBhcyB3ZWxsLgotICAgICAgICB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJy ZW50V29ybGQoZXhlYyksIGRvY3VtZW50KTsKKyAgICAgICAgd3JhcHBlciA9IGdldENhY2hlZFdy YXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBkb2N1bWVudCk7CiAgICAgICAgIGlmICh3cmFw cGVyKQogICAgICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFbGVtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTRWxlbWVudEN1c3RvbS5jcHAKaW5kZXggYmY3MTUwZS4uY2E1MjZm MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFbGVtZW50Q3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0VsZW1lbnRDdXN0b20uY3Bw CkBAIC01Myw3ICs1Myw3IEBAIEpTVmFsdWUgdG9KU05ld2x5Q3JlYXRlZChFeGVjU3RhdGUqIGV4 ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEVsZW1lCiAgICAgaWYgKCFlbGVt ZW50KQogICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAKLSAgICBBU1NFUlQoIWdldENhY2hlZFdy YXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBlbGVtZW50KSk7CisgICAgQVNTRVJUKCFnZXRDYWNo ZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQoKSwgZWxlbWVudCkpOwogCiAgICAgSlNET01X cmFwcGVyKiB3cmFwcGVyOyAgICAgICAgCiAgICAgaWYgKGVsZW1lbnQtPmlzSFRNTEVsZW1lbnQo KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRDdXN0b20u Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudEN1c3RvbS5jcHAKaW5kZXgg ZWE1NjFkMC4uYmVhOWJiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNFdmVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVu dEN1c3RvbS5jcHAKQEAgLTU5LDcgKzU5LDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhl YywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgRXZlbnQqIGV2ZW50KQogICAgIGlm ICghZXZlbnQpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAotICAgIEpTT2JqZWN0KiB3cmFw cGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGV2ZW50KTsKKyAgICBK U09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgp LCBldmVudCk7CiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxDb2xsZWN0aW9uQ3Vz dG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENvbGxlY3Rpb25DdXN0 b20uY3BwCmluZGV4IDFiMDJjYjIuLmIzNmI1NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTSFRNTENvbGxlY3Rpb25DdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTSFRNTENvbGxlY3Rpb25DdXN0b20uY3BwCkBAIC01Nyw3ICs1Nyw3 IEBAIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplY3QsIEhUTUxDb2xsZWN0aW9uKiBjCiAgICAgaWYgKCFjb2xsZWN0aW9uKQogICAgICAg ICByZXR1cm4ganNOdWxsKCk7CiAKLSAgICBKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdy YXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBjb2xsZWN0aW9uKTsKKyAgICBKU09iamVjdCogd3Jh cHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBjb2xsZWN0aW9u KTsKIAogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTFRlbXBsYXRlRWxlbWVudEN1c3Rv bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0hUTUxUZW1wbGF0ZUVsZW1lbnRD dXN0b20uY3BwCmluZGV4IGU0Y2RhMmIuLjJkN2Y1YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTSFRNTFRlbXBsYXRlRWxlbWVudEN1c3RvbS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNIVE1MVGVtcGxhdGVFbGVtZW50Q3VzdG9tLmNwcApA QCAtNDksNyArNDksNyBAQCBKU1ZhbHVlIEpTSFRNTFRlbXBsYXRlRWxlbWVudDo6Y29udGVudChF eGVjU3RhdGUqIGV4ZWMpIGNvbnN0CiAKICAgICBEb2N1bWVudEZyYWdtZW50KiBjb250ZW50ID0g aW1wbCgpLmNvbnRlbnQoKTsKIAotICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3Jh cHBlcihjdXJyZW50V29ybGQoZXhlYyksIGNvbnRlbnQpOworICAgIEpTT2JqZWN0KiB3cmFwcGVy ID0gZ2V0Q2FjaGVkV3JhcHBlcihnbG9iYWxPYmplY3QoKS0+d29ybGQoKSwgY29udGVudCk7CiAg ICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdlRGF0YUN1c3RvbS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdlRGF0YUN1c3RvbS5jcHAKaW5kZXggMTU3NmQ1ZS4u YjBkMWQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFnZURh dGFDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW1hZ2VEYXRh Q3VzdG9tLmNwcApAQCAtMzksNyArMzksNyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVj LCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBJbWFnZURhdGEqIGltYWdlRAogICAg IGlmICghaW1hZ2VEYXRhKQogICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAgICAgCi0gICAgSlNP YmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgaW1h Z2VEYXRhKTsKKyAgICBKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFs T2JqZWN0LT53b3JsZCgpLCBpbWFnZURhdGEpOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICBy ZXR1cm4gd3JhcHBlcjsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTTm9kZUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVD dXN0b20uY3BwCmluZGV4IDUxNTI5MDguLmI5YzY2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNOb2RlQ3VzdG9tLmNwcApAQCAtMTk2LDcgKzE5Niw3IEBAIHZvaWQgSlNOb2Rl Ojp2aXNpdENoaWxkcmVuKEpTQ2VsbCogY2VsbCwgU2xvdFZpc2l0b3ImIHZpc2l0b3IpCiBzdGF0 aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGNyZWF0ZVdyYXBwZXJJbmxpbmUoRXhlY1N0YXRlKiBl eGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBOb2RlKiBub2RlKQogewogICAg IEFTU0VSVChub2RlKTsKLSAgICBBU1NFUlQoIWdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxk KGV4ZWMpLCBub2RlKSk7CisgICAgQVNTRVJUKCFnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVj dC0+d29ybGQoKSwgbm9kZSkpOwogICAgIAogICAgIEpTRE9NV3JhcHBlciogd3JhcHBlcjsgICAg CiAgICAgc3dpdGNoIChub2RlLT5ub2RlVHlwZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTTm9kZUN1c3RvbS5oCmluZGV4IDg1Y2FhNDAuLmJmN2M5YTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5oCkBAIC00MCw3ICs0MCw3IEBAIGlubGluZSBK U0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBKU0M6OmpzTnVs bCgpOwogCi0gICAgSlNOb2RlKiB3cmFwcGVyID0gSlNDOjpqc0Nhc3Q8SlNOb2RlKj4oZ2V0Q2Fj aGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIG5vZGUpKTsKKyAgICBKU05vZGUqIHdyYXBw ZXIgPSBKU0M6OmpzQ2FzdDxKU05vZGUqPihnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+ d29ybGQoKSwgbm9kZSkpOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBl cjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTVkdQYXRoU2Vn Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTU1ZHUGF0aFNlZ0N1c3Rv bS5jcHAKaW5kZXggNzc5ZmVkYy4uZGJhZTQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNTVkdQYXRoU2VnQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU1NWR1BhdGhTZWdDdXN0b20uY3BwCkBAIC02NCw3ICs2NCw3IEBAIEpTVmFs dWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3Qs IFNWR1BhdGhTZWcqIG9iamVjCiAgICAgaWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybiBqc051 bGwoKTsKIAotICAgIGlmIChKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoY3Vy cmVudFdvcmxkKGV4ZWMpLCBvYmplY3QpKQorICAgIGlmIChKU09iamVjdCogd3JhcHBlciA9IGdl dENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBvYmplY3QpKQogICAgICAgICBy ZXR1cm4gd3JhcHBlcjsKIAogICAgIHN3aXRjaCAob2JqZWN0LT5wYXRoU2VnVHlwZSgpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1N0eWxlU2hlZXRDdXN0b20u Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTdHlsZVNoZWV0Q3VzdG9tLmNwcApp bmRleCBlN2QwNWIxLi45YzBiNmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU1N0eWxlU2hlZXRDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTU3R5bGVTaGVldEN1c3RvbS5jcHAKQEAgLTUwLDcgKzUwLDcgQEAgSlNWYWx1ZSB0b0pT KEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgU3R5bGVT aGVldCogc3R5bGUKICAgICBpZiAoIXN0eWxlU2hlZXQpCiAgICAgICAgIHJldHVybiBqc051bGwo KTsKIAotICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29y bGQoZXhlYyksIHN0eWxlU2hlZXQpOworICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVk V3JhcHBlcihnbG9iYWxPYmplY3QtPndvcmxkKCksIHN0eWxlU2hlZXQpOwogICAgIGlmICh3cmFw cGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNUZXh0VHJhY2tDdWVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNUZXh0VHJhY2tDdWVDdXN0b20uY3BwCmluZGV4IDNkY2U2NzcuLjU3ODU0 MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTVGV4dFRyYWNrQ3Vl Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RleHRUcmFja0N1 ZUN1c3RvbS5jcHAKQEAgLTYzLDcgKzYzLDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhl YywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgVGV4dFRyYWNrQ3VlKiBjdWUKICAg ICBpZiAoIWN1ZSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgSlNPYmplY3QqIHdy YXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgY3VlKTsKKyAgICBK U09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgp LCBjdWUpOwogCiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNUcmFja0N1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RyYWNrQ3VzdG9tLmNwcAppbmRleCBmNTVhNjBl Li5iNjVjMDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RyYWNr Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RyYWNrQ3VzdG9t LmNwcApAQCAtNTcsNyArNTcsNyBAQCBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSog ZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgVHJhY2tCYQogICAgIGlmICgh dHJhY2spCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKICAgICAKLSAgICBKU09iamVjdCogd3Jh cHBlciA9IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCB0cmFjayk7CisgICAg SlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQo KSwgdHJhY2spOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKICAg ICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyR2xvYmFs U2NvcGVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJHbG9i YWxTY29wZUN1c3RvbS5jcHAKaW5kZXggZDEyZDk4ZS4uNjk3NzE5NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJHbG9iYWxTY29wZUN1c3RvbS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJHbG9iYWxTY29wZUN1c3RvbS5j cHAKQEAgLTk1LDcgKzk1LDcgQEAgSlNWYWx1ZSBKU1dvcmtlckdsb2JhbFNjb3BlOjppbXBvcnRT Y3JpcHRzKEV4ZWNTdGF0ZSogZXhlYykKIAogSlNWYWx1ZSBKU1dvcmtlckdsb2JhbFNjb3BlOjpz ZXRUaW1lb3V0KEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICBPd25QdHI8U2NoZWR1bGVkQWN0aW9u PiBhY3Rpb24gPSBTY2hlZHVsZWRBY3Rpb246OmNyZWF0ZShleGVjLCBjdXJyZW50V29ybGQoZXhl YyksIGltcGwoKS5jb250ZW50U2VjdXJpdHlQb2xpY3koKSk7CisgICAgT3duUHRyPFNjaGVkdWxl ZEFjdGlvbj4gYWN0aW9uID0gU2NoZWR1bGVkQWN0aW9uOjpjcmVhdGUoZXhlYywgZ2xvYmFsT2Jq ZWN0KCktPndvcmxkKCksIGltcGwoKS5jb250ZW50U2VjdXJpdHlQb2xpY3koKSk7CiAgICAgaWYg KGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKICAg ICBpZiAoIWFjdGlvbikKQEAgLTEwNiw3ICsxMDYsNyBAQCBKU1ZhbHVlIEpTV29ya2VyR2xvYmFs U2NvcGU6OnNldFRpbWVvdXQoRXhlY1N0YXRlKiBleGVjKQogCiBKU1ZhbHVlIEpTV29ya2VyR2xv YmFsU2NvcGU6OnNldEludGVydmFsKEV4ZWNTdGF0ZSogZXhlYykKIHsKLSAgICBPd25QdHI8U2No ZWR1bGVkQWN0aW9uPiBhY3Rpb24gPSBTY2hlZHVsZWRBY3Rpb246OmNyZWF0ZShleGVjLCBjdXJy ZW50V29ybGQoZXhlYyksIGltcGwoKS5jb250ZW50U2VjdXJpdHlQb2xpY3koKSk7CisgICAgT3du UHRyPFNjaGVkdWxlZEFjdGlvbj4gYWN0aW9uID0gU2NoZWR1bGVkQWN0aW9uOjpjcmVhdGUoZXhl YywgZ2xvYmFsT2JqZWN0KCktPndvcmxkKCksIGltcGwoKS5jb250ZW50U2VjdXJpdHlQb2xpY3ko KSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4ganNVbmRl ZmluZWQoKTsKICAgICBpZiAoIWFjdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5kZXggMDJjODM0ZS4uNmU1MTg0ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KQEAgLTMwMzIsMTAgKzMwMzIsMTAgQEAgRU5ECiBFTkQKIAogICAgICAgICBpZiAoJHN2Z1By b3BlcnR5VHlwZSkgewotICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKEpT VmFsdWUgcmVzdWx0ID0gZ2V0RXhpc3RpbmdXcmFwcGVyPCRjbGFzc05hbWUsICRpbXBsVHlwZT4o ZXhlYywgaW1wbCkpXG4iKTsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlm IChKU1ZhbHVlIHJlc3VsdCA9IGdldEV4aXN0aW5nV3JhcHBlcjwkY2xhc3NOYW1lLCAkaW1wbFR5 cGU+KGdsb2JhbE9iamVjdCwgaW1wbCkpXG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICAgICByZXR1cm4gcmVzdWx0O1xuIik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBpZiAoSlNWYWx1ZSByZXN1bHQgPSBnZXRF eGlzdGluZ1dyYXBwZXI8JGNsYXNzTmFtZT4oZXhlYywgaW1wbCkpXG4iKTsKKyAgICAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmIChKU1ZhbHVlIHJlc3VsdCA9IGdldEV4aXN0aW5n V3JhcHBlcjwkY2xhc3NOYW1lPihnbG9iYWxPYmplY3QsIGltcGwpKVxuIik7CiAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIHJlc3VsdDtcbiIpOwogICAgICAg ICB9CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCA8PEVORCkgaWYgJHZ0YWJsZU5hbWVHbnU7 Cg== 227211 2014-03-19 12:41:26 -0700 2014-03-19 13:26:17 -0700 Patch bug-130458.diff text/plain 20725 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZjczMzU1Li41NDZkODdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjMg QEAKKzIwMTQtMDMtMTkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIEpTQyBiaW5kaW5ncyBzaG91bGQgdXNlIHRoZSBwYXNzZWQtaW4gZ2xvYmFsIG9iamVjdCBm b3Igd3JhcHBlciBjYWNoaW5nLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTMwNDU4 PgorCisgICAgICAgIFRha2UgYSBzaG9ydGVyIHBhdGggdG8gdGhlIERPTVdyYXBwZXJXb3JsZCBi eSB1c2luZyB0aGUgcGFzc2VkLWluCisgICAgICAgIGdsb2JhbCBvYmplY3QgaW5zdGVhZCBvZiBn ZXR0aW5nIHRoZSBsZXhpY2FsIGdsb2JhbCBmcm9tIEV4ZWNTdGF0ZS4KKyAgICAgICAgUmVtb3Zl ZCBhbiBvbGQgRklYTUUgdGhhdCBubyBsb25nZXIgYXBwbGllcyBzaW5jZSBKU09iamVjdHMgY2Fu CisgICAgICAgIGFsd2F5cyBmaW5kIHRoZSByaWdodCBnbG9iYWwgb2JqZWN0IHRoZXNlIGRheXMu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5k aW5ncy9qcy9KU0NTU1J1bGVDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6Cisg ICAgICAgICogYmluZGluZ3MvanMvSlNDU1NTdHlsZURlY2xhcmF0aW9uQ3VzdG9tLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkpTQ1NTU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1 ZSk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNDU1NWYWx1ZUN1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaDoK KyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVdyYXBwZXIpOgorICAgICAgICAoV2ViQ29yZTo6d3Jh cCk6CisgICAgICAgIChXZWJDb3JlOjpnZXRFeGlzdGluZ1dyYXBwZXIpOgorICAgICAgICAoV2Vi Q29yZTo6Y3JlYXRlTmV3V3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpKU0RPTVdpbmRvdzo6c2V0VGltZW91dCk6CisgICAgICAgIChXZWJDb3JlOjpKU0RPTVdpbmRv dzo6c2V0SW50ZXJ2YWwpOgorICAgICAgICAoV2ViQ29yZTo6SlNET01XaW5kb3c6OmFkZEV2ZW50 TGlzdGVuZXIpOgorICAgICAgICAoV2ViQ29yZTo6SlNET01XaW5kb3c6OnJlbW92ZUV2ZW50TGlz dGVuZXIpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRG9jdW1lbnRDdXN0b20uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SlNEb2N1bWVudDo6bG9jYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 dG9KUyk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNFbGVtZW50Q3VzdG9tLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnRvSlNOZXdseUNyZWF0ZWQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pT RXZlbnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6CisgICAgICAgICogYmlu ZGluZ3MvanMvSlNIVE1MQ29sbGVjdGlvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0 b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0hUTUxUZW1wbGF0ZUVsZW1lbnRDdXN0b20u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNIVE1MVGVtcGxhdGVFbGVtZW50Ojpjb250ZW50KToK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0ltYWdlRGF0YUN1c3RvbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlV3JhcHBlcklubGluZSk6CisgICAgICAgICogYmluZGlu Z3MvanMvSlNOb2RlQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAg KiBiaW5kaW5ncy9qcy9KU1NWR1BhdGhTZWdDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 dG9KUyk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNTdHlsZVNoZWV0Q3VzdG9tLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTVGV4dFRyYWNr Q3VlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAgICAgICAqIGJpbmRp bmdzL2pzL0pTVHJhY2tDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6CisgICAg ICAgICogYmluZGluZ3MvanMvSlNXb3JrZXJHbG9iYWxTY29wZUN1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU1dvcmtlckdsb2JhbFNjb3BlOjpzZXRUaW1lb3V0KToKKyAgICAgICAgKFdl YkNvcmU6OkpTV29ya2VyR2xvYmFsU2NvcGU6OnNldEludGVydmFsKToKKyAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKyAgICAgICAgKEdlbmVyYXRlSW1wbGVt ZW50YXRpb24pOgorCiAyMDE0LTAzLTE4ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgogCiAgICAgICAgIFRleHRUcmFja1JlZ2lvbiBOb3QgSW1wbGVtZW50ZWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTUnVsZUN1c3RvbS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1J1bGVDdXN0b20uY3BwCmluZGV4IDE3YWVkZDMu LjVjMjAwODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTUnVs ZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NSdWxlQ3Vz dG9tLmNwcApAQCAtNzAsNyArNzAsNyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBK U0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDU1NSdWxlKiBydWxlKQogICAgIGlmICgh cnVsZSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgSlNPYmplY3QqIHdyYXBwZXIg PSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgcnVsZSk7CisgICAgSlNPYmpl Y3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQoKSwgcnVs ZSk7CiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1N0eWxlRGVjbGFyYXRpb25DdXN0 b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NTdHlsZURlY2xhcmF0aW9u Q3VzdG9tLmNwcAppbmRleCBlNzVhMmQxLi44MGY3MmVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0NTU1N0eWxlRGVjbGFyYXRpb25DdXN0b20uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTU3R5bGVEZWNsYXJhdGlvbkN1c3RvbS5jcHAK QEAgLTM3Niw3ICszNzYsNyBAQCBKU1ZhbHVlIEpTQ1NTU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJv cGVydHlDU1NWYWx1ZShFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKCFjc3NWYWx1ZSkKICAgICAg ICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgY3VycmVudFdvcmxkKGV4ZWMpLm1fY3NzVmFsdWVS b290cy5hZGQoY3NzVmFsdWUuZ2V0KCksIHJvb3QoJmltcGwoKSkpOyAvLyBCYWxhbmNlZCBieSBK U0NTU1ZhbHVlT3duZXI6OmZpbmFsaXplKCkuCisgICAgZ2xvYmFsT2JqZWN0KCktPndvcmxkKCku bV9jc3NWYWx1ZVJvb3RzLmFkZChjc3NWYWx1ZS5nZXQoKSwgcm9vdCgmaW1wbCgpKSk7IC8vIEJh bGFuY2VkIGJ5IEpTQ1NTVmFsdWVPd25lcjo6ZmluYWxpemUoKS4KICAgICByZXR1cm4gdG9KUyhl eGVjLCBnbG9iYWxPYmplY3QoKSwgV1RGOjpnZXRQdHIoY3NzVmFsdWUpKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NWYWx1ZUN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1ZhbHVlQ3VzdG9tLmNwcAppbmRleCBlNjE0 ZDQzLi4wYjJkYWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NT U1ZhbHVlQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1Zh bHVlQ3VzdG9tLmNwcApAQCAtODAsNyArODAsNyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBl eGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDU1NWYWx1ZSogdmFsdWUpCiAg ICAgaWYgKCF2YWx1ZS0+aXNDU1NPTVNhZmUoKSkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwog Ci0gICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChl eGVjKSwgdmFsdWUpOworICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihn bG9iYWxPYmplY3QtPndvcmxkKCksIHZhbHVlKTsKIAogICAgIGlmICh3cmFwcGVyKQogICAgICAg ICByZXR1cm4gd3JhcHBlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTRE9NQmluZGluZy5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5kaW5n LmgKaW5kZXggZWVhOTc3Mi4uM2FhYzNkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNET01CaW5kaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNET01CaW5kaW5nLmgKQEAgLTE5OSwxMSArMTk5LDkgQEAgdGVtcGxhdGUgPHR5cGVuYW1lIERP TUNsYXNzLCB0eXBlbmFtZSBXcmFwcGVyQ2xhc3M+IGlubGluZSB2b2lkIHVuY2FjaGVXcmFwcGVy KEQKIHRlbXBsYXRlPGNsYXNzIFdyYXBwZXJDbGFzcywgY2xhc3MgRE9NQ2xhc3M+IGlubGluZSBK U0RPTVdyYXBwZXIqIGNyZWF0ZVdyYXBwZXIoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xv YmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIERPTUNsYXNzKiBub2RlKQogewogICAgIEFTU0VSVChu b2RlKTsKLSAgICBBU1NFUlQoIWdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBu b2RlKSk7CisgICAgQVNTRVJUKCFnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQo KSwgbm9kZSkpOwogICAgIFdyYXBwZXJDbGFzcyogd3JhcHBlciA9IFdyYXBwZXJDbGFzczo6Y3Jl YXRlKGdldERPTVN0cnVjdHVyZTxXcmFwcGVyQ2xhc3M+KGV4ZWMtPnZtKCksIGdsb2JhbE9iamVj dCksIGdsb2JhbE9iamVjdCwgbm9kZSk7Ci0gICAgLy8gRklYTUU6IFRoZSBlbnRpcmUgZnVuY3Rp b24gY2FuIGJlIHJlbW92ZWQsIG9uY2Ugd2UgZml4IGNhY2hpbmcuCi0gICAgLy8gVGhpcyBmdW5j dGlvbiBpcyBhIG9uZS1vZmYgaGFjayB0byBtYWtlIE5vZGVzIGNhY2hlIGluIHRoZSByaWdodCBn bG9iYWwgb2JqZWN0LgotICAgIGNhY2hlV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIG5vZGUs IHdyYXBwZXIpOworICAgIGNhY2hlV3JhcHBlcihnbG9iYWxPYmplY3QtPndvcmxkKCksIG5vZGUs IHdyYXBwZXIpOwogICAgIHJldHVybiB3cmFwcGVyOwogfQogCkBAIC0yMTEsMjEgKzIwOSwyNiBA QCB0ZW1wbGF0ZTxjbGFzcyBXcmFwcGVyQ2xhc3MsIGNsYXNzIERPTUNsYXNzPiBpbmxpbmUgSlND OjpKU1ZhbHVlIHdyYXAoSlNDOjpFeGVjUwogewogICAgIGlmICghZG9tT2JqZWN0KQogICAgICAg ICByZXR1cm4gSlNDOjpqc051bGwoKTsKLSAgICBpZiAoSlNDOjpKU09iamVjdCogd3JhcHBlciA9 IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBkb21PYmplY3QpKQorICAgIGlm IChKU0M6OkpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihnbG9iYWxPYmplY3Qt PndvcmxkKCksIGRvbU9iamVjdCkpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOworICAgIAorICAg IFdyYXBwZXJDbGFzcyogd3JhcHBlciA9IFdyYXBwZXJDbGFzczo6Y3JlYXRlKGdldERPTVN0cnVj dHVyZTxXcmFwcGVyQ2xhc3M+KGV4ZWMtPnZtKCksIGdsb2JhbE9iamVjdCksIGdsb2JhbE9iamVj dCwgbm9kZSk7CisgICAgY2FjaGVXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQoKSwgbm9kZSwg d3JhcHBlcik7CisgICAgcmV0dXJuIHdyYXBwZXI7CisKICAgICByZXR1cm4gY3JlYXRlV3JhcHBl cjxXcmFwcGVyQ2xhc3M+KGV4ZWMsIGdsb2JhbE9iamVjdCwgZG9tT2JqZWN0KTsKIH0KIAotdGVt cGxhdGU8Y2xhc3MgV3JhcHBlckNsYXNzLCBjbGFzcyBET01DbGFzcz4gaW5saW5lIEpTQzo6SlNW YWx1ZSBnZXRFeGlzdGluZ1dyYXBwZXIoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIERPTUNsYXNzKiBk b21PYmplY3QpCit0ZW1wbGF0ZTxjbGFzcyBXcmFwcGVyQ2xhc3MsIGNsYXNzIERPTUNsYXNzPiBp bmxpbmUgSlNDOjpKU1ZhbHVlIGdldEV4aXN0aW5nV3JhcHBlcihKU0RPTUdsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBET01DbGFzcyogZG9tT2JqZWN0KQogewogICAgIEFTU0VSVChkb21PYmpl Y3QpOwotICAgIHJldHVybiBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgZG9t T2JqZWN0KTsKKyAgICByZXR1cm4gZ2V0Q2FjaGVkV3JhcHBlcihnbG9iYWxPYmplY3QtPndvcmxk KCksIGRvbU9iamVjdCk7CiB9CiAKIHRlbXBsYXRlPGNsYXNzIFdyYXBwZXJDbGFzcywgY2xhc3Mg RE9NQ2xhc3M+IGlubGluZSBKU0M6OkpTVmFsdWUgY3JlYXRlTmV3V3JhcHBlcihKU0M6OkV4ZWNT dGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgRE9NQ2xhc3MqIGRv bU9iamVjdCkKIHsKICAgICBBU1NFUlQoZG9tT2JqZWN0KTsKLSAgICBBU1NFUlQoIWdldENhY2hl ZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBkb21PYmplY3QpKTsKKyAgICBBU1NFUlQoIWdl dENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBkb21PYmplY3QpKTsKICAgICBy ZXR1cm4gY3JlYXRlV3JhcHBlcjxXcmFwcGVyQ2xhc3M+KGV4ZWMsIGdsb2JhbE9iamVjdCwgZG9t T2JqZWN0KTsKIH0KIApAQCAtMzQ4LDExICszNTEsMTEgQEAgaW5saW5lIEpTQzo6SlNWYWx1ZSB0 b0pTKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0 LAogewogICAgIGlmICghYnVmZmVyKQogICAgICAgICByZXR1cm4gSlNDOjpqc051bGwoKTsKLSAg ICBpZiAoSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IGdldEV4aXN0aW5nV3JhcHBlcjxKU0M6OkpTQXJy YXlCdWZmZXI+KGV4ZWMsIGJ1ZmZlcikpCisgICAgaWYgKEpTQzo6SlNWYWx1ZSByZXN1bHQgPSBn ZXRFeGlzdGluZ1dyYXBwZXI8SlNDOjpKU0FycmF5QnVmZmVyPihnbG9iYWxPYmplY3QsIGJ1ZmZl cikpCiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgYnVmZmVyLT5yZWYoKTsKICAgICBKU0M6 OkpTQXJyYXlCdWZmZXIqIHdyYXBwZXIgPSBKU0M6OkpTQXJyYXlCdWZmZXI6OmNyZWF0ZShleGVj LT52bSgpLCBnbG9iYWxPYmplY3QtPmFycmF5QnVmZmVyU3RydWN0dXJlKCksIGJ1ZmZlcik7Ci0g ICAgY2FjaGVXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgYnVmZmVyLCB3cmFwcGVyKTsKKyAg ICBjYWNoZVdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBidWZmZXIsIHdyYXBwZXIpOwog ICAgIHJldHVybiB3cmFwcGVyOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKaW5kZXggZTkyNjMxOS4uOTRiNzVlMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcApAQCAtNTk0 LDcgKzU5NCw3IEBAIEpTVmFsdWUgSlNET01XaW5kb3c6OnBvc3RNZXNzYWdlKEV4ZWNTdGF0ZSog ZXhlYykKIEpTVmFsdWUgSlNET01XaW5kb3c6OnNldFRpbWVvdXQoRXhlY1N0YXRlKiBleGVjKQog ewogICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5UG9saWN5ID0gaW1w bCgpLmRvY3VtZW50KCkgPyBpbXBsKCkuZG9jdW1lbnQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5 KCkgOiAwOwotICAgIE93blB0cjxTY2hlZHVsZWRBY3Rpb24+IGFjdGlvbiA9IFNjaGVkdWxlZEFj dGlvbjo6Y3JlYXRlKGV4ZWMsIGN1cnJlbnRXb3JsZChleGVjKSwgY29udGVudFNlY3VyaXR5UG9s aWN5KTsKKyAgICBPd25QdHI8U2NoZWR1bGVkQWN0aW9uPiBhY3Rpb24gPSBTY2hlZHVsZWRBY3Rp b246OmNyZWF0ZShleGVjLCBnbG9iYWxPYmplY3QoKS0+d29ybGQoKSwgY29udGVudFNlY3VyaXR5 UG9saWN5KTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBq c1VuZGVmaW5lZCgpOwogCkBAIC02MTMsNyArNjEzLDcgQEAgSlNWYWx1ZSBKU0RPTVdpbmRvdzo6 c2V0VGltZW91dChFeGVjU3RhdGUqIGV4ZWMpCiBKU1ZhbHVlIEpTRE9NV2luZG93OjpzZXRJbnRl cnZhbChFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5KiBjb250 ZW50U2VjdXJpdHlQb2xpY3kgPSBpbXBsKCkuZG9jdW1lbnQoKSA/IGltcGwoKS5kb2N1bWVudCgp LT5jb250ZW50U2VjdXJpdHlQb2xpY3koKSA6IDA7Ci0gICAgT3duUHRyPFNjaGVkdWxlZEFjdGlv bj4gYWN0aW9uID0gU2NoZWR1bGVkQWN0aW9uOjpjcmVhdGUoZXhlYywgY3VycmVudFdvcmxkKGV4 ZWMpLCBjb250ZW50U2VjdXJpdHlQb2xpY3kpOworICAgIE93blB0cjxTY2hlZHVsZWRBY3Rpb24+ IGFjdGlvbiA9IFNjaGVkdWxlZEFjdGlvbjo6Y3JlYXRlKGV4ZWMsIGdsb2JhbE9iamVjdCgpLT53 b3JsZCgpLCBjb250ZW50U2VjdXJpdHlQb2xpY3kpOwogICAgIGlmIChleGVjLT5oYWRFeGNlcHRp b24oKSkKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAgICAgaW50IGRlbGF5ID0gZXhl Yy0+YXJndW1lbnQoMSkudG9JbnQzMihleGVjKTsKQEAgLTYzOCw3ICs2MzgsNyBAQCBKU1ZhbHVl IEpTRE9NV2luZG93OjphZGRFdmVudExpc3RlbmVyKEV4ZWNTdGF0ZSogZXhlYykKICAgICBpZiAo IWxpc3RlbmVyLmlzT2JqZWN0KCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCi0g ICAgaW1wbCgpLmFkZEV2ZW50TGlzdGVuZXIoZXhlYy0+YXJndW1lbnQoMCkudG9TdHJpbmcoZXhl YyktPnZhbHVlKGV4ZWMpLCBKU0V2ZW50TGlzdGVuZXI6OmNyZWF0ZShhc09iamVjdChsaXN0ZW5l ciksIHRoaXMsIGZhbHNlLCBjdXJyZW50V29ybGQoZXhlYykpLCBleGVjLT5hcmd1bWVudCgyKS50 b0Jvb2xlYW4oZXhlYykpOworICAgIGltcGwoKS5hZGRFdmVudExpc3RlbmVyKGV4ZWMtPmFyZ3Vt ZW50KDApLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSwgSlNFdmVudExpc3RlbmVyOjpjcmVh dGUoYXNPYmplY3QobGlzdGVuZXIpLCB0aGlzLCBmYWxzZSwgZ2xvYmFsT2JqZWN0KCktPndvcmxk KCkpLCBleGVjLT5hcmd1bWVudCgyKS50b0Jvb2xlYW4oZXhlYykpOwogICAgIHJldHVybiBqc1Vu ZGVmaW5lZCgpOwogfQogCkBAIC02NTIsNyArNjUyLDcgQEAgSlNWYWx1ZSBKU0RPTVdpbmRvdzo6 cmVtb3ZlRXZlbnRMaXN0ZW5lcihFeGVjU3RhdGUqIGV4ZWMpCiAgICAgaWYgKCFsaXN0ZW5lci5p c09iamVjdCgpKQogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKIAotICAgIGltcGwoKS5y ZW1vdmVFdmVudExpc3RlbmVyKGV4ZWMtPmFyZ3VtZW50KDApLnRvU3RyaW5nKGV4ZWMpLT52YWx1 ZShleGVjKSwgSlNFdmVudExpc3RlbmVyOjpjcmVhdGUoYXNPYmplY3QobGlzdGVuZXIpLCB0aGlz LCBmYWxzZSwgY3VycmVudFdvcmxkKGV4ZWMpKS5nZXQoKSwgZXhlYy0+YXJndW1lbnQoMikudG9C b29sZWFuKGV4ZWMpKTsKKyAgICBpbXBsKCkucmVtb3ZlRXZlbnRMaXN0ZW5lcihleGVjLT5hcmd1 bWVudCgwKS50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYyksIEpTRXZlbnRMaXN0ZW5lcjo6Y3Jl YXRlKGFzT2JqZWN0KGxpc3RlbmVyKSwgdGhpcywgZmFsc2UsIGdsb2JhbE9iamVjdCgpLT53b3Js ZCgpKS5nZXQoKSwgZXhlYy0+YXJndW1lbnQoMikudG9Cb29sZWFuKGV4ZWMpKTsKICAgICByZXR1 cm4ganNVbmRlZmluZWQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RvY3VtZW50Q3VzdG9tLmNwcAppbmRleCA4ZjY5ZWI4Li4xY2M1ODViIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RvY3VtZW50Q3VzdG9tLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RvY3VtZW50Q3VzdG9tLmNwcApAQCAtNTMsMTEgKzUz LDExIEBAIEpTVmFsdWUgSlNEb2N1bWVudDo6bG9jYXRpb24oRXhlY1N0YXRlKiBleGVjKSBjb25z dAogICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAKICAgICBMb2NhdGlvbiogbG9jYXRpb24gPSBm cmFtZS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCktPmxvY2F0aW9uKCk7Ci0gICAgaWYgKEpTT2Jq ZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGxvY2F0 aW9uKSkKKyAgICBpZiAoSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGdsb2Jh bE9iamVjdCgpLT53b3JsZCgpLCBsb2NhdGlvbikpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwog CiAgICAgSlNMb2NhdGlvbioganNMb2NhdGlvbiA9IEpTTG9jYXRpb246OmNyZWF0ZShnZXRET01T dHJ1Y3R1cmU8SlNMb2NhdGlvbj4oZXhlYy0+dm0oKSwgZ2xvYmFsT2JqZWN0KCkpLCBnbG9iYWxP YmplY3QoKSwgbG9jYXRpb24pOwotICAgIGNhY2hlV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyks IGxvY2F0aW9uLCBqc0xvY2F0aW9uKTsKKyAgICBjYWNoZVdyYXBwZXIoZ2xvYmFsT2JqZWN0KCkt PndvcmxkKCksIGxvY2F0aW9uLCBqc0xvY2F0aW9uKTsKICAgICByZXR1cm4ganNMb2NhdGlvbjsK IH0KIApAQCAtODAsMTQgKzgwLDE0IEBAIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpT RE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIERvY3VtZW50KiBkb2N1bWVuCiAgICAgaWYg KCFkb2N1bWVudCkKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgSlNPYmplY3QqIHdy YXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgZG9jdW1lbnQpOwor ICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihnbG9iYWxPYmplY3QtPndv cmxkKCksIGRvY3VtZW50KTsKICAgICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBw ZXI7CiAKICAgICBpZiAoRE9NV2luZG93KiBkb21XaW5kb3cgPSBkb2N1bWVudC0+ZG9tV2luZG93 KCkpIHsKICAgICAgICAgZ2xvYmFsT2JqZWN0ID0gdG9KU0RPTVdpbmRvdyh0b0pTKGV4ZWMsIGRv bVdpbmRvdykpOwogICAgICAgICAvLyBDcmVhdGluZyBhIHdyYXBwZXIgZm9yIGRvbVdpbmRvdyBt aWdodCBoYXZlIGNyZWF0ZWQgYSB3cmFwcGVyIGZvciBkb2N1bWVudCBhcyB3ZWxsLgotICAgICAg ICB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGRvY3VtZW50 KTsKKyAgICAgICAgd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3Js ZCgpLCBkb2N1bWVudCk7CiAgICAgICAgIGlmICh3cmFwcGVyKQogICAgICAgICAgICAgcmV0dXJu IHdyYXBwZXI7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNFbGVtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRWxlbWVu dEN1c3RvbS5jcHAKaW5kZXggYmY3MTUwZS4uY2E1MjZmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNFbGVtZW50Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0VsZW1lbnRDdXN0b20uY3BwCkBAIC01Myw3ICs1Myw3IEBAIEpTVmFs dWUgdG9KU05ld2x5Q3JlYXRlZChFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBn bG9iYWxPYmplY3QsIEVsZW1lCiAgICAgaWYgKCFlbGVtZW50KQogICAgICAgICByZXR1cm4ganNO dWxsKCk7CiAKLSAgICBBU1NFUlQoIWdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMp LCBlbGVtZW50KSk7CisgICAgQVNTRVJUKCFnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+ d29ybGQoKSwgZWxlbWVudCkpOwogCiAgICAgSlNET01XcmFwcGVyKiB3cmFwcGVyOyAgICAgICAg CiAgICAgaWYgKGVsZW1lbnQtPmlzSFRNTEVsZW1lbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNFdmVudEN1c3RvbS5jcHAKaW5kZXggZWE1NjFkMC4uYmVhOWJiZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudEN1c3RvbS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudEN1c3RvbS5jcHAKQEAgLTU5LDcgKzU5 LDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCwgRXZlbnQqIGV2ZW50KQogICAgIGlmICghZXZlbnQpCiAgICAgICAgIHJldHVy biBqc051bGwoKTsKIAotICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihj dXJyZW50V29ybGQoZXhlYyksIGV2ZW50KTsKKyAgICBKU09iamVjdCogd3JhcHBlciA9IGdldENh Y2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBldmVudCk7CiAgICAgaWYgKHdyYXBw ZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU0hUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTSFRNTENvbGxlY3Rpb25DdXN0b20uY3BwCmluZGV4IDFiMDJjYjIuLmIz NmI1NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENvbGxl Y3Rpb25DdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENv bGxlY3Rpb25DdXN0b20uY3BwCkBAIC01Nyw3ICs1Nyw3IEBAIEpTVmFsdWUgdG9KUyhFeGVjU3Rh dGUqIGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEhUTUxDb2xsZWN0aW9u KiBjCiAgICAgaWYgKCFjb2xsZWN0aW9uKQogICAgICAgICByZXR1cm4ganNOdWxsKCk7CiAKLSAg ICBKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMp LCBjb2xsZWN0aW9uKTsKKyAgICBKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIo Z2xvYmFsT2JqZWN0LT53b3JsZCgpLCBjb2xsZWN0aW9uKTsKIAogICAgIGlmICh3cmFwcGVyKQog ICAgICAgICByZXR1cm4gd3JhcHBlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTSFRNTFRlbXBsYXRlRWxlbWVudEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0hUTUxUZW1wbGF0ZUVsZW1lbnRDdXN0b20uY3BwCmluZGV4IGU0Y2RhMmIu LjJkN2Y1YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTFRl bXBsYXRlRWxlbWVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNIVE1MVGVtcGxhdGVFbGVtZW50Q3VzdG9tLmNwcApAQCAtNDksNyArNDksNyBAQCBKU1ZhbHVl IEpTSFRNTFRlbXBsYXRlRWxlbWVudDo6Y29udGVudChFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0CiAK ICAgICBEb2N1bWVudEZyYWdtZW50KiBjb250ZW50ID0gaW1wbCgpLmNvbnRlbnQoKTsKIAotICAg IEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyks IGNvbnRlbnQpOworICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihnbG9i YWxPYmplY3QoKS0+d29ybGQoKSwgY29udGVudCk7CiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAg IHJldHVybiB3cmFwcGVyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0ltYWdlRGF0YUN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0lt YWdlRGF0YUN1c3RvbS5jcHAKaW5kZXggMTU3NmQ1ZS4uYjBkMWQ2MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFnZURhdGFDdXN0b20uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW1hZ2VEYXRhQ3VzdG9tLmNwcApAQCAtMzksNyArMzks NyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBJbWFnZURhdGEqIGltYWdlRAogICAgIGlmICghaW1hZ2VEYXRhKQogICAgICAg ICByZXR1cm4ganNOdWxsKCk7CiAgICAgCi0gICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNo ZWRXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgaW1hZ2VEYXRhKTsKKyAgICBKU09iamVjdCog d3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBpbWFnZURh dGEpOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKICAgICAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uY3BwCmluZGV4IDUxNTI5MDgu LmI5YzY2MjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1 c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNOb2RlQ3VzdG9tLmNw cApAQCAtMTk2LDcgKzE5Niw3IEBAIHZvaWQgSlNOb2RlOjp2aXNpdENoaWxkcmVuKEpTQ2VsbCog Y2VsbCwgU2xvdFZpc2l0b3ImIHZpc2l0b3IpCiBzdGF0aWMgQUxXQVlTX0lOTElORSBKU1ZhbHVl IGNyZWF0ZVdyYXBwZXJJbmxpbmUoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBOb2RlKiBub2RlKQogewogICAgIEFTU0VSVChub2RlKTsKLSAgICBBU1NF UlQoIWdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBub2RlKSk7CisgICAgQVNT RVJUKCFnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQoKSwgbm9kZSkpOwogICAg IAogICAgIEpTRE9NV3JhcHBlciogd3JhcHBlcjsgICAgCiAgICAgc3dpdGNoIChub2RlLT5ub2Rl VHlwZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVD dXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1c3RvbS5oCmluZGV4 IDg1Y2FhNDAuLmJmN2M5YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTTm9kZUN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUN1 c3RvbS5oCkBAIC00MCw3ICs0MCw3IEBAIGlubGluZSBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4 ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwKICAgICBpZiAo IW5vZGUpCiAgICAgICAgIHJldHVybiBKU0M6OmpzTnVsbCgpOwogCi0gICAgSlNOb2RlKiB3cmFw cGVyID0gSlNDOjpqc0Nhc3Q8SlNOb2RlKj4oZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQo ZXhlYyksIG5vZGUpKTsKKyAgICBKU05vZGUqIHdyYXBwZXIgPSBKU0M6OmpzQ2FzdDxKU05vZGUq PihnZXRDYWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQoKSwgbm9kZSkpOwogICAgIGlm ICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNTVkdQYXRoU2VnQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL2pzL0pTU1ZHUGF0aFNlZ0N1c3RvbS5jcHAKaW5kZXggNzc5ZmVkYy4uZGJh ZTQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTVkdQYXRoU2Vn Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1NWR1BhdGhTZWdD dXN0b20uY3BwCkBAIC02NCw3ICs2NCw3IEBAIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMs IEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIFNWR1BhdGhTZWcqIG9iamVjCiAgICAg aWYgKCFvYmplY3QpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAotICAgIGlmIChKU09iamVj dCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBvYmplY3Qp KQorICAgIGlmIChKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIoZ2xvYmFsT2Jq ZWN0LT53b3JsZCgpLCBvYmplY3QpKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKIAogICAgIHN3 aXRjaCAob2JqZWN0LT5wYXRoU2VnVHlwZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU1N0eWxlU2hlZXRDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNTdHlsZVNoZWV0Q3VzdG9tLmNwcAppbmRleCBlN2QwNWIxLi45YzBiNmIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1N0eWxlU2hlZXRDdXN0b20u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTU3R5bGVTaGVldEN1c3RvbS5j cHAKQEAgLTUwLDcgKzUwLDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01H bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgU3R5bGVTaGVldCogc3R5bGUKICAgICBpZiAoIXN0 eWxlU2hlZXQpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAotICAgIEpTT2JqZWN0KiB3cmFw cGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIHN0eWxlU2hlZXQpOwor ICAgIEpTT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkV3JhcHBlcihnbG9iYWxPYmplY3QtPndv cmxkKCksIHN0eWxlU2hlZXQpOwogICAgIGlmICh3cmFwcGVyKQogICAgICAgICByZXR1cm4gd3Jh cHBlcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNUZXh0VHJh Y2tDdWVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNUZXh0VHJhY2tD dWVDdXN0b20uY3BwCmluZGV4IDNkY2U2NzcuLjU3ODU0MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTVGV4dFRyYWNrQ3VlQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RleHRUcmFja0N1ZUN1c3RvbS5jcHAKQEAgLTYzLDcgKzYz LDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCwgVGV4dFRyYWNrQ3VlKiBjdWUKICAgICBpZiAoIWN1ZSkKICAgICAgICAgcmV0 dXJuIGpzTnVsbCgpOwogCi0gICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRXcmFwcGVy KGN1cnJlbnRXb3JsZChleGVjKSwgY3VlKTsKKyAgICBKU09iamVjdCogd3JhcHBlciA9IGdldENh Y2hlZFdyYXBwZXIoZ2xvYmFsT2JqZWN0LT53b3JsZCgpLCBjdWUpOwogCiAgICAgaWYgKHdyYXBw ZXIpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNUcmFja0N1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU1RyYWNrQ3VzdG9tLmNwcAppbmRleCBmNTVhNjBlLi5iNjVjMDI1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RyYWNrQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU1RyYWNrQ3VzdG9tLmNwcApAQCAtNTcsNyArNTcsNyBAQCBK U0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3Qq IGdsb2JhbE9iamVjdCwgVHJhY2tCYQogICAgIGlmICghdHJhY2spCiAgICAgICAgIHJldHVybiBq c051bGwoKTsKICAgICAKLSAgICBKU09iamVjdCogd3JhcHBlciA9IGdldENhY2hlZFdyYXBwZXIo Y3VycmVudFdvcmxkKGV4ZWMpLCB0cmFjayk7CisgICAgSlNPYmplY3QqIHdyYXBwZXIgPSBnZXRD YWNoZWRXcmFwcGVyKGdsb2JhbE9iamVjdC0+d29ybGQoKSwgdHJhY2spOwogICAgIGlmICh3cmFw cGVyKQogICAgICAgICByZXR1cm4gd3JhcHBlcjsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTV29ya2VyR2xvYmFsU2NvcGVDdXN0b20uY3BwIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNXb3JrZXJHbG9iYWxTY29wZUN1c3RvbS5jcHAKaW5kZXgg ZDEyZDk4ZS4uNjk3NzE5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNXb3JrZXJHbG9iYWxTY29wZUN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNXb3JrZXJHbG9iYWxTY29wZUN1c3RvbS5jcHAKQEAgLTk1LDcgKzk1LDcgQEAgSlNW YWx1ZSBKU1dvcmtlckdsb2JhbFNjb3BlOjppbXBvcnRTY3JpcHRzKEV4ZWNTdGF0ZSogZXhlYykK IAogSlNWYWx1ZSBKU1dvcmtlckdsb2JhbFNjb3BlOjpzZXRUaW1lb3V0KEV4ZWNTdGF0ZSogZXhl YykKIHsKLSAgICBPd25QdHI8U2NoZWR1bGVkQWN0aW9uPiBhY3Rpb24gPSBTY2hlZHVsZWRBY3Rp b246OmNyZWF0ZShleGVjLCBjdXJyZW50V29ybGQoZXhlYyksIGltcGwoKS5jb250ZW50U2VjdXJp dHlQb2xpY3koKSk7CisgICAgT3duUHRyPFNjaGVkdWxlZEFjdGlvbj4gYWN0aW9uID0gU2NoZWR1 bGVkQWN0aW9uOjpjcmVhdGUoZXhlYywgZ2xvYmFsT2JqZWN0KCktPndvcmxkKCksIGltcGwoKS5j b250ZW50U2VjdXJpdHlQb2xpY3koKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQog ICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKICAgICBpZiAoIWFjdGlvbikKQEAgLTEwNiw3 ICsxMDYsNyBAQCBKU1ZhbHVlIEpTV29ya2VyR2xvYmFsU2NvcGU6OnNldFRpbWVvdXQoRXhlY1N0 YXRlKiBleGVjKQogCiBKU1ZhbHVlIEpTV29ya2VyR2xvYmFsU2NvcGU6OnNldEludGVydmFsKEV4 ZWNTdGF0ZSogZXhlYykKIHsKLSAgICBPd25QdHI8U2NoZWR1bGVkQWN0aW9uPiBhY3Rpb24gPSBT Y2hlZHVsZWRBY3Rpb246OmNyZWF0ZShleGVjLCBjdXJyZW50V29ybGQoZXhlYyksIGltcGwoKS5j b250ZW50U2VjdXJpdHlQb2xpY3koKSk7CisgICAgT3duUHRyPFNjaGVkdWxlZEFjdGlvbj4gYWN0 aW9uID0gU2NoZWR1bGVkQWN0aW9uOjpjcmVhdGUoZXhlYywgZ2xvYmFsT2JqZWN0KCktPndvcmxk KCksIGltcGwoKS5jb250ZW50U2VjdXJpdHlQb2xpY3koKSk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4 Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKICAgICBpZiAoIWFjdGlv bikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVy YXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG0KaW5kZXggMDJjODM0ZS4uNmU1MTg0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTMwMzIsMTAgKzMwMzIsMTAg QEAgRU5ECiBFTkQKIAogICAgICAgICBpZiAoJHN2Z1Byb3BlcnR5VHlwZSkgewotICAgICAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0gZ2V0RXhpc3Rp bmdXcmFwcGVyPCRjbGFzc05hbWUsICRpbXBsVHlwZT4oZXhlYywgaW1wbCkpXG4iKTsKKyAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmIChKU1ZhbHVlIHJlc3VsdCA9IGdldEV4 aXN0aW5nV3JhcHBlcjwkY2xhc3NOYW1lLCAkaW1wbFR5cGU+KGdsb2JhbE9iamVjdCwgaW1wbCkp XG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm4gcmVz dWx0O1xuIik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIiAgICBpZiAoSlNWYWx1ZSByZXN1bHQgPSBnZXRFeGlzdGluZ1dyYXBwZXI8JGNsYXNzTmFt ZT4oZXhlYywgaW1wbCkpXG4iKTsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAg IGlmIChKU1ZhbHVlIHJlc3VsdCA9IGdldEV4aXN0aW5nV3JhcHBlcjwkY2xhc3NOYW1lPihnbG9i YWxPYmplY3QsIGltcGwpKVxuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAg ICAgICAgcmV0dXJuIHJlc3VsdDtcbiIpOwogICAgICAgICB9CiAgICAgICAgIHB1c2goQGltcGxD b250ZW50LCA8PEVORCkgaWYgJHZ0YWJsZU5hbWVHbnU7Cg==