172516 2017-05-23 11:44:08 -0700 [WebIDL] Further cleanup enumeration handling 2017-05-23 13:49:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam buildbot cdumez commit-queue oldest_to_newest 1311966 0 sam 2017-05-23 11:44:08 -0700 [WebIDL] Further cleanup enumeration handling 1311970 1 311033 sam 2017-05-23 11:47:23 -0700 Created attachment 311033 Patch 1311989 2 311033 cdumez 2017-05-23 12:26:45 -0700 Comment on attachment 311033 Patch r=me 1312026 3 311033 commit-queue 2017-05-23 13:49:12 -0700 Comment on attachment 311033 Patch Clearing flags on attachment: 311033 Committed r217297: <http://trac.webkit.org/changeset/217297> 1312027 4 commit-queue 2017-05-23 13:49:13 -0700 All reviewed patches have been landed. Closing bug. 311033 2017-05-23 11:47:23 -0700 2017-05-23 13:49:12 -0700 Patch bug-172516-20170523114649.patch text/plain 14379 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzI4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE3LTA1LTIzICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYklETF0gRnVydGhlciBjbGVhbnVw IGVudW1lcmF0aW9uIGhhbmRsaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzI1MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAg ICAgICAoR2VuZXJhdGVQdXQpOgorICAgICAgICAoR2VuZXJhdGVQdXRCeUluZGV4KToKKyAgICAg ICAgKEdlbmVyYXRlRGljdGlvbmFyeUltcGxlbWVudGF0aW9uQ29udGVudCk6CisgICAgICAgIChH ZW5lcmF0ZVBhcmFtZXRlcnNDaGVjayk6CisgICAgICAgIChHZW5lcmF0ZUNhbGxiYWNrSW1wbGVt ZW50YXRpb25Db250ZW50KToKKyAgICAgICAgVXBkYXRlIG5vdyB0aGF0IEpTVmFsdWVUb05hdGl2 ZSBkb2Vzbid0IGhhdmUgYSBzZWNvbmQgcmV0dXJuIHZhbHVlLgorCisgICAgICAgIChHZW5lcmF0 ZUltcGxlbWVudGF0aW9uKToKKyAgICAgICAgQWRkIGVudW1lcmF0aW9uIHNwZWNpYWwgY2FzaW5n IHRvIGF0dHJpYnV0ZSBzZXR0aW5nIGNvZGUsIHdoZXJlIGl0IGlzIHNwZWNpYWwKKyAgICAgICAg Y2FzZWQgaW4gdGhlIHN0YW5kYXJkCisKKyAgICAgICAgKFBhc3NBcmd1bWVudEV4cHJlc3Npb24p OgorICAgICAgICBTdG9wIHNwZWNpYWwgY2FzaW5nIGVudW1lcmF0aW9ucy4KKyAgICAgICAgCisg ICAgICAgIChJc1ZhbGlkQ29udGV4dEZvckpTVmFsdWVUb05hdGl2ZSk6CisgICAgICAgIEFzc2Vy dCB0aGF0IGVudW1zIGFyZSBuZXZlciBwYXNzZWQgdG8gSlNWYWx1ZVRvTmF0aXZlIGluIGFuIGF0 dHJpYnV0ZSBjb250ZXh0LgorCisgICAgICAgIChKU1ZhbHVlVG9OYXRpdmUpOgorICAgICAgICBS ZW1vdmUgZW51bWVyYXRpb24gc3BlY2lhbCBjYXNlIGFuZCBzZWNvbmQgcmV0dXJuIHZhbHVlICh3 aGljaCB3YXMgYWx3YXlzIDEpLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pT L0pTVGVzdE9iai5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpFbnVtQXR0ckZ1 bmN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OnNldEpTVGVzdE9iakltcGxlbWVudGF0aW9uRW51 bUF0dHJGdW5jdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzZXRKU1Rlc3RPYmpBdHRyaWJ1dGVX aXRoUmVzZXJ2ZWRFbnVtVHlwZUZ1bmN0aW9uKToKKyAgICAgICAgVXBkYXRlIHJlc3VsdHMuCisK IDIwMTctMDUtMjMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBB U1NFUlRJT04gRkFJTEVEOiAhcmVuZGVyZXIoKS52aWV3KCkubmVlZHNMYXlvdXQoKSB3aGlsZSBy dW5uaW5nIG1lZGlhL3ZpZGVvLW1haW4tY29udGVudC1hdXRvcGxheS5odG1sCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQko cmV2aXNpb24gMjE3MjgyKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9ySlMucG0JKHdvcmtpbmcgY29weSkKQEAgLTY0OCwxMiArNjQ4LDEyIEBAIHN1YiBH ZW5lcmF0ZVB1dAogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgIyBUaGUgc2Vjb25kIGFy Z3VtZW50IG9mIHRoZSBpbmRleGVkIHNldHRlciBmdW5jdGlvbiBpcyB0aGUgYXJndW1lbnQgYmVp bmcgY29udmVydGVkLgogICAgICAgICAgICAgbXkgJGFyZ3VtZW50ID0gQHskaW5kZXhlZFNldHRl ckZ1bmN0aW9uLT5hcmd1bWVudHN9WzFdOwotICAgICAgICAgICAgbXkgKCRuYXRpdmVWYWx1ZSwg JG1heVRocm93RXhjZXB0aW9uKSA9IEpTVmFsdWVUb05hdGl2ZSgkaW50ZXJmYWNlLCAkYXJndW1l bnQsICJ2YWx1ZSIsICRpbmRleGVkU2V0dGVyRnVuY3Rpb24tPmV4dGVuZGVkQXR0cmlidXRlcy0+ e0NvbmRpdGlvbmFsfSwgInN0YXRlIiwgIipzdGF0ZSIsICJ0aGlzT2JqZWN0IiwgIiIsICIiKTsK KyAgICAgICAgICAgIG15ICRuYXRpdmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgkaW50ZXJmYWNl LCAkYXJndW1lbnQsICJ2YWx1ZSIsICRpbmRleGVkU2V0dGVyRnVuY3Rpb24tPmV4dGVuZGVkQXR0 cmlidXRlcy0+e0NvbmRpdGlvbmFsfSwgInN0YXRlIiwgIipzdGF0ZSIsICJ0aGlzT2JqZWN0Iiwg IiIsICIiKTsKIAogICAgICAgICAgICAgcHVzaChAb3V0cHV0LCAiICAgIGlmIChhdXRvIGluZGV4 ID0gcGFyc2VJbmRleChwcm9wZXJ0eU5hbWUpKSB7XG4iKTsKICAgICAgICAgICAgIHB1c2goQG91 dHB1dCwgIiAgICAgICAgYXV0byB0aHJvd1Njb3BlID0gREVDTEFSRV9USFJPV19TQ09QRShzdGF0 ZS0+dm0oKSk7XG4iKTsKICAgICAgICAgICAgIHB1c2goQG91dHB1dCwgIiAgICAgICAgYXV0byBu YXRpdmVWYWx1ZSA9ICR7bmF0aXZlVmFsdWV9O1xuIik7Ci0gICAgICAgICAgICBwdXNoKEBvdXRw dXQsICIgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgdHJ1ZSk7XG4iKSBp ZiAkbWF5VGhyb3dFeGNlcHRpb247CisgICAgICAgICAgICBwdXNoKEBvdXRwdXQsICIgICAgICAg IFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgdHJ1ZSk7XG4iKTsKIAogICAgICAgICAg ICAgbXkgJGluZGV4ZWRTZXR0ZXJGdW5jdGlvbk5hbWUgPSAkaW5kZXhlZFNldHRlckZ1bmN0aW9u LT5uYW1lIHx8ICJzZXRJdGVtIjsKICAgICAgICAgICAgIG15ICRmdW5jdGlvblN0cmluZyA9ICIk e2luZGV4ZWRTZXR0ZXJGdW5jdGlvbk5hbWV9KGluZGV4LCBXVEZNb3ZlKG5hdGl2ZVZhbHVlKSki OwpAQCAtNjk5LDEyICs2OTksMTIgQEAgc3ViIEdlbmVyYXRlUHV0QnlJbmRleAogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgIyBUaGUgc2Vjb25kIGFyZ3VtZW50IG9mIHRoZSBpbmRleGVk IHNldHRlciBmdW5jdGlvbiBpcyB0aGUgYXJndW1lbnQgYmVpbmcgY29udmVydGVkLgogICAgICAg ICAgICAgbXkgJGFyZ3VtZW50ID0gQHskaW5kZXhlZFNldHRlckZ1bmN0aW9uLT5hcmd1bWVudHN9 WzFdOwotICAgICAgICAgICAgbXkgKCRuYXRpdmVWYWx1ZSwgJG1heVRocm93RXhjZXB0aW9uKSA9 IEpTVmFsdWVUb05hdGl2ZSgkaW50ZXJmYWNlLCAkYXJndW1lbnQsICJ2YWx1ZSIsICRpbmRleGVk U2V0dGVyRnVuY3Rpb24tPmV4dGVuZGVkQXR0cmlidXRlcy0+e0NvbmRpdGlvbmFsfSwgInN0YXRl IiwgIipzdGF0ZSIsICJ0aGlzT2JqZWN0IiwgIiIsICIiKTsKKyAgICAgICAgICAgIG15ICRuYXRp dmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgkaW50ZXJmYWNlLCAkYXJndW1lbnQsICJ2YWx1ZSIs ICRpbmRleGVkU2V0dGVyRnVuY3Rpb24tPmV4dGVuZGVkQXR0cmlidXRlcy0+e0NvbmRpdGlvbmFs fSwgInN0YXRlIiwgIipzdGF0ZSIsICJ0aGlzT2JqZWN0IiwgIiIsICIiKTsKIAogICAgICAgICAg ICAgcHVzaChAb3V0cHV0LCAiICAgIGlmIChMSUtFTFkoaW5kZXggPD0gTUFYX0FSUkFZX0lOREVY KSkge1xuIik7CiAgICAgICAgICAgICBwdXNoKEBvdXRwdXQsICIgICAgICAgIGF1dG8gdGhyb3dT Y29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUoc3RhdGUtPnZtKCkpO1xuIik7CiAgICAgICAgICAg ICBwdXNoKEBvdXRwdXQsICIgICAgICAgIGF1dG8gbmF0aXZlVmFsdWUgPSAke25hdGl2ZVZhbHVl fTtcbiIpOwotICAgICAgICAgICAgcHVzaChAb3V0cHV0LCAiICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHRocm93U2NvcGUsIHRydWUpO1xuIikgaWYgJG1heVRocm93RXhjZXB0aW9uOworICAg ICAgICAgICAgcHVzaChAb3V0cHV0LCAiICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93 U2NvcGUsIHRydWUpO1xuIik7CiAKICAgICAgICAgICAgIG15ICRpbmRleGVkU2V0dGVyRnVuY3Rp b25OYW1lID0gJGluZGV4ZWRTZXR0ZXJGdW5jdGlvbi0+bmFtZSB8fCAic2V0SXRlbSI7CiAgICAg ICAgICAgICBteSAkZnVuY3Rpb25TdHJpbmcgPSAiJHtpbmRleGVkU2V0dGVyRnVuY3Rpb25OYW1l fShpbmRleCwgV1RGTW92ZShuYXRpdmVWYWx1ZSkpIjsKQEAgLTg4Miw3ICs4ODIsNiBAQCBzdWIg UGFzc0FyZ3VtZW50RXhwcmVzc2lvbgogCiAgICAgbXkgJHR5cGUgPSAkY29udGV4dC0+dHlwZTsK IAotICAgIHJldHVybiAiJHtuYW1lfS52YWx1ZSgpIiBpZiAkY29kZUdlbmVyYXRvci0+SXNFbnVt VHlwZSgkdHlwZSkgJiYgcmVmKCRjb250ZXh0KSBlcSAiSURMQXR0cmlidXRlIjsKICAgICByZXR1 cm4gIldURk1vdmUoJHtuYW1lfSkiIGlmICR0eXBlLT5pc051bGxhYmxlOwogICAgIAogICAgIGlm ICgkY29kZUdlbmVyYXRvci0+SXNUeXBlZEFycmF5VHlwZSgkdHlwZSkpIHsKQEAgLTE2MDIsNyAr MTYwMSw3IEBAIHN1YiBHZW5lcmF0ZURpY3Rpb25hcnlJbXBsZW1lbnRhdGlvbkNvbnQKICAgICAg ICAgICAgICMgNS4zLiBJZiB2YWx1ZSBpcyBub3QgdW5kZWZpbmVkLCB0aGVuOgogICAgICAgICAg ICAgJHJlc3VsdCAuPSAiICAgIGlmICghJHtrZXl9VmFsdWUuaXNVbmRlZmluZWQoKSkge1xuIjsK IAotICAgICAgICAgICAgbXkgKCRuYXRpdmVWYWx1ZSwgJG1heVRocm93RXhjZXB0aW9uKSA9IEpT VmFsdWVUb05hdGl2ZSgkdHlwZVNjb3BlLCAkbWVtYmVyLCAiJHtrZXl9VmFsdWUiLCAkbWVtYmVy LT5leHRlbmRlZEF0dHJpYnV0ZXMtPntDb25kaXRpb25hbH0sICImc3RhdGUiLCAic3RhdGUiKTsK KyAgICAgICAgICAgIG15ICRuYXRpdmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgkdHlwZVNjb3Bl LCAkbWVtYmVyLCAiJHtrZXl9VmFsdWUiLCAkbWVtYmVyLT5leHRlbmRlZEF0dHJpYnV0ZXMtPntD b25kaXRpb25hbH0sICImc3RhdGUiLCAic3RhdGUiKTsKICAgICAgICAgICAgICRyZXN1bHQgLj0g IiAgICAgICAgcmVzdWx0LiRpbXBsZW1lbnRlZEFzS2V5ID0gJG5hdGl2ZVZhbHVlO1xuIjsKICAg ICAgICAgICAgICRyZXN1bHQgLj0gIiAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Nj b3BlLCB7IH0pO1xuIjsKIApAQCAtNDAxMCwxNyArNDAwOSwyMSBAQCBzdWIgR2VuZXJhdGVJbXBs ZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICAgICAgbXkgJGdsb2JhbE9iamVjdFJlZmVyZW5jZSA9ICRhdHRyaWJ1dGUtPmlz U3RhdGljID8gIipqc0Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPihzdGF0ZS0+bGV4aWNhbEdsb2Jh bE9iamVjdCgpKSIgOiAiKnRoaXNPYmplY3QuZ2xvYmFsT2JqZWN0KCkiOwotICAgICAgICAgICAg ICAgIG15ICRleGNlcHRpb25UaHJvd2VyID0gR2V0QXR0cmlidXRlRXhjZXB0aW9uVGhyb3dlcigk aW50ZXJmYWNlLCAkYXR0cmlidXRlKTsKLQotICAgICAgICAgICAgICAgIG15ICgkbmF0aXZlVmFs dWUsICRtYXlUaHJvd0V4Y2VwdGlvbikgPSBKU1ZhbHVlVG9OYXRpdmUoJGludGVyZmFjZSwgJGF0 dHJpYnV0ZSwgInZhbHVlIiwgJGF0dHJpYnV0ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Q29uZGl0 aW9uYWx9LCAiJnN0YXRlIiwgInN0YXRlIiwgInRoaXNPYmplY3QiLCAkZ2xvYmFsT2JqZWN0UmVm ZXJlbmNlLCAkZXhjZXB0aW9uVGhyb3dlcik7Ci0KLSAgICAgICAgICAgICAgICBwdXNoKEBpbXBs Q29udGVudCwgIiAgICBhdXRvIG5hdGl2ZVZhbHVlID0gJG5hdGl2ZVZhbHVlO1xuIik7Ci0gICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0 aHJvd1Njb3BlLCBmYWxzZSk7XG4iKSBpZiAkbWF5VGhyb3dFeGNlcHRpb247Ci0KICAgICAgICAg ICAgICAgICBpZiAoJGNvZGVHZW5lcmF0b3ItPklzRW51bVR5cGUoJHR5cGUpKSB7Ci0gICAgICAg ICAgICAgICAgICAgIHB1c2ggKEBpbXBsQ29udGVudCwgIiAgICBpZiAoVU5MSUtFTFkoIW5hdGl2 ZVZhbHVlKSlcbiIpOwotICAgICAgICAgICAgICAgICAgICBwdXNoIChAaW1wbENvbnRlbnQsICIg ICAgICAgIHJldHVybiBmYWxzZTtcbiIpOworICAgICAgICAgICAgICAgICAgICAjIEFzIHBlciBz ZWN0aW9uIDMuNS42IG9mIGh0dHBzOi8vaGV5Y2FtLmdpdGh1Yi5pby93ZWJpZGwvI2Rmbi1hdHRy aWJ1dGUtc2V0dGVyLCBlbnVtZXJhdGlvbnMgZG8gbm90IHVzZQorICAgICAgICAgICAgICAgICAg ICAjIHRoZSBzdGFuZGFyZCBjb252ZXJzaW9uLCBidXQgcmF0aGVyIHNpbGVudGx5IGZhaWwgb24g aW52YWxpZCBlbnVtZXJhdGlvbiB2YWx1ZXMuCisgICAgICAgICAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCAiICAgIGF1dG8gb3B0aW9uYWxOYXRpdmVWYWx1ZSA9IHBhcnNlRW51bWVyYXRp b248IiAuIEdldEVudW1lcmF0aW9uQ2xhc3NOYW1lKCR0eXBlLCAkaW50ZXJmYWNlKSAuICI+KHN0 YXRlLCB2YWx1ZSk7XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCBmYWxzZSk7XG4iKTsKKyAgICAg ICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKFVOTElLRUxZKCFvcHRp b25hbE5hdGl2ZVZhbHVlKSlcbiIpOworICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICAgICAgcmV0dXJuIGZhbHNlO1xuIik7CisgICAgICAgICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50LCAiICAgIGF1dG8gbmF0aXZlVmFsdWUgPSBvcHRpb25hbE5hdGl2ZVZh bHVlLnZhbHVlKCk7XG4iKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgICAgICBteSAkZ2xvYmFsT2JqZWN0UmVmZXJlbmNlID0gJGF0dHJpYnV0ZS0+aXNTdGF0aWMg PyAiKmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHN0YXRlLT5sZXhpY2FsR2xvYmFsT2JqZWN0 KCkpIiA6ICIqdGhpc09iamVjdC5nbG9iYWxPYmplY3QoKSI7CisgICAgICAgICAgICAgICAgICAg IG15ICRleGNlcHRpb25UaHJvd2VyID0gR2V0QXR0cmlidXRlRXhjZXB0aW9uVGhyb3dlcigkaW50 ZXJmYWNlLCAkYXR0cmlidXRlKTsKKworICAgICAgICAgICAgICAgICAgICBteSAkbmF0aXZlVmFs dWUgPSBKU1ZhbHVlVG9OYXRpdmUoJGludGVyZmFjZSwgJGF0dHJpYnV0ZSwgInZhbHVlIiwgJGF0 dHJpYnV0ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Q29uZGl0aW9uYWx9LCAiJnN0YXRlIiwgInN0 YXRlIiwgInRoaXNPYmplY3QiLCAkZ2xvYmFsT2JqZWN0UmVmZXJlbmNlLCAkZXhjZXB0aW9uVGhy b3dlcik7CisgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGF1dG8g bmF0aXZlVmFsdWUgPSAkbmF0aXZlVmFsdWU7XG4iKTsKKyAgICAgICAgICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCBmYWxz ZSk7XG4iKTsKICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICBteSAoJGZ1bmN0 aW9uTmFtZSwgQGFyZ3VtZW50cykgPSAkY29kZUdlbmVyYXRvci0+U2V0dGVyRXhwcmVzc2lvbihc JWltcGxJbmNsdWRlcywgJGludGVyZmFjZU5hbWUsICRhdHRyaWJ1dGUpOwpAQCAtNDkxNSwxMyAr NDkxOCwxMyBAQCBzdWIgR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2sKICAgICAgICAgICAgIG15ICRn bG9iYWxPYmplY3RSZWZlcmVuY2UgPSAkZnVuY3Rpb24tPmlzU3RhdGljID8gIipqc0Nhc3Q8SlNE T01HbG9iYWxPYmplY3QqPihzdGF0ZS0+bGV4aWNhbEdsb2JhbE9iamVjdCgpKSIgOiAiKmNhc3Rl ZFRoaXMtPmdsb2JhbE9iamVjdCgpIjsKICAgICAgICAgICAgIG15ICRhcmd1bWVudEV4Y2VwdGlv blRocm93ZXIgPSBHZXRBcmd1bWVudEV4Y2VwdGlvblRocm93ZXIoJGludGVyZmFjZSwgJGFyZ3Vt ZW50LCAkYXJndW1lbnRJbmRleCwgJHF1b3RlZEZ1bmN0aW9uTmFtZSk7CiAKLSAgICAgICAgICAg IG15ICgkbmF0aXZlVmFsdWUsICRtYXlUaHJvd0V4Y2VwdGlvbikgPSBKU1ZhbHVlVG9OYXRpdmUo JGludGVyZmFjZSwgJGFyZ3VtZW50LCAkYXJndW1lbnRMb29rdXBGb3JDb252ZXJzaW9uLCAkY29u ZGl0aW9uYWwsICJzdGF0ZSIsICIqc3RhdGUiLCAiKmNhc3RlZFRoaXMiLCAkZ2xvYmFsT2JqZWN0 UmVmZXJlbmNlLCAkYXJndW1lbnRFeGNlcHRpb25UaHJvd2VyKTsKKyAgICAgICAgICAgIG15ICRu YXRpdmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgkaW50ZXJmYWNlLCAkYXJndW1lbnQsICRhcmd1 bWVudExvb2t1cEZvckNvbnZlcnNpb24sICRjb25kaXRpb25hbCwgInN0YXRlIiwgIipzdGF0ZSIs ICIqY2FzdGVkVGhpcyIsICRnbG9iYWxPYmplY3RSZWZlcmVuY2UsICRhcmd1bWVudEV4Y2VwdGlv blRocm93ZXIpOwogCiAgICAgICAgICAgICAkbmF0aXZlVmFsdWUgPSAiJHtuYXRpdmVWYWx1ZUNh c3RGdW5jdGlvbn0oIiAuICRuYXRpdmVWYWx1ZSAuICIpIiBpZiBkZWZpbmVkICRuYXRpdmVWYWx1 ZUNhc3RGdW5jdGlvbjsKICAgICAgICAgICAgICRuYXRpdmVWYWx1ZSA9ICRvcHRpb25hbENoZWNr IC4gJG5hdGl2ZVZhbHVlIGlmIGRlZmluZWQgJG9wdGlvbmFsQ2hlY2s7CiAKICAgICAgICAgICAg IHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBhdXRvICRuYW1lID0gJHtuYXRpdmVWYWx1ZX07XG4i KTsKLSAgICAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHRocm93U2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpO1xuIikgaWYgJG1heVRocm93RXhjZXB0 aW9uOworICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIFJFVFVSTl9JRl9FWENF UFRJT04odGhyb3dTY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7XG4iKTsKIAogICAgICAgICAgICAg JHZhbHVlID0gUGFzc0FyZ3VtZW50RXhwcmVzc2lvbigkbmFtZSwgJGFyZ3VtZW50KTsKICAgICAg ICAgfQpAQCAtNTMwNSwxNiArNTMwOCwxMiBAQCBzdWIgR2VuZXJhdGVDYWxsYmFja0ltcGxlbWVu dGF0aW9uQ29udGVuCiAgICAgICAgICAgICBpZiAoJGZ1bmN0aW9uLT50eXBlLT5uYW1lIGVxICJ2 b2lkIikgewogICAgICAgICAgICAgICAgIHB1c2goQCRjb250ZW50UmVmLCAiICAgIHJldHVybiB7 IH07XG4iKTsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgbXkgKCRuYXRp dmVWYWx1ZSwgJG1heVRocm93RXhjZXB0aW9uKSA9IEpTVmFsdWVUb05hdGl2ZSgkaW50ZXJmYWNl T3JDYWxsYmFjaywgJGZ1bmN0aW9uLCAianNSZXN1bHQiLCAiIiwgIiZzdGF0ZSIsICJzdGF0ZSIp OworICAgICAgICAgICAgICAgIG15ICRuYXRpdmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgkaW50 ZXJmYWNlT3JDYWxsYmFjaywgJGZ1bmN0aW9uLCAianNSZXN1bHQiLCAiIiwgIiZzdGF0ZSIsICJz dGF0ZSIpOwogICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgaWYgKCRtYXlUaHJvd0V4Y2Vw dGlvbikgewotICAgICAgICAgICAgICAgICAgICBwdXNoKEAkY29udGVudFJlZiwgIiAgICBhdXRv IHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTtcbiIpOwotICAgICAgICAgICAg ICAgICAgICBwdXNoKEAkY29udGVudFJlZiwgIiAgICBhdXRvIHJldHVyblZhbHVlID0gJHtuYXRp dmVWYWx1ZX07XG4iKTsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAJGNvbnRlbnRSZWYsICIg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCBDYWxsYmFja1Jlc3VsdFR5cGU6OkV4 Y2VwdGlvblRocm93bik7XG4iKTsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAJGNvbnRlbnRS ZWYsICIgICAgcmV0dXJuIFdURk1vdmUocmV0dXJuVmFsdWUpO1xuIik7Ci0gICAgICAgICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgcHVzaChAJGNvbnRlbnRSZWYsICIgICAg cmV0dXJuICR7bmF0aXZlVmFsdWV9O1xuIik7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIHB1c2goQCRjb250ZW50UmVmLCAiICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVf VEhST1dfU0NPUEUodm0pO1xuIik7CisgICAgICAgICAgICAgICAgcHVzaChAJGNvbnRlbnRSZWYs ICIgICAgYXV0byByZXR1cm5WYWx1ZSA9ICR7bmF0aXZlVmFsdWV9O1xuIik7CisgICAgICAgICAg ICAgICAgcHVzaChAJGNvbnRlbnRSZWYsICIgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Nj b3BlLCBDYWxsYmFja1Jlc3VsdFR5cGU6OkV4Y2VwdGlvblRocm93bik7XG4iKTsKKyAgICAgICAg ICAgICAgICBwdXNoKEAkY29udGVudFJlZiwgIiAgICByZXR1cm4gV1RGTW92ZShyZXR1cm5WYWx1 ZSk7XG4iKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgcHVzaChAJGNvbnRlbnRSZWYs ICJ9XG5cbiIpOwpAQCAtNTYxOCwxMSArNTYxNyw5IEBAIHN1YiBKU1ZhbHVlVG9OYXRpdmVET01D b252ZXJ0TmVlZHNHbG9iYWwKIHN1YiBJc1ZhbGlkQ29udGV4dEZvckpTVmFsdWVUb05hdGl2ZQog ewogICAgIG15ICRjb250ZXh0ID0gc2hpZnQ7Ci0gICAgcmV0dXJuIHJlZigkY29udGV4dCkgZXEg IklETEF0dHJpYnV0ZSIgfHwgcmVmKCRjb250ZXh0KSBlcSAiSURMQXJndW1lbnQiIHx8IHJlZigk Y29udGV4dCkgZXEgIklETERpY3Rpb25hcnlNZW1iZXIiIHx8IHJlZigkY29udGV4dCkgZXEgIklE TE9wZXJhdGlvbiI7CisgICAgcmV0dXJuIChyZWYoJGNvbnRleHQpIGVxICJJRExBdHRyaWJ1dGUi ICYmICEkY29kZUdlbmVyYXRvci0+SXNFbnVtVHlwZSgkY29udGV4dC0+dHlwZSkpIHx8IHJlZigk Y29udGV4dCkgZXEgIklETEFyZ3VtZW50IiB8fCByZWYoJGNvbnRleHQpIGVxICJJRExEaWN0aW9u YXJ5TWVtYmVyIiB8fCByZWYoJGNvbnRleHQpIGVxICJJRExPcGVyYXRpb24iOwogfQogCi0jIFJl dHVybnMgKGNvbnZlcnRTdHJpbmcsIG1heVRocm93RXhjZXB0aW9uKS4KLQogc3ViIEpTVmFsdWVU b05hdGl2ZQogewogICAgIG15ICgkaW50ZXJmYWNlLCAkY29udGV4dCwgJHZhbHVlLCAkY29uZGl0 aW9uYWwsICRzdGF0ZVBvaW50ZXIsICRzdGF0ZVJlZmVyZW5jZSwgJHRoaXNPYmplY3RSZWZlcmVu Y2UsICRnbG9iYWxPYmplY3RSZWZlcmVuY2UsICRleGNlcHRpb25UaHJvd2VyKSA9IEBfOwpAQCAt NTYzOCwxMCArNTYzNSw2IEBAIHN1YiBKU1ZhbHVlVG9OYXRpdmUKIAogICAgIEFkZFRvSW1wbElu Y2x1ZGVzRm9ySURMVHlwZSgkdHlwZSwgJGNvbmRpdGlvbmFsKTsKIAotICAgIGlmICgkY29kZUdl bmVyYXRvci0+SXNFbnVtVHlwZSgkdHlwZSkgJiYgcmVmKCRjb250ZXh0KSBlcSAiSURMQXR0cmli dXRlIikgewotICAgICAgICByZXR1cm4gKCJwYXJzZUVudW1lcmF0aW9uPCIgLiBHZXRFbnVtZXJh dGlvbkNsYXNzTmFtZSgkdHlwZSwgJGludGVyZmFjZSkgLiAiPigkc3RhdGVSZWZlcmVuY2UsICR2 YWx1ZSkiLCAxKTsKLSAgICB9Ci0KICAgICBBZGRUb0ltcGxJbmNsdWRlcygiSlNET01Db252ZXJ0 LmgiKTsKIAogICAgIG15ICRJRExUeXBlID0gR2V0SURMVHlwZSgkaW50ZXJmYWNlLCAkdHlwZSk7 CkBAIC01NjUzLDcgKzU2NDYsNyBAQCBzdWIgSlNWYWx1ZVRvTmF0aXZlCiAgICAgcHVzaChAY29u dmVyc2lvbkFyZ3VtZW50cywgJGdsb2JhbE9iamVjdFJlZmVyZW5jZSkgaWYgSlNWYWx1ZVRvTmF0 aXZlRE9NQ29udmVydE5lZWRzR2xvYmFsT2JqZWN0KCR0eXBlKTsKICAgICBwdXNoKEBjb252ZXJz aW9uQXJndW1lbnRzLCAkZXhjZXB0aW9uVGhyb3dlcikgaWYgJGV4Y2VwdGlvblRocm93ZXI7CiAK LSAgICByZXR1cm4gKCJjb252ZXJ0PCRJRExUeXBlPigiIC4gam9pbigiLCAiLCBAY29udmVyc2lv bkFyZ3VtZW50cykgLiAiKSIsIDEpOworICAgIHJldHVybiAiY29udmVydDwkSURMVHlwZT4oIiAu IGpvaW4oIiwgIiwgQGNvbnZlcnNpb25Bcmd1bWVudHMpIC4gIikiOwogfQogCiBzdWIgVW5zYWZl VG9OYXRpdmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9K U1Rlc3RPYmouY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCShyZXZpc2lvbiAyMTcyODIpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzY1MywxMSArMzY1MywxMiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2V0SlNUZXN0T2Jq RW51bUF0dHJGCiAgICAgVU5VU0VEX1BBUkFNKHN0YXRlKTsKICAgICBVTlVTRURfUEFSQU0odGhy b3dTY29wZSk7CiAgICAgYXV0byYgaW1wbCA9IHRoaXNPYmplY3Qud3JhcHBlZCgpOwotICAgIGF1 dG8gbmF0aXZlVmFsdWUgPSBwYXJzZUVudW1lcmF0aW9uPFRlc3RPYmo6OkVudW1UeXBlPihzdGF0 ZSwgdmFsdWUpOworICAgIGF1dG8gb3B0aW9uYWxOYXRpdmVWYWx1ZSA9IHBhcnNlRW51bWVyYXRp b248VGVzdE9iajo6RW51bVR5cGU+KHN0YXRlLCB2YWx1ZSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTih0aHJvd1Njb3BlLCBmYWxzZSk7Ci0gICAgaWYgKFVOTElLRUxZKCFuYXRpdmVWYWx1ZSkp CisgICAgaWYgKFVOTElLRUxZKCFvcHRpb25hbE5hdGl2ZVZhbHVlKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIGltcGwuc2V0RW51bUF0dHIobmF0aXZlVmFsdWUudmFsdWUoKSk7CisgICAg YXV0byBuYXRpdmVWYWx1ZSA9IG9wdGlvbmFsTmF0aXZlVmFsdWUudmFsdWUoKTsKKyAgICBpbXBs LnNldEVudW1BdHRyKFdURk1vdmUobmF0aXZlVmFsdWUpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApAQCAtNDE2OCwxMSArNDE2OSwxMiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgc2V0SlNUZXN0T2Jq SW1wbGVtZW50CiAgICAgVU5VU0VEX1BBUkFNKHN0YXRlKTsKICAgICBVTlVTRURfUEFSQU0odGhy b3dTY29wZSk7CiAgICAgYXV0byYgaW1wbCA9IHRoaXNPYmplY3Qud3JhcHBlZCgpOwotICAgIGF1 dG8gbmF0aXZlVmFsdWUgPSBwYXJzZUVudW1lcmF0aW9uPEFsdGVybmF0ZUVudW1OYW1lPihzdGF0 ZSwgdmFsdWUpOworICAgIGF1dG8gb3B0aW9uYWxOYXRpdmVWYWx1ZSA9IHBhcnNlRW51bWVyYXRp b248QWx0ZXJuYXRlRW51bU5hbWU+KHN0YXRlLCB2YWx1ZSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTih0aHJvd1Njb3BlLCBmYWxzZSk7Ci0gICAgaWYgKFVOTElLRUxZKCFuYXRpdmVWYWx1ZSkp CisgICAgaWYgKFVOTElLRUxZKCFvcHRpb25hbE5hdGl2ZVZhbHVlKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIGltcGwuc2V0SW1wbGVtZW50YXRpb25FbnVtQXR0cihuYXRpdmVWYWx1ZS52 YWx1ZSgpKTsKKyAgICBhdXRvIG5hdGl2ZVZhbHVlID0gb3B0aW9uYWxOYXRpdmVWYWx1ZS52YWx1 ZSgpOworICAgIGltcGwuc2V0SW1wbGVtZW50YXRpb25FbnVtQXR0cihXVEZNb3ZlKG5hdGl2ZVZh bHVlKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTUxMzAsMTEgKzUxMzIsMTIgQEAgc3Rh dGljIGlubGluZSBib29sIHNldEpTVGVzdE9iakF0dHJpYnV0ZQogICAgIFVOVVNFRF9QQVJBTShz dGF0ZSk7CiAgICAgVU5VU0VEX1BBUkFNKHRocm93U2NvcGUpOwogICAgIGF1dG8mIGltcGwgPSB0 aGlzT2JqZWN0LndyYXBwZWQoKTsKLSAgICBhdXRvIG5hdGl2ZVZhbHVlID0gcGFyc2VFbnVtZXJh dGlvbjxUZXN0T2JqOjpPcHRpb25hbD4oc3RhdGUsIHZhbHVlKTsKKyAgICBhdXRvIG9wdGlvbmFs TmF0aXZlVmFsdWUgPSBwYXJzZUVudW1lcmF0aW9uPFRlc3RPYmo6Ok9wdGlvbmFsPihzdGF0ZSwg dmFsdWUpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgZmFsc2UpOwotICAg IGlmIChVTkxJS0VMWSghbmF0aXZlVmFsdWUpKQorICAgIGlmIChVTkxJS0VMWSghb3B0aW9uYWxO YXRpdmVWYWx1ZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbXBsLnNldEF0dHJpYnV0 ZVdpdGhSZXNlcnZlZEVudW1UeXBlKG5hdGl2ZVZhbHVlLnZhbHVlKCkpOworICAgIGF1dG8gbmF0 aXZlVmFsdWUgPSBvcHRpb25hbE5hdGl2ZVZhbHVlLnZhbHVlKCk7CisgICAgaW1wbC5zZXRBdHRy aWJ1dGVXaXRoUmVzZXJ2ZWRFbnVtVHlwZShXVEZNb3ZlKG5hdGl2ZVZhbHVlKSk7CiAgICAgcmV0 dXJuIHRydWU7CiB9CiAK