65821 2011-08-06 15:24:44 -0700 Don't form identifiers the first time a string is used as a property name. 2011-08-06 20:45:04 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough webkit.review.bot oldest_to_newest 447671 0 barraclough 2011-08-06 15:24:44 -0700 This is a 1% win on SunSpider. 447673 1 103167 barraclough 2011-08-06 15:31:22 -0700 Created attachment 103167 The patch 447674 2 webkit.review.bot 2011-08-06 15:33:59 -0700 Attachment 103167 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/JavaScriptCore/ChangeLog', u'Source..." exit_code: 1 Source/JavaScriptCore/runtime/PropertyMapHashTable.h:158: The parameter name "key" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 447675 3 103167 oliver 2011-08-06 15:53:47 -0700 Comment on attachment 103167 The patch r=me, but fix the style problem 447697 4 barraclough 2011-08-06 20:45:04 -0700 Fixed in r92569 103167 2011-08-06 15:31:22 -0700 2011-08-06 15:53:47 -0700 The patch 65821.patch text/plain 9782 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTI1NjMpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAK KzIwMTEtMDgtMDYgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTgyMQor ICAgICAgICBEb24ndCBmb3JtIGlkZW50aWZpZXJzIHRoZSBmaXJzdCB0aW1lIGEgc3RyaW5nIGlz IHVzZWQgYXMgYSBwcm9wZXJ0eSBuYW1lLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSAxJSB3aW4gb24gU3VuU3BpZGVyLgorCisgICAg ICAgICogZGZnL0RGR09wZXJhdGlvbnMuY3BwOgorICAgICAgICAgICAgLSBVc2UgZmFzdEdldE93 blByb3BlcnR5LgorICAgICAgICAqIGppdC9KSVRTdHVicy5jcHA6CisgICAgICAgIChKU0M6OkRF RklORV9TVFVCX0ZVTkNUSU9OKToKKyAgICAgICAgICAgIC0gVXNlIGZhc3RHZXRPd25Qcm9wZXJ0 eS4KKyAgICAgICAgKiBydW50aW1lL0pTQ2VsbC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmpl Y3QuaDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjpmYXN0R2V0T3duUHJvcGVydHkpOgorICAgICAg ICAgICAgLSBGYXN0IGNhbGwgdG8gZ2V0IGEgcHJvcGVydHkgd2l0aG91dCBjcmVhdGluZyBhbiBp ZGVudGlmaWVyIHRoZSBmaXJzdCB0aW1lLgorICAgICAgICAqIHJ1bnRpbWUvUHJvcGVydHlNYXBI YXNoVGFibGUuaDoKKyAgICAgICAgKEpTQzo6UHJvcGVydHlUYWJsZTo6ZmluZCk6CisgICAgICAg IChKU0M6OlByb3BlcnR5VGFibGU6OmZpbmRXaXRoU3RyaW5nKToKKyAgICAgICAgICAgIC0gQWRk IGludGVyZmFjZSB0byBsb29rIHVwIGJ5IGVpdGhlciBzdHJpbnNnIG9yIGlkZW50aWZpZXJzLgor ICAgICAgICAqIHJ1bnRpbWUvU3RydWN0dXJlLmg6CisgICAgICAgIChKU0M6OlN0cnVjdHVyZTo6 Z2V0KToKKyAgICAgICAgICAgIC0gQWRkIGEgZ2V0KCkgY2FsbCB0aGF0IHRha2VzIGEgVVN0cmlu Zywgbm90IGFuIElkZW50aWZpZXIuCisgICAgICAgICogd3RmL3RleHQvU3RyaW5nSW1wbC5oOgor ICAgICAgICAoV1RGOjpTdHJpbmdJbXBsOjpoYXNIYXNoKToKKyAgICAgICAgICAgIC0gQWRkIGEg Y2FsbCB0byBjaGVjayBpZiB0aGUgaGFzIGhhcyBiZWVuIHNldCAodG8gZGV0ZWN0IHRoZSBmaXJz dCB1c2UgYXMgYSBwcm9wZXJ0eSBuYW1lKS4KKwogMjAxMS0wOC0wNiAgQXJvbiBSb3NlbmJlcmcg IDxhcm9zZW5iZXJnQGxvZ2l0ZWNoLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZW5qYW1p biBQb3VsYWluLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25z LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09wZXJhdGlv bnMuY3BwCShyZXZpc2lvbiA5MjQwNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH T3BlcmF0aW9ucy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMCwxMCArMjEwLDggQEAgRW5jb2Rl ZEpTVmFsdWUgb3BlcmF0aW9uR2V0QnlWYWwoRXhlY1N0YQogICAgICAgICAgICAgaWYgKHByb3Bl cnR5QXNVSW50MzIgPT0gcHJvcGVydHlBc0RvdWJsZSkKICAgICAgICAgICAgICAgICByZXR1cm4g Z2V0QnlWYWwoZXhlYywgYmFzZSwgcHJvcGVydHlBc1VJbnQzMik7CiAgICAgICAgIH0gZWxzZSBp ZiAocHJvcGVydHkuaXNTdHJpbmcoKSkgewotICAgICAgICAgICAgSWRlbnRpZmllciBwcm9wZXJ0 eU5hbWUoZXhlYywgYXNTdHJpbmcocHJvcGVydHkpLT52YWx1ZShleGVjKSk7Ci0gICAgICAgICAg ICBQcm9wZXJ0eVNsb3Qgc2xvdChiYXNlKTsKLSAgICAgICAgICAgIGlmIChiYXNlLT5mYXN0R2V0 T3duUHJvcGVydHlTbG90KGV4ZWMsIHByb3BlcnR5TmFtZSwgc2xvdCkpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShzbG90LmdldFZhbHVlKGV4ZWMsIHByb3BlcnR5TmFt ZSkpOworICAgICAgICAgICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0gYmFzZS0+ZmFzdEdldE93blBy b3BlcnR5KGV4ZWMsIGFzU3RyaW5nKHByb3BlcnR5KS0+dmFsdWUoZXhlYykpKQorICAgICAgICAg ICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsKICAgICAgICAgfQogICAgIH0K IApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAJKHJldmlzaW9uIDky NDA1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTIyNDksMTIgKzIyNDksNyBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNvZGVk SlNWYWx1ZSwgb3BfCiAgICAgSlNWYWx1ZSBzdWJzY3JpcHQgPSBzdGFja0ZyYW1lLmFyZ3NbMV0u anNWYWx1ZSgpOwogCiAgICAgaWYgKExJS0VMWShiYXNlVmFsdWUuaXNDZWxsKCkgJiYgc3Vic2Ny aXB0LmlzU3RyaW5nKCkpKSB7Ci0gICAgICAgIElkZW50aWZpZXIgcHJvcGVydHlOYW1lKGNhbGxG cmFtZSwgYXNTdHJpbmcoc3Vic2NyaXB0KS0+dmFsdWUoY2FsbEZyYW1lKSk7Ci0gICAgICAgIFBy b3BlcnR5U2xvdCBzbG90KGJhc2VWYWx1ZS5hc0NlbGwoKSk7Ci0gICAgICAgIC8vIEpTU3RyaW5n Ojp2YWx1ZSBtYXkgaGF2ZSB0aHJvd24sIGJ1dCB3ZSBzaG91bGRuJ3QgZmluZCBhIHByb3BlcnR5 IHdpdGggYSBudWxsIGlkZW50aWZpZXIsCi0gICAgICAgIC8vIHNvIHdlIHNob3VsZCBtaXNzIHRo aXMgY2FzZSBhbmQgd2luZCB1cCBpbiB0aGUgQ0hFQ0tfRk9SX0VYQ0VQVElPTl9BVF9FTkQsIGJl bG93LgotICAgICAgICBpZiAoYmFzZVZhbHVlLmFzQ2VsbCgpLT5mYXN0R2V0T3duUHJvcGVydHlT bG90KGNhbGxGcmFtZSwgcHJvcGVydHlOYW1lLCBzbG90KSkgewotICAgICAgICAgICAgSlNWYWx1 ZSByZXN1bHQgPSBzbG90LmdldFZhbHVlKGNhbGxGcmFtZSwgcHJvcGVydHlOYW1lKTsKKyAgICAg ICAgaWYgKEpTVmFsdWUgcmVzdWx0ID0gYmFzZVZhbHVlLmFzQ2VsbCgpLT5mYXN0R2V0T3duUHJv cGVydHkoY2FsbEZyYW1lLCBhc1N0cmluZyhzdWJzY3JpcHQpLT52YWx1ZShjYWxsRnJhbWUpKSkg ewogICAgICAgICAgICAgQ0hFQ0tfRk9SX0VYQ0VQVElPTigpOwogICAgICAgICAgICAgcmV0dXJu IEpTVmFsdWU6OmVuY29kZShyZXN1bHQpOwogICAgICAgICB9CkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0NlbGwuaAkocmV2aXNpb24gOTI0MDUpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDYgKzEzNyw3 IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAvLyBjYWxsIHRoaXMgZnVuY3Rpb24sIG5vdCBp dHMgc2xvd2VyIHZpcnR1YWwgY291bnRlcnBhcnQuIChGb3IgaW50ZWdlcgogICAgICAgICAvLyBw cm9wZXJ0eSBuYW1lcywgd2Ugd2FudCBhIHNpbWlsYXIgaW50ZXJmYWNlIHdpdGggYXBwcm9wcmlh dGUgb3B0aW1pemF0aW9ucy4pCiAgICAgICAgIGJvb2wgZmFzdEdldE93blByb3BlcnR5U2xvdChF eGVjU3RhdGUqLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYp OworICAgICAgICBKU1ZhbHVlIGZhc3RHZXRPd25Qcm9wZXJ0eShFeGVjU3RhdGUqLCBjb25zdCBV U3RyaW5nJik7CiAKICAgICAgICAgc3RhdGljIHB0cmRpZmZfdCBzdHJ1Y3R1cmVPZmZzZXQoKQog ICAgICAgICB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgJ KHJldmlzaW9uIDkyNDA1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmpl Y3QuaAkod29ya2luZyBjb3B5KQpAQCAtNTM2LDYgKzUzNiwyMiBAQCBBTFdBWVNfSU5MSU5FIGJv b2wgSlNDZWxsOjpmYXN0R2V0T3duUHJvCiAgICAgcmV0dXJuIGdldE93blByb3BlcnR5U2xvdChl eGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwogfQogCisvLyBGYXN0IGNhbGwgdG8gZ2V0IGEgcHJv cGVydHkgd2hlcmUgd2UgbWF5IG5vdCB5ZXQgaGF2ZSBjb252ZXJ0ZWQgdGhlIHN0cmluZyB0byBh bgorLy8gaWRlbnRpZmllci4gVGhlIGZpcnN0IHRpbWUgd2UgcGVyZm9ybSBhIHByb3BlcnR5IGFj Y2VzcyB3aXRoIGEgZ2l2ZW4gc3RyaW5nLCB0cnkKKy8vIHBlcmZvcm1pbmcgdGhlIHByb3BlcnR5 IG1hcCBsb29rdXAgd2l0aG91dCBmb3JtaW5nIGFuIGlkZW50aWZpZXIuIFdlIGRldGVjdCB0aGlz CisvLyBjYXNlIGJ5IGNoZWNraW5nIHdoZXRoZXIgdGhlIGhhc2ggaGFzIHlldCBiZWVuIHNldCBm b3IgdGhpcyBzdHJpbmcuCitBTFdBWVNfSU5MSU5FIEpTVmFsdWUgSlNDZWxsOjpmYXN0R2V0T3du UHJvcGVydHkoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBVU3RyaW5nJiBuYW1lKQoreworICAgIGlm ICghbV9zdHJ1Y3R1cmUtPnR5cGVJbmZvKCkub3ZlcnJpZGVzR2V0T3duUHJvcGVydHlTbG90KCkg JiYgIW1fc3RydWN0dXJlLT5oYXNHZXR0ZXJTZXR0ZXJQcm9wZXJ0aWVzKCkpIHsKKyAgICAgICAg c2l6ZV90IG9mZnNldCA9IG5hbWUuaW1wbCgpLT5oYXNIYXNoKCkKKyAgICAgICAgICAgID8gbV9z dHJ1Y3R1cmUtPmdldChleGVjLT5nbG9iYWxEYXRhKCksIElkZW50aWZpZXIoZXhlYywgbmFtZSkp CisgICAgICAgICAgICA6IG1fc3RydWN0dXJlLT5nZXQoZXhlYy0+Z2xvYmFsRGF0YSgpLCBuYW1l KTsKKyAgICAgICAgaWYgKG9mZnNldCAhPSBXVEY6Om5vdEZvdW5kKQorICAgICAgICAgICAgcmV0 dXJuIGFzT2JqZWN0KHRoaXMpLT5sb2NhdGlvbkZvck9mZnNldChvZmZzZXQpLT5nZXQoKTsKKyAg ICB9CisgICAgcmV0dXJuIEpTVmFsdWUoKTsKK30KKwogLy8gSXQgbWF5IHNlZW0gY3JhenkgdG8g aW5saW5lIGEgZnVuY3Rpb24gdGhpcyBsYXJnZSBidXQgaXQgbWFrZXMgYSBiaWcgZGlmZmVyZW5j ZQogLy8gc2luY2UgdGhpcyBpcyBmdW5jdGlvbiB2ZXJ5IGhvdCBpbiB2YXJpYWJsZSBsb29rdXAK IEFMV0FZU19JTkxJTkUgYm9vbCBKU09iamVjdDo6Z2V0UHJvcGVydHlTbG90KEV4ZWNTdGF0ZSog ZXhlYywgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3Qp CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hUYWJs ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5 TWFwSGFzaFRhYmxlLmgJKHJldmlzaW9uIDkyNDA1KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvUHJvcGVydHlNYXBIYXNoVGFibGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTU1LDYg KzE1NSw3IEBAIHB1YmxpYzoKIAogICAgIC8vIEZpbmQgYSB2YWx1ZSBpbiB0aGUgdGFibGUuCiAg ICAgZmluZF9pdGVyYXRvciBmaW5kKGNvbnN0IEtleVR5cGUmIGtleSk7CisgICAgZmluZF9pdGVy YXRvciBmaW5kV2l0aFN0cmluZyhjb25zdCBLZXlUeXBlJiBrZXkpOwogICAgIC8vIEFkZCBhIHZh bHVlIHRvIHRoZSB0YWJsZQogICAgIHN0ZDo6cGFpcjxmaW5kX2l0ZXJhdG9yLCBib29sPiBhZGQo Y29uc3QgVmFsdWVUeXBlJiBlbnRyeSk7CiAgICAgLy8gUmVtb3ZlIGEgdmFsdWUgZnJvbSB0aGUg dGFibGUuCkBAIC0zMjQsNiArMzI1LDcgQEAgaW5saW5lIFByb3BlcnR5VGFibGU6OmNvbnN0X2l0 ZXJhdG9yIFBybwogaW5saW5lIFByb3BlcnR5VGFibGU6OmZpbmRfaXRlcmF0b3IgUHJvcGVydHlU YWJsZTo6ZmluZChjb25zdCBLZXlUeXBlJiBrZXkpCiB7CiAgICAgQVNTRVJUKGtleSk7CisgICAg QVNTRVJUKGtleS0+aXNJZGVudGlmaWVyKCkpOwogICAgIHVuc2lnbmVkIGhhc2ggPSBrZXktPmV4 aXN0aW5nSGFzaCgpOwogICAgIHVuc2lnbmVkIHN0ZXAgPSAwOwogCkBAIC0zNDMsNyArMzQ1LDM5 IEBAIGlubGluZSBQcm9wZXJ0eVRhYmxlOjpmaW5kX2l0ZXJhdG9yIFByb3AKICNlbmRpZgogCiAg ICAgICAgIGlmICghc3RlcCkKLSAgICAgICAgICAgIHN0ZXAgPVdURjo6ZG91YmxlSGFzaChrZXkt PmV4aXN0aW5nSGFzaCgpKSB8IDE7CisgICAgICAgICAgICBzdGVwID0gV1RGOjpkb3VibGVIYXNo KGtleS0+ZXhpc3RpbmdIYXNoKCkpIHwgMTsKKyAgICAgICAgaGFzaCArPSBzdGVwOworCisjaWYg RFVNUF9QUk9QRVJUWU1BUF9TVEFUUworICAgICAgICArK251bVJlaGFzaGVzOworI2VuZGlmCisg ICAgfQorfQorCitpbmxpbmUgUHJvcGVydHlUYWJsZTo6ZmluZF9pdGVyYXRvciBQcm9wZXJ0eVRh YmxlOjpmaW5kV2l0aFN0cmluZyhjb25zdCBLZXlUeXBlJiBrZXkpCit7CisgICAgQVNTRVJUKGtl eSk7CisgICAgQVNTRVJUKCFrZXktPmlzSWRlbnRpZmllcigpICYmICFrZXktPmhhc0hhc2goKSk7 CisgICAgdW5zaWduZWQgaGFzaCA9IGtleS0+aGFzaCgpOworICAgIHVuc2lnbmVkIHN0ZXAgPSAw OworCisjaWYgRFVNUF9QUk9QRVJUWU1BUF9TVEFUUworICAgICsrbnVtUHJvYmVzOworI2VuZGlm CisKKyAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICB1bnNpZ25lZCBlbnRyeUluZGV4ID0gbV9p bmRleFtoYXNoICYgbV9pbmRleE1hc2tdOworICAgICAgICBpZiAoZW50cnlJbmRleCA9PSBFbXB0 eUVudHJ5SW5kZXgpCisgICAgICAgICAgICByZXR1cm4gc3RkOjptYWtlX3BhaXIoKFZhbHVlVHlw ZSopMCwgaGFzaCAmIG1faW5kZXhNYXNrKTsKKyAgICAgICAgaWYgKGVxdWFsKGtleSwgdGFibGUo KVtlbnRyeUluZGV4IC0gMV0ua2V5KSkKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfcGFp cigmdGFibGUoKVtlbnRyeUluZGV4IC0gMV0sIGhhc2ggJiBtX2luZGV4TWFzayk7CisKKyNpZiBE VU1QX1BST1BFUlRZTUFQX1NUQVRTCisgICAgICAgICsrbnVtQ29sbGlzaW9uczsKKyNlbmRpZgor CisgICAgICAgIGlmICghc3RlcCkKKyAgICAgICAgICAgIHN0ZXAgPSBXVEY6OmRvdWJsZUhhc2go a2V5LT5leGlzdGluZ0hhc2goKSkgfCAxOwogICAgICAgICBoYXNoICs9IHN0ZXA7CiAKICNpZiBE VU1QX1BST1BFUlRZTUFQX1NUQVRTCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9TdHJ1Y3R1cmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9TdHJ1Y3R1cmUuaAkocmV2aXNpb24gOTI0MDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9TdHJ1Y3R1cmUuaAkod29ya2luZyBjb3B5KQpAQCAtMTEyLDYgKzExMiw3IEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICBib29sIGlzVXNpbmdJbmxpbmVTdG9yYWdlKCkgY29uc3Q7 CiAKICAgICAgICAgc2l6ZV90IGdldChKU0dsb2JhbERhdGEmLCBjb25zdCBJZGVudGlmaWVyJiBw cm9wZXJ0eU5hbWUpOworICAgICAgICBzaXplX3QgZ2V0KEpTR2xvYmFsRGF0YSYsIGNvbnN0IFVT dHJpbmcmIG5hbWUpOwogICAgICAgICBzaXplX3QgZ2V0KEpTR2xvYmFsRGF0YSYsIFN0cmluZ0lt cGwqIHByb3BlcnR5TmFtZSwgdW5zaWduZWQmIGF0dHJpYnV0ZXMsIEpTQ2VsbComIHNwZWNpZmlj VmFsdWUpOwogICAgICAgICBzaXplX3QgZ2V0KEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgY29u c3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCB1bnNpZ25lZCYgYXR0cmlidXRlcywgSlNDZWxs KiYgc3BlY2lmaWNWYWx1ZSkKICAgICAgICAgewpAQCAtMjY1LDYgKzI2NiwxOCBAQCBuYW1lc3Bh Y2UgSlNDIHsKICAgICAgICAgcmV0dXJuIGVudHJ5ID8gZW50cnktPm9mZnNldCA6IG5vdEZvdW5k OwogICAgIH0KIAorICAgIGlubGluZSBzaXplX3QgU3RydWN0dXJlOjpnZXQoSlNHbG9iYWxEYXRh JiBnbG9iYWxEYXRhLCBjb25zdCBVU3RyaW5nJiBuYW1lKQorICAgIHsKKyAgICAgICAgQVNTRVJU KHN0cnVjdHVyZSgpLT5jbGFzc0luZm8oKSA9PSAmc19pbmZvKTsKKyAgICAgICAgbWF0ZXJpYWxp emVQcm9wZXJ0eU1hcElmTmVjZXNzYXJ5KGdsb2JhbERhdGEpOworICAgICAgICBpZiAoIW1fcHJv cGVydHlUYWJsZSkKKyAgICAgICAgICAgIHJldHVybiBub3RGb3VuZDsKKworICAgICAgICBQcm9w ZXJ0eU1hcEVudHJ5KiBlbnRyeSA9IG1fcHJvcGVydHlUYWJsZS0+ZmluZFdpdGhTdHJpbmcobmFt ZS5pbXBsKCkpLmZpcnN0OworICAgICAgICBBU1NFUlQoIWVudHJ5IHx8IGVudHJ5LT5vZmZzZXQg Pj0gbV9hbm9ueW1vdXNTbG90Q291bnQpOworICAgICAgICByZXR1cm4gZW50cnkgPyBlbnRyeS0+ b2Zmc2V0IDogbm90Rm91bmQ7CisgICAgfQorCiAgICAgaW5saW5lIGJvb2wgSlNDZWxsOjppc09i amVjdCgpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gbV9zdHJ1Y3R1cmUtPnR5cGVJbmZv KCkudHlwZSgpID09IE9iamVjdFR5cGU7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3Rm L3RleHQvU3RyaW5nSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93 dGYvdGV4dC9TdHJpbmdJbXBsLmgJKHJldmlzaW9uIDkyNDA1KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMjM4LDYgKzIz OCw3IEBAIHB1YmxpYzoKIAogICAgIHVuc2lnbmVkIGhhc2goKSBjb25zdCB7IGlmICghbV9oYXNo KSBtX2hhc2ggPSBTdHJpbmdIYXNoZXI6OmNvbXB1dGVIYXNoKG1fZGF0YSwgbV9sZW5ndGgpOyBy ZXR1cm4gbV9oYXNoOyB9CiAgICAgdW5zaWduZWQgZXhpc3RpbmdIYXNoKCkgY29uc3QgeyBBU1NF UlQobV9oYXNoKTsgcmV0dXJuIG1faGFzaDsgfQorICAgIGJvb2wgaGFzSGFzaCgpIGNvbnN0IHsg cmV0dXJuIG1faGFzaDsgfQogCiAgICAgQUxXQVlTX0lOTElORSB2b2lkIGRlcmVmKCkgeyBtX3Jl ZkNvdW50QW5kRmxhZ3MgLT0gc19yZWZDb3VudEluY3JlbWVudDsgaWYgKCEobV9yZWZDb3VudEFu ZEZsYWdzICYgKHNfcmVmQ291bnRNYXNrIHwgc19yZWZDb3VudEZsYWdTdGF0aWMpKSkgZGVsZXRl IHRoaXM7IH0KICAgICBBTFdBWVNfSU5MSU5FIGJvb2wgaGFzT25lUmVmKCkgY29uc3QgeyByZXR1 cm4gKG1fcmVmQ291bnRBbmRGbGFncyAmIChzX3JlZkNvdW50TWFzayB8IHNfcmVmQ291bnRGbGFn U3RhdGljKSkgPT0gc19yZWZDb3VudEluY3JlbWVudDsgfQo=