128542 2014-02-10 10:27:49 -0800 Make the Identifier::add() family return PassRef<StringImpl>. 2014-02-10 12:34:14 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue oldest_to_newest 978951 0 kling 2014-02-10 10:27:49 -0800 We should make Identifier::add() and friends return PassRef<StringImpl> since they are guaranteed to return non-null strings. This will remove one null-check branch from Identifier's constructor. 978952 1 223724 kling 2014-02-10 10:28:21 -0800 Created attachment 223724 Patch 978955 2 commit-queue 2014-02-10 10:29:40 -0800 Attachment 223724 did not pass style-queue: ERROR: Source/JavaScriptCore/runtime/Identifier.h:133: The parameter name "r" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/runtime/Identifier.h:134: The parameter name "r" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 978976 3 223724 koivisto 2014-02-10 11:31:37 -0800 Comment on attachment 223724 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223724&action=review > Source/JavaScriptCore/runtime/Identifier.h:196 > + return addResult.isNewEntry ? adoptRef(**addResult.iterator) : **addResult.iterator; ** :| 979003 4 223724 commit-queue 2014-02-10 12:34:12 -0800 Comment on attachment 223724 Patch Clearing flags on attachment: 223724 Committed r163808: <http://trac.webkit.org/changeset/163808> 979004 5 commit-queue 2014-02-10 12:34:14 -0800 All reviewed patches have been landed. Closing bug. 223724 2014-02-10 10:28:21 -0800 2014-02-10 12:34:11 -0800 Patch bug-128542.diff text/plain 8755 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDdhY2IwODkuLjMzZTI3ZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTEwICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIHRoZSBJZGVudGlmaWVyOjphZGQo KSBmYW1pbHkgcmV0dXJuIFBhc3NSZWY8U3RyaW5nSW1wbD4uCisgICAgICAgIDxodHRwczovL3dl YmtpdC5vcmcvYi8xMjg1NDI+CisKKyAgICAgICAgVGhpcyBrbm9ja3Mgb25lIGJyYW5jaCBvZmYg b2YgY3JlYXRpbmcgYW4gSWRlbnRpZmllciBmcm9tIGFub3RoZXIKKyAgICAgICAgc3RyaW5nIHNv dXJjZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJ1bnRpbWUvSWRlbnRpZmllci5jcHA6CisgICAgICAgIChKU0M6OklkZW50aWZpZXI6OmFkZCk6 CisgICAgICAgIChKU0M6OklkZW50aWZpZXI6OmFkZDgpOgorICAgICAgICAoSlNDOjpJZGVudGlm aWVyOjphZGRTbG93Q2FzZSk6CisgICAgICAgICogcnVudGltZS9JZGVudGlmaWVyLmg6CisgICAg ICAgIChKU0M6OklkZW50aWZpZXI6OmFkZCk6CisgICAgICAgICogcnVudGltZS9Mb29rdXAuY3Bw OgorICAgICAgICAoSlNDOjpIYXNoVGFibGU6OmNyZWF0ZVRhYmxlKToKKwogMjAxNC0wMi0xMCAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCB1c2luZyBTdHJp bmc6OmRlcHJlY2F0ZWRDaGFyYWN0ZXJzIHRvIGNhbGwgV1RGOjpDb2xsYXRvcgpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSWRlbnRpZmllci5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9JZGVudGlmaWVyLmNwcAppbmRleCAzNjU4ZDg3Li5iM2Uy MzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JZGVudGlmaWVy LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JZGVudGlmaWVyLmNwcApA QCAtODgsNyArODgsNyBAQCBzdHJ1Y3QgSWRlbnRpZmllckxDaGFyRnJvbVVDaGFyVHJhbnNsYXRv ciB7CiAgICAgfQogfTsKIAotUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBJZGVudGlmaWVyOjphZGQo Vk0qIHZtLCBjb25zdCBjaGFyKiBjKQorUGFzc1JlZjxTdHJpbmdJbXBsPiBJZGVudGlmaWVyOjph ZGQoVk0qIHZtLCBjb25zdCBjaGFyKiBjKQogewogICAgIEFTU0VSVChjKTsKICAgICBBU1NFUlQo Y1swXSk7CkBAIC0xMDMsMTUgKzEwMywxNSBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IElkZW50 aWZpZXI6OmFkZChWTSogdm0sIGNvbnN0IGNoYXIqIGMpCiAgICAgLy8gVGhlIGJvb2xlYW4gaW4g dGhlIHBhaXIgdGVsbHMgdXMgaWYgdGhhdCBpcyBzby4KICAgICBSZWZQdHI8U3RyaW5nSW1wbD4g YWRkZWRTdHJpbmcgPSBhZGRSZXN1bHQuaXNOZXdFbnRyeSA/IGFkb3B0UmVmKCphZGRSZXN1bHQu aXRlcmF0b3IpIDogKmFkZFJlc3VsdC5pdGVyYXRvcjsKIAotICAgIHJldHVybiBhZGRlZFN0cmlu Zy5yZWxlYXNlKCk7CisgICAgcmV0dXJuIGFkZGVkU3RyaW5nLnJlbGVhc2VOb25OdWxsKCk7CiB9 CiAKLVBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gSWRlbnRpZmllcjo6YWRkKEV4ZWNTdGF0ZSogZXhl YywgY29uc3QgY2hhciogYykKK1Bhc3NSZWY8U3RyaW5nSW1wbD4gSWRlbnRpZmllcjo6YWRkKEV4 ZWNTdGF0ZSogZXhlYywgY29uc3QgY2hhciogYykKIHsKICAgICByZXR1cm4gYWRkKCZleGVjLT52 bSgpLCBjKTsKIH0KIAotUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBJZGVudGlmaWVyOjphZGQ4KFZN KiB2bSwgY29uc3QgVUNoYXIqIHMsIGludCBsZW5ndGgpCitQYXNzUmVmPFN0cmluZ0ltcGw+IElk ZW50aWZpZXI6OmFkZDgoVk0qIHZtLCBjb25zdCBVQ2hhciogcywgaW50IGxlbmd0aCkKIHsKICAg ICBpZiAobGVuZ3RoID09IDEpIHsKICAgICAgICAgVUNoYXIgYyA9IHNbMF07CkBAIC0xMjEsMTkg KzEyMSwxOSBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IElkZW50aWZpZXI6OmFkZDgoVk0qIHZt LCBjb25zdCBVQ2hhciogcywgaW50IGxlbmd0aCkKICAgICB9CiAgICAgCiAgICAgaWYgKCFsZW5n dGgpCi0gICAgICAgIHJldHVybiBTdHJpbmdJbXBsOjplbXB0eSgpOworICAgICAgICByZXR1cm4g KlN0cmluZ0ltcGw6OmVtcHR5KCk7CiAgICAgQ2hhckJ1ZmZlcjxVQ2hhcj4gYnVmID0geyBzLCBz dGF0aWNfY2FzdDx1bnNpZ25lZD4obGVuZ3RoKSB9OwogICAgIEhhc2hTZXQ8U3RyaW5nSW1wbCo+ OjpBZGRSZXN1bHQgYWRkUmVzdWx0ID0gdm0tPmlkZW50aWZpZXJUYWJsZS0+YWRkPENoYXJCdWZm ZXI8VUNoYXI+LCBJZGVudGlmaWVyTENoYXJGcm9tVUNoYXJUcmFuc2xhdG9yID4oYnVmKTsKICAg ICAKICAgICAvLyBJZiB0aGUgc3RyaW5nIGlzIG5ld2x5LXRyYW5zbGF0ZWQsIHRoZW4gd2UgbmVl ZCB0byBhZG9wdCBpdC4KICAgICAvLyBUaGUgYm9vbGVhbiBpbiB0aGUgcGFpciB0ZWxscyB1cyBp ZiB0aGF0IGlzIHNvLgotICAgIHJldHVybiBhZGRSZXN1bHQuaXNOZXdFbnRyeSA/IGFkb3B0UmVm KCphZGRSZXN1bHQuaXRlcmF0b3IpIDogKmFkZFJlc3VsdC5pdGVyYXRvcjsKKyAgICByZXR1cm4g YWRkUmVzdWx0LmlzTmV3RW50cnkgPyBhZG9wdFJlZigqKmFkZFJlc3VsdC5pdGVyYXRvcikgOiAq KmFkZFJlc3VsdC5pdGVyYXRvcjsKIH0KIAotUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBJZGVudGlm aWVyOjphZGRTbG93Q2FzZShWTSogdm0sIFN0cmluZ0ltcGwqIHIpCitQYXNzUmVmPFN0cmluZ0lt cGw+IElkZW50aWZpZXI6OmFkZFNsb3dDYXNlKFZNKiB2bSwgU3RyaW5nSW1wbCogcikKIHsKICAg ICBpZiAoci0+aXNFbXB0eVVuaXF1ZSgpKQotICAgICAgICByZXR1cm4gcjsKKyAgICAgICAgcmV0 dXJuICpyOwogICAgIEFTU0VSVCghci0+aXNJZGVudGlmaWVyKCkpOwogICAgIC8vIFRoZSBlbXB0 eSAmIG51bGwgc3RyaW5ncyBhcmUgc3RhdGljIHNpbmdsZXRvbnMsIGFuZCBzdGF0aWMgc3RyaW5n cyBhcmUgaGFuZGxlZAogICAgIC8vIGluIDo6YWRkKCkgaW4gdGhlIGhlYWRlciwgc28gd2Ugc2hv dWxkIG5ldmVyIGdldCBoZXJlIHdpdGggYSB6ZXJvIGxlbmd0aCBzdHJpbmcuCkBAIC0xNDQsMTMg KzE0NCwxMyBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IElkZW50aWZpZXI6OmFkZFNsb3dDYXNl KFZNKiB2bSwgU3RyaW5nSW1wbCogcikKICAgICAgICAgaWYgKGMgPD0gbWF4U2luZ2xlQ2hhcmFj dGVyU3RyaW5nKQogICAgICAgICAgICAgciA9IHZtLT5zbWFsbFN0cmluZ3Muc2luZ2xlQ2hhcmFj dGVyU3RyaW5nUmVwKGMpOwogICAgICAgICAgICAgaWYgKHItPmlzSWRlbnRpZmllcigpKQotICAg ICAgICAgICAgICAgIHJldHVybiByOworICAgICAgICAgICAgICAgIHJldHVybiAqcjsKICAgICB9 CiAKLSAgICByZXR1cm4gKnZtLT5pZGVudGlmaWVyVGFibGUtPmFkZChyKS5pdGVyYXRvcjsKKyAg ICByZXR1cm4gKip2bS0+aWRlbnRpZmllclRhYmxlLT5hZGQocikuaXRlcmF0b3I7CiB9CiAKLVBh c3NSZWZQdHI8U3RyaW5nSW1wbD4gSWRlbnRpZmllcjo6YWRkU2xvd0Nhc2UoRXhlY1N0YXRlKiBl eGVjLCBTdHJpbmdJbXBsKiByKQorUGFzc1JlZjxTdHJpbmdJbXBsPiBJZGVudGlmaWVyOjphZGRT bG93Q2FzZShFeGVjU3RhdGUqIGV4ZWMsIFN0cmluZ0ltcGwqIHIpCiB7CiAgICAgcmV0dXJuIGFk ZFNsb3dDYXNlKCZleGVjLT52bSgpLCByKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0lkZW50aWZpZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0lkZW50aWZpZXIuaAppbmRleCA2NzMzZWM1Li5kODAzN2ViIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JZGVudGlmaWVyLmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSWRlbnRpZmllci5oCkBAIC05NSw4ICs5NSw4IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICBzdGF0aWMgYm9vbCBlcXVhbChjb25zdCBTdHJpbmdJbXBsKiBhLCBj b25zdCBTdHJpbmdJbXBsKiBiKSB7IHJldHVybiA6OmVxdWFsKGEsIGIpOyB9CiAKICAgICAgICAg Ly8gT25seSB0byBiZSB1c2VkIHdpdGggc3RyaW5nIGxpdGVyYWxzLgotICAgICAgICBzdGF0aWMg UGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZGQoVk0qLCBjb25zdCBjaGFyKik7Ci0gICAgICAgIEpT X0VYUE9SVF9QUklWQVRFIHN0YXRpYyBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGFkZChFeGVjU3Rh dGUqLCBjb25zdCBjaGFyKik7CisgICAgICAgIHN0YXRpYyBQYXNzUmVmPFN0cmluZ0ltcGw+IGFk ZChWTSosIGNvbnN0IGNoYXIqKTsKKyAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIFBh c3NSZWY8U3RyaW5nSW1wbD4gYWRkKEV4ZWNTdGF0ZSosIGNvbnN0IGNoYXIqKTsKIAogICAgIHBy aXZhdGU6CiAgICAgICAgIFN0cmluZyBtX3N0cmluZzsKQEAgLTEwNywzMSArMTA3LDMxIEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICBzdGF0aWMgYm9vbCBlcXVhbChjb25zdCBJZGVudGlmaWVy JiBhLCBjb25zdCBJZGVudGlmaWVyJiBiKSB7IHJldHVybiBhLm1fc3RyaW5nLmltcGwoKSA9PSBi Lm1fc3RyaW5nLmltcGwoKTsgfQogICAgICAgICBzdGF0aWMgYm9vbCBlcXVhbChjb25zdCBJZGVu dGlmaWVyJiBhLCBjb25zdCBMQ2hhciogYikgeyByZXR1cm4gZXF1YWwoYS5tX3N0cmluZy5pbXBs KCksIGIpOyB9CiAKLSAgICAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQ+IHN0YXRpYyBQYXNzUmVm UHRyPFN0cmluZ0ltcGw+IGFkZChWTSosIGNvbnN0IFQqLCBpbnQgbGVuZ3RoKTsKLSAgICAgICAg c3RhdGljIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gYWRkOChWTSosIGNvbnN0IFVDaGFyKiwgaW50 IGxlbmd0aCk7CisgICAgICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBzdGF0aWMgUGFzc1JlZjxT dHJpbmdJbXBsPiBhZGQoVk0qLCBjb25zdCBUKiwgaW50IGxlbmd0aCk7CisgICAgICAgIHN0YXRp YyBQYXNzUmVmPFN0cmluZ0ltcGw+IGFkZDgoVk0qLCBjb25zdCBVQ2hhciosIGludCBsZW5ndGgp OwogICAgICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gQUxXQVlTX0lOTElORSBzdGF0aWMgYm9v bCBjYW5Vc2VTaW5nbGVDaGFyYWN0ZXJTdHJpbmcoVCk7CiAKLSAgICAgICAgc3RhdGljIFBhc3NS ZWZQdHI8U3RyaW5nSW1wbD4gYWRkKEV4ZWNTdGF0ZSogZXhlYywgU3RyaW5nSW1wbCogcikKKyAg ICAgICAgc3RhdGljIFBhc3NSZWY8U3RyaW5nSW1wbD4gYWRkKEV4ZWNTdGF0ZSogZXhlYywgU3Ry aW5nSW1wbCogcikKICAgICAgICAgewogI2lmbmRlZiBOREVCVUcKICAgICAgICAgICAgIGNoZWNr Q3VycmVudElkZW50aWZpZXJUYWJsZShleGVjKTsKICNlbmRpZgogICAgICAgICAgICAgaWYgKHIt PmlzSWRlbnRpZmllcigpKQotICAgICAgICAgICAgICAgIHJldHVybiByOworICAgICAgICAgICAg ICAgIHJldHVybiAqcjsKICAgICAgICAgICAgIHJldHVybiBhZGRTbG93Q2FzZShleGVjLCByKTsK ICAgICAgICAgfQotICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZGQoVk0q IHZtLCBTdHJpbmdJbXBsKiByKQorICAgICAgICBzdGF0aWMgUGFzc1JlZjxTdHJpbmdJbXBsPiBh ZGQoVk0qIHZtLCBTdHJpbmdJbXBsKiByKQogICAgICAgICB7CiAjaWZuZGVmIE5ERUJVRwogICAg ICAgICAgICAgY2hlY2tDdXJyZW50SWRlbnRpZmllclRhYmxlKHZtKTsKICNlbmRpZgogICAgICAg ICAgICAgaWYgKHItPmlzSWRlbnRpZmllcigpKQotICAgICAgICAgICAgICAgIHJldHVybiByOwor ICAgICAgICAgICAgICAgIHJldHVybiAqcjsKICAgICAgICAgICAgIHJldHVybiBhZGRTbG93Q2Fz ZSh2bSwgcik7CiAgICAgICAgIH0KIAotICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBzdGF0aWMg UGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBhZGRTbG93Q2FzZShFeGVjU3RhdGUqLCBTdHJpbmdJbXBs KiByKTsKLSAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5n SW1wbD4gYWRkU2xvd0Nhc2UoVk0qLCBTdHJpbmdJbXBsKiByKTsKKyAgICAgICAgSlNfRVhQT1JU X1BSSVZBVEUgc3RhdGljIFBhc3NSZWY8U3RyaW5nSW1wbD4gYWRkU2xvd0Nhc2UoRXhlY1N0YXRl KiwgU3RyaW5nSW1wbCogcik7CisgICAgICAgIEpTX0VYUE9SVF9QUklWQVRFIHN0YXRpYyBQYXNz UmVmPFN0cmluZ0ltcGw+IGFkZFNsb3dDYXNlKFZNKiwgU3RyaW5nSW1wbCogcik7CiAKICAgICAg ICAgSlNfRVhQT1JUX1BSSVZBVEUgc3RhdGljIHZvaWQgY2hlY2tDdXJyZW50SWRlbnRpZmllclRh YmxlKEV4ZWNTdGF0ZSopOwogICAgICAgICBKU19FWFBPUlRfUFJJVkFURSBzdGF0aWMgdm9pZCBj aGVja0N1cnJlbnRJZGVudGlmaWVyVGFibGUoVk0qKTsKQEAgLTE3OCw3ICsxNzgsNyBAQCBuYW1l c3BhY2UgSlNDIHsKICAgICB9OwogCiAgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFQ+Ci0gICAgUGFz c1JlZlB0cjxTdHJpbmdJbXBsPiBJZGVudGlmaWVyOjphZGQoVk0qIHZtLCBjb25zdCBUKiBzLCBp bnQgbGVuZ3RoKQorICAgIFBhc3NSZWY8U3RyaW5nSW1wbD4gSWRlbnRpZmllcjo6YWRkKFZNKiB2 bSwgY29uc3QgVCogcywgaW50IGxlbmd0aCkKICAgICB7CiAgICAgICAgIGlmIChsZW5ndGggPT0g MSkgewogICAgICAgICAgICAgVCBjID0gc1swXTsKQEAgLTE4NywxMyArMTg3LDEzIEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBpZiAoIWxlbmd0aCkKLSAg ICAgICAgICAgIHJldHVybiBTdHJpbmdJbXBsOjplbXB0eSgpOworICAgICAgICAgICAgcmV0dXJu ICpTdHJpbmdJbXBsOjplbXB0eSgpOwogICAgICAgICBDaGFyQnVmZmVyPFQ+IGJ1ZiA9IHsgcywg c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGxlbmd0aCkgfTsKICAgICAgICAgSGFzaFNldDxTdHJpbmdJ bXBsKj46OkFkZFJlc3VsdCBhZGRSZXN1bHQgPSB2bS0+aWRlbnRpZmllclRhYmxlLT5hZGQ8Q2hh ckJ1ZmZlcjxUPiwgSWRlbnRpZmllckNoYXJCdWZmZXJUcmFuc2xhdG9yPFQ+PihidWYpOwogICAg ICAgICAKICAgICAgICAgLy8gSWYgdGhlIHN0cmluZyBpcyBuZXdseS10cmFuc2xhdGVkLCB0aGVu IHdlIG5lZWQgdG8gYWRvcHQgaXQuCiAgICAgICAgIC8vIFRoZSBib29sZWFuIGluIHRoZSBwYWly IHRlbGxzIHVzIGlmIHRoYXQgaXMgc28uCi0gICAgICAgIHJldHVybiBhZGRSZXN1bHQuaXNOZXdF bnRyeSA/IGFkb3B0UmVmKCphZGRSZXN1bHQuaXRlcmF0b3IpIDogKmFkZFJlc3VsdC5pdGVyYXRv cjsKKyAgICAgICAgcmV0dXJuIGFkZFJlc3VsdC5pc05ld0VudHJ5ID8gYWRvcHRSZWYoKiphZGRS ZXN1bHQuaXRlcmF0b3IpIDogKiphZGRSZXN1bHQuaXRlcmF0b3I7CiAgICAgfQogCiAgICAgaW5s aW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBJZGVudGlmaWVyJiBhLCBjb25zdCBJZGVudGlmaWVy JiBiKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5jcHAKaW5kZXggYTgwNmRk MC4uYjM2OGEzMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9v a3VwLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Mb29rdXAuY3BwCkBA IC0zNCw4ICszNCw4IEBAIHZvaWQgSGFzaFRhYmxlOjpjcmVhdGVUYWJsZShWTSYgdm0pIGNvbnN0 CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBjb21wYWN0U2l6ZTsgKytpKQogICAgICAgICBlbnRy aWVzW2ldLnNldEtleSgwKTsKICAgICBmb3IgKGludCBpID0gMDsgdmFsdWVzW2ldLmtleTsgKytp KSB7Ci0gICAgICAgIFN0cmluZ0ltcGwqIGlkZW50aWZpZXIgPSBJZGVudGlmaWVyOjphZGQoJnZt LCB2YWx1ZXNbaV0ua2V5KS5sZWFrUmVmKCk7Ci0gICAgICAgIGludCBoYXNoSW5kZXggPSBpZGVu dGlmaWVyLT5leGlzdGluZ0hhc2goKSAmIGNvbXBhY3RIYXNoU2l6ZU1hc2s7CisgICAgICAgIFN0 cmluZ0ltcGwmIGlkZW50aWZpZXIgPSBJZGVudGlmaWVyOjphZGQoJnZtLCB2YWx1ZXNbaV0ua2V5 KS5sZWFrUmVmKCk7CisgICAgICAgIGludCBoYXNoSW5kZXggPSBpZGVudGlmaWVyLmV4aXN0aW5n SGFzaCgpICYgY29tcGFjdEhhc2hTaXplTWFzazsKICAgICAgICAgSGFzaEVudHJ5KiBlbnRyeSA9 ICZlbnRyaWVzW2hhc2hJbmRleF07CiAKICAgICAgICAgaWYgKGVudHJ5LT5rZXkoKSkgewpAQCAt NDcsNyArNDcsNyBAQCB2b2lkIEhhc2hUYWJsZTo6Y3JlYXRlVGFibGUoVk0mIHZtKSBjb25zdAog ICAgICAgICAgICAgZW50cnkgPSBlbnRyeS0+bmV4dCgpOwogICAgICAgICB9CiAKLSAgICAgICAg ZW50cnktPmluaXRpYWxpemUoaWRlbnRpZmllciwgdmFsdWVzW2ldLmF0dHJpYnV0ZXMsIHZhbHVl c1tpXS52YWx1ZTEsIHZhbHVlc1tpXS52YWx1ZTIsIHZhbHVlc1tpXS5pbnRyaW5zaWMpOworICAg ICAgICBlbnRyeS0+aW5pdGlhbGl6ZSgmaWRlbnRpZmllciwgdmFsdWVzW2ldLmF0dHJpYnV0ZXMs IHZhbHVlc1tpXS52YWx1ZTEsIHZhbHVlc1tpXS52YWx1ZTIsIHZhbHVlc1tpXS5pbnRyaW5zaWMp OwogICAgIH0KICAgICB0YWJsZSA9IGVudHJpZXM7CiB9Cg==