121795 2013-09-23 10:56:45 -0700 ListHashSet should use std::reverse_iterator for reverse iterators 2013-09-23 11:30:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 932197 0 andersca 2013-09-23 10:56:45 -0700 ListHashSet should use std::reverse_iterator for reverse iterators 932204 1 212369 andersca 2013-09-23 11:12:41 -0700 Created attachment 212369 Patch 932207 2 commit-queue 2013-09-23 11:15:36 -0700 Attachment 212369 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/ListHashSet.h', u'Tools/ChangeLog', u'Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp']" exit_code: 1 Source/WTF/wtf/ListHashSet.h:78: reverse_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:79: const_reverse_iterator is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:284: difference_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:285: value_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:288: iterator_category is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:336: difference_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:337: value_type is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WTF/wtf/ListHashSet.h:340: iterator_category is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 8 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 932211 3 andersca 2013-09-23 11:30:37 -0700 Committed r156281: <http://trac.webkit.org/changeset/156281> 212369 2013-09-23 11:12:41 -0700 2013-09-23 11:13:55 -0700 Patch bug-121795-20130923111240.patch text/plain 14507 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2Mjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDJiMDExODZmMmNjM2RjYzkzOTk1ZTAx ZDIxMjIwZjRjNTk3NWQ0ZDkuLjRiYTI1Zjc2NmZlYTUwNGUxYjIxYzM5OWZkMmMyYWY1YTU5MTZk ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTMtMDktMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBMaXN0SGFzaFNldCBzaG91bGQgdXNlIHN0ZDo6 cmV2ZXJzZV9pdGVyYXRvciBmb3IgcmV2ZXJzZSBpdGVyYXRvcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTc5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdldCByaWQgb2YgdGhlIGN1c3RvbSByZXZl cnNlIGl0ZXJhdG9ycyBhbmQganVzdCB1c2Ugc3RkOjpyZXZlcnNlX2l0ZXJhdG9yIGluc3RlYWQu CisKKyAgICAgICAgKiB3dGYvTGlzdEhhc2hTZXQuaDoKKworMjAxMy0wOS0yMyAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIERlLWluZGVudCBMaXN0SGFz aFNldCBpbiBwcmVwYXJhdGlvbiBvZiBtb3JlIGNoYW5nZXMuCiAKICAgICAgICAgUnViYmVyLXN0 YW1wZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xpc3RIYXNo U2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9MaXN0SGFzaFNldC5oCmluZGV4IDhkMDRjYTZkYzYyMjA5 NDNhZGRlMDA1YzVjNDk5NTA0YTE0Yzc4ZjguLjA5ZDg5NmQxODk0ODFmNjEzOTE1M2RmODJmNmNh OGFlNWIyNDIxNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xpc3RIYXNoU2V0LmgKKysr IGIvU291cmNlL1dURi93dGYvTGlzdEhhc2hTZXQuaApAQCAtNDUsOCArNDUsNiBAQCB2b2lkIGRl bGV0ZUFsbFZhbHVlcyhjb25zdCBMaXN0SGFzaFNldDxWYWx1ZSwgaW5saW5lQ2FwYWNpdHksIEhh c2hGdW5jdGlvbnM+Jik7CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlQXJnLCBzaXplX3QgaW5s aW5lQ2FwYWNpdHksIHR5cGVuYW1lIEhhc2hBcmc+IGNsYXNzIExpc3RIYXNoU2V0SXRlcmF0b3I7 CiB0ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZywgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBl bmFtZSBIYXNoQXJnPiBjbGFzcyBMaXN0SGFzaFNldENvbnN0SXRlcmF0b3I7Ci10ZW1wbGF0ZTx0 eXBlbmFtZSBWYWx1ZUFyZywgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBIYXNoQXJn PiBjbGFzcyBMaXN0SGFzaFNldFJldmVyc2VJdGVyYXRvcjsKLXRlbXBsYXRlPHR5cGVuYW1lIFZh bHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIEhhc2hBcmc+IGNsYXNzIExp c3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0b3I7CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVl QXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+IHN0cnVjdCBMaXN0SGFzaFNldE5vZGU7CiB0ZW1w bGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZywgc2l6ZV90IGlubGluZUNhcGFjaXR5PiBzdHJ1Y3QgTGlz dEhhc2hTZXROb2RlQWxsb2NhdG9yOwpAQCAtNzcsOSArNzUsOCBAQCBwdWJsaWM6CiAgICAgdHlw ZWRlZiBMaXN0SGFzaFNldENvbnN0SXRlcmF0b3I8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0eSwg SGFzaEFyZz4gY29uc3RfaXRlcmF0b3I7CiAgICAgZnJpZW5kIGNsYXNzIExpc3RIYXNoU2V0Q29u c3RJdGVyYXRvcjxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPjsKIAotICAgIHR5 cGVkZWYgTGlzdEhhc2hTZXRSZXZlcnNlSXRlcmF0b3I8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0 eSwgSGFzaEFyZz4gcmV2ZXJzZV9pdGVyYXRvcjsKLSAgICB0eXBlZGVmIExpc3RIYXNoU2V0Q29u c3RSZXZlcnNlSXRlcmF0b3I8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0eSwgSGFzaEFyZz4gY29u c3RfcmV2ZXJzZV9pdGVyYXRvcjsKLSAgICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXRDb25zdFJl dmVyc2VJdGVyYXRvcjxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPjsKKyAgICB0 eXBlZGVmIHN0ZDo6cmV2ZXJzZV9pdGVyYXRvcjxpdGVyYXRvcj4gcmV2ZXJzZV9pdGVyYXRvcjsK KyAgICB0eXBlZGVmIHN0ZDo6cmV2ZXJzZV9pdGVyYXRvcjxjb25zdF9pdGVyYXRvcj4gY29uc3Rf cmV2ZXJzZV9pdGVyYXRvcjsKIAogICAgIHR5cGVkZWYgSGFzaFRhYmxlQWRkUmVzdWx0PGl0ZXJh dG9yPiBBZGRSZXN1bHQ7CiAKQEAgLTk5LDEwICs5NiwxMCBAQCBwdWJsaWM6CiAgICAgY29uc3Rf aXRlcmF0b3IgYmVnaW4oKSBjb25zdDsKICAgICBjb25zdF9pdGVyYXRvciBlbmQoKSBjb25zdDsK IAotICAgIHJldmVyc2VfaXRlcmF0b3IgcmJlZ2luKCk7Ci0gICAgcmV2ZXJzZV9pdGVyYXRvciBy ZW5kKCk7Ci0gICAgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciByYmVnaW4oKSBjb25zdDsKLSAgICBj b25zdF9yZXZlcnNlX2l0ZXJhdG9yIHJlbmQoKSBjb25zdDsKKyAgICByZXZlcnNlX2l0ZXJhdG9y IHJiZWdpbigpIHsgcmV0dXJuIHJldmVyc2VfaXRlcmF0b3IoZW5kKCkpOyB9CisgICAgcmV2ZXJz ZV9pdGVyYXRvciByZW5kKCkgeyByZXR1cm4gcmV2ZXJzZV9pdGVyYXRvcihiZWdpbigpKTsgfQor ICAgIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IgcmJlZ2luKCkgY29uc3QgeyByZXR1cm4gY29uc3Rf cmV2ZXJzZV9pdGVyYXRvcihlbmQoKSk7IH0KKyAgICBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yIHJl bmQoKSBjb25zdCB7IHJldHVybiBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yKGJlZ2luKCkpOyB9CiAK ICAgICBWYWx1ZVR5cGUmIGZpcnN0KCk7CiAgICAgY29uc3QgVmFsdWVUeXBlJiBmaXJzdCgpIGNv bnN0OwpAQCAtMTU2LDggKzE1Myw2IEBAIHByaXZhdGU6CiAgICAgCiAgICAgaXRlcmF0b3IgbWFr ZUl0ZXJhdG9yKE5vZGUqKTsKICAgICBjb25zdF9pdGVyYXRvciBtYWtlQ29uc3RJdGVyYXRvcihO b2RlKikgY29uc3Q7Ci0gICAgcmV2ZXJzZV9pdGVyYXRvciBtYWtlUmV2ZXJzZUl0ZXJhdG9yKE5v ZGUqKTsKLSAgICBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yIG1ha2VDb25zdFJldmVyc2VJdGVyYXRv cihOb2RlKikgY29uc3Q7CiAKICAgICBmcmllbmQgdm9pZCBkZWxldGVBbGxWYWx1ZXM8Pihjb25z dCBMaXN0SGFzaFNldCYpOwogCkBAIC0yODAsMjEgKzI3NSwyNSBAQCBwcml2YXRlOgogICAgIHR5 cGVkZWYgTGlzdEhhc2hTZXRDb25zdEl0ZXJhdG9yPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwg SGFzaEFyZz4gY29uc3RfaXRlcmF0b3I7CiAgICAgdHlwZWRlZiBMaXN0SGFzaFNldE5vZGU8VmFs dWVBcmcsIGlubGluZUNhcGFjaXR5PiBOb2RlOwogICAgIHR5cGVkZWYgVmFsdWVBcmcgVmFsdWVU eXBlOwotICAgIHR5cGVkZWYgVmFsdWVUeXBlJiBSZWZlcmVuY2VUeXBlOwotICAgIHR5cGVkZWYg VmFsdWVUeXBlKiBQb2ludGVyVHlwZTsKIAogICAgIGZyaWVuZCBjbGFzcyBMaXN0SGFzaFNldDxW YWx1ZUFyZywgaW5saW5lQ2FwYWNpdHksIEhhc2hBcmc+OwogCiAgICAgTGlzdEhhc2hTZXRJdGVy YXRvcihjb25zdCBMaXN0SGFzaFNldFR5cGUqIHNldCwgTm9kZSogcG9zaXRpb24pIDogbV9pdGVy YXRvcihzZXQsIHBvc2l0aW9uKSB7IH0KIAogcHVibGljOgorICAgIHR5cGVkZWYgcHRyZGlmZl90 IGRpZmZlcmVuY2VfdHlwZTsKKyAgICB0eXBlZGVmIFZhbHVlVHlwZSB2YWx1ZV90eXBlOworICAg IHR5cGVkZWYgVmFsdWVUeXBlKiBwb2ludGVyOworICAgIHR5cGVkZWYgVmFsdWVUeXBlJiByZWZl cmVuY2U7CisgICAgdHlwZWRlZiBzdGQ6OmJpZGlyZWN0aW9uYWxfaXRlcmF0b3JfdGFnIGl0ZXJh dG9yX2NhdGVnb3J5OworCiAgICAgTGlzdEhhc2hTZXRJdGVyYXRvcigpIHsgfQogCiAgICAgLy8g ZGVmYXVsdCBjb3B5LCBhc3NpZ25tZW50IGFuZCBkZXN0cnVjdG9yIGFyZSBPSwogCi0gICAgUG9p bnRlclR5cGUgZ2V0KCkgY29uc3QgeyByZXR1cm4gY29uc3RfY2FzdDxQb2ludGVyVHlwZT4obV9p dGVyYXRvci5nZXQoKSk7IH0KLSAgICBSZWZlcmVuY2VUeXBlIG9wZXJhdG9yKigpIGNvbnN0IHsg cmV0dXJuICpnZXQoKTsgfQotICAgIFBvaW50ZXJUeXBlIG9wZXJhdG9yLT4oKSBjb25zdCB7IHJl dHVybiBnZXQoKTsgfQorICAgIFZhbHVlVHlwZSogZ2V0KCkgY29uc3QgeyByZXR1cm4gY29uc3Rf Y2FzdDxWYWx1ZVR5cGUqPihtX2l0ZXJhdG9yLmdldCgpKTsgfQorICAgIFZhbHVlVHlwZSYgb3Bl cmF0b3IqKCkgY29uc3QgeyByZXR1cm4gKmdldCgpOyB9CisgICAgVmFsdWVUeXBlKiBvcGVyYXRv ci0+KCkgY29uc3QgeyByZXR1cm4gZ2V0KCk7IH0KIAogICAgIGl0ZXJhdG9yJiBvcGVyYXRvcisr KCkgeyArK21faXRlcmF0b3I7IHJldHVybiAqdGhpczsgfQogCkBAIC0zMjMsOCArMzIyLDYgQEAg cHJpdmF0ZToKICAgICB0eXBlZGVmIExpc3RIYXNoU2V0Q29uc3RJdGVyYXRvcjxWYWx1ZUFyZywg aW5saW5lQ2FwYWNpdHksIEhhc2hBcmc+IGNvbnN0X2l0ZXJhdG9yOwogICAgIHR5cGVkZWYgTGlz dEhhc2hTZXROb2RlPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eT4gTm9kZTsKICAgICB0eXBlZGVm IFZhbHVlQXJnIFZhbHVlVHlwZTsKLSAgICB0eXBlZGVmIGNvbnN0IFZhbHVlVHlwZSYgUmVmZXJl bmNlVHlwZTsKLSAgICB0eXBlZGVmIGNvbnN0IFZhbHVlVHlwZSogUG9pbnRlclR5cGU7CiAKICAg ICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXQ8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5LCBIYXNo QXJnPjsKICAgICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXRJdGVyYXRvcjxWYWx1ZUFyZywgaW5s aW5lQ2FwYWNpdHksIEhhc2hBcmc+OwpAQCAtMzM2LDE2ICszMzMsMjMgQEAgcHJpdmF0ZToKICAg ICB9CiAKIHB1YmxpYzoKKyAgICB0eXBlZGVmIHB0cmRpZmZfdCBkaWZmZXJlbmNlX3R5cGU7Cisg ICAgdHlwZWRlZiBjb25zdCBWYWx1ZVR5cGUgdmFsdWVfdHlwZTsKKyAgICB0eXBlZGVmIGNvbnN0 IFZhbHVlVHlwZSogcG9pbnRlcjsKKyAgICB0eXBlZGVmIGNvbnN0IFZhbHVlVHlwZSYgcmVmZXJl bmNlOworICAgIHR5cGVkZWYgc3RkOjpiaWRpcmVjdGlvbmFsX2l0ZXJhdG9yX3RhZyBpdGVyYXRv cl9jYXRlZ29yeTsKKwogICAgIExpc3RIYXNoU2V0Q29uc3RJdGVyYXRvcigpCiAgICAgewogICAg IH0KIAotICAgIFBvaW50ZXJUeXBlIGdldCgpIGNvbnN0CisgICAgY29uc3QgVmFsdWVUeXBlKiBn ZXQoKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0dXJuICZtX3Bvc2l0aW9uLT5tX3ZhbHVlOwog ICAgIH0KLSAgICBSZWZlcmVuY2VUeXBlIG9wZXJhdG9yKigpIGNvbnN0IHsgcmV0dXJuICpnZXQo KTsgfQotICAgIFBvaW50ZXJUeXBlIG9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiBnZXQoKTsg fQorCisgICAgY29uc3QgVmFsdWVUeXBlJiBvcGVyYXRvciooKSBjb25zdCB7IHJldHVybiAqZ2V0 KCk7IH0KKyAgICBjb25zdCBWYWx1ZVR5cGUqIG9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiBn ZXQoKTsgfQogCiAgICAgY29uc3RfaXRlcmF0b3ImIG9wZXJhdG9yKysoKQogICAgIHsKQEAgLTM4 NSwxMTggKzM4OSw2IEBAIHByaXZhdGU6CiAgICAgTm9kZSogbV9wb3NpdGlvbjsKIH07CiAKLXRl bXBsYXRlPHR5cGVuYW1lIFZhbHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1l IEhhc2hBcmc+IGNsYXNzIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yIHsKLXByaXZhdGU6Ci0g ICAgdHlwZWRlZiBMaXN0SGFzaFNldDxWYWx1ZUFyZywgaW5saW5lQ2FwYWNpdHksIEhhc2hBcmc+ IExpc3RIYXNoU2V0VHlwZTsKLSAgICB0eXBlZGVmIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9y PFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwgSGFzaEFyZz4gcmV2ZXJzZV9pdGVyYXRvcjsKLSAg ICB0eXBlZGVmIExpc3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0b3I8VmFsdWVBcmcsIGlubGlu ZUNhcGFjaXR5LCBIYXNoQXJnPiBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yOwotICAgIHR5cGVkZWYg TGlzdEhhc2hTZXROb2RlPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eT4gTm9kZTsKLSAgICB0eXBl ZGVmIFZhbHVlQXJnIFZhbHVlVHlwZTsKLSAgICB0eXBlZGVmIFZhbHVlVHlwZSYgUmVmZXJlbmNl VHlwZTsKLSAgICB0eXBlZGVmIFZhbHVlVHlwZSogUG9pbnRlclR5cGU7Ci0KLSAgICBmcmllbmQg Y2xhc3MgTGlzdEhhc2hTZXQ8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPjsKLQot ICAgIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yKGNvbnN0IExpc3RIYXNoU2V0VHlwZSogc2V0 LCBOb2RlKiBwb3NpdGlvbikgOiBtX2l0ZXJhdG9yKHNldCwgcG9zaXRpb24pIHsgfQotCi1wdWJs aWM6Ci0gICAgTGlzdEhhc2hTZXRSZXZlcnNlSXRlcmF0b3IoKSB7IH0KLQotICAgIC8vIGRlZmF1 bHQgY29weSwgYXNzaWdubWVudCBhbmQgZGVzdHJ1Y3RvciBhcmUgT0sKLQotICAgIFBvaW50ZXJU eXBlIGdldCgpIGNvbnN0IHsgcmV0dXJuIGNvbnN0X2Nhc3Q8UG9pbnRlclR5cGU+KG1faXRlcmF0 b3IuZ2V0KCkpOyB9Ci0gICAgUmVmZXJlbmNlVHlwZSBvcGVyYXRvciooKSBjb25zdCB7IHJldHVy biAqZ2V0KCk7IH0KLSAgICBQb2ludGVyVHlwZSBvcGVyYXRvci0+KCkgY29uc3QgeyByZXR1cm4g Z2V0KCk7IH0KLQotICAgIHJldmVyc2VfaXRlcmF0b3ImIG9wZXJhdG9yKysoKSB7ICsrbV9pdGVy YXRvcjsgcmV0dXJuICp0aGlzOyB9Ci0KLSAgICAvLyBwb3N0Zml4ICsrIGludGVudGlvbmFsbHkg b21pdHRlZAotCi0gICAgcmV2ZXJzZV9pdGVyYXRvciYgb3BlcmF0b3ItLSgpIHsgLS1tX2l0ZXJh dG9yOyByZXR1cm4gKnRoaXM7IH0KLQotICAgIC8vIHBvc3RmaXggLS0gaW50ZW50aW9uYWxseSBv bWl0dGVkCi0KLSAgICAvLyBDb21wYXJpc29uLgotICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBy ZXZlcnNlX2l0ZXJhdG9yJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9pdGVyYXRvciA9PSBvdGhl ci5tX2l0ZXJhdG9yOyB9Ci0gICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IHJldmVyc2VfaXRlcmF0 b3ImIG90aGVyKSBjb25zdCB7IHJldHVybiBtX2l0ZXJhdG9yICE9IG90aGVyLm1faXRlcmF0b3I7 IH0KLQotICAgIG9wZXJhdG9yIGNvbnN0X3JldmVyc2VfaXRlcmF0b3IoKSBjb25zdCB7IHJldHVy biBtX2l0ZXJhdG9yOyB9Ci0KLXByaXZhdGU6Ci0gICAgTm9kZSogbm9kZSgpIHsgcmV0dXJuIG1f aXRlcmF0b3Iubm9kZSgpOyB9Ci0KLSAgICBjb25zdF9yZXZlcnNlX2l0ZXJhdG9yIG1faXRlcmF0 b3I7Ci19OwotCi10ZW1wbGF0ZTx0eXBlbmFtZSBWYWx1ZUFyZywgc2l6ZV90IGlubGluZUNhcGFj aXR5LCB0eXBlbmFtZSBIYXNoQXJnPiBjbGFzcyBMaXN0SGFzaFNldENvbnN0UmV2ZXJzZUl0ZXJh dG9yIHsKLXByaXZhdGU6Ci0gICAgdHlwZWRlZiBMaXN0SGFzaFNldDxWYWx1ZUFyZywgaW5saW5l Q2FwYWNpdHksIEhhc2hBcmc+IExpc3RIYXNoU2V0VHlwZTsKLSAgICB0eXBlZGVmIExpc3RIYXNo U2V0UmV2ZXJzZUl0ZXJhdG9yPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0eSwgSGFzaEFyZz4gcmV2 ZXJzZV9pdGVyYXRvcjsKLSAgICB0eXBlZGVmIExpc3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0 b3I8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPiBjb25zdF9yZXZlcnNlX2l0ZXJh dG9yOwotICAgIHR5cGVkZWYgTGlzdEhhc2hTZXROb2RlPFZhbHVlQXJnLCBpbmxpbmVDYXBhY2l0 eT4gTm9kZTsKLSAgICB0eXBlZGVmIFZhbHVlQXJnIFZhbHVlVHlwZTsKLSAgICB0eXBlZGVmIGNv bnN0IFZhbHVlVHlwZSYgUmVmZXJlbmNlVHlwZTsKLSAgICB0eXBlZGVmIGNvbnN0IFZhbHVlVHlw ZSogUG9pbnRlclR5cGU7Ci0KLSAgICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXQ8VmFsdWVBcmcs IGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPjsKLSAgICBmcmllbmQgY2xhc3MgTGlzdEhhc2hTZXRS ZXZlcnNlSXRlcmF0b3I8VmFsdWVBcmcsIGlubGluZUNhcGFjaXR5LCBIYXNoQXJnPjsKLQotICAg IExpc3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0b3IoY29uc3QgTGlzdEhhc2hTZXRUeXBlKiBz ZXQsIE5vZGUqIHBvc2l0aW9uKQotICAgICAgICA6IG1fc2V0KHNldCkKLSAgICAgICAgLCBtX3Bv c2l0aW9uKHBvc2l0aW9uKQotICAgIHsKLSAgICB9Ci0KLXB1YmxpYzoKLSAgICBMaXN0SGFzaFNl dENvbnN0UmV2ZXJzZUl0ZXJhdG9yKCkKLSAgICB7Ci0gICAgfQotCi0gICAgUG9pbnRlclR5cGUg Z2V0KCkgY29uc3QKLSAgICB7Ci0gICAgICAgIHJldHVybiAmbV9wb3NpdGlvbi0+bV92YWx1ZTsK LSAgICB9Ci0gICAgUmVmZXJlbmNlVHlwZSBvcGVyYXRvciooKSBjb25zdCB7IHJldHVybiAqZ2V0 KCk7IH0KLSAgICBQb2ludGVyVHlwZSBvcGVyYXRvci0+KCkgY29uc3QgeyByZXR1cm4gZ2V0KCk7 IH0KLQotICAgIGNvbnN0X3JldmVyc2VfaXRlcmF0b3ImIG9wZXJhdG9yKysoKQotICAgIHsKLSAg ICAgICAgQVNTRVJUKG1fcG9zaXRpb24gIT0gMCk7Ci0gICAgICAgIG1fcG9zaXRpb24gPSBtX3Bv c2l0aW9uLT5tX3ByZXY7Ci0gICAgICAgIHJldHVybiAqdGhpczsKLSAgICB9Ci0KLSAgICAvLyBw b3N0Zml4ICsrIGludGVudGlvbmFsbHkgb21pdHRlZAotCi0gICAgY29uc3RfcmV2ZXJzZV9pdGVy YXRvciYgb3BlcmF0b3ItLSgpCi0gICAgewotICAgICAgICBBU1NFUlQobV9wb3NpdGlvbiAhPSBt X3NldC0+bV90YWlsKTsKLSAgICAgICAgaWYgKCFtX3Bvc2l0aW9uKQotICAgICAgICAgICAgbV9w b3NpdGlvbiA9IG1fc2V0LT5tX2hlYWQ7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fcG9z aXRpb24gPSBtX3Bvc2l0aW9uLT5tX25leHQ7Ci0gICAgICAgIHJldHVybiAqdGhpczsKLSAgICB9 Ci0KLSAgICAvLyBwb3N0Zml4IC0tIGludGVudGlvbmFsbHkgb21pdHRlZAotCi0gICAgLy8gQ29t cGFyaXNvbi4KLSAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgY29uc3RfcmV2ZXJzZV9pdGVyYXRv ciYgb3RoZXIpIGNvbnN0Ci0gICAgewotICAgICAgICByZXR1cm4gbV9wb3NpdGlvbiA9PSBvdGhl ci5tX3Bvc2l0aW9uOwotICAgIH0KLSAgICBib29sIG9wZXJhdG9yIT0oY29uc3QgY29uc3RfcmV2 ZXJzZV9pdGVyYXRvciYgb3RoZXIpIGNvbnN0Ci0gICAgewotICAgICAgICByZXR1cm4gbV9wb3Np dGlvbiAhPSBvdGhlci5tX3Bvc2l0aW9uOwotICAgIH0KLQotcHJpdmF0ZToKLSAgICBOb2RlKiBu b2RlKCkgeyByZXR1cm4gbV9wb3NpdGlvbjsgfQotCi0gICAgY29uc3QgTGlzdEhhc2hTZXRUeXBl KiBtX3NldDsKLSAgICBOb2RlKiBtX3Bvc2l0aW9uOwotfTsKLQogdGVtcGxhdGU8dHlwZW5hbWUg SGFzaEZ1bmN0aW9ucz4KIHN0cnVjdCBMaXN0SGFzaFNldFRyYW5zbGF0b3IgewogICAgIHRlbXBs YXRlPHR5cGVuYW1lIFQ+IHN0YXRpYyB1bnNpZ25lZCBoYXNoKGNvbnN0IFQmIGtleSkgeyByZXR1 cm4gSGFzaEZ1bmN0aW9uczo6aGFzaChrZXkpOyB9CkBAIC01OTIsMzAgKzQ4NCw2IEBAIGlubGlu ZSB0eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmNvbnN0X2l0ZXJh dG9yIExpc3RIYXNoU2V0PFQsCiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxp bmVDYXBhY2l0eSwgdHlwZW5hbWUgVT4KLWlubGluZSB0eXBlbmFtZSBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46OnJldmVyc2VfaXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5l Q2FwYWNpdHksIFU+OjpyYmVnaW4oKQotewotICAgIHJldHVybiBtYWtlUmV2ZXJzZUl0ZXJhdG9y KG1fdGFpbCk7IAotfQotCi10ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNp dHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2Fw YWNpdHksIFU+OjpyZXZlcnNlX2l0ZXJhdG9yIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5 LCBVPjo6cmVuZCgpCi17Ci0gICAgcmV0dXJuIG1ha2VSZXZlcnNlSXRlcmF0b3IoMCk7Ci19Ci0K LXRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlwZW5hbWUgVT4K LWlubGluZSB0eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmNvbnN0 X3JldmVyc2VfaXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpyYmVn aW4oKSBjb25zdAotewotICAgIHJldHVybiBtYWtlQ29uc3RSZXZlcnNlSXRlcmF0b3IobV90YWls KTsgCi19Ci0KLXRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eSwgdHlw ZW5hbWUgVT4KLWlubGluZSB0eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwg VT46OmNvbnN0X3JldmVyc2VfaXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHks IFU+OjpyZW5kKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbWFrZUNvbnN0UmV2ZXJzZUl0ZXJhdG9y KDApOyAKLX0KLQotdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0 eXBlbmFtZSBVPgogaW5saW5lIFQmIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6 Zmlyc3QoKQogewogICAgIEFTU0VSVCghaXNFbXB0eSgpKTsKQEAgLTg4OCwxOCArNzU2LDYgQEAg dm9pZCBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmRlbGV0ZUFsbE5vZGVzKCkK IH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFt ZSBVPgotaW5saW5lIExpc3RIYXNoU2V0UmV2ZXJzZUl0ZXJhdG9yPFQsIGlubGluZUNhcGFjaXR5 LCBVPiBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46Om1ha2VSZXZlcnNlSXRlcmF0 b3IoTm9kZSogcG9zaXRpb24pIAotewotICAgIHJldHVybiBMaXN0SGFzaFNldFJldmVyc2VJdGVy YXRvcjxULCBpbmxpbmVDYXBhY2l0eSwgVT4odGhpcywgcG9zaXRpb24pOyAKLX0KLQotdGVtcGxh dGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotaW5saW5l IExpc3RIYXNoU2V0Q29uc3RSZXZlcnNlSXRlcmF0b3I8VCwgaW5saW5lQ2FwYWNpdHksIFU+IExp c3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6bWFrZUNvbnN0UmV2ZXJzZUl0ZXJhdG9y KE5vZGUqIHBvc2l0aW9uKSBjb25zdAoteyAKLSAgICByZXR1cm4gTGlzdEhhc2hTZXRDb25zdFJl dmVyc2VJdGVyYXRvcjxULCBpbmxpbmVDYXBhY2l0eSwgVT4odGhpcywgcG9zaXRpb24pOyAKLX0K LQotdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBV PgogaW5saW5lIExpc3RIYXNoU2V0SXRlcmF0b3I8VCwgaW5saW5lQ2FwYWNpdHksIFU+IExpc3RI YXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6bWFrZUl0ZXJhdG9yKE5vZGUqIHBvc2l0aW9u KSAKIHsKICAgICByZXR1cm4gTGlzdEhhc2hTZXRJdGVyYXRvcjxULCBpbmxpbmVDYXBhY2l0eSwg VT4odGhpcywgcG9zaXRpb24pOyAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAxMWFkYTA4YWUwNDI4YjQwYjg5NjFlY2JkYWVhZGMxZmU0OTkwOGEz Li5mNzE4YmJjYTYxZmIzZjJlZThhMTQ3ODZmNDAwZWRlMzQ0ZjcyNTIwIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIw MTMtMDktMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAg ICBMaXN0SGFzaFNldCBzaG91bGQgdXNlIHN0ZDo6cmV2ZXJzZV9pdGVyYXRvciBmb3IgcmV2ZXJz ZSBpdGVyYXRvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyMTc5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCB0ZXN0IGZvciByZXZlcnNlIGl0ZXJhdG9ycy4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV1RGL0xpc3RIYXNoU2V0LmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6 OlRFU1QpOgorCiAyMDEzLTA5LTIzICBLcnp5c3p0b2YgQ3plY2ggIDxrLmN6ZWNoQHNhbXN1bmcu Y29tPgogCiAgICAgICAgIFtFRkxdIGFjY2Vzc2liaWxpdHkvYXJpYS1pbnZhbGlkIGlzIGZhaWxp bmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0xpc3RIYXNoU2V0 LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0xpc3RIYXNoU2V0LmNwcAppbmRl eCA3NTc5YzQyOTkwNTczZmMxYTYxYzRhNGRjYWUzMTRkNjI1ZGMxNDM5Li5iOTQ2ZmEwN2UyNzdh M2FjNDQzMjNlNTY5MWFkYjc0ZTE0MTA3Y2QwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dURi9MaXN0SGFzaFNldC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XVEYvTGlzdEhhc2hTZXQuY3BwCkBAIC0yOSw3ICsyOSw3IEBACiAKIG5hbWVzcGFjZSBU ZXN0V2ViS2l0QVBJIHsKIAotVEVTVChXVEYsIExpc3RIYXNoU2V0UmVtb3ZlRmlyc3QpCitURVNU KFdURl9MaXN0SGFzaFNldCwgUmVtb3ZlRmlyc3QpCiB7CiAgICAgTGlzdEhhc2hTZXQ8aW50PiBs aXN0OwogICAgIGxpc3QuYWRkKDEpOwpAQCAtNDgsNyArNDgsNyBAQCBURVNUKFdURiwgTGlzdEhh c2hTZXRSZW1vdmVGaXJzdCkKICAgICBBU1NFUlRfVFJVRShsaXN0LmlzRW1wdHkoKSk7CiB9CiAK LVRFU1QoV1RGLCBMaXN0SGFzaFNldEFwcGVuZE9yTW92ZVRvTGFzdE5ld0l0ZW1zKQorVEVTVChX VEZfTGlzdEhhc2hTZXQsIEFwcGVuZE9yTW92ZVRvTGFzdE5ld0l0ZW1zKQogewogICAgIExpc3RI YXNoU2V0PGludD4gbGlzdDsKICAgICBMaXN0SGFzaFNldDxpbnQ+OjpBZGRSZXN1bHQgcmVzdWx0 ID0gbGlzdC5hcHBlbmRPck1vdmVUb0xhc3QoMSk7CkBAIC03MCw3ICs3MCw3IEBAIFRFU1QoV1RG LCBMaXN0SGFzaFNldEFwcGVuZE9yTW92ZVRvTGFzdE5ld0l0ZW1zKQogICAgICsraXRlcmF0b3I7 CiB9CiAKLVRFU1QoV1RGLCBMaXN0SGFzaFNldEFwcGVuZE9yTW92ZVRvTGFzdFdpdGhEdXBsaWNh dGVzKQorVEVTVChXVEZfTGlzdEhhc2hTZXQsIEFwcGVuZE9yTW92ZVRvTGFzdFdpdGhEdXBsaWNh dGVzKQogewogICAgIExpc3RIYXNoU2V0PGludD4gbGlzdDsKIApAQCAtMTA5LDcgKzEwOSw3IEBA IFRFU1QoV1RGLCBMaXN0SGFzaFNldEFwcGVuZE9yTW92ZVRvTGFzdFdpdGhEdXBsaWNhdGVzKQog ICAgICsraXRlcmF0b3I7CiB9CiAKLVRFU1QoV1RGLCBMaXN0SGFzaFNldFByZXBlbmRPck1vdmVU b0xhc3ROZXdJdGVtcykKK1RFU1QoV1RGX0xpc3RIYXNoU2V0LCBQcmVwZW5kT3JNb3ZlVG9MYXN0 TmV3SXRlbXMpCiB7CiAgICAgTGlzdEhhc2hTZXQ8aW50PiBsaXN0OwogICAgIExpc3RIYXNoU2V0 PGludD46OkFkZFJlc3VsdCByZXN1bHQgPSBsaXN0LnByZXBlbmRPck1vdmVUb0ZpcnN0KDEpOwpA QCAtMTMxLDcgKzEzMSw3IEBAIFRFU1QoV1RGLCBMaXN0SGFzaFNldFByZXBlbmRPck1vdmVUb0xh c3ROZXdJdGVtcykKICAgICArK2l0ZXJhdG9yOwogfQogCi1URVNUKFdURiwgTGlzdEhhc2hTZXRQ cmVwZW5kT3JNb3ZlVG9MYXN0V2l0aER1cGxpY2F0ZXMpCitURVNUKFdURl9MaXN0SGFzaFNldCwg UHJlcGVuZE9yTW92ZVRvTGFzdFdpdGhEdXBsaWNhdGVzKQogewogICAgIExpc3RIYXNoU2V0PGlu dD4gbGlzdDsKIApAQCAtMTcwLDQgKzE3MCwzMyBAQCBURVNUKFdURiwgTGlzdEhhc2hTZXRQcmVw ZW5kT3JNb3ZlVG9MYXN0V2l0aER1cGxpY2F0ZXMpCiAgICAgKytpdGVyYXRvcjsKIH0KIAorVEVT VChXVEZfTGlzdEhhc2hTZXQsIFJldmVyc2VJdGVyYXRvcikKK3sKKyAgICBMaXN0SGFzaFNldDxp bnQ+IGxpc3Q7CisKKyAgICBsaXN0LmFkZCgxKTsKKyAgICBsaXN0LmFkZCgyKTsKKyAgICBsaXN0 LmFkZCgzKTsKKworICAgIGF1dG8gaXQgPSBsaXN0LnJiZWdpbigpOworICAgIEFTU0VSVF9FUSgz LCAqaXQpOworICAgICsraXQ7CisgICAgQVNTRVJUX0VRKDIsICppdCk7CisgICAgKytpdDsKKyAg ICBBU1NFUlRfRVEoMSwgKml0KTsKKyAgICArK2l0OworICAgIEFTU0VSVF9UUlVFKGl0ID09IGxp c3QucmVuZCgpKTsKKworICAgIGNvbnN0IGF1dG8mIGxpc3RIYXNoU2V0ID0gbGlzdDsKKworICAg IGF1dG8gY29uc3RJdCA9IGxpc3RIYXNoU2V0LnJiZWdpbigpOworICAgIEFTU0VSVF9FUSgzLCAq Y29uc3RJdCk7CisgICAgKytjb25zdEl0OworICAgIEFTU0VSVF9FUSgyLCAqY29uc3RJdCk7Cisg ICAgKytjb25zdEl0OworICAgIEFTU0VSVF9FUSgxLCAqY29uc3RJdCk7CisgICAgKytjb25zdEl0 OworICAgIEFTU0VSVF9UUlVFKGNvbnN0SXQgPT0gbGlzdEhhc2hTZXQucmVuZCgpKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSQo=