58689 2011-04-15 13:39:54 -0700 Some mechanical DOM wrapper cleanup 2011-04-15 13:47:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oliver oldest_to_newest 386877 0 ggaren 2011-04-15 13:39:54 -0700 Some mechanical DOM wrapper cleanup 386880 1 89844 ggaren 2011-04-15 13:45:51 -0700 Created attachment 89844 Patch 386884 2 ggaren 2011-04-15 13:47:58 -0700 Committed r84029: <http://trac.webkit.org/changeset/84029> 89844 2011-04-15 13:45:51 -0700 2011-04-15 13:47:18 -0700 Patch bug-58689-20110415134550.patch text/plain 23383 ggaren SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MDI3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNjUgQEAKKzIwMTEtMDQtMTUgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTb21lIG1lY2hhbmljYWwgRE9NIHdyYXBwZXIgY2xlYW51cAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg2ODkKKwor ICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBFeHBvcnQhCisKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9ET01XcmFwcGVyV29ybGQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNSZWFjaGFibGVGcm9t RE9NKTogSW52ZXJ0ZWQgdGhlIGluRG9jdW1lbnQgdGVzdCB0byBtYWtlIHRoZQorICAgICAgICBy ZWxhdGlvbnNoaXAgb2YgdGhlIHNwZWNpYWwgY2FzZXMgdG8gdGhlIG5vcm1hbCBjYXNlIGNsZWFy ZXIuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0FycmF5QnVmZmVyVmlld0hlbHBlci5oOgor ICAgICAgICAoV2ViQ29yZTo6dG9KU0FycmF5QnVmZmVyVmlldyk6CisgICAgICAgICogYmluZGlu Z3MvanMvSlNDU1NSdWxlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAg ICAgICAqIGJpbmRpbmdzL2pzL0pTQ1NTVmFsdWVDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6dG9KUyk6CisgICAgICAgICogYmluZGluZ3MvanMvSlNET01CaW5kaW5nLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmdldENhY2hlZERPTU9iamVjdFdyYXBwZXIpOgorICAgICAgICAoV2ViQ29y ZTo6Y2FjaGVET01PYmplY3RXcmFwcGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTUJp bmRpbmcuaDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZURPTU9iamVjdFdyYXBwZXIpOgorICAg ICAgICAoV2ViQ29yZTo6Z2V0RE9NT2JqZWN0V3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpj cmVhdGVET01Ob2RlV3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlOjpnZXRET01Ob2RlV3JhcHBl cik6IENoYW5nZWQgRE9NIHdyYXBwZXIgZnVuY3Rpb25zIHRvIG9wZXJhdGUKKyAgICAgICAgaW4g dGVybXMgb2YgRE9NV3JhcHBlcldvcmxkcyBpbnN0ZWFkIG9mIEV4ZWNTdGF0ZXMuIFRoaXMgaXMg Y2xlYXJlciwKKyAgICAgICAgYW5kIGV2ZXItc28tc2xpZ2h0bHkgZmFzdGVyLgorICAgICAgICAK KyAgICAgICAgUmVtb3ZlZCBoYXNDYWNoZWRYWFggZnVuY3Rpb25zLCBub3cgdGhhdCB0aGV5J3Jl IHVudXNlZC4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkpTRE9NV2luZG93OjpoaXN0b3J5KToKKyAgICAgICAgKFdlYkNv cmU6OkpTRE9NV2luZG93Ojpsb2NhdGlvbik6CisgICAgICAgICogYmluZGluZ3MvanMvSlNEb2N1 bWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RvY3VtZW50Ojpsb2NhdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0VsZW1l bnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9KU05ld2x5Q3JlYXRlZCk6CisgICAg ICAgICogYmluZGluZ3MvanMvSlNFdmVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp0 b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0hUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSW1hZ2VE YXRhQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAgICAgICAqIGJpbmRp bmdzL2pzL0pTTm9kZUN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVXcmFwcGVy SW5saW5lKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU05vZGVDdXN0b20uaDoKKyAgICAgICAg KFdlYkNvcmU6OmdldENhY2hlZERPTU5vZGVXcmFwcGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmNh Y2hlRE9NTm9kZVdyYXBwZXIpOgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6CisgICAgICAgICog YmluZGluZ3MvanMvSlNTVkdQYXRoU2VnQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRv SlMpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTU3R5bGVTaGVldEN1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjp0b0pTKTogVXBkYXRlZCBmb3IgY2hhbmdlcyBhYm92ZS4KKworICAgICAg ICAqIHhtbC9YTUxIdHRwUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVx dWVzdDo6ZHJvcFByb3RlY3Rpb24pOiBSZW1vdmVkIHVzZSBvZiBoYXNDYWNoZWRET01PYmplY3RX cmFwcGVyCisgICAgICAgIGJlY2F1c2UgWEhSIGlzIGFsbW9zdCBhbHdheXMgY3JlYXRlZCBhbmQg dXNlZCBieSBKYXZhU2NyaXB0LCBzbyBpdCdzCisgICAgICAgIHNpbXBsZXIgdG8ganVzdCBhbHdh eXMgcmVwb3J0IGV4dHJhIGNvc3QuCisKIDIwMTEtMDQtMTUgIEFuZHJlYXMgS2xpbmcgIDxrbGlu Z0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJvbGxpbmcgb3V0IGFjY2lkZW50YWwgcGFydCBvZiBy ODQwMTAuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gODM5OTApCisrKyBTb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMzUwLDcgKzM1MCw2 IEBAIF9fWk43V2ViQ29yZTE0RG9jdW1lbnRMb2FkZXJDMkVSS05TXzE1UmUKIF9fWk43V2ViQ29y ZTE0RG9jdW1lbnRMb2FkZXJEMkV2CiBfX1pON1dlYkNvcmUxNERvY3VtZW50V3JpdGVyMTFzZXRF bmNvZGluZ0VSS04zV1RGNlN0cmluZ0ViCiBfX1pON1dlYkNvcmUxNFJlc291cmNlSGFuZGxlMTJy ZWxlYXNlUHJveHlFdgotX19aTjdXZWJDb3JlMjVnZXRDYWNoZWRET01PYmplY3RXcmFwcGVyRVBO M0pTQzlFeGVjU3RhdGVFUHYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5kbGUyMGZvcmNlQ29u dGVudFNuaWZmaW5nRXYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VMb2FkZXIxNGNhbmNlbGxlZEVy cm9yRXYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VMb2FkZXIxOXNldFNob3VsZEJ1ZmZlckRhdGFF YgpAQCAtNTk1LDYgKzU5NCw3IEBAIF9fWk43V2ViQ29yZTI1UGx1Z2luTWFpblRocmVhZFNjaGVk dWxlcjEKIF9fWk43V2ViQ29yZTI1UGx1Z2luTWFpblRocmVhZFNjaGVkdWxlcjlzY2hlZHVsZXJF dgogX19aTjdXZWJDb3JlMjVhZGRMYW5ndWFnZUNoYW5nZU9ic2VydmVyRVB2UEZ2UzBfRQogX19a TjdXZWJDb3JlMjVjb250ZXh0TWVudUl0ZW1UYWdPdXRsaW5lRXYKK19fWk43V2ViQ29yZTI1Z2V0 Q2FjaGVkRE9NT2JqZWN0V3JhcHBlckVQTlNfMTVET01XcmFwcGVyV29ybGRFUHYKIF9fWk43V2Vi Q29yZTI2Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb25DMUV2CiBfX1pON1dlYkNvcmUyNlVzZXJU eXBpbmdHZXN0dXJlSW5kaWNhdG9yMjdwcm9jZXNzaW5nVXNlclR5cGluZ0dlc3R1cmVFdgogX19a TjdXZWJDb3JlMjZVc2VyVHlwaW5nR2VzdHVyZUluZGljYXRvcjI4Zm9jdXNlZEVsZW1lbnRBdEdl c3R1cmVTdGFydEV2CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9ET01XcmFwcGVy V29ybGQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0RPTVdy YXBwZXJXb3JsZC5jcHAJKHJldmlzaW9uIDgzOTkwKQorKysgU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvRE9NV3JhcHBlcldvcmxkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIwLDI3ICsxMjAs MjYgQEAgc3RhdGljIGJvb2wgaXNPYnNlcnZhYmxlKEpTTm9kZSoganNOb2RlLAogCiBzdGF0aWMg aW5saW5lIGJvb2wgaXNSZWFjaGFibGVGcm9tRE9NKEpTTm9kZSoganNOb2RlLCBOb2RlKiBub2Rl LCBET01XcmFwcGVyV29ybGQqIHdvcmxkLCBNYXJrU3RhY2smIG1hcmtTdGFjaykKIHsKLSAgICBp ZiAobm9kZS0+aW5Eb2N1bWVudCgpKQotICAgICAgICByZXR1cm4gaXNPYnNlcnZhYmxlKGpzTm9k ZSwgbm9kZSwgd29ybGQpICYmIG1hcmtTdGFjay5jb250YWluc09wYXF1ZVJvb3Qocm9vdChub2Rl KSk7Ci0KLSAgICAvLyBJZiBhIHdyYXBwZXIgaXMgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIGFuIGlt YWdlIG9yIHNjcmlwdCBlbGVtZW50Ci0gICAgLy8gdGhhdCBpcyBsb2FkaW5nIGJ1dCBub3QgaW4g dGhlIGRvY3VtZW50LCB0aGUgd3JhcHBlciBpcyBvYnNlcnZhYmxlCi0gICAgLy8gYmVjYXVzZSBp dCBpcyB0aGUgb25seSB0aGluZyBrZWVwaW5nIHRoZSBpbWFnZSBlbGVtZW50IGFsaXZlLCBhbmQg aWYKLSAgICAvLyB0aGUgaW1hZ2UgZWxlbWVudCBpcyBkZXN0cm95ZWQsIGl0cyBsb2FkIGV2ZW50 IHdpbGwgbm90IGZpcmUuCi0gICAgLy8gRklYTUU6IFRoZSBET00gc2hvdWxkIG1hbmFnZSB0aGlz IGlzc3VlIHdpdGhvdXQgdGhlIGhlbHAgb2YgSmF2YVNjcmlwdCB3cmFwcGVycy4KLSAgICBpZiAo bm9kZS0+aGFzVGFnTmFtZShpbWdUYWcpICYmICFzdGF0aWNfY2FzdDxIVE1MSW1hZ2VFbGVtZW50 Kj4obm9kZSktPmhhdmVGaXJlZExvYWRFdmVudCgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICBpZiAobm9kZS0+aGFzVGFnTmFtZShzY3JpcHRUYWcpICYmICFzdGF0aWNfY2FzdDxIVE1MU2Ny aXB0RWxlbWVudCo+KG5vZGUpLT5oYXZlRmlyZWRMb2FkRXZlbnQoKSkKLSAgICAgICAgcmV0dXJu IHRydWU7Ci0jaWYgRU5BQkxFKFZJREVPKQotICAgIGlmIChub2RlLT5oYXNUYWdOYW1lKGF1ZGlv VGFnKSAmJiAhc3RhdGljX2Nhc3Q8SFRNTEF1ZGlvRWxlbWVudCo+KG5vZGUpLT5wYXVzZWQoKSkK LSAgICAgICAgcmV0dXJuIHRydWU7Ci0jZW5kaWYKLQotICAgIC8vIElmIGEgbm9kZSBpcyBmaXJp bmcgZXZlbnQgbGlzdGVuZXJzLCBpdHMgd3JhcHBlciBpcyBvYnNlcnZhYmxlIGJlY2F1c2UKLSAg ICAvLyBpdHMgd3JhcHBlciBpcyByZXNwb25zaWJsZSBmb3IgbWFya2luZyB0aG9zZSBldmVudCBs aXN0ZW5lcnMuCi0gICAgaWYgKG5vZGUtPmlzRmlyaW5nRXZlbnRMaXN0ZW5lcnMoKSkKLSAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgaWYgKCFub2RlLT5pbkRvY3VtZW50KCkpIHsKKyAgICAgICAg Ly8gSWYgYSB3cmFwcGVyIGlzIHRoZSBsYXN0IHJlZmVyZW5jZSB0byBhbiBpbWFnZSBvciBzY3Jp cHQgZWxlbWVudAorICAgICAgICAvLyB0aGF0IGlzIGxvYWRpbmcgYnV0IG5vdCBpbiB0aGUgZG9j dW1lbnQsIHRoZSB3cmFwcGVyIGlzIG9ic2VydmFibGUKKyAgICAgICAgLy8gYmVjYXVzZSBpdCBp cyB0aGUgb25seSB0aGluZyBrZWVwaW5nIHRoZSBpbWFnZSBlbGVtZW50IGFsaXZlLCBhbmQgaWYK KyAgICAgICAgLy8gdGhlIGltYWdlIGVsZW1lbnQgaXMgZGVzdHJveWVkLCBpdHMgbG9hZCBldmVu dCB3aWxsIG5vdCBmaXJlLgorICAgICAgICAvLyBGSVhNRTogVGhlIERPTSBzaG91bGQgbWFuYWdl IHRoaXMgaXNzdWUgd2l0aG91dCB0aGUgaGVscCBvZiBKYXZhU2NyaXB0IHdyYXBwZXJzLgorICAg ICAgICBpZiAobm9kZS0+aGFzVGFnTmFtZShpbWdUYWcpICYmICFzdGF0aWNfY2FzdDxIVE1MSW1h Z2VFbGVtZW50Kj4obm9kZSktPmhhdmVGaXJlZExvYWRFdmVudCgpKQorICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgIGlmIChub2RlLT5oYXNUYWdOYW1lKHNjcmlwdFRhZykgJiYgIXN0 YXRpY19jYXN0PEhUTUxTY3JpcHRFbGVtZW50Kj4obm9kZSktPmhhdmVGaXJlZExvYWRFdmVudCgp KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgI2lmIEVOQUJMRShWSURFTykKKyAgICAg ICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUoYXVkaW9UYWcpICYmICFzdGF0aWNfY2FzdDxIVE1MQXVk aW9FbGVtZW50Kj4obm9kZSktPnBhdXNlZCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgI2VuZGlmCisKKyAgICAgICAgLy8gSWYgYSBub2RlIGlzIGZpcmluZyBldmVudCBsaXN0ZW5l cnMsIGl0cyB3cmFwcGVyIGlzIG9ic2VydmFibGUgYmVjYXVzZQorICAgICAgICAvLyBpdHMgd3Jh cHBlciBpcyByZXNwb25zaWJsZSBmb3IgbWFya2luZyB0aG9zZSBldmVudCBsaXN0ZW5lcnMuCisg ICAgICAgIGlmIChub2RlLT5pc0ZpcmluZ0V2ZW50TGlzdGVuZXJzKCkpCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICB9CiAKICAgICByZXR1cm4gaXNPYnNlcnZhYmxlKGpzTm9kZSwgbm9k ZSwgd29ybGQpICYmIG1hcmtTdGFjay5jb250YWluc09wYXF1ZVJvb3Qocm9vdChub2RlKSk7CiB9 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0FycmF5QnVmZmVyVmlld0hlbHBl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQXJyYXlCdWZm ZXJWaWV3SGVscGVyLmgJKHJldmlzaW9uIDgzOTg5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNBcnJheUJ1ZmZlclZpZXdIZWxwZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTYzLDcg KzE2Myw3IEBAIHN0YXRpYyBKU0M6OkpTVmFsdWUgdG9KU0FycmF5QnVmZmVyVmlldygKICAgICBp ZiAoIW9iamVjdCkKICAgICAgICAgcmV0dXJuIEpTQzo6anNOdWxsKCk7CiAKLSAgICBpZiAoRE9N T2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihleGVjLCBvYmplY3Qp KQorICAgIGlmIChET01PYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRET01PYmplY3RXcmFwcGVy KGN1cnJlbnRXb3JsZChleGVjKSwgb2JqZWN0KSkKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAK ICAgICBleGVjLT5oZWFwKCktPnJlcG9ydEV4dHJhTWVtb3J5Q29zdChvYmplY3QtPmJ5dGVMZW5n dGgoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NTU1J1bGVDdXN0b20u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTUnVsZUN1 c3RvbS5jcHAJKHJldmlzaW9uIDgzOTg5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMv SlNDU1NSdWxlQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjMsNyArNjMsNyBAQCBKU1Zh bHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhCiAgICAgaWYgKCFydWxlKQogICAg ICAgICByZXR1cm4ganNOdWxsKCk7CiAKLSAgICBET01PYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNo ZWRET01PYmplY3RXcmFwcGVyKGV4ZWMsIHJ1bGUpOworICAgIERPTU9iamVjdCogd3JhcHBlciA9 IGdldENhY2hlZERPTU9iamVjdFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBydWxlKTsKICAg ICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTVmFsdWVDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTVmFsdWVDdXN0b20uY3BwCShyZXZpc2lvbiA4 Mzk4OSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTVmFsdWVDdXN0b20uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00OSw3ICs0OSw3IEBAIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUq IGV4ZWMsIEpTRE9NR2xvYmEKICAgICBpZiAoIXZhbHVlKQogICAgICAgICByZXR1cm4ganNOdWxs KCk7CiAKLSAgICBET01PYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRET01PYmplY3RXcmFwcGVy KGV4ZWMsIHZhbHVlKTsKKyAgICBET01PYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRET01PYmpl Y3RXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgdmFsdWUpOwogCiAgICAgaWYgKHdyYXBwZXIp CiAgICAgICAgIHJldHVybiB3cmFwcGVyOwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNET01CaW5kaW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTUJpbmRpbmcuY3BwCShyZXZpc2lvbiA4Mzk5MCkKKysrIFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNSwzMiAr MTM1LDEzIEBAIGNvbnN0IEpTQzo6SGFzaFRhYmxlKiBnZXRIYXNoVGFibGVGb3JHbG8KICAgICBy ZXR1cm4gRE9NT2JqZWN0SGFzaFRhYmxlTWFwOjptYXBGb3IoZ2xvYmFsRGF0YSkuZ2V0KHN0YXRp Y1RhYmxlKTsKIH0KIAotYm9vbCBoYXNDYWNoZWRET01PYmplY3RXcmFwcGVyVW5jaGVja2VkKEpT R2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgdm9pZCogb2JqZWN0SGFuZGxlKQorRE9NT2JqZWN0KiBn ZXRDYWNoZWRET01PYmplY3RXcmFwcGVyKERPTVdyYXBwZXJXb3JsZCogd29ybGQsIHZvaWQqIG9i amVjdEhhbmRsZSkgCiB7Ci0gICAgZm9yIChKU0dsb2JhbERhdGFXb3JsZEl0ZXJhdG9yIHdvcmxk SXRlcihnbG9iYWxEYXRhKTsgd29ybGRJdGVyOyArK3dvcmxkSXRlcikgewotICAgICAgICBpZiAo d29ybGRJdGVyLT5tX3dyYXBwZXJzLmdldChvYmplY3RIYW5kbGUpKQotICAgICAgICAgICAgcmV0 dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKLX0KLQotYm9vbCBoYXNDYWNoZWRE T01PYmplY3RXcmFwcGVyKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgdm9pZCogb2JqZWN0SGFu ZGxlKQotewotICAgIGZvciAoSlNHbG9iYWxEYXRhV29ybGRJdGVyYXRvciB3b3JsZEl0ZXIoZ2xv YmFsRGF0YSk7IHdvcmxkSXRlcjsgKyt3b3JsZEl0ZXIpIHsKLSAgICAgICAgaWYgKHdvcmxkSXRl ci0+bV93cmFwcGVycy5nZXQob2JqZWN0SGFuZGxlKSkKLSAgICAgICAgICAgIHJldHVybiB0cnVl OwotICAgIH0KLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KLURPTU9iamVjdCogZ2V0Q2FjaGVkRE9N T2JqZWN0V3JhcHBlcihKU0M6OkV4ZWNTdGF0ZSogZXhlYywgdm9pZCogb2JqZWN0SGFuZGxlKSAK LXsKLSAgICByZXR1cm4gZG9tT2JqZWN0V3JhcHBlck1hcEZvcihleGVjKS5nZXQob2JqZWN0SGFu ZGxlKS5nZXQoKTsKKyAgICByZXR1cm4gd29ybGQtPm1fd3JhcHBlcnMuZ2V0KG9iamVjdEhhbmRs ZSkuZ2V0KCk7CiB9CiAKLXZvaWQgY2FjaGVET01PYmplY3RXcmFwcGVyKEpTQzo6RXhlY1N0YXRl KiBleGVjLCB2b2lkKiBvYmplY3RIYW5kbGUsIERPTU9iamVjdCogd3JhcHBlcikgCit2b2lkIGNh Y2hlRE9NT2JqZWN0V3JhcHBlcihET01XcmFwcGVyV29ybGQqIHdvcmxkLCB2b2lkKiBvYmplY3RI YW5kbGUsIERPTU9iamVjdCogd3JhcHBlcikgCiB7Ci0gICAgRE9NV3JhcHBlcldvcmxkKiB3b3Js ZCA9IGN1cnJlbnRXb3JsZChleGVjKTsKICAgICB3b3JsZC0+bV93cmFwcGVycy5zZXQob2JqZWN0 SGFuZGxlLCBXZWFrPERPTU9iamVjdD4oKndvcmxkLT5nbG9iYWxEYXRhKCksIHdyYXBwZXIsIHdv cmxkLT5kb21PYmplY3RIYW5kbGVPd25lcigpKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCShyZXZpc2lvbiA4Mzk5MCkKKysrIFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTMs MTggKzExMywxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIH0KICAgICB9OwogCi0g ICAgRE9NT2JqZWN0KiBnZXRDYWNoZWRET01PYmplY3RXcmFwcGVyKEpTQzo6RXhlY1N0YXRlKiwg dm9pZCogb2JqZWN0SGFuZGxlKTsKLSAgICBib29sIGhhc0NhY2hlZERPTU9iamVjdFdyYXBwZXIo SlNDOjpKU0dsb2JhbERhdGEqLCB2b2lkKiBvYmplY3RIYW5kbGUpOwotICAgIHZvaWQgY2FjaGVE T01PYmplY3RXcmFwcGVyKEpTQzo6RXhlY1N0YXRlKiwgdm9pZCogb2JqZWN0SGFuZGxlLCBET01P YmplY3QqIHdyYXBwZXIpOworICAgIERPTU9iamVjdCogZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBl cihET01XcmFwcGVyV29ybGQqLCB2b2lkKiBvYmplY3RIYW5kbGUpOworICAgIHZvaWQgY2FjaGVE T01PYmplY3RXcmFwcGVyKERPTVdyYXBwZXJXb3JsZCosIHZvaWQqIG9iamVjdEhhbmRsZSwgRE9N T2JqZWN0KiB3cmFwcGVyKTsKICAgICB2b2lkIHVuY2FjaGVET01PYmplY3RXcmFwcGVyKERPTVdy YXBwZXJXb3JsZCosIHZvaWQqIG9iamVjdEhhbmRsZSwgRE9NT2JqZWN0KiB3cmFwcGVyKTsKIAot ICAgIEpTTm9kZSogZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoSlNDOjpFeGVjU3RhdGUqLCBOb2Rl Kik7Ci0gICAgdm9pZCBjYWNoZURPTU5vZGVXcmFwcGVyKEpTQzo6RXhlY1N0YXRlKiwgTm9kZSos IEpTTm9kZSogd3JhcHBlcik7CisgICAgSlNOb2RlKiBnZXRDYWNoZWRET01Ob2RlV3JhcHBlcihE T01XcmFwcGVyV29ybGQqLCBOb2RlKik7CisgICAgdm9pZCBjYWNoZURPTU5vZGVXcmFwcGVyKERP TVdyYXBwZXJXb3JsZCosIE5vZGUqLCBKU05vZGUqIHdyYXBwZXIpOwogICAgIHZvaWQgdW5jYWNo ZURPTU5vZGVXcmFwcGVyKERPTVdyYXBwZXJXb3JsZCosIE5vZGUqLCBKU05vZGUqIHdyYXBwZXIp OwogICAgIAogICAgIHZvaWQgbWFya0FjdGl2ZU9iamVjdHNGb3JDb250ZXh0KEpTQzo6TWFya1N0 YWNrJiwgSlNDOjpKU0dsb2JhbERhdGEmLCBTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7CiAgICAg dm9pZCBtYXJrRE9NT2JqZWN0V3JhcHBlcihKU0M6Ok1hcmtTdGFjayYsIEpTQzo6SlNHbG9iYWxE YXRhJiBnbG9iYWxEYXRhLCB2b2lkKiBvYmplY3QpOwotICAgIGJvb2wgaGFzQ2FjaGVkRE9NT2Jq ZWN0V3JhcHBlclVuY2hlY2tlZChKU0M6OkpTR2xvYmFsRGF0YSosIHZvaWQqIG9iamVjdEhhbmRs ZSk7CiAKICAgICBKU0M6OlN0cnVjdHVyZSogZ2V0Q2FjaGVkRE9NU3RydWN0dXJlKEpTRE9NR2xv YmFsT2JqZWN0KiwgY29uc3QgSlNDOjpDbGFzc0luZm8qKTsKICAgICBKU0M6OlN0cnVjdHVyZSog Y2FjaGVET01TdHJ1Y3R1cmUoSlNET01HbG9iYWxPYmplY3QqLCBOb25OdWxsUGFzc1JlZlB0cjxK U0M6OlN0cnVjdHVyZT4sIGNvbnN0IEpTQzo6Q2xhc3NJbmZvKik7CkBAIC0xNTYsMTcgKzE1NCwx NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgdGVtcGxhdGU8Y2xhc3MgV3JhcHBlckNsYXNz LCBjbGFzcyBET01DbGFzcz4gaW5saW5lIERPTU9iamVjdCogY3JlYXRlRE9NT2JqZWN0V3JhcHBl cihKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwg RE9NQ2xhc3MqIG9iamVjdCkKICAgICB7CiAgICAgICAgIEFTU0VSVChvYmplY3QpOwotICAgICAg ICBBU1NFUlQoIWdldENhY2hlZERPTU9iamVjdFdyYXBwZXIoZXhlYywgb2JqZWN0KSk7CisgICAg ICAgIEFTU0VSVCghZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyks IG9iamVjdCkpOwogICAgICAgICAvLyBGSVhNRTogbmV3IChleGVjKSBjb3VsZCB1c2UgYSBkaWZm ZXJlbnQgZ2xvYmFsRGF0YSB0aGFuIHRoZSBnbG9iYWxEYXRhIHRoaXMgd3JhcHBlciBpcyBjYWNo ZWQgb24uCiAgICAgICAgIFdyYXBwZXJDbGFzcyogd3JhcHBlciA9IG5ldyAoZXhlYykgV3JhcHBl ckNsYXNzKGdldERPTVN0cnVjdHVyZTxXcmFwcGVyQ2xhc3M+KGV4ZWMsIGdsb2JhbE9iamVjdCks IGdsb2JhbE9iamVjdCwgb2JqZWN0KTsKLSAgICAgICAgY2FjaGVET01PYmplY3RXcmFwcGVyKGV4 ZWMsIG9iamVjdCwgd3JhcHBlcik7CisgICAgICAgIGNhY2hlRE9NT2JqZWN0V3JhcHBlcihjdXJy ZW50V29ybGQoZXhlYyksIG9iamVjdCwgd3JhcHBlcik7CiAgICAgICAgIHJldHVybiB3cmFwcGVy OwogICAgIH0KICAgICB0ZW1wbGF0ZTxjbGFzcyBXcmFwcGVyQ2xhc3MsIGNsYXNzIERPTUNsYXNz PiBpbmxpbmUgSlNDOjpKU1ZhbHVlIGdldERPTU9iamVjdFdyYXBwZXIoSlNDOjpFeGVjU3RhdGUq IGV4ZWMsIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIERPTUNsYXNzKiBvYmplY3Qp CiAgICAgewogICAgICAgICBpZiAoIW9iamVjdCkKICAgICAgICAgICAgIHJldHVybiBKU0M6Ompz TnVsbCgpOwotICAgICAgICBpZiAoRE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2Jq ZWN0V3JhcHBlcihleGVjLCBvYmplY3QpKQorICAgICAgICBpZiAoRE9NT2JqZWN0KiB3cmFwcGVy ID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIG9iamVjdCkp CiAgICAgICAgICAgICByZXR1cm4gd3JhcHBlcjsKICAgICAgICAgcmV0dXJuIGNyZWF0ZURPTU9i amVjdFdyYXBwZXI8V3JhcHBlckNsYXNzPihleGVjLCBnbG9iYWxPYmplY3QsIG9iamVjdCk7CiAg ICAgfQpAQCAtMTc1LDE4ICsxNzMsMTggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHRlbXBs YXRlPGNsYXNzIFdyYXBwZXJDbGFzcywgY2xhc3MgRE9NQ2xhc3M+IGlubGluZSBKU05vZGUqIGNy ZWF0ZURPTU5vZGVXcmFwcGVyKEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0LCBET01DbGFzcyogbm9kZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChu b2RlKTsKLSAgICAgICAgQVNTRVJUKCFnZXRDYWNoZWRET01Ob2RlV3JhcHBlcihleGVjLCBub2Rl KSk7CisgICAgICAgIEFTU0VSVCghZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoY3VycmVudFdvcmxk KGV4ZWMpLCBub2RlKSk7CiAgICAgICAgIFdyYXBwZXJDbGFzcyogd3JhcHBlciA9IG5ldyAoZXhl YykgV3JhcHBlckNsYXNzKGdldERPTVN0cnVjdHVyZTxXcmFwcGVyQ2xhc3M+KGV4ZWMsIGdsb2Jh bE9iamVjdCksIGdsb2JhbE9iamVjdCwgbm9kZSk7CiAgICAgICAgIC8vIEZJWE1FOiBUaGUgZW50 aXJlIGZ1bmN0aW9uIGNhbiBiZSByZW1vdmVkLCBvbmNlIHdlIGZpeCBjYWNoaW5nLgogICAgICAg ICAvLyBUaGlzIGZ1bmN0aW9uIGlzIGEgb25lLW9mZiBoYWNrIHRvIG1ha2UgTm9kZXMgY2FjaGUg aW4gdGhlIHJpZ2h0IGdsb2JhbCBvYmplY3QuCi0gICAgICAgIGNhY2hlRE9NTm9kZVdyYXBwZXIo ZXhlYywgbm9kZSwgd3JhcHBlcik7CisgICAgICAgIGNhY2hlRE9NTm9kZVdyYXBwZXIoY3VycmVu dFdvcmxkKGV4ZWMpLCBub2RlLCB3cmFwcGVyKTsKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAg ICAgfQogICAgIHRlbXBsYXRlPGNsYXNzIFdyYXBwZXJDbGFzcywgY2xhc3MgRE9NQ2xhc3M+IGlu bGluZSBKU0M6OkpTVmFsdWUgZ2V0RE9NTm9kZVdyYXBwZXIoSlNDOjpFeGVjU3RhdGUqIGV4ZWMs IEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIERPTUNsYXNzKiBub2RlKQogICAgIHsK ICAgICAgICAgaWYgKCFub2RlKQogICAgICAgICAgICAgcmV0dXJuIEpTQzo6anNOdWxsKCk7Ci0g ICAgICAgIGlmIChKU0M6OkpTQ2VsbCogd3JhcHBlciA9IGdldENhY2hlZERPTU5vZGVXcmFwcGVy KGV4ZWMsIG5vZGUpKQorICAgICAgICBpZiAoSlNDOjpKU0NlbGwqIHdyYXBwZXIgPSBnZXRDYWNo ZWRET01Ob2RlV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIG5vZGUpKQogICAgICAgICAgICAg cmV0dXJuIHdyYXBwZXI7CiAgICAgICAgIHJldHVybiBjcmVhdGVET01Ob2RlV3JhcHBlcjxXcmFw cGVyQ2xhc3M+KGV4ZWMsIGdsb2JhbE9iamVjdCwgbm9kZSk7CiAgICAgfQpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NV2luZG93Q3VzdG9tLmNwcAkocmV2aXNp b24gODM5ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3Rv bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0MSwyNCArNDQxLDI0IEBAIEpTVmFsdWUgSlNET01X aW5kb3c6Omxvb2t1cFNldHRlcihFeGVjU3QKIEpTVmFsdWUgSlNET01XaW5kb3c6Omhpc3Rvcnko RXhlY1N0YXRlKiBleGVjKSBjb25zdAogewogICAgIEhpc3RvcnkqIGhpc3RvcnkgPSBpbXBsKCkt Pmhpc3RvcnkoKTsKLSAgICBpZiAoRE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2Jq ZWN0V3JhcHBlcihleGVjLCBoaXN0b3J5KSkKKyAgICBpZiAoRE9NT2JqZWN0KiB3cmFwcGVyID0g Z2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGhpc3RvcnkpKQog ICAgICAgICByZXR1cm4gd3JhcHBlcjsKIAogICAgIEpTRE9NV2luZG93KiB3aW5kb3cgPSBjb25z dF9jYXN0PEpTRE9NV2luZG93Kj4odGhpcyk7CiAgICAgSlNIaXN0b3J5KiBqc0hpc3RvcnkgPSBu ZXcgKGV4ZWMpIEpTSGlzdG9yeShnZXRET01TdHJ1Y3R1cmU8SlNIaXN0b3J5PihleGVjLCB3aW5k b3cpLCB3aW5kb3csIGhpc3RvcnkpOwotICAgIGNhY2hlRE9NT2JqZWN0V3JhcHBlcihleGVjLCBo aXN0b3J5LCBqc0hpc3RvcnkpOworICAgIGNhY2hlRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29y bGQoZXhlYyksIGhpc3RvcnksIGpzSGlzdG9yeSk7CiAgICAgcmV0dXJuIGpzSGlzdG9yeTsKIH0K IAogSlNWYWx1ZSBKU0RPTVdpbmRvdzo6bG9jYXRpb24oRXhlY1N0YXRlKiBleGVjKSBjb25zdAog ewogICAgIExvY2F0aW9uKiBsb2NhdGlvbiA9IGltcGwoKS0+bG9jYXRpb24oKTsKLSAgICBpZiAo RE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihleGVjLCBsb2Nh dGlvbikpCisgICAgaWYgKERPTU9iamVjdCogd3JhcHBlciA9IGdldENhY2hlZERPTU9iamVjdFdy YXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBsb2NhdGlvbikpCiAgICAgICAgIHJldHVybiB3cmFw cGVyOwogCiAgICAgSlNET01XaW5kb3cqIHdpbmRvdyA9IGNvbnN0X2Nhc3Q8SlNET01XaW5kb3cq Pih0aGlzKTsKICAgICBKU0xvY2F0aW9uKiBqc0xvY2F0aW9uID0gbmV3IChleGVjKSBKU0xvY2F0 aW9uKGdldERPTVN0cnVjdHVyZTxKU0xvY2F0aW9uPihleGVjLCB3aW5kb3cpLCB3aW5kb3csIGxv Y2F0aW9uKTsKLSAgICBjYWNoZURPTU9iamVjdFdyYXBwZXIoZXhlYywgbG9jYXRpb24sIGpzTG9j YXRpb24pOworICAgIGNhY2hlRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGxv Y2F0aW9uLCBqc0xvY2F0aW9uKTsKICAgICByZXR1cm4ganNMb2NhdGlvbjsKIH0KIApJbmRleDog U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAJKHJl dmlzaW9uIDgzOTkwKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1 c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4LDExICs2OCwxMSBAQCBKU1ZhbHVlIEpTRG9j dW1lbnQ6OmxvY2F0aW9uKEV4ZWNTdGF0ZSogCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAog ICAgIExvY2F0aW9uKiBsb2NhdGlvbiA9IGZyYW1lLT5kb21XaW5kb3coKS0+bG9jYXRpb24oKTsK LSAgICBpZiAoRE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihl eGVjLCBsb2NhdGlvbikpCisgICAgaWYgKERPTU9iamVjdCogd3JhcHBlciA9IGdldENhY2hlZERP TU9iamVjdFdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBsb2NhdGlvbikpCiAgICAgICAgIHJl dHVybiB3cmFwcGVyOwogCiAgICAgSlNMb2NhdGlvbioganNMb2NhdGlvbiA9IG5ldyAoZXhlYykg SlNMb2NhdGlvbihnZXRET01TdHJ1Y3R1cmU8SlNMb2NhdGlvbj4oZXhlYywgZ2xvYmFsT2JqZWN0 KCkpLCBnbG9iYWxPYmplY3QoKSwgbG9jYXRpb24pOwotICAgIGNhY2hlRE9NT2JqZWN0V3JhcHBl cihleGVjLCBsb2NhdGlvbiwganNMb2NhdGlvbik7CisgICAgY2FjaGVET01PYmplY3RXcmFwcGVy KGN1cnJlbnRXb3JsZChleGVjKSwgbG9jYXRpb24sIGpzTG9jYXRpb24pOwogICAgIHJldHVybiBq c0xvY2F0aW9uOwogfQogCkBAIC0xMDAsNyArMTAwLDcgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0 ZSogZXhlYywgSlNET01HbG9iYQogICAgIGlmICghZG9jdW1lbnQpCiAgICAgICAgIHJldHVybiBq c051bGwoKTsKIAotICAgIERPTU9iamVjdCogd3JhcHBlciA9IGdldENhY2hlZERPTU5vZGVXcmFw cGVyKGV4ZWMsIGRvY3VtZW50KTsKKyAgICBET01PYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRE T01Ob2RlV3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGRvY3VtZW50KTsKICAgICBpZiAod3Jh cHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRWxlbWVudEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNFbGVtZW50Q3VzdG9tLmNwcAkocmV2aXNpb24gODM5OTApCisrKyBT b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0VsZW1lbnRDdXN0b20uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03MSw3ICs3MSw3IEBAIEpTVmFsdWUgdG9KU05ld2x5Q3JlYXRlZChFeGVjU3RhdGUq IGV4ZWMKICAgICBpZiAoIWVsZW1lbnQpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAotICAg IEFTU0VSVCghZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoZXhlYywgZWxlbWVudCkpOworICAgIEFT U0VSVCghZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMpLCBlbGVtZW50 KSk7CiAKICAgICBKU05vZGUqIHdyYXBwZXI7ICAgICAgICAKICAgICBpZiAoZWxlbWVudC0+aXNI VE1MRWxlbWVudCgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudEN1 c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVu dEN1c3RvbS5jcHAJKHJldmlzaW9uIDgzOTg5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNFdmVudEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMSw3ICsxMjEsNyBAQCBK U1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhCiAgICAgaWYgKCFldmVudCkK ICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgRE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0 Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihleGVjLCBldmVudCk7CisgICAgRE9NT2JqZWN0KiB3cmFw cGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyksIGV2ZW50 KTsKICAgICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENvbGxlY3Rpb25DdXN0b20uY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTSFRNTENvbGxlY3Rpb25DdXN0 b20uY3BwCShyZXZpc2lvbiA4Mzk4OSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT SFRNTENvbGxlY3Rpb25DdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzQsNyArMTM0LDcg QEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9iYQogICAgIGlmICghY29s bGVjdGlvbikKICAgICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgRE9NT2JqZWN0KiB3cmFw cGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihleGVjLCBjb2xsZWN0aW9uKTsKKyAgICBE T01PYmplY3QqIHdyYXBwZXIgPSBnZXRDYWNoZWRET01PYmplY3RXcmFwcGVyKGN1cnJlbnRXb3Js ZChleGVjKSwgY29sbGVjdGlvbik7CiAKICAgICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJu IHdyYXBwZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdlRGF0YUN1 c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbWFn ZURhdGFDdXN0b20uY3BwCShyZXZpc2lvbiA4Mzk4OSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTSW1hZ2VEYXRhQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEs NyBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2JhCiAgICAgaWYgKCFp bWFnZURhdGEpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKICAgICAKLSAgICBET01PYmplY3Qq IHdyYXBwZXIgPSBnZXRDYWNoZWRET01PYmplY3RXcmFwcGVyKGV4ZWMsIGltYWdlRGF0YSk7Cisg ICAgRE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50 V29ybGQoZXhlYyksIGltYWdlRGF0YSk7CiAgICAgaWYgKHdyYXBwZXIpCiAgICAgICAgIHJldHVy biB3cmFwcGVyOwogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNOb2Rl Q3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05v ZGVDdXN0b20uY3BwCShyZXZpc2lvbiA4Mzk5MCkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTTm9kZUN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw3ICsxMzAsNyBAQCB2 b2lkIEpTTm9kZTo6bWFya0NoaWxkcmVuKE1hcmtTdGFjayYgbWFyCiBzdGF0aWMgQUxXQVlTX0lO TElORSBKU1ZhbHVlIGNyZWF0ZVdyYXBwZXJJbmxpbmUoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBOb2RlKiBub2RlKQogewogICAgIEFTU0VSVChub2Rl KTsKLSAgICBBU1NFUlQoIWdldENhY2hlZERPTU5vZGVXcmFwcGVyKGV4ZWMsIG5vZGUpKTsKKyAg ICBBU1NFUlQoIWdldENhY2hlZERPTU5vZGVXcmFwcGVyKGN1cnJlbnRXb3JsZChleGVjKSwgbm9k ZSkpOwogICAgIAogICAgIEpTTm9kZSogd3JhcHBlcjsgICAgCiAgICAgc3dpdGNoIChub2RlLT5u b2RlVHlwZSgpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0 b20uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05vZGVDdXN0 b20uaAkocmV2aXNpb24gODM5OTApCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU05v ZGVDdXN0b20uaAkod29ya2luZyBjb3B5KQpAQCAtMzEsMjMgKzMxLDIxIEBACiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAotaW5saW5lIEpTTm9kZSogZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoSlND OjpFeGVjU3RhdGUqIGV4ZWMsIE5vZGUqIG5vZGUpCitpbmxpbmUgSlNOb2RlKiBnZXRDYWNoZWRE T01Ob2RlV3JhcHBlcihET01XcmFwcGVyV29ybGQqIHdvcmxkLCBOb2RlKiBub2RlKQogewotICAg IGlmIChjdXJyZW50V29ybGQoZXhlYyktPmlzTm9ybWFsKCkpCisgICAgaWYgKHdvcmxkLT5pc05v cm1hbCgpKQogICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SlNOb2RlKj4obm9kZS0+d3JhcHBl cigpKTsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SlNOb2RlKj4oZ2V0Q2FjaGVkRE9NT2JqZWN0 V3JhcHBlcihleGVjLCBub2RlKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PEpTTm9kZSo+KGdl dENhY2hlZERPTU9iamVjdFdyYXBwZXIod29ybGQsIG5vZGUpKTsKIH0KIAotaW5saW5lIHZvaWQg Y2FjaGVET01Ob2RlV3JhcHBlcihKU0M6OkV4ZWNTdGF0ZSogZXhlYywgTm9kZSogbm9kZSwgSlNO b2RlKiB3cmFwcGVyKQoraW5saW5lIHZvaWQgY2FjaGVET01Ob2RlV3JhcHBlcihET01XcmFwcGVy V29ybGQqIHdvcmxkLCBOb2RlKiBub2RlLCBKU05vZGUqIHdyYXBwZXIpCiB7CiAgICAgQVNTRVJU KHdyYXBwZXIpOwotCi0gICAgRE9NV3JhcHBlcldvcmxkKiB3b3JsZCA9IGN1cnJlbnRXb3JsZChl eGVjKTsKICAgICBpZiAod29ybGQtPmlzTm9ybWFsKCkpIHsKICAgICAgICAgbm9kZS0+c2V0V3Jh cHBlcigqd29ybGQtPmdsb2JhbERhdGEoKSwgd3JhcHBlciwgd29ybGQtPmpzTm9kZUhhbmRsZU93 bmVyKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGNhY2hlRE9NT2JqZWN0V3JhcHBl cihleGVjLCBub2RlLCB3cmFwcGVyKTsKKyAgICBjYWNoZURPTU9iamVjdFdyYXBwZXIod29ybGQs IG5vZGUsIHdyYXBwZXIpOwogfQogCiBpbmxpbmUgdm9pZCB1bmNhY2hlRE9NTm9kZVdyYXBwZXIo RE9NV3JhcHBlcldvcmxkKiB3b3JsZCwgTm9kZSogbm9kZSwgSlNOb2RlKiBqc05vZGUpCkBAIC02 Niw3ICs2NCw3IEBAIGlubGluZSBKU0M6OkpTVmFsdWUgdG9KUyhKU0M6OkV4ZWNTdGF0ZSoKICAg ICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBKU0M6OmpzTnVsbCgpOwogCi0gICAgSlNOb2Rl KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoZXhlYywgbm9kZSk7CisgICAgSlNO b2RlKiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NTm9kZVdyYXBwZXIoY3VycmVudFdvcmxkKGV4ZWMp LCBub2RlKTsKICAgICBpZiAod3JhcHBlcikKICAgICAgICAgcmV0dXJuIHdyYXBwZXI7CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTU1ZHUGF0aFNlZ0N1c3RvbS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNTVkdQYXRoU2VnQ3VzdG9t LmNwcAkocmV2aXNpb24gODM5ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1NW R1BhdGhTZWdDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIEpTVmFs dWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmEKICAgICBpZiAoIW9iamVjdCkKICAg ICAgICAgcmV0dXJuIGpzTnVsbCgpOwogCi0gICAgaWYgKERPTU9iamVjdCogd3JhcHBlciA9IGdl dENhY2hlZERPTU9iamVjdFdyYXBwZXIoZXhlYywgb2JqZWN0KSkKKyAgICBpZiAoRE9NT2JqZWN0 KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBlcihjdXJyZW50V29ybGQoZXhlYyks IG9iamVjdCkpCiAgICAgICAgIHJldHVybiB3cmFwcGVyOwogCiAgICAgc3dpdGNoIChvYmplY3Qt PnBhdGhTZWdUeXBlKCkpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTU3R5 bGVTaGVldEN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNTdHlsZVNoZWV0Q3VzdG9tLmNwcAkocmV2aXNpb24gODM5ODkpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU1N0eWxlU2hlZXRDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00MCw3ICs0MCw3IEBAIEpTVmFsdWUgdG9KUyhFeGVjU3RhdGUqIGV4ZWMsIEpTRE9NR2xvYmEK ICAgICBpZiAoIXN0eWxlU2hlZXQpCiAgICAgICAgIHJldHVybiBqc051bGwoKTsKIAotICAgIERP TU9iamVjdCogd3JhcHBlciA9IGdldENhY2hlZERPTU9iamVjdFdyYXBwZXIoZXhlYywgc3R5bGVT aGVldCk7CisgICAgRE9NT2JqZWN0KiB3cmFwcGVyID0gZ2V0Q2FjaGVkRE9NT2JqZWN0V3JhcHBl cihjdXJyZW50V29ybGQoZXhlYyksIHN0eWxlU2hlZXQpOwogICAgIGlmICh3cmFwcGVyKQogICAg ICAgICByZXR1cm4gd3JhcHBlcjsKIApJbmRleDogU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBS ZXF1ZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVl c3QuY3BwCShyZXZpc2lvbiA4Mzk4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVx dWVzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4NCwxMSArNzg0LDkgQEAgdm9pZCBYTUxIdHRw UmVxdWVzdDo6ZHJvcFByb3RlY3Rpb24oKQogICAgIC8vIG91dC4gQnV0IGl0IGlzIHByb3RlY3Rl ZCBmcm9tIEdDIHdoaWxlIGxvYWRpbmcsIHNvIHRoaXMKICAgICAvLyBjYW4ndCBiZSByZWNvdXBl ZCB1bnRpbCB0aGUgbG9hZCBpcyBkb25lLCBzbyBvbmx5CiAgICAgLy8gcmVwb3J0IHRoZSBleHRy YSBjb3N0IGF0IHRoYXQgcG9pbnQuCisgICAgSlNDOjpKU0xvY2sgbG9jayhKU0M6OlNpbGVuY2VB c3NlcnRpb25zT25seSk7CiAgICAgSlNDOjpKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEgPSBzY3Jp cHRFeGVjdXRpb25Db250ZXh0KCktPmdsb2JhbERhdGEoKTsKLSAgICBpZiAoaGFzQ2FjaGVkRE9N T2JqZWN0V3JhcHBlcihnbG9iYWxEYXRhLCB0aGlzKSkgewotICAgICAgICBKU0M6OkpTTG9jayBs b2NrKEpTQzo6U2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKLSAgICAgICAgZ2xvYmFsRGF0YS0+aGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAyKTsK LSAgICB9CisgICAgZ2xvYmFsRGF0YS0+aGVhcC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QobV9yZXNw b25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAyKTsKICNlbmRpZgogCiAgICAgdW5zZXRQZW5kaW5nQWN0 aXZpdHkodGhpcyk7Cg==