133586 2014-06-06 15:25:01 -0700 Indexed getters should return values directly on the PropertySlot. 2020-05-21 16:42:18 -0700 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling cdumez cgarcia commit-queue m.debski mhahnenberg oldest_to_newest 1013865 0 kling 2014-06-06 15:25:01 -0700 Patch on the way. 1013867 1 232631 kling 2014-06-06 15:26:09 -0700 Created attachment 232631 Patch 1013884 2 232631 commit-queue 2014-06-06 16:57:20 -0700 Comment on attachment 232631 Patch Clearing flags on attachment: 232631 Committed r169668: <http://trac.webkit.org/changeset/169668> 1013885 3 commit-queue 2014-06-06 16:57:25 -0700 All reviewed patches have been landed. Closing bug. 1655143 4 changseok 2020-05-21 16:42:18 -0700 *** Bug 133848 has been marked as a duplicate of this bug. *** 232631 2014-06-06 15:26:09 -0700 2014-06-06 16:57:20 -0700 Patch bug-133586.diff text/plain 19305 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGNhMDU5ZjEuLjZiYzUyMmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA2LTA2ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBJbmRleGVkIGdldHRlcnMgc2hvdWxkIHJl dHVybiB2YWx1ZXMgZGlyZWN0bHkgb24gdGhlIFByb3BlcnR5U2xvdC4KKyAgICAgICAgPGh0dHBz Oi8vd2Via2l0Lm9yZy9iLzEzMzU4Nj4KKworICAgICAgICBSZW1vdmUgUHJvcGVydHlTbG90J3Mg Y3VzdG9tIGluZGV4IG1vZGUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0Lmg6CisgICAgICAgIChKU0M6OlByb3BlcnR5 U2xvdDo6Z2V0VmFsdWUpOgorICAgICAgICAqIHJ1bnRpbWUvUHJvcGVydHlTbG90Lmg6CisgICAg ICAgIChKU0M6OlByb3BlcnR5U2xvdDo6c2V0Q3VzdG9tSW5kZXgpOiBEZWxldGVkLgorCiAyMDE0 LTA2LTA0ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBpT1MgRGVidWcgYnVpbGQgZml4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNP YmplY3QuaAppbmRleCA4ZTk4ZjMxLi5hYjA5MmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTT2JqZWN0LmgKQEAgLTE1NjAsOCArMTU2MCw2IEBAIEFMV0FZU19JTkxJTkUgSlNW YWx1ZSBQcm9wZXJ0eVNsb3Q6OmdldFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1l IHByb3BlCiB7CiAgICAgaWYgKG1fcHJvcGVydHlUeXBlID09IFR5cGVWYWx1ZSkKICAgICAgICAg cmV0dXJuIEpTVmFsdWU6OmRlY29kZShtX2RhdGEudmFsdWUpOwotICAgIGlmIChtX3Byb3BlcnR5 VHlwZSA9PSBUeXBlQ3VzdG9tSW5kZXgpCi0gICAgICAgIHJldHVybiBKU1ZhbHVlOjpkZWNvZGUo bV9kYXRhLmN1c3RvbUluZGV4LmdldEluZGV4VmFsdWUoZXhlYywgc2xvdEJhc2UoKSwgSlNWYWx1 ZTo6ZW5jb2RlKG1fdGhpc1ZhbHVlKSwgbV9kYXRhLmN1c3RvbUluZGV4LmluZGV4KSk7CiAgICAg aWYgKG1fcHJvcGVydHlUeXBlID09IFR5cGVHZXR0ZXIpCiAgICAgICAgIHJldHVybiBmdW5jdGlv bkdldHRlcihleGVjKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZGVjb2RlKG1fZGF0YS5jdXN0b20u Z2V0VmFsdWUoZXhlYywgc2xvdEJhc2UoKSwgSlNWYWx1ZTo6ZW5jb2RlKG1fdGhpc1ZhbHVlKSwg cHJvcGVydHlOYW1lKSk7CkBAIC0xNTcxLDggKzE1NjksNiBAQCBBTFdBWVNfSU5MSU5FIEpTVmFs dWUgUHJvcGVydHlTbG90OjpnZXRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIHVuc2lnbmVkIHByb3Bl cnR5TgogewogICAgIGlmIChtX3Byb3BlcnR5VHlwZSA9PSBUeXBlVmFsdWUpCiAgICAgICAgIHJl dHVybiBKU1ZhbHVlOjpkZWNvZGUobV9kYXRhLnZhbHVlKTsKLSAgICBpZiAobV9wcm9wZXJ0eVR5 cGUgPT0gVHlwZUN1c3RvbUluZGV4KQotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZGVjb2RlKG1f ZGF0YS5jdXN0b21JbmRleC5nZXRJbmRleFZhbHVlKGV4ZWMsIHNsb3RCYXNlKCksIEpTVmFsdWU6 OmVuY29kZShtX3RoaXNWYWx1ZSksIG1fZGF0YS5jdXN0b21JbmRleC5pbmRleCkpOwogICAgIGlm IChtX3Byb3BlcnR5VHlwZSA9PSBUeXBlR2V0dGVyKQogICAgICAgICByZXR1cm4gZnVuY3Rpb25H ZXR0ZXIoZXhlYyk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmRlY29kZShtX2RhdGEuY3VzdG9tLmdl dFZhbHVlKGV4ZWMsIHNsb3RCYXNlKCksIEpTVmFsdWU6OmVuY29kZShtX3RoaXNWYWx1ZSksIElk ZW50aWZpZXI6OmZyb20oZXhlYywgcHJvcGVydHlOYW1lKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJvcGVydHlTbG90LmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Qcm9wZXJ0eVNsb3QuaAppbmRleCAwOGNhYzdjLi4wMzQ1MDg5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eVNsb3QuaAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eVNsb3QuaApAQCAtNTIsOCAr NTIsNyBAQCBjbGFzcyBQcm9wZXJ0eVNsb3QgewogICAgICAgICBUeXBlVW5zZXQsCiAgICAgICAg IFR5cGVWYWx1ZSwKICAgICAgICAgVHlwZUdldHRlciwKLSAgICAgICAgVHlwZUN1c3RvbSwKLSAg ICAgICAgVHlwZUN1c3RvbUluZGV4CisgICAgICAgIFR5cGVDdXN0b20KICAgICB9OwogCiAgICAg ZW51bSBDYWNoZWFiaWxpdHlUeXBlIHsKQEAgLTcyLDcgKzcxLDYgQEAgcHVibGljOgogICAgIH0K IAogICAgIHR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgKCpHZXRWYWx1ZUZ1bmMpKEV4ZWNTdGF0ZSos IEpTT2JqZWN0KiBzbG90QmFzZSwgRW5jb2RlZEpTVmFsdWUgdGhpc1ZhbHVlLCBQcm9wZXJ0eU5h bWUpOwotICAgIHR5cGVkZWYgRW5jb2RlZEpTVmFsdWUgKCpHZXRJbmRleFZhbHVlRnVuYykoRXhl Y1N0YXRlKiwgSlNPYmplY3QqIHNsb3RCYXNlLCBFbmNvZGVkSlNWYWx1ZSB0aGlzVmFsdWUsIHVu c2lnbmVkKTsKIAogICAgIEpTVmFsdWUgZ2V0VmFsdWUoRXhlY1N0YXRlKiwgUHJvcGVydHlOYW1l KSBjb25zdDsKICAgICBKU1ZhbHVlIGdldFZhbHVlKEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3Bl cnR5TmFtZSkgY29uc3Q7CkBAIC0xODAsMTkgKzE3OCw2IEBAIHB1YmxpYzoKICAgICAgICAgbV9v ZmZzZXQgPSAhaW52YWxpZE9mZnNldDsKICAgICB9CiAKLSAgICB2b2lkIHNldEN1c3RvbUluZGV4 KEpTT2JqZWN0KiBzbG90QmFzZSwgdW5zaWduZWQgYXR0cmlidXRlcywgdW5zaWduZWQgaW5kZXgs IEdldEluZGV4VmFsdWVGdW5jIGdldEluZGV4VmFsdWUpCi0gICAgewotICAgICAgICBBU1NFUlQo Z2V0SW5kZXhWYWx1ZSk7Ci0gICAgICAgIG1fZGF0YS5jdXN0b21JbmRleC5nZXRJbmRleFZhbHVl ID0gZ2V0SW5kZXhWYWx1ZTsKLSAgICAgICAgbV9kYXRhLmN1c3RvbUluZGV4LmluZGV4ID0gaW5k ZXg7Ci0gICAgICAgIG1fYXR0cmlidXRlcyA9IGF0dHJpYnV0ZXM7Ci0KLSAgICAgICAgQVNTRVJU KHNsb3RCYXNlKTsKLSAgICAgICAgbV9zbG90QmFzZSA9IHNsb3RCYXNlOwotICAgICAgICBtX3By b3BlcnR5VHlwZSA9IFR5cGVDdXN0b21JbmRleDsKLSAgICAgICAgbV9vZmZzZXQgPSBpbnZhbGlk T2Zmc2V0OwotICAgIH0KLQogICAgIHZvaWQgc2V0R2V0dGVyU2xvdChKU09iamVjdCogc2xvdEJh c2UsIHVuc2lnbmVkIGF0dHJpYnV0ZXMsIEdldHRlclNldHRlciogZ2V0dGVyU2V0dGVyKQogICAg IHsKICAgICAgICAgQVNTRVJUKGdldHRlclNldHRlcik7CkBAIC0yNDQsMTAgKzIyOSw2IEBAIHBy aXZhdGU6CiAgICAgICAgIHN0cnVjdCB7CiAgICAgICAgICAgICBHZXRWYWx1ZUZ1bmMgZ2V0VmFs dWU7CiAgICAgICAgIH0gY3VzdG9tOwotICAgICAgICBzdHJ1Y3QgewotICAgICAgICAgICAgR2V0 SW5kZXhWYWx1ZUZ1bmMgZ2V0SW5kZXhWYWx1ZTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGluZGV4 OwotICAgICAgICB9IGN1c3RvbUluZGV4OwogICAgIH0gbV9kYXRhOwogCiAgICAgUHJvcGVydHlU eXBlIG1fcHJvcGVydHlUeXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGVhZTZkMWQuLjQ4ZDE2N2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAxNC0wNi0wNiAgQW5kcmVhcyBLbGluZyAgPGFrbGlu Z0BhcHBsZS5jb20+CisKKyAgICAgICAgSW5kZXhlZCBnZXR0ZXJzIHNob3VsZCByZXR1cm4gdmFs dWVzIGRpcmVjdGx5IG9uIHRoZSBQcm9wZXJ0eVNsb3QuCisgICAgICAgIDxodHRwczovL3dlYmtp dC5vcmcvYi8xMzM1ODY+CisKKyAgICAgICAgTWFrZSBpbmRleGVkIGdldHRlcnMgbW9yZSBlZmZp Y2llbnQgYnkgdXNpbmcgUHJvcGVydHlTbG90OjpzZXRWYWx1ZSgpCisgICAgICAgIHRvIHBhc3Mg dGhlIHZhbHVlIGRpcmVjdGx5IGJhY2sgdGhyb3VnaCB0aGUgc2xvdCwgaW5zdGVhZCBvZiBnaXZp bmcgaXQKKyAgICAgICAgYSBmdW5jdGlvbiBwb2ludGVyIHRoYXQgSlNDIHdvdWxkIHRoZW4gaW1t ZWRpYXRlbHkgY2FsbCBiYWNrIHRocm91Z2gKKyAgICAgICAgdG8gcmV0cmlldmUgdGhlIHZhbHVl LgorCisgICAgICAgIFRoZSBmdW5jdGlvbiBwb2ludGVyIGFwcHJvYWNoIHdvdWxkIG1ha2Ugc2Vu c2UgaWYgd2UgZGlkIGlubGluZSBjYWNoaW5nCisgICAgICAgIG9mIGluZGV4ZWQgZ2V0dGVycyBi dXQgc2luY2Ugd2UgY3VycmVudGx5IGRvbid0LCB0aGlzIGlzIHB1cmUgb3ZlcmhlYWQuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5kaW5ncy9q cy9KU0NTU1N0eWxlRGVjbGFyYXRpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlND U1NTdHlsZURlY2xhcmF0aW9uOjpnZXRPd25Qcm9wZXJ0eVNsb3REZWxlZ2F0ZSk6CisgICAgICAg IChXZWJDb3JlOjpjc3NQcm9wZXJ0eUdldHRlclBpeGVsT3JQb3NQcmVmaXhDYWxsYmFjayk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpjc3NQcm9wZXJ0eUdldHRlckNhbGxiYWNrKTogRGVs ZXRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpKU0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVydHlTbG90KToKKyAgICAgICAg KFdlYkNvcmU6OkpTRE9NV2luZG93OjpnZXRPd25Qcm9wZXJ0eVNsb3RCeUluZGV4KToKKyAgICAg ICAgKFdlYkNvcmU6OmluZGV4R2V0dGVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKyAgICAgICAgKEdlbmVyYXRlR2V0T3duUHJvcGVy dHlTbG90Qm9keSk6CisgICAgICAgIChHZW5lcmF0ZUhlYWRlcik6CisgICAgICAgIChHZXRJbmRl eGVkR2V0dGVyRXhwcmVzc2lvbik6CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToK KyAgICAgICAgKiBicmlkZ2UvcnVudGltZV9hcnJheS5jcHA6CisgICAgICAgIChKU0M6OlJ1bnRp bWVBcnJheTo6Z2V0T3duUHJvcGVydHlTbG90KToKKyAgICAgICAgKEpTQzo6UnVudGltZUFycmF5 OjpnZXRPd25Qcm9wZXJ0eVNsb3RCeUluZGV4KToKKyAgICAgICAgKEpTQzo6UnVudGltZUFycmF5 OjppbmRleEdldHRlcik6IERlbGV0ZWQuCisgICAgICAgICogYnJpZGdlL3J1bnRpbWVfYXJyYXku aDoKKwogMjAxNC0wNi0wNiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAog ICAgICAgICBbaU9TXSBTdXBwb3J0IHBhc3RpbmcgSFRNTApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNDU1NTdHlsZURlY2xhcmF0aW9uQ3VzdG9tLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTU3R5bGVEZWNsYXJhdGlvbkN1c3RvbS5jcHAKaW5k ZXggOTQ1NzdjMi4uMTFkZTVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDU1NTdHlsZURlY2xhcmF0aW9uQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0NTU1N0eWxlRGVjbGFyYXRpb25DdXN0b20uY3BwCkBAIC0yOTcsMTQgKzI5 Nyw2IEBAIHN0YXRpYyBpbmxpbmUgSlNWYWx1ZSBjc3NQcm9wZXJ0eUdldHRlclBpeGVsT3JQb3NQ cmVmaXgoRXhlY1N0YXRlKiBleGVjLCBKU0NTU1N0CiAgICAgcmV0dXJuIGdldFByb3BlcnR5VmFs dWVGYWxsYmFjayhleGVjLCB0aGlzT2JqLCBwcm9wZXJ0eUlEKTsKIH0KIAotc3RhdGljIEVuY29k ZWRKU1ZhbHVlIGNzc1Byb3BlcnR5R2V0dGVyUGl4ZWxPclBvc1ByZWZpeENhbGxiYWNrKEV4ZWNT dGF0ZSogZXhlYywgSlNPYmplY3QqLCBFbmNvZGVkSlNWYWx1ZSB0aGlzVmFsdWUsIHVuc2lnbmVk IHByb3BlcnR5SUQpCi17Ci0gICAgSlNDU1NTdHlsZURlY2xhcmF0aW9uKiB0aGlzT2JqZWN0ID0g anNEeW5hbWljQ2FzdDxKU0NTU1N0eWxlRGVjbGFyYXRpb24qPihKU1ZhbHVlOjpkZWNvZGUodGhp c1ZhbHVlKSk7Ci0gICAgaWYgKCF0aGlzT2JqZWN0KQotICAgICAgICByZXR1cm4gdGhyb3dWTVR5 cGVFcnJvcihleGVjKTsKLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNzc1Byb3BlcnR5R2V0 dGVyUGl4ZWxPclBvc1ByZWZpeChleGVjLCB0aGlzT2JqZWN0LCBwcm9wZXJ0eUlEKSk7Ci19Ci0K IHN0YXRpYyBpbmxpbmUgSlNWYWx1ZSBjc3NQcm9wZXJ0eUdldHRlcihFeGVjU3RhdGUqIGV4ZWMs IEpTQ1NTU3R5bGVEZWNsYXJhdGlvbiogdGhpc09iaiwgdW5zaWduZWQgcHJvcGVydHlJRCkKIHsK ICAgICBSZWZQdHI8Q1NTVmFsdWU+IHYgPSB0aGlzT2JqLT5pbXBsKCkuZ2V0UHJvcGVydHlDU1NW YWx1ZUludGVybmFsKHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KHByb3BlcnR5SUQpKTsKQEAg LTMxNCwyNCArMzA2LDE2IEBAIHN0YXRpYyBpbmxpbmUgSlNWYWx1ZSBjc3NQcm9wZXJ0eUdldHRl cihFeGVjU3RhdGUqIGV4ZWMsIEpTQ1NTU3R5bGVEZWNsYXJhdGlvbioKICAgICByZXR1cm4gZ2V0 UHJvcGVydHlWYWx1ZUZhbGxiYWNrKGV4ZWMsIHRoaXNPYmosIHByb3BlcnR5SUQpOwogfQogCi1z dGF0aWMgRW5jb2RlZEpTVmFsdWUgY3NzUHJvcGVydHlHZXR0ZXJDYWxsYmFjayhFeGVjU3RhdGUq IGV4ZWMsIEpTT2JqZWN0KiwgRW5jb2RlZEpTVmFsdWUgdGhpc1ZhbHVlLCB1bnNpZ25lZCBwcm9w ZXJ0eUlEKQotewotICAgIEpTQ1NTU3R5bGVEZWNsYXJhdGlvbiogdGhpc09iamVjdCA9IGpzRHlu YW1pY0Nhc3Q8SlNDU1NTdHlsZURlY2xhcmF0aW9uKj4oSlNWYWx1ZTo6ZGVjb2RlKHRoaXNWYWx1 ZSkpOwotICAgIGlmICghdGhpc09iamVjdCkKLSAgICAgICAgcmV0dXJuIHRocm93Vk1UeXBlRXJy b3IoZXhlYyk7Ci0gICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShjc3NQcm9wZXJ0eUdldHRlcihl eGVjLCB0aGlzT2JqZWN0LCBwcm9wZXJ0eUlEKSk7Ci19Ci0KLWJvb2wgSlNDU1NTdHlsZURlY2xh cmF0aW9uOjpnZXRPd25Qcm9wZXJ0eVNsb3REZWxlZ2F0ZShFeGVjU3RhdGUqLCBQcm9wZXJ0eU5h bWUgcHJvcGVydHlJZGVudGlmaWVyLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCitib29sIEpTQ1NTU3R5 bGVEZWNsYXJhdGlvbjo6Z2V0T3duUHJvcGVydHlTbG90RGVsZWdhdGUoRXhlY1N0YXRlKiBleGVj LCBQcm9wZXJ0eU5hbWUgcHJvcGVydHlJZGVudGlmaWVyLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCiB7 CiAgICAgQ1NTUHJvcGVydHlJbmZvIHByb3BlcnR5SW5mbyA9IGNzc1Byb3BlcnR5SURGb3JKU0NT U1Byb3BlcnR5TmFtZShwcm9wZXJ0eUlkZW50aWZpZXIpOwogICAgIGlmICghcHJvcGVydHlJbmZv LnByb3BlcnR5SUQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChwcm9wZXJ0eUlu Zm8uaGFkUGl4ZWxPclBvc1ByZWZpeCkKLSAgICAgICAgc2xvdC5zZXRDdXN0b21JbmRleCh0aGlz LCBEb250RGVsZXRlLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocHJvcGVydHlJbmZvLnByb3BlcnR5 SUQpLCBjc3NQcm9wZXJ0eUdldHRlclBpeGVsT3JQb3NQcmVmaXhDYWxsYmFjayk7CisgICAgICAg IHNsb3Quc2V0VmFsdWUodGhpcywgRG9udERlbGV0ZSwgY3NzUHJvcGVydHlHZXR0ZXJQaXhlbE9y UG9zUHJlZml4KGV4ZWMsIHRoaXMsIHByb3BlcnR5SW5mby5wcm9wZXJ0eUlEKSk7CiAgICAgZWxz ZQotICAgICAgICBzbG90LnNldEN1c3RvbUluZGV4KHRoaXMsIERvbnREZWxldGUsIHN0YXRpY19j YXN0PHVuc2lnbmVkPihwcm9wZXJ0eUluZm8ucHJvcGVydHlJRCksIGNzc1Byb3BlcnR5R2V0dGVy Q2FsbGJhY2spOworICAgICAgICBzbG90LnNldFZhbHVlKHRoaXMsIERvbnREZWxldGUsIGNzc1By b3BlcnR5R2V0dGVyKGV4ZWMsIHRoaXMsIHByb3BlcnR5SW5mby5wcm9wZXJ0eUlEKSk7CiAgICAg cmV0dXJuIHRydWU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTRE9NV2luZG93Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9N V2luZG93Q3VzdG9tLmNwcAppbmRleCA1YjIwYTMxLi40ZTk1NmY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd0N1c3RvbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01XaW5kb3dDdXN0b20uY3BwCkBAIC03NSwxMSArNzUs NiBAQCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgY2hpbGRGcmFtZUdldHRlcihFeGVjU3RhdGUqIGV4 ZWMsIEpTT2JqZWN0KiBzbG90QmFzZSwgRW5jbwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUo dG9KUyhleGVjLCBqc0Nhc3Q8SlNET01XaW5kb3cqPihzbG90QmFzZSktPmltcGwoKS5mcmFtZSgp LT50cmVlKCkuc2NvcGVkQ2hpbGQocHJvcGVydHlOYW1lVG9BdG9taWNTdHJpbmcocHJvcGVydHlO YW1lKSktPmRvY3VtZW50KCktPmRvbVdpbmRvdygpKSk7CiB9CiAKLXN0YXRpYyBFbmNvZGVkSlNW YWx1ZSBpbmRleEdldHRlcihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBzbG90QmFzZSwgRW5j b2RlZEpTVmFsdWUsIHVuc2lnbmVkIGluZGV4KQotewotICAgIHJldHVybiBKU1ZhbHVlOjplbmNv ZGUodG9KUyhleGVjLCBqc0Nhc3Q8SlNET01XaW5kb3cqPihzbG90QmFzZSktPmltcGwoKS5mcmFt ZSgpLT50cmVlKCkuc2NvcGVkQ2hpbGQoaW5kZXgpLT5kb2N1bWVudCgpLT5kb21XaW5kb3coKSkp OwotfQotCiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgbmFtZWRJdGVtR2V0dGVyKEV4ZWNTdGF0ZSog ZXhlYywgSlNPYmplY3QqIHNsb3RCYXNlLCBFbmNvZGVkSlNWYWx1ZSwgUHJvcGVydHlOYW1lIHBy b3BlcnR5TmFtZSkKIHsKICAgICBKU0RPTVdpbmRvd0Jhc2UqIHRoaXNPYmogPSBqc0Nhc3Q8SlNE T01XaW5kb3cqPihzbG90QmFzZSk7CkBAIC0yMzIsNyArMjI3LDggQEAgYm9vbCBKU0RPTVdpbmRv dzo6Z2V0T3duUHJvcGVydHlTbG90KEpTT2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0ZSogZXhlYywg UHJvcGVydHkKICAgICB1bnNpZ25lZCBpID0gcHJvcGVydHlOYW1lLmFzSW5kZXgoKTsKICAgICBp ZiAoaSA8IHRoaXNPYmplY3QtPmltcGwoKS5mcmFtZSgpLT50cmVlKCkuc2NvcGVkQ2hpbGRDb3Vu dCgpKSB7CiAgICAgICAgIEFTU0VSVChpICE9IFByb3BlcnR5TmFtZTo6Tm90QW5JbmRleCk7Ci0g ICAgICAgIHNsb3Quc2V0Q3VzdG9tSW5kZXgodGhpc09iamVjdCwgUmVhZE9ubHkgfCBEb250RGVs ZXRlIHwgRG9udEVudW0sIGksIGluZGV4R2V0dGVyKTsKKyAgICAgICAgc2xvdC5zZXRWYWx1ZSh0 aGlzT2JqZWN0LCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bSwKKyAgICAgICAgICAg IHRvSlMoZXhlYywgdGhpc09iamVjdC0+aW1wbCgpLmZyYW1lKCktPnRyZWUoKS5zY29wZWRDaGls ZChpKS0+ZG9jdW1lbnQoKS0+ZG9tV2luZG93KCkpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQogCkBAIC0zMDgsNyArMzA0LDggQEAgYm9vbCBKU0RPTVdpbmRvdzo6Z2V0T3duUHJvcGVy dHlTbG90QnlJbmRleChKU09iamVjdCogb2JqZWN0LCBFeGVjU3RhdGUqIGV4ZWMsIHUKICAgICAv LyBhbGxvdyB3aW5kb3dbMV0gb3IgcGFyZW50WzFdIGV0Yy4gKCM1Njk4MykKICAgICBpZiAoaW5k ZXggPCB0aGlzT2JqZWN0LT5pbXBsKCkuZnJhbWUoKS0+dHJlZSgpLnNjb3BlZENoaWxkQ291bnQo KSkgewogICAgICAgICBBU1NFUlQoaW5kZXggIT0gUHJvcGVydHlOYW1lOjpOb3RBbkluZGV4KTsK LSAgICAgICAgc2xvdC5zZXRDdXN0b21JbmRleCh0aGlzT2JqZWN0LCBSZWFkT25seSB8IERvbnRE ZWxldGUgfCBEb250RW51bSwgaW5kZXgsIGluZGV4R2V0dGVyKTsKKyAgICAgICAgc2xvdC5zZXRW YWx1ZSh0aGlzT2JqZWN0LCBSZWFkT25seSB8IERvbnREZWxldGUgfCBEb250RW51bSwKKyAgICAg ICAgICAgIHRvSlMoZXhlYywgdGhpc09iamVjdC0+aW1wbCgpLmZyYW1lKCktPnRyZWUoKS5zY29w ZWRDaGlsZChpbmRleCktPmRvY3VtZW50KCktPmRvbVdpbmRvdygpKSk7CiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9ySlMucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCBiMjZkNzExLi4xZDdkYWNhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQpAQCAtNDMy LDcgKzQzMiw3IEBAIHN1YiBHZW5lcmF0ZUdldE93blByb3BlcnR5U2xvdEJvZHkKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgIHB1c2goQGdldE93blByb3BlcnR5U2xvdEltcGwsICIgICAg ICAgIHVuc2lnbmVkIGF0dHJpYnV0ZXMgPSAke25hbWVzcGFjZU1heWJlfURvbnREZWxldGUgfCAk e25hbWVzcGFjZU1heWJlfVJlYWRPbmx5O1xuIik7CiAgICAgICAgIH0KLSAgICAgICAgcHVzaChA Z2V0T3duUHJvcGVydHlTbG90SW1wbCwgIiAgICAgICAgc2xvdC5zZXRDdXN0b21JbmRleCh0aGlz T2JqZWN0LCBhdHRyaWJ1dGVzLCBpbmRleCwgaW5kZXhHZXR0ZXIpO1xuIik7CisgICAgICAgIHB1 c2goQGdldE93blByb3BlcnR5U2xvdEltcGwsICIgICAgICAgIHNsb3Quc2V0VmFsdWUodGhpc09i amVjdCwgYXR0cmlidXRlcywgIiAuIEdldEluZGV4ZWRHZXR0ZXJFeHByZXNzaW9uKCRpbmRleGVk R2V0dGVyRnVuY3Rpb24pIC4gIik7XG4iKTsKICAgICAgICAgcHVzaChAZ2V0T3duUHJvcGVydHlT bG90SW1wbCwgIiAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKICAgICAgICAgcHVzaChAZ2V0T3du UHJvcGVydHlTbG90SW1wbCwgIiAgICB9XG4iKTsKICAgICB9CkBAIC0xMTI2LDExICsxMTI2LDYg QEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAgfQogICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICJC YXNlOjpTdHJ1Y3R1cmVGbGFncztcbiIpOwogCi0gICAgIyBJbmRleCBnZXR0ZXIKLSAgICBpZiAo JGluZGV4ZWRHZXR0ZXJGdW5jdGlvbikgewotICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAi ICAgIHN0YXRpYyBKU0M6OkVuY29kZWRKU1ZhbHVlIGluZGV4R2V0dGVyKEpTQzo6RXhlY1N0YXRl KiwgSlNDOjpKU09iamVjdCosIEpTQzo6RW5jb2RlZEpTVmFsdWUsIHVuc2lnbmVkKTtcbiIpOwot ICAgIH0KLQogICAgICMgSW5kZXggc2V0dGVyCiAgICAgaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyJDdXN0b21JbmRleGVkU2V0dGVyIn0pIHsKICAgICAgICAgcHVzaChAaGVh ZGVyQ29udGVudCwgIiAgICB2b2lkIGluZGV4U2V0dGVyKEpTQzo6RXhlY1N0YXRlKiwgdW5zaWdu ZWQgaW5kZXgsIEpTQzo6SlNWYWx1ZSk7XG4iKTsKQEAgLTE3MjEsNiArMTcxNiwxNSBAQCBzdWIg R2V0Q2FzdGluZ0hlbHBlckZvckJhc2VPYmplY3QKICAgICByZXR1cm4gImpzQ2FzdDxKUyIgLiAk aW50ZXJmYWNlLT5uYW1lIC4gIio+IjsKIH0KIAorc3ViIEdldEluZGV4ZWRHZXR0ZXJFeHByZXNz aW9uCit7CisgICAgbXkgJGluZGV4ZWRHZXR0ZXJGdW5jdGlvbiA9IHNoaWZ0OworICAgIGlmICgk aW5kZXhlZEdldHRlckZ1bmN0aW9uLT5zaWduYXR1cmUtPnR5cGUgZXEgIkRPTVN0cmluZyIpIHsK KyAgICAgICAgcmV0dXJuICJqc1N0cmluZ09yVW5kZWZpbmVkKGV4ZWMsIHRoaXNPYmplY3QtPmlt cGwoKS5pdGVtKGluZGV4KSkiOworICAgIH0KKyAgICByZXR1cm4gInRvSlMoZXhlYywgdGhpc09i amVjdC0+Z2xvYmFsT2JqZWN0KCksIHRoaXNPYmplY3QtPmltcGwoKS5pdGVtKGluZGV4KSkiOwor fQorCiBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogewogICAgIG15ICgkb2JqZWN0LCAkaW50 ZXJmYWNlKSA9IEBfOwpAQCAtMjEwNyw3ICsyMTExLDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50 YXRpb24KICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICAgICAgdW5zaWduZWQgYXR0cmlidXRlcyA9IERvbnREZWxldGUg fCBSZWFkT25seTtcbiIpOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICAgICAgc2xvdC5zZXRDdXN0b21JbmRleCh0aGlzT2JqZWN0LCBh dHRyaWJ1dGVzLCBpbmRleCwgdGhpc09iamVjdC0+aW5kZXhHZXR0ZXIpO1xuIik7CisgICAgICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIHNsb3Quc2V0VmFsdWUodGhpc09i amVjdCwgYXR0cmlidXRlcywgIiAuIEdldEluZGV4ZWRHZXR0ZXJFeHByZXNzaW9uKCRpbmRleGVk R2V0dGVyRnVuY3Rpb24pIC4gIik7XG4iKTsKICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKICAgICAgICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgIiAgICB9XG4iKTsKICAgICAgICAgICAgIH0KQEAgLTI4ODksMTcgKzI4OTMs OSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgIH0KIAogICAgIGlmICgkaW5kZXhl ZEdldHRlckZ1bmN0aW9uKSB7Ci0gICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiXG5FbmNvZGVk SlNWYWx1ZSAke2NsYXNzTmFtZX06OmluZGV4R2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmpl Y3QqIHNsb3RCYXNlLCBFbmNvZGVkSlNWYWx1ZSwgdW5zaWduZWQgaW5kZXgpXG4iKTsKLSAgICAg ICAgcHVzaChAaW1wbENvbnRlbnQsICJ7XG4iKTsKLSAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgJHtjbGFzc05hbWV9KiB0aGlzT2JqID0ganNDYXN0PCRjbGFzc05hbWUqPihzbG90QmFz ZSk7XG4iKTsKLSAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgQVNTRVJUX0dDX09CSkVD VF9JTkhFUklUUyh0aGlzT2JqLCBpbmZvKCkpO1xuIik7CiAgICAgICAgIGlmICgkaW5kZXhlZEdl dHRlckZ1bmN0aW9uLT5zaWduYXR1cmUtPnR5cGUgZXEgIkRPTVN0cmluZyIpIHsKICAgICAgICAg ICAgICRpbXBsSW5jbHVkZXN7IlVSTC5oIn0gPSAxOwotICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsICIgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1N0cmluZ09yVW5kZWZpbmVkKGV4 ZWMsIHRoaXNPYmotPmltcGwoKS5pdGVtKGluZGV4KSkpO1xuIik7Ci0gICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKHRvSlMoZXhlYywgdGhpc09iai0+Z2xvYmFsT2JqZWN0KCksIHRoaXNPYmotPmltcGwoKS5p dGVtKGluZGV4KSkpO1xuIik7CiAgICAgICAgIH0KLSAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICJ9XG5cbiIpOwogICAgICAgICBpZiAoJGludGVyZmFjZU5hbWUgPX4gL15IVE1MXHcqQ29sbGVj dGlvbiQvIG9yICRpbnRlcmZhY2VOYW1lIGVxICJSYWRpb05vZGVMaXN0IikgewogICAgICAgICAg ICAgJGltcGxJbmNsdWRlc3siSlNOb2RlLmgifSA9IDE7CiAgICAgICAgICAgICAkaW1wbEluY2x1 ZGVzeyJOb2RlLmgifSA9IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvSlMvSlNUZXN0RXZlbnRUYXJnZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEV2ZW50VGFyZ2V0LmNwcAppbmRleCBkZWJlZTk3 Li40ZGI1OTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvSlMvSlNUZXN0RXZlbnRUYXJnZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RFdmVudFRhcmdldC5jcHAKQEAgLTE1Nyw3ICsxNTcsNyBA QCBib29sIEpTVGVzdEV2ZW50VGFyZ2V0OjpnZXRPd25Qcm9wZXJ0eVNsb3QoSlNPYmplY3QqIG9i amVjdCwgRXhlY1N0YXRlKiBleGVjLCBQcgogICAgIHVuc2lnbmVkIGluZGV4ID0gcHJvcGVydHlO YW1lLmFzSW5kZXgoKTsKICAgICBpZiAoaW5kZXggIT0gUHJvcGVydHlOYW1lOjpOb3RBbkluZGV4 ICYmIGluZGV4IDwgdGhpc09iamVjdC0+aW1wbCgpLmxlbmd0aCgpKSB7CiAgICAgICAgIHVuc2ln bmVkIGF0dHJpYnV0ZXMgPSBEb250RGVsZXRlIHwgUmVhZE9ubHk7Ci0gICAgICAgIHNsb3Quc2V0 Q3VzdG9tSW5kZXgodGhpc09iamVjdCwgYXR0cmlidXRlcywgaW5kZXgsIGluZGV4R2V0dGVyKTsK KyAgICAgICAgc2xvdC5zZXRWYWx1ZSh0aGlzT2JqZWN0LCBhdHRyaWJ1dGVzLCB0b0pTKGV4ZWMs IHRoaXNPYmplY3QtPmdsb2JhbE9iamVjdCgpLCB0aGlzT2JqZWN0LT5pbXBsKCkuaXRlbShpbmRl eCkpKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIGlmIChjYW5HZXRJdGVtc0Zv ck5hbWUoZXhlYywgJnRoaXNPYmplY3QtPmltcGwoKSwgcHJvcGVydHlOYW1lKSkgewpAQCAtMTcz LDcgKzE3Myw3IEBAIGJvb2wgSlNUZXN0RXZlbnRUYXJnZXQ6OmdldE93blByb3BlcnR5U2xvdEJ5 SW5kZXgoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRlKiBlCiAgICAgQVNTRVJUX0dDX09CSkVD VF9JTkhFUklUUyh0aGlzT2JqZWN0LCBpbmZvKCkpOwogICAgIGlmIChpbmRleCA8IHRoaXNPYmpl Y3QtPmltcGwoKS5sZW5ndGgoKSkgewogICAgICAgICB1bnNpZ25lZCBhdHRyaWJ1dGVzID0gRG9u dERlbGV0ZSB8IFJlYWRPbmx5OwotICAgICAgICBzbG90LnNldEN1c3RvbUluZGV4KHRoaXNPYmpl Y3QsIGF0dHJpYnV0ZXMsIGluZGV4LCB0aGlzT2JqZWN0LT5pbmRleEdldHRlcik7CisgICAgICAg IHNsb3Quc2V0VmFsdWUodGhpc09iamVjdCwgYXR0cmlidXRlcywgdG9KUyhleGVjLCB0aGlzT2Jq ZWN0LT5nbG9iYWxPYmplY3QoKSwgdGhpc09iamVjdC0+aW1wbCgpLml0ZW0oaW5kZXgpKSk7CiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICBQcm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1l ID0gSWRlbnRpZmllcjo6ZnJvbShleGVjLCBpbmRleCk7CkBAIC0yODcsMTQgKzI4Nyw2IEBAIHZv aWQgSlNUZXN0RXZlbnRUYXJnZXQ6OnZpc2l0Q2hpbGRyZW4oSlNDZWxsKiBjZWxsLCBTbG90Vmlz aXRvciYgdmlzaXRvcikKICAgICB0aGlzT2JqZWN0LT5pbXBsKCkudmlzaXRKU0V2ZW50TGlzdGVu ZXJzKHZpc2l0b3IpOwogfQogCi0KLUVuY29kZWRKU1ZhbHVlIEpTVGVzdEV2ZW50VGFyZ2V0Ojpp bmRleEdldHRlcihFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBzbG90QmFzZSwgRW5jb2RlZEpT VmFsdWUsIHVuc2lnbmVkIGluZGV4KQotewotICAgIEpTVGVzdEV2ZW50VGFyZ2V0KiB0aGlzT2Jq ID0ganNDYXN0PEpTVGVzdEV2ZW50VGFyZ2V0Kj4oc2xvdEJhc2UpOwotICAgIEFTU0VSVF9HQ19P QkpFQ1RfSU5IRVJJVFModGhpc09iaiwgaW5mbygpKTsKLSAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKHRvSlMoZXhlYywgdGhpc09iai0+Z2xvYmFsT2JqZWN0KCksIHRoaXNPYmotPmltcGwoKS5p dGVtKGluZGV4KSkpOwotfQotCiBib29sIEpTVGVzdEV2ZW50VGFyZ2V0T3duZXI6OmlzUmVhY2hh YmxlRnJvbU9wYXF1ZVJvb3RzKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGFuZGxlLCB2b2lk KiwgU2xvdFZpc2l0b3ImIHZpc2l0b3IpCiB7CiAgICAgSlNUZXN0RXZlbnRUYXJnZXQqIGpzVGVz dEV2ZW50VGFyZ2V0ID0ganNDYXN0PEpTVGVzdEV2ZW50VGFyZ2V0Kj4oaGFuZGxlLnNsb3QoKS0+ YXNDZWxsKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L0pTL0pTVGVzdEV2ZW50VGFyZ2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNUZXN0RXZlbnRUYXJnZXQuaAppbmRleCBlMWVkYzI5Li4yMmU2OTUwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0 RXZlbnRUYXJnZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0RXZlbnRUYXJnZXQuaApAQCAtNzksNyArNzksNiBAQCBwcm90ZWN0ZWQ6CiAgICAg fQogCiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFN0cnVjdHVyZUZsYWdzID0gSlNDOjpIYXNJ bXB1cmVHZXRPd25Qcm9wZXJ0eVNsb3QgfCBKU0M6OkludGVyY2VwdHNHZXRPd25Qcm9wZXJ0eVNs b3RCeUluZGV4RXZlbldoZW5MZW5ndGhJc05vdFplcm8gfCBKU0M6Ok1hc3F1ZXJhZGVzQXNVbmRl ZmluZWQgfCBKU0M6Ok92ZXJyaWRlc0dldE93blByb3BlcnR5U2xvdCB8IEpTQzo6T3ZlcnJpZGVz R2V0UHJvcGVydHlOYW1lcyB8IEpTQzo6T3ZlcnJpZGVzVmlzaXRDaGlsZHJlbiB8IEJhc2U6OlN0 cnVjdHVyZUZsYWdzOwotICAgIHN0YXRpYyBKU0M6OkVuY29kZWRKU1ZhbHVlIGluZGV4R2V0dGVy KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU09iamVjdCosIEpTQzo6RW5jb2RlZEpTVmFsdWUsIHVu c2lnbmVkKTsKIHByaXZhdGU6CiAgICAgc3RhdGljIGJvb2wgY2FuR2V0SXRlbXNGb3JOYW1lKEpT Qzo6RXhlY1N0YXRlKiwgVGVzdEV2ZW50VGFyZ2V0KiwgSlNDOjpQcm9wZXJ0eU5hbWUpOwogICAg IHN0YXRpYyBKU0M6OkVuY29kZWRKU1ZhbHVlIG5hbWVHZXR0ZXIoSlNDOjpFeGVjU3RhdGUqLCBK U0M6OkpTT2JqZWN0KiwgSlNDOjpFbmNvZGVkSlNWYWx1ZSwgSlNDOjpQcm9wZXJ0eU5hbWUpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfYXJyYXkuY3BwIGIvU291 cmNlL1dlYkNvcmUvYnJpZGdlL3J1bnRpbWVfYXJyYXkuY3BwCmluZGV4IDY3MjE0ZjguLmQ4ZmY5 ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX2FycmF5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9hcnJheS5jcHAKQEAgLTY4LDEyICs2 OCw2IEBAIEVuY29kZWRKU1ZhbHVlIFJ1bnRpbWVBcnJheTo6bGVuZ3RoR2V0dGVyKEV4ZWNTdGF0 ZSogZXhlYywgSlNPYmplY3QqLCBFbmNvZGVkSlNWCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShqc051bWJlcih0aGlzT2JqZWN0LT5nZXRMZW5ndGgoKSkpOwogfQogCi1FbmNvZGVkSlNWYWx1 ZSBSdW50aW1lQXJyYXk6OmluZGV4R2V0dGVyKEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIHNs b3RCYXNlLCBFbmNvZGVkSlNWYWx1ZSwgdW5zaWduZWQgaW5kZXgpCi17Ci0gICAgUnVudGltZUFy cmF5KiB0aGlzT2JqID0ganNDYXN0PFJ1bnRpbWVBcnJheSo+KHNsb3RCYXNlKTsKLSAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKHRoaXNPYmotPmdldENvbmNyZXRlQXJyYXkoKS0+dmFsdWVBdChl eGVjLCBpbmRleCkpOwotfQotCiB2b2lkIFJ1bnRpbWVBcnJheTo6Z2V0T3duUHJvcGVydHlOYW1l cyhKU09iamVjdCogb2JqZWN0LCBFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5JiBw cm9wZXJ0eU5hbWVzLCBFbnVtZXJhdGlvbk1vZGUgbW9kZSkKIHsKICAgICBSdW50aW1lQXJyYXkq IHRoaXNPYmplY3QgPSBqc0Nhc3Q8UnVudGltZUFycmF5Kj4ob2JqZWN0KTsKQEAgLTk4LDcgKzky LDggQEAgYm9vbCBSdW50aW1lQXJyYXk6OmdldE93blByb3BlcnR5U2xvdChKU09iamVjdCogb2Jq ZWN0LCBFeGVjU3RhdGUqIGV4ZWMsIFByb3BlcnQKICAgICB1bnNpZ25lZCBpbmRleCA9IHByb3Bl cnR5TmFtZS5hc0luZGV4KCk7CiAgICAgaWYgKGluZGV4IDwgdGhpc09iamVjdC0+Z2V0TGVuZ3Ro KCkpIHsKICAgICAgICAgQVNTRVJUKGluZGV4ICE9IFByb3BlcnR5TmFtZTo6Tm90QW5JbmRleCk7 Ci0gICAgICAgIHNsb3Quc2V0Q3VzdG9tSW5kZXgodGhpc09iamVjdCwgRG9udERlbGV0ZSB8IERv bnRFbnVtLCBpbmRleCwgdGhpc09iamVjdC0+aW5kZXhHZXR0ZXIpOworICAgICAgICBzbG90LnNl dFZhbHVlKHRoaXNPYmplY3QsIERvbnREZWxldGUgfCBEb250RW51bSwKKyAgICAgICAgICAgIHRo aXNPYmplY3QtPmdldENvbmNyZXRlQXJyYXkoKS0+dmFsdWVBdChleGVjLCBpbmRleCkpOwogICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCkBAIC0xMDksNyArMTA0LDggQEAgYm9vbCBS dW50aW1lQXJyYXk6OmdldE93blByb3BlcnR5U2xvdEJ5SW5kZXgoSlNPYmplY3QqIG9iamVjdCwg RXhlY1N0YXRlICpleGVjLAogewogICAgIFJ1bnRpbWVBcnJheSogdGhpc09iamVjdCA9IGpzQ2Fz dDxSdW50aW1lQXJyYXkqPihvYmplY3QpOwogICAgIGlmIChpbmRleCA8IHRoaXNPYmplY3QtPmdl dExlbmd0aCgpKSB7Ci0gICAgICAgIHNsb3Quc2V0Q3VzdG9tSW5kZXgodGhpc09iamVjdCwgRG9u dERlbGV0ZSB8IERvbnRFbnVtLCBpbmRleCwgdGhpc09iamVjdC0+aW5kZXhHZXR0ZXIpOworICAg ICAgICBzbG90LnNldFZhbHVlKHRoaXNPYmplY3QsIERvbnREZWxldGUgfCBEb250RW51bSwKKyAg ICAgICAgICAgIHRoaXNPYmplY3QtPmdldENvbmNyZXRlQXJyYXkoKS0+dmFsdWVBdChleGVjLCBp bmRleCkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9hcnJheS5oIGIvU291cmNlL1dlYkNvcmUvYnJp ZGdlL3J1bnRpbWVfYXJyYXkuaAppbmRleCA5OThkYjUzLi5iNmQxZjY4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9hcnJheS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JyaWRnZS9ydW50aW1lX2FycmF5LmgKQEAgLTg1LDcgKzg1LDYgQEAgcHJvdGVjdGVkOgogcHJp dmF0ZToKICAgICBSdW50aW1lQXJyYXkoRXhlY1N0YXRlKiwgU3RydWN0dXJlKik7CiAgICAgc3Rh dGljIEVuY29kZWRKU1ZhbHVlIGxlbmd0aEdldHRlcihFeGVjU3RhdGUqLCBKU09iamVjdCosIEVu Y29kZWRKU1ZhbHVlLCBQcm9wZXJ0eU5hbWUpOwotICAgIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBp bmRleEdldHRlcihFeGVjU3RhdGUqLCBKU09iamVjdCosIEVuY29kZWRKU1ZhbHVlLCB1bnNpZ25l ZCk7CiAKICAgICBCaW5kaW5nc0FycmF5KiBtX2FycmF5OwogfTsK