136348 2014-08-28 13:14:51 -0700 Use JSString::toIdentifier() in more places. 2014-08-28 14:38:38 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Performance P2 Normal --- 1 kling kling commit-queue oldest_to_newest 1032056 0 kling 2014-08-28 13:14:51 -0700 JSString::toIdentifier() avoids allocating a new StringImpl when serializing a rope string into an already-existing Identifier. 1032057 1 237324 kling 2014-08-28 13:16:05 -0700 Created attachment 237324 Patch 1032067 2 237324 ggaren 2014-08-28 13:50:29 -0700 Comment on attachment 237324 Patch r=me 1032073 3 237324 commit-queue 2014-08-28 14:38:35 -0700 Comment on attachment 237324 Patch Clearing flags on attachment: 237324 Committed r173082: <http://trac.webkit.org/changeset/173082> 1032074 4 commit-queue 2014-08-28 14:38:38 -0700 All reviewed patches have been landed. Closing bug. 237324 2014-08-28 13:16:05 -0700 2014-08-28 14:38:35 -0700 Patch bug-136348.diff text/plain 9990 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDIyM2VmOGYuLjY4NDhhYzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA4LTI4ICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgSlNTdHJpbmc6OnRvSWRlbnRpZmll cigpIGluIG1vcmUgcGxhY2VzLgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM2MzQ4 PgorCisgICAgICAgIENhbGwgc2l0ZXMgdGhhdCBncmFiIHRoZSBXVEY6OlN0cmluZyBmcm9tIGEg SlNTdHJpbmcgdXNpbmcgdmFsdWUoKSBjYW4KKyAgICAgICAgdXNlIHRoZSBtb3JlIGVmZmljaWVu dCB0b0lkZW50aWZpZXIoKSBpZiB0aGUgc3RyaW5nIGlzIGdvaW5nIHRvIGJlIHVzZWQKKyAgICAg ICAgdG8gY29uc3RydWN0IGFuIElkZW50aWZpZXIuCisKKyAgICAgICAgSWYgdGhlIEpTU3RyaW5n IGlzIGEgcm9wZSB0aGF0IHJlc29sdmVzIHRvIHNvbWV0aGluZyB0aGF0IGlzIGFscmVhZHkKKyAg ICAgICAgcHJlc2VudCBpbiB0aGUgVk0ncyBJZGVudGlmaWVyIHRhYmxlLCB1c2luZyB0b0lkZW50 aWZpZXIoKSBjYW4gYXZvaWQKKyAgICAgICAgYWxsb2NhdGluZyBhIG5ldyBTdHJpbmdJbXBsLgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaml0L0pJ VE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAqIGxsaW50L0xMSW50U2xvd1BhdGhzLmNwcDoKKyAg ICAgICAgKEpTQzo6TExJbnQ6OkxMSU5UX1NMT1dfUEFUSF9ERUNMKToKKyAgICAgICAgKiBydW50 aW1lL0NvbW1vblNsb3dQYXRocy5jcHA6CisgICAgICAgIChKU0M6OlNMT1dfUEFUSF9ERUNMKToK KyAgICAgICAgKiBydW50aW1lL0NvbW1vblNsb3dQYXRocy5oOgorICAgICAgICAoSlNDOjpDb21t b25TbG93UGF0aHM6Om9wSW4pOgorICAgICAgICAqIHJ1bnRpbWUvSlNPTk9iamVjdC5jcHA6Cisg ICAgICAgIChKU0M6OlN0cmluZ2lmaWVyOjpTdHJpbmdpZmllcik6CisgICAgICAgICogcnVudGlt ZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHA6CisgICAgICAgIChKU0M6Om9iamVjdENvbnN0cnVjdG9y R2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKToKKyAgICAgICAgKEpTQzo6b2JqZWN0Q29uc3RydWN0 b3JEZWZpbmVQcm9wZXJ0eSk6CisgICAgICAgICogcnVudGltZS9PYmplY3RQcm90b3R5cGUuY3Bw OgorICAgICAgICAoSlNDOjpvYmplY3RQcm90b0Z1bmNQcm9wZXJ0eUlzRW51bWVyYWJsZSk6CisK IDIwMTQtMDgtMjcgIEFrb3MgS2lzcyAgPGFraXNzQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAg ICBFbnN1cmUgdGhhdCB0aGUgY2FsbCBmcmFtZSBwYXNzZWQgZnJvbSBKSVQgY29kZSB2aWEgSlND OjpvcGVyYXRpb25DYWxsRXZhbCB0byBKU0M6OmV2YWwgYWx3YXlzIGNvbnRhaW5zIHRoZSB2YWxp ZCBzY29wZSBjaGFpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU T3BlcmF0aW9ucy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMu Y3BwCmluZGV4IDJiN2Y0MGQuLjlmZmFjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pp dC9KSVRPcGVyYXRpb25zLmNwcApAQCAtNDgwLDcgKzQ4MCw3IEBAIHN0YXRpYyB2b2lkIGRpcmVj dFB1dEJ5VmFsKENhbGxGcmFtZSogY2FsbEZyYW1lLCBKU09iamVjdCogYmFzZU9iamVjdCwgSlNW YWx1ZSBzCiAgICAgICAgIFB1dFByb3BlcnR5U2xvdCBzbG90KGJhc2VPYmplY3QsIGNhbGxGcmFt ZS0+Y29kZUJsb2NrKCktPmlzU3RyaWN0TW9kZSgpKTsKICAgICAgICAgYmFzZU9iamVjdC0+cHV0 RGlyZWN0KGNhbGxGcmFtZS0+dm0oKSwganNDYXN0PE5hbWVJbnN0YW5jZSo+KHN1YnNjcmlwdC5h c0NlbGwoKSktPnByaXZhdGVOYW1lKCksIHZhbHVlLCBzbG90KTsKICAgICB9IGVsc2UgewotICAg ICAgICBJZGVudGlmaWVyIHByb3BlcnR5KGNhbGxGcmFtZSwgc3Vic2NyaXB0LnRvU3RyaW5nKGNh bGxGcmFtZSktPnZhbHVlKGNhbGxGcmFtZSkpOworICAgICAgICBJZGVudGlmaWVyIHByb3BlcnR5 ID0gc3Vic2NyaXB0LnRvU3RyaW5nKGNhbGxGcmFtZSktPnRvSWRlbnRpZmllcihjYWxsRnJhbWUp OwogICAgICAgICBpZiAoIWNhbGxGcmFtZS0+dm0oKS5leGNlcHRpb24oKSkgeyAvLyBEb24ndCBw dXQgdG8gYW4gb2JqZWN0IGlmIHRvU3RyaW5nIHRocmV3IGFuIGV4Y2VwdGlvbi4KICAgICAgICAg ICAgIFB1dFByb3BlcnR5U2xvdCBzbG90KGJhc2VPYmplY3QsIGNhbGxGcmFtZS0+Y29kZUJsb2Nr KCktPmlzU3RyaWN0TW9kZSgpKTsKICAgICAgICAgICAgIGJhc2VPYmplY3QtPnB1dERpcmVjdChj YWxsRnJhbWUtPnZtKCksIHByb3BlcnR5LCB2YWx1ZSwgc2xvdCk7CkBAIC05MjAsNyArOTIwLDcg QEAgc2l6ZV90IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uQ29tcGFyZVN0cmluZ0VxKEV4ZWNTdGF0 ZSogZXhlYywgSlNDZWxsKiBsZWZ0LCBKU0MKIAogc2l6ZV90IEpJVF9PUEVSQVRJT04gb3BlcmF0 aW9uSGFzUHJvcGVydHkoRXhlY1N0YXRlKiBleGVjLCBKU09iamVjdCogYmFzZSwgSlNTdHJpbmcq IHByb3BlcnR5KQogewotICAgIGludCByZXN1bHQgPSBiYXNlLT5oYXNQcm9wZXJ0eShleGVjLCBJ ZGVudGlmaWVyKGV4ZWMsIHByb3BlcnR5LT52YWx1ZShleGVjKSkpOworICAgIGludCByZXN1bHQg PSBiYXNlLT5oYXNQcm9wZXJ0eShleGVjLCBwcm9wZXJ0eS0+dG9JZGVudGlmaWVyKGV4ZWMpKTsK ICAgICByZXR1cm4gcmVzdWx0OwogfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9s bGludC9MTEludFNsb3dQYXRocy5jcHAKaW5kZXggMjEyNDFmNS4uOTQ5ZjYxZiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50U2xvd1BhdGhzLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTExJbnRTbG93UGF0aHMuY3BwCkBAIC03OTMsNyAr NzkzLDcgQEAgTExJTlRfU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX3B1dF9ieV92YWwpCiAgICAg ICAgIExMSU5UX0VORCgpOwogICAgIH0KIAotICAgIElkZW50aWZpZXIgcHJvcGVydHkoZXhlYywg c3Vic2NyaXB0LnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSk7CisgICAgSWRlbnRpZmllciBw cm9wZXJ0eSA9IHN1YnNjcmlwdC50b1N0cmluZyhleGVjKS0+dG9JZGVudGlmaWVyKGV4ZWMpOwog ICAgIExMSU5UX0NIRUNLX0VYQ0VQVElPTigpOwogICAgIFB1dFByb3BlcnR5U2xvdCBzbG90KGJh c2VWYWx1ZSwgZXhlYy0+Y29kZUJsb2NrKCktPmlzU3RyaWN0TW9kZSgpKTsKICAgICBiYXNlVmFs dWUucHV0KGV4ZWMsIHByb3BlcnR5LCB2YWx1ZSwgc2xvdCk7CkBAIC04MTYsNyArODE2LDcgQEAg TExJTlRfU0xPV19QQVRIX0RFQ0woc2xvd19wYXRoX3B1dF9ieV92YWxfZGlyZWN0KQogICAgICAg ICBQdXRQcm9wZXJ0eVNsb3Qgc2xvdChiYXNlT2JqZWN0LCBleGVjLT5jb2RlQmxvY2soKS0+aXNT dHJpY3RNb2RlKCkpOwogICAgICAgICBiYXNlT2JqZWN0LT5wdXREaXJlY3QoZXhlYy0+dm0oKSwg anNDYXN0PE5hbWVJbnN0YW5jZSo+KHN1YnNjcmlwdC5hc0NlbGwoKSktPnByaXZhdGVOYW1lKCks IHZhbHVlLCBzbG90KTsKICAgICB9IGVsc2UgewotICAgICAgICBJZGVudGlmaWVyIHByb3BlcnR5 KGV4ZWMsIHN1YnNjcmlwdC50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYykpOworICAgICAgICBJ ZGVudGlmaWVyIHByb3BlcnR5ID0gc3Vic2NyaXB0LnRvU3RyaW5nKGV4ZWMpLT50b0lkZW50aWZp ZXIoZXhlYyk7CiAgICAgICAgIGlmICghZXhlYy0+dm0oKS5leGNlcHRpb24oKSkgeyAvLyBEb24n dCBwdXQgdG8gYW4gb2JqZWN0IGlmIHRvU3RyaW5nIHRocmV3IGFuIGV4Y2VwdGlvbi4KICAgICAg ICAgICAgIFB1dFByb3BlcnR5U2xvdCBzbG90KGJhc2VPYmplY3QsIGV4ZWMtPmNvZGVCbG9jaygp LT5pc1N0cmljdE1vZGUoKSk7CiAgICAgICAgICAgICBiYXNlT2JqZWN0LT5wdXREaXJlY3QoZXhl Yy0+dm0oKSwgcHJvcGVydHksIHZhbHVlLCBzbG90KTsKQEAgLTg0Miw3ICs4NDIsNyBAQCBMTElO VF9TTE9XX1BBVEhfREVDTChzbG93X3BhdGhfZGVsX2J5X3ZhbCkKICAgICAgICAgY291bGREZWxl dGUgPSBiYXNlT2JqZWN0LT5tZXRob2RUYWJsZSgpLT5kZWxldGVQcm9wZXJ0eShiYXNlT2JqZWN0 LCBleGVjLCBqc0Nhc3Q8TmFtZUluc3RhbmNlKj4oc3Vic2NyaXB0LmFzQ2VsbCgpKS0+cHJpdmF0 ZU5hbWUoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIExMSU5UX0NIRUNLX0VYQ0VQVElPTigpOwot ICAgICAgICBJZGVudGlmaWVyIHByb3BlcnR5KGV4ZWMsIHN1YnNjcmlwdC50b1N0cmluZyhleGVj KS0+dmFsdWUoZXhlYykpOworICAgICAgICBJZGVudGlmaWVyIHByb3BlcnR5ID0gc3Vic2NyaXB0 LnRvU3RyaW5nKGV4ZWMpLT50b0lkZW50aWZpZXIoZXhlYyk7CiAgICAgICAgIExMSU5UX0NIRUNL X0VYQ0VQVElPTigpOwogICAgICAgICBjb3VsZERlbGV0ZSA9IGJhc2VPYmplY3QtPm1ldGhvZFRh YmxlKCktPmRlbGV0ZVByb3BlcnR5KGJhc2VPYmplY3QsIGV4ZWMsIHByb3BlcnR5KTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0 aHMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNw cAppbmRleCBiZWIzNDFiLi5iZDFmYmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAKQEAgLTUwNyw3ICs1MDcsNyBAQCBTTE9XX1BB VEhfREVDTChzbG93X3BhdGhfZGVsX2J5X3ZhbCkKICAgICAgICAgY291bGREZWxldGUgPSBiYXNl T2JqZWN0LT5tZXRob2RUYWJsZSgpLT5kZWxldGVQcm9wZXJ0eShiYXNlT2JqZWN0LCBleGVjLCBq c0Nhc3Q8TmFtZUluc3RhbmNlKj4oc3Vic2NyaXB0LmFzQ2VsbCgpKS0+cHJpdmF0ZU5hbWUoKSk7 CiAgICAgZWxzZSB7CiAgICAgICAgIENIRUNLX0VYQ0VQVElPTigpOwotICAgICAgICBJZGVudGlm aWVyIHByb3BlcnR5KGV4ZWMsIHN1YnNjcmlwdC50b1N0cmluZyhleGVjKS0+dmFsdWUoZXhlYykp OworICAgICAgICBJZGVudGlmaWVyIHByb3BlcnR5ID0gc3Vic2NyaXB0LnRvU3RyaW5nKGV4ZWMp LT50b0lkZW50aWZpZXIoZXhlYyk7CiAgICAgICAgIENIRUNLX0VYQ0VQVElPTigpOwogICAgICAg ICBjb3VsZERlbGV0ZSA9IGJhc2VPYmplY3QtPm1ldGhvZFRhYmxlKCktPmRlbGV0ZVByb3BlcnR5 KGJhc2VPYmplY3QsIGV4ZWMsIHByb3BlcnR5KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5oCmluZGV4IGZjYWM5NGEuLjM5ZjQ1YmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRo cy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5o CkBAIC04NSw3ICs4NSw3IEBAIGlubGluZSBib29sIG9wSW4oRXhlY1N0YXRlKiBleGVjLCBKU1Zh bHVlIHByb3BOYW1lLCBKU1ZhbHVlIGJhc2VWYWwpCiAgICAgaWYgKGlzTmFtZShwcm9wTmFtZSkp CiAgICAgICAgIHJldHVybiBiYXNlT2JqLT5oYXNQcm9wZXJ0eShleGVjLCBqc0Nhc3Q8TmFtZUlu c3RhbmNlKj4ocHJvcE5hbWUuYXNDZWxsKCkpLT5wcml2YXRlTmFtZSgpKTsKIAotICAgIElkZW50 aWZpZXIgcHJvcGVydHkoZXhlYywgcHJvcE5hbWUudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMp KTsKKyAgICBJZGVudGlmaWVyIHByb3BlcnR5ID0gcHJvcE5hbWUudG9TdHJpbmcoZXhlYyktPnRv SWRlbnRpZmllcihleGVjKTsKICAgICBpZiAoZXhlYy0+dm0oKS5leGNlcHRpb24oKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiBiYXNlT2JqLT5oYXNQcm9wZXJ0eShleGVjLCBw cm9wZXJ0eSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09O T2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT05PYmplY3QuY3Bw CmluZGV4IGE2MTllYzEuLjQ5NzRlODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTT05PYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTT05PYmplY3QuY3BwCkBAIC0yMjgsNyArMjI4LDcgQEAgU3RyaW5naWZpZXI6OlN0cmlu Z2lmaWVyKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgTG9jYWw8VW5rbm93bj4mIHJlcGxhY2VyLCBj b25zdAogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KIAotICAg ICAgICAgICAgbV9hcnJheVJlcGxhY2VyUHJvcGVydHlOYW1lcy5hZGQoSWRlbnRpZmllcihleGVj LCBuYW1lLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKSkpOworICAgICAgICAgICAgbV9hcnJh eVJlcGxhY2VyUHJvcGVydHlOYW1lcy5hZGQobmFtZS50b1N0cmluZyhleGVjKS0+dG9JZGVudGlm aWVyKGV4ZWMpKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0Q29uc3RydWN0b3IuY3BwCmluZGV4 IGJmZWVkMmUuLmE4N2E0ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL09iamVjdENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9PYmplY3RDb25zdHJ1Y3Rvci5jcHAKQEAgLTE3MywxMiArMTczLDEyIEBAIEVuY29kZWRK U1ZhbHVlIEpTQ19IT1NUX0NBTEwgb2JqZWN0Q29uc3RydWN0b3JHZXRPd25Qcm9wZXJ0eURlc2Ny aXB0b3IoRXhlY1N0YXRlCiB7CiAgICAgaWYgKCFleGVjLT5hcmd1bWVudCgwKS5pc09iamVjdCgp KQogICAgICAgICByZXR1cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5cGVFcnJvcihleGVj LCBBU0NJSUxpdGVyYWwoIlJlcXVlc3RlZCBwcm9wZXJ0eSBkZXNjcmlwdG9yIG9mIGEgdmFsdWUg dGhhdCBpcyBub3QgYW4gb2JqZWN0LiIpKSk7Ci0gICAgU3RyaW5nIHByb3BlcnR5TmFtZSA9IGV4 ZWMtPmFyZ3VtZW50KDEpLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKTsKKyAgICBJZGVudGlm aWVyIHByb3BlcnR5TmFtZSA9IGV4ZWMtPmFyZ3VtZW50KDEpLnRvU3RyaW5nKGV4ZWMpLT50b0lk ZW50aWZpZXIoZXhlYyk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTnVsbCgpKTsKICAgICBKU09iamVjdCogb2JqZWN0ID0g YXNPYmplY3QoZXhlYy0+YXJndW1lbnQoMCkpOwogICAgIFByb3BlcnR5RGVzY3JpcHRvciBkZXNj cmlwdG9yOwotICAgIGlmICghb2JqZWN0LT5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoZXhlYywg SWRlbnRpZmllcihleGVjLCBwcm9wZXJ0eU5hbWUpLCBkZXNjcmlwdG9yKSkKKyAgICBpZiAoIW9i amVjdC0+Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKGV4ZWMsIHByb3BlcnR5TmFtZSwgZGVzY3Jp cHRvcikpCiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAg ICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzVW5kZWZpbmVkKCkpOwpAQCAtMzE2LDcgKzMxNiw3IEBAIEVuY29kZWRKU1ZhbHVlIEpT Q19IT1NUX0NBTEwgb2JqZWN0Q29uc3RydWN0b3JEZWZpbmVQcm9wZXJ0eShFeGVjU3RhdGUqIGV4 ZWMpCiAgICAgaWYgKCFleGVjLT5hcmd1bWVudCgwKS5pc09iamVjdCgpKQogICAgICAgICByZXR1 cm4gdGhyb3dWTUVycm9yKGV4ZWMsIGNyZWF0ZVR5cGVFcnJvcihleGVjLCBBU0NJSUxpdGVyYWwo IlByb3BlcnRpZXMgY2FuIG9ubHkgYmUgZGVmaW5lZCBvbiBPYmplY3RzLiIpKSk7CiAgICAgSlNP YmplY3QqIE8gPSBhc09iamVjdChleGVjLT5hcmd1bWVudCgwKSk7Ci0gICAgU3RyaW5nIHByb3Bl cnR5TmFtZSA9IGV4ZWMtPmFyZ3VtZW50KDEpLnRvU3RyaW5nKGV4ZWMpLT52YWx1ZShleGVjKTsK KyAgICBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSA9IGV4ZWMtPmFyZ3VtZW50KDEpLnRvU3RyaW5n KGV4ZWMpLT50b0lkZW50aWZpZXIoZXhlYyk7CiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigp KQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTnVsbCgpKTsKICAgICBQcm9wZXJ0 eURlc2NyaXB0b3IgZGVzY3JpcHRvcjsKQEAgLTMyNCw3ICszMjQsNyBAQCBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIG9iamVjdENvbnN0cnVjdG9yRGVmaW5lUHJvcGVydHkoRXhlY1N0YXRl KiBleGVjKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTnVsbCgpKTsKICAgICBB U1NFUlQoKGRlc2NyaXB0b3IuYXR0cmlidXRlcygpICYgQWNjZXNzb3IpIHx8ICghZGVzY3JpcHRv ci5pc0FjY2Vzc29yRGVzY3JpcHRvcigpKSk7CiAgICAgQVNTRVJUKCFleGVjLT5oYWRFeGNlcHRp b24oKSk7Ci0gICAgTy0+bWV0aG9kVGFibGUoZXhlYy0+dm0oKSktPmRlZmluZU93blByb3BlcnR5 KE8sIGV4ZWMsIElkZW50aWZpZXIoZXhlYywgcHJvcGVydHlOYW1lKSwgZGVzY3JpcHRvciwgdHJ1 ZSk7CisgICAgTy0+bWV0aG9kVGFibGUoZXhlYy0+dm0oKSktPmRlZmluZU93blByb3BlcnR5KE8s IGV4ZWMsIHByb3BlcnR5TmFtZSwgZGVzY3JpcHRvciwgdHJ1ZSk7CiAgICAgcmV0dXJuIEpTVmFs dWU6OmVuY29kZShPKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvT2JqZWN0UHJvdG90eXBlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L09iamVjdFByb3RvdHlwZS5jcHAKaW5kZXggZTMwMjdkMy4uMGIwN2NjNiAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT2JqZWN0UHJvdG90eXBlLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PYmplY3RQcm90b3R5cGUuY3BwCkBAIC0xODIs NyArMTgyLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBvYmplY3RQcm90b0Z1bmNM b29rdXBTZXR0ZXIoRXhlY1N0YXRlKiBleGVjKQogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBvYmplY3RQcm90b0Z1bmNQcm9wZXJ0eUlzRW51bWVyYWJsZShFeGVjU3RhdGUqIGV4ZWMpCiB7 CiAgICAgSlNPYmplY3QqIHRoaXNPYmplY3QgPSBleGVjLT50aGlzVmFsdWUoKS50b1RoaXMoZXhl YywgU3RyaWN0TW9kZSkudG9PYmplY3QoZXhlYyk7Ci0gICAgSWRlbnRpZmllciBwcm9wZXJ0eU5h bWUoZXhlYywgZXhlYy0+YXJndW1lbnQoMCkudG9TdHJpbmcoZXhlYyktPnZhbHVlKGV4ZWMpKTsK KyAgICBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSA9IGV4ZWMtPmFyZ3VtZW50KDApLnRvU3RyaW5n KGV4ZWMpLT50b0lkZW50aWZpZXIoZXhlYyk7CiAKICAgICBQcm9wZXJ0eURlc2NyaXB0b3IgZGVz Y3JpcHRvcjsKICAgICBib29sIGVudW1lcmFibGUgPSB0aGlzT2JqZWN0LT5nZXRPd25Qcm9wZXJ0 eURlc2NyaXB0b3IoZXhlYywgcHJvcGVydHlOYW1lLCBkZXNjcmlwdG9yKSAmJiBkZXNjcmlwdG9y LmVudW1lcmFibGUoKTsK