187444 2018-07-08 00:35:34 -0700 PropertyTable::skipDeletedEntries() should guard against iterating past the table end. 2018-07-08 02:54:59 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam commit-queue fpizlo keith_miller msaboff rmorisset saam tzagallo webkit-bug-importer oldest_to_newest 1440206 0 mark.lam 2018-07-08 00:35:34 -0700 PropertyTable supports C++ iteration by offering begin() and end() methods, and an iterator class. The begin() methods and the iterator operator++() method uses PropertyTable::skipDeletedEntries() to skip over deleted entries in the table. However, PropertyTable::skipDeletedEntries() does not prevent the iteration pointer from being incremented past the end of the table. As a result, we can iterate past the end of the table. Note that the C++ iteration protocol tests for the iterator not being equal to the end() value. It does not do a <= test. If the iterator ever shoots past end, the loop will effectively not terminate. This issue can manifest if and only if the last entry in the table is a deleted one. <rdar://problem/41282849> 1440207 1 344540 mark.lam 2018-07-08 01:11:47 -0700 Created attachment 344540 proposed patch. 1440208 2 344541 mark.lam 2018-07-08 01:14:48 -0700 Created attachment 344541 proposed patch. 1440209 3 344541 saam 2018-07-08 01:58:58 -0700 Comment on attachment 344541 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=344541&action=review > Source/JavaScriptCore/ChangeLog:18 > + This issue can manifest if and only if the last entry in the table is a deleted Crazy 1440211 4 344541 mark.lam 2018-07-08 02:27:25 -0700 Comment on attachment 344541 proposed patch. Thanks for the review. Landing. 1440216 5 344541 commit-queue 2018-07-08 02:54:57 -0700 Comment on attachment 344541 proposed patch. Clearing flags on attachment: 344541 Committed r233625: <https://trac.webkit.org/changeset/233625> 1440217 6 commit-queue 2018-07-08 02:54:59 -0700 All reviewed patches have been landed. Closing bug. 344540 2018-07-08 01:11:47 -0700 2018-07-08 01:14:48 -0700 proposed patch. bug-187444.patch text/plain 5403 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMzNjI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDE4LTA3LTA4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBQ cm9wZXJ0eVRhYmxlOjpza2lwRGVsZXRlZEVudHJpZXMoKSBzaG91bGQgZ3VhcmQgYWdhaW5zdCBp dGVyYXRpbmcgcGFzdCB0aGUgdGFibGUgZW5kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NDQ0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTI4 Mjg0OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ cm9wZXJ0eVRhYmxlIHN1cHBvcnRzIEMrKyBpdGVyYXRpb24gYnkgb2ZmZXJpbmcgYmVnaW4oKSBh bmQgZW5kKCkgbWV0aG9kcywgYW5kCisgICAgICAgIGFuIGl0ZXJhdG9yIGNsYXNzLiAgVGhlIGJl Z2luKCkgbWV0aG9kcyBhbmQgdGhlIGl0ZXJhdG9yIG9wZXJhdG9yKysoKSBtZXRob2QgdXNlcwor ICAgICAgICBQcm9wZXJ0eVRhYmxlOjpza2lwRGVsZXRlZEVudHJpZXMoKSB0byBza2lwIG92ZXIg ZGVsZXRlZCBlbnRyaWVzIGluIHRoZSB0YWJsZS4KKyAgICAgICAgSG93ZXZlciwgUHJvcGVydHlU YWJsZTo6c2tpcERlbGV0ZWRFbnRyaWVzKCkgZG9lcyBub3QgcHJldmVudCB0aGUgaXRlcmF0aW9u CisgICAgICAgIHBvaW50ZXIgZnJvbSBiZWluZyBpbmNyZW1lbnRlZCBwYXN0IHRoZSBlbmQgb2Yg dGhlIHRhYmxlLiAgQXMgYSByZXN1bHQsIHdlIGNhbgorICAgICAgICBpdGVyYXRlIHBhc3QgdGhl IGVuZCBvZiB0aGUgdGFibGUuICBOb3RlIHRoYXQgdGhlIEMrKyBpdGVyYXRpb24gcHJvdG9jb2wg dGVzdHMKKyAgICAgICAgZm9yIHRoZSBpdGVyYXRvciBub3QgYmVpbmcgZXF1YWwgdG8gdGhlIGVu ZCgpIHZhbHVlLiAgSXQgZG9lcyBub3QgZG8gYSA8PSB0ZXN0LgorICAgICAgICBJZiB0aGUgaXRl cmF0b3IgZXZlciBzaG9vdHMgcGFzdCBlbmQsIHRoZSBsb29wIHdpbGwgZWZmZWN0aXZlbHkgbm90 IHRlcm1pbmF0ZS4KKworICAgICAgICBUaGlzIGlzc3VlIGNhbiBtYW5pZmVzdCBpZiBhbmQgb25s eSBpZiB0aGUgbGFzdCBlbnRyeSBpbiB0aGUgdGFibGUgaXMgYSBkZWxldGVkCisgICAgICAgIG9u ZSwgYW5kIHRoZSBrZXkgZmllbGQgb2YgdGhlIFByb3BlcnR5TWFwRW50cnkgc2hhcGVkIHNwYWNl IGF0IHRoZSBlbmQgb2YgdGhlCisgICAgICAgIHRhYmxlICh0aGUgb25lIGJleW9uZCB0aGUgbGFz dCkgY29udGFpbnMgYSAxIChpLmUuIFBST1BFUlRZX01BUF9ERUxFVEVEX0VOVFJZX0tFWSkKKyAg ICAgICAgdmFsdWUuCisKKyAgICAgICAgTm8gdGVzdCBiZWNhdXNlIG1hbmlmZXN0aW5nIHRoaXMg aXNzdWUgcmVxdWlyZXMgdW5jb250cm9sbGFibGUgaGFwcGVuc3RhbmNlIHdoZXJlCisgICAgICAg IG1lbW9yeSBqdXN0IGJleW9uZCB0aGUgZW5kIG9mIHRoZSB0YWJsZSBsb29rcyBsaWtlIGEgZGVs ZXRlZCBlbnRyeS4KKworICAgICAgICAqIHJ1bnRpbWUvUHJvcGVydHlNYXBIYXNoVGFibGUuaDoK KyAgICAgICAgKEpTQzo6UHJvcGVydHlUYWJsZTo6YmVnaW4pOgorICAgICAgICAoSlNDOjpQcm9w ZXJ0eVRhYmxlOjplbmQpOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVRhYmxlOjpiZWdpbiBjb25z dCk6CisgICAgICAgIChKU0M6OlByb3BlcnR5VGFibGU6OmVuZCBjb25zdCk6CisgICAgICAgIChK U0M6OlByb3BlcnR5VGFibGU6OnNraXBEZWxldGVkRW50cmllcyk6CisKIDIwMTgtMDctMDcgIFl1 c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgW0pTQ10gT3B0 aW1pemUgbGF5b3V0IG9mIFN5bWJvbFRhYmxlIHRvIHJlZHVjZSBwYWRkaW5nCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hUYWJsZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxl LmgJKHJldmlzaW9uIDIzMzYyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1By b3BlcnR5TWFwSGFzaFRhYmxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTg0LDcgKzg0LDcgQEAgY2xh c3MgUHJvcGVydHlUYWJsZSBmaW5hbCA6IHB1YmxpYyBKU0NlbAogICAgIHB1YmxpYzoKICAgICAg ICAgb3JkZXJlZF9pdGVyYXRvcjxUPiYgb3BlcmF0b3IrKygpCiAgICAgICAgIHsKLSAgICAgICAg ICAgIG1fdmFsdWVQdHIgPSBza2lwRGVsZXRlZEVudHJpZXMobV92YWx1ZVB0ciArIDEpOworICAg ICAgICAgICAgbV92YWx1ZVB0ciA9IHNraXBEZWxldGVkRW50cmllcyhtX3ZhbHVlUHRyICsgMSwg bV9lbmRWYWx1ZVB0cik7CiAgICAgICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgICAgIH0KIApA QCAtMTA4LDEzICsxMDgsMTUgQEAgY2xhc3MgUHJvcGVydHlUYWJsZSBmaW5hbCA6IHB1YmxpYyBK U0NlbAogICAgICAgICAgICAgcmV0dXJuIG1fdmFsdWVQdHI7CiAgICAgICAgIH0KIAotICAgICAg ICBvcmRlcmVkX2l0ZXJhdG9yKFQqIHZhbHVlUHRyKQorICAgICAgICBvcmRlcmVkX2l0ZXJhdG9y KFQqIHZhbHVlUHRyLCBUKiBlbmRWYWx1ZVB0cikKICAgICAgICAgICAgIDogbV92YWx1ZVB0cih2 YWx1ZVB0cikKKyAgICAgICAgICAgICwgbV9lbmRWYWx1ZVB0cihlbmRWYWx1ZVB0cikKICAgICAg ICAgewogICAgICAgICB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBUKiBtX3ZhbHVlUHRyOwor ICAgICAgICBUKiBtX2VuZFZhbHVlUHRyOwogICAgIH07CiAKIHB1YmxpYzoKQEAgLTIyOCwxMiAr MjMwLDE1IEBAIHByaXZhdGU6CiAKICAgICAvLyBVc2VkIGluIGl0ZXJhdG9yIGNyZWF0aW9uL3By b2dyZXNzaW9uLgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+Ci0gICAgc3RhdGljIFQqIHNraXBE ZWxldGVkRW50cmllcyhUKiB2YWx1ZVB0cik7CisgICAgc3RhdGljIFQqIHNraXBEZWxldGVkRW50 cmllcyhUKiB2YWx1ZVB0ciwgVCogZW5kVmFsdWVQdHIpOwogCiAgICAgLy8gVGhlIHRhYmxlIG9m IHZhbHVlcyBsaWVzIGFmdGVyIHRoZSBoYXNoIGluZGV4LgogICAgIFZhbHVlVHlwZSogdGFibGUo KTsKICAgICBjb25zdCBWYWx1ZVR5cGUqIHRhYmxlKCkgY29uc3Q7CiAKKyAgICBWYWx1ZVR5cGUq IHRhYmxlRW5kKCkgeyByZXR1cm4gdGFibGUoKSArIHVzZWRDb3VudCgpOyB9CisgICAgY29uc3Qg VmFsdWVUeXBlKiB0YWJsZUVuZCgpIGNvbnN0IHsgcmV0dXJuIHRhYmxlKCkgKyB1c2VkQ291bnQo KTsgfQorCiAgICAgLy8gdG90YWwgbnVtYmVyIG9mICB1c2VkIGVudHJpZXMgaW4gdGhlIHZhbHVl cyBhcnJheSAtIGJ5IGVpdGhlciB2YWxpZCBlbnRyaWVzLCBvciBkZWxldGVkIG9uZXMuCiAgICAg dW5zaWduZWQgdXNlZENvdW50KCkgY29uc3Q7CiAKQEAgLTI1OCwyMiArMjYzLDI2IEBAIHByaXZh dGU6CiAKIGlubGluZSBQcm9wZXJ0eVRhYmxlOjppdGVyYXRvciBQcm9wZXJ0eVRhYmxlOjpiZWdp bigpCiB7Ci0gICAgcmV0dXJuIGl0ZXJhdG9yKHNraXBEZWxldGVkRW50cmllcyh0YWJsZSgpKSk7 CisgICAgYXV0byogdGFibGVFbmQgPSB0aGlzLT50YWJsZUVuZCgpOworICAgIHJldHVybiBpdGVy YXRvcihza2lwRGVsZXRlZEVudHJpZXModGFibGUoKSwgdGFibGVFbmQpLCB0YWJsZUVuZCk7CiB9 CiAKIGlubGluZSBQcm9wZXJ0eVRhYmxlOjppdGVyYXRvciBQcm9wZXJ0eVRhYmxlOjplbmQoKQog ewotICAgIHJldHVybiBpdGVyYXRvcih0YWJsZSgpICsgdXNlZENvdW50KCkpOworICAgIGF1dG8q IHRhYmxlRW5kID0gdGhpcy0+dGFibGVFbmQoKTsKKyAgICByZXR1cm4gaXRlcmF0b3IodGFibGVF bmQsIHRhYmxlRW5kKTsKIH0KIAogaW5saW5lIFByb3BlcnR5VGFibGU6OmNvbnN0X2l0ZXJhdG9y IFByb3BlcnR5VGFibGU6OmJlZ2luKCkgY29uc3QKIHsKLSAgICByZXR1cm4gY29uc3RfaXRlcmF0 b3Ioc2tpcERlbGV0ZWRFbnRyaWVzKHRhYmxlKCkpKTsKKyAgICBhdXRvKiB0YWJsZUVuZCA9IHRo aXMtPnRhYmxlRW5kKCk7CisgICAgcmV0dXJuIGNvbnN0X2l0ZXJhdG9yKHNraXBEZWxldGVkRW50 cmllcyh0YWJsZSgpLCB0YWJsZUVuZCksIHRhYmxlRW5kKTsKIH0KIAogaW5saW5lIFByb3BlcnR5 VGFibGU6OmNvbnN0X2l0ZXJhdG9yIFByb3BlcnR5VGFibGU6OmVuZCgpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGNvbnN0X2l0ZXJhdG9yKHRhYmxlKCkgKyB1c2VkQ291bnQoKSk7CisgICAgYXV0byog dGFibGVFbmQgPSB0aGlzLT50YWJsZUVuZCgpOworICAgIHJldHVybiBjb25zdF9pdGVyYXRvcih0 YWJsZUVuZCwgdGFibGVFbmQpOwogfQogCiBpbmxpbmUgUHJvcGVydHlUYWJsZTo6ZmluZF9pdGVy YXRvciBQcm9wZXJ0eVRhYmxlOjpmaW5kKGNvbnN0IEtleVR5cGUmIGtleSkKQEAgLTUyMCwxMCAr NTI5LDE4IEBAIGlubGluZSB1bnNpZ25lZCBQcm9wZXJ0eVRhYmxlOjp0YWJsZUNhcGEKIGlubGlu ZSB1bnNpZ25lZCBQcm9wZXJ0eVRhYmxlOjpkZWxldGVkRW50cnlJbmRleCgpIGNvbnN0IHsgcmV0 dXJuIHRhYmxlQ2FwYWNpdHkoKSArIDE7IH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KLWlubGlu ZSBUKiBQcm9wZXJ0eVRhYmxlOjpza2lwRGVsZXRlZEVudHJpZXMoVCogdmFsdWVQdHIpCitpbmxp bmUgVCogUHJvcGVydHlUYWJsZTo6c2tpcERlbGV0ZWRFbnRyaWVzKFQqIHZhbHVlUHRyLCBUKiBl bmRWYWx1ZVB0cikKIHsKLSAgICB3aGlsZSAodmFsdWVQdHItPmtleSA9PSBQUk9QRVJUWV9NQVBf REVMRVRFRF9FTlRSWV9LRVkpCi0gICAgICAgICsrdmFsdWVQdHI7CisgICAgaWYgKGdldGVudigi Zml4IikpIHsKKyAgICAgICAgd2hpbGUgKHZhbHVlUHRyIDwgZW5kVmFsdWVQdHIgJiYgdmFsdWVQ dHItPmtleSA9PSBQUk9QRVJUWV9NQVBfREVMRVRFRF9FTlRSWV9LRVkpCisgICAgICAgICAgICAr K3ZhbHVlUHRyOworICAgIH0gZWxzZSB7CisgICAgICAgIHdoaWxlICh2YWx1ZVB0ci0+a2V5ID09 IFBST1BFUlRZX01BUF9ERUxFVEVEX0VOVFJZX0tFWSkgeworICAgICAgICAgICAgaWYgKHZhbHVl UHRyID49IGVuZFZhbHVlUHRyKQorICAgICAgICAgICAgICAgIGRhdGFMb2dMbigiICAgbWxhbSBC SU5HTyB2YWx1ZVB0ciA+PSBlbmRWYWx1ZVB0ciIpOworICAgICAgICAgICAgKyt2YWx1ZVB0cjsK KyAgICAgICAgfQorICAgIH0KICAgICByZXR1cm4gdmFsdWVQdHI7CiB9CiAK 344541 2018-07-08 01:14:48 -0700 2018-07-08 02:54:57 -0700 proposed patch. bug-187444.patch text/plain 5109 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMzNjI0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDE4LTA3LTA4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBQ cm9wZXJ0eVRhYmxlOjpza2lwRGVsZXRlZEVudHJpZXMoKSBzaG91bGQgZ3VhcmQgYWdhaW5zdCBp dGVyYXRpbmcgcGFzdCB0aGUgdGFibGUgZW5kLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NDQ0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTI4 Mjg0OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ cm9wZXJ0eVRhYmxlIHN1cHBvcnRzIEMrKyBpdGVyYXRpb24gYnkgb2ZmZXJpbmcgYmVnaW4oKSBh bmQgZW5kKCkgbWV0aG9kcywgYW5kCisgICAgICAgIGFuIGl0ZXJhdG9yIGNsYXNzLiAgVGhlIGJl Z2luKCkgbWV0aG9kcyBhbmQgdGhlIGl0ZXJhdG9yIG9wZXJhdG9yKysoKSBtZXRob2QgdXNlcwor ICAgICAgICBQcm9wZXJ0eVRhYmxlOjpza2lwRGVsZXRlZEVudHJpZXMoKSB0byBza2lwIG92ZXIg ZGVsZXRlZCBlbnRyaWVzIGluIHRoZSB0YWJsZS4KKyAgICAgICAgSG93ZXZlciwgUHJvcGVydHlU YWJsZTo6c2tpcERlbGV0ZWRFbnRyaWVzKCkgZG9lcyBub3QgcHJldmVudCB0aGUgaXRlcmF0aW9u CisgICAgICAgIHBvaW50ZXIgZnJvbSBiZWluZyBpbmNyZW1lbnRlZCBwYXN0IHRoZSBlbmQgb2Yg dGhlIHRhYmxlLiAgQXMgYSByZXN1bHQsIHdlIGNhbgorICAgICAgICBpdGVyYXRlIHBhc3QgdGhl IGVuZCBvZiB0aGUgdGFibGUuICBOb3RlIHRoYXQgdGhlIEMrKyBpdGVyYXRpb24gcHJvdG9jb2wg dGVzdHMKKyAgICAgICAgZm9yIHRoZSBpdGVyYXRvciBub3QgYmVpbmcgZXF1YWwgdG8gdGhlIGVu ZCgpIHZhbHVlLiAgSXQgZG9lcyBub3QgZG8gYSA8PSB0ZXN0LgorICAgICAgICBJZiB0aGUgaXRl cmF0b3IgZXZlciBzaG9vdHMgcGFzdCBlbmQsIHRoZSBsb29wIHdpbGwgZWZmZWN0aXZlbHkgbm90 IHRlcm1pbmF0ZS4KKworICAgICAgICBUaGlzIGlzc3VlIGNhbiBtYW5pZmVzdCBpZiBhbmQgb25s eSBpZiB0aGUgbGFzdCBlbnRyeSBpbiB0aGUgdGFibGUgaXMgYSBkZWxldGVkCisgICAgICAgIG9u ZSwgYW5kIHRoZSBrZXkgZmllbGQgb2YgdGhlIFByb3BlcnR5TWFwRW50cnkgc2hhcGVkIHNwYWNl IGF0IHRoZSBlbmQgb2YgdGhlCisgICAgICAgIHRhYmxlICh0aGUgb25lIGJleW9uZCB0aGUgbGFz dCkgY29udGFpbnMgYSAxIChpLmUuIFBST1BFUlRZX01BUF9ERUxFVEVEX0VOVFJZX0tFWSkKKyAg ICAgICAgdmFsdWUuCisKKyAgICAgICAgTm8gdGVzdCBiZWNhdXNlIG1hbmlmZXN0aW5nIHRoaXMg aXNzdWUgcmVxdWlyZXMgdW5jb250cm9sbGFibGUgaGFwcGVuc3RhbmNlIHdoZXJlCisgICAgICAg IG1lbW9yeSBqdXN0IGJleW9uZCB0aGUgZW5kIG9mIHRoZSB0YWJsZSBsb29rcyBsaWtlIGEgZGVs ZXRlZCBlbnRyeS4KKworICAgICAgICAqIHJ1bnRpbWUvUHJvcGVydHlNYXBIYXNoVGFibGUuaDoK KyAgICAgICAgKEpTQzo6UHJvcGVydHlUYWJsZTo6YmVnaW4pOgorICAgICAgICAoSlNDOjpQcm9w ZXJ0eVRhYmxlOjplbmQpOgorICAgICAgICAoSlNDOjpQcm9wZXJ0eVRhYmxlOjpiZWdpbiBjb25z dCk6CisgICAgICAgIChKU0M6OlByb3BlcnR5VGFibGU6OmVuZCBjb25zdCk6CisgICAgICAgIChK U0M6OlByb3BlcnR5VGFibGU6OnNraXBEZWxldGVkRW50cmllcyk6CisKIDIwMTgtMDctMDcgIFl1 c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CiAKICAgICAgICAgW0pTQ10gT3B0 aW1pemUgbGF5b3V0IG9mIFN5bWJvbFRhYmxlIHRvIHJlZHVjZSBwYWRkaW5nCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eU1hcEhhc2hUYWJsZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3BlcnR5TWFwSGFzaFRhYmxl LmgJKHJldmlzaW9uIDIzMzYyNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1By b3BlcnR5TWFwSGFzaFRhYmxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTg0LDcgKzg0LDcgQEAgY2xh c3MgUHJvcGVydHlUYWJsZSBmaW5hbCA6IHB1YmxpYyBKU0NlbAogICAgIHB1YmxpYzoKICAgICAg ICAgb3JkZXJlZF9pdGVyYXRvcjxUPiYgb3BlcmF0b3IrKygpCiAgICAgICAgIHsKLSAgICAgICAg ICAgIG1fdmFsdWVQdHIgPSBza2lwRGVsZXRlZEVudHJpZXMobV92YWx1ZVB0ciArIDEpOworICAg ICAgICAgICAgbV92YWx1ZVB0ciA9IHNraXBEZWxldGVkRW50cmllcyhtX3ZhbHVlUHRyICsgMSwg bV9lbmRWYWx1ZVB0cik7CiAgICAgICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgICAgIH0KIApA QCAtMTA4LDEzICsxMDgsMTUgQEAgY2xhc3MgUHJvcGVydHlUYWJsZSBmaW5hbCA6IHB1YmxpYyBK U0NlbAogICAgICAgICAgICAgcmV0dXJuIG1fdmFsdWVQdHI7CiAgICAgICAgIH0KIAotICAgICAg ICBvcmRlcmVkX2l0ZXJhdG9yKFQqIHZhbHVlUHRyKQorICAgICAgICBvcmRlcmVkX2l0ZXJhdG9y KFQqIHZhbHVlUHRyLCBUKiBlbmRWYWx1ZVB0cikKICAgICAgICAgICAgIDogbV92YWx1ZVB0cih2 YWx1ZVB0cikKKyAgICAgICAgICAgICwgbV9lbmRWYWx1ZVB0cihlbmRWYWx1ZVB0cikKICAgICAg ICAgewogICAgICAgICB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBUKiBtX3ZhbHVlUHRyOwor ICAgICAgICBUKiBtX2VuZFZhbHVlUHRyOwogICAgIH07CiAKIHB1YmxpYzoKQEAgLTIyOCwxMiAr MjMwLDE1IEBAIHByaXZhdGU6CiAKICAgICAvLyBVc2VkIGluIGl0ZXJhdG9yIGNyZWF0aW9uL3By b2dyZXNzaW9uLgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+Ci0gICAgc3RhdGljIFQqIHNraXBE ZWxldGVkRW50cmllcyhUKiB2YWx1ZVB0cik7CisgICAgc3RhdGljIFQqIHNraXBEZWxldGVkRW50 cmllcyhUKiB2YWx1ZVB0ciwgVCogZW5kVmFsdWVQdHIpOwogCiAgICAgLy8gVGhlIHRhYmxlIG9m IHZhbHVlcyBsaWVzIGFmdGVyIHRoZSBoYXNoIGluZGV4LgogICAgIFZhbHVlVHlwZSogdGFibGUo KTsKICAgICBjb25zdCBWYWx1ZVR5cGUqIHRhYmxlKCkgY29uc3Q7CiAKKyAgICBWYWx1ZVR5cGUq IHRhYmxlRW5kKCkgeyByZXR1cm4gdGFibGUoKSArIHVzZWRDb3VudCgpOyB9CisgICAgY29uc3Qg VmFsdWVUeXBlKiB0YWJsZUVuZCgpIGNvbnN0IHsgcmV0dXJuIHRhYmxlKCkgKyB1c2VkQ291bnQo KTsgfQorCiAgICAgLy8gdG90YWwgbnVtYmVyIG9mICB1c2VkIGVudHJpZXMgaW4gdGhlIHZhbHVl cyBhcnJheSAtIGJ5IGVpdGhlciB2YWxpZCBlbnRyaWVzLCBvciBkZWxldGVkIG9uZXMuCiAgICAg dW5zaWduZWQgdXNlZENvdW50KCkgY29uc3Q7CiAKQEAgLTI1OCwyMiArMjYzLDI2IEBAIHByaXZh dGU6CiAKIGlubGluZSBQcm9wZXJ0eVRhYmxlOjppdGVyYXRvciBQcm9wZXJ0eVRhYmxlOjpiZWdp bigpCiB7Ci0gICAgcmV0dXJuIGl0ZXJhdG9yKHNraXBEZWxldGVkRW50cmllcyh0YWJsZSgpKSk7 CisgICAgYXV0byogdGFibGVFbmQgPSB0aGlzLT50YWJsZUVuZCgpOworICAgIHJldHVybiBpdGVy YXRvcihza2lwRGVsZXRlZEVudHJpZXModGFibGUoKSwgdGFibGVFbmQpLCB0YWJsZUVuZCk7CiB9 CiAKIGlubGluZSBQcm9wZXJ0eVRhYmxlOjppdGVyYXRvciBQcm9wZXJ0eVRhYmxlOjplbmQoKQog ewotICAgIHJldHVybiBpdGVyYXRvcih0YWJsZSgpICsgdXNlZENvdW50KCkpOworICAgIGF1dG8q IHRhYmxlRW5kID0gdGhpcy0+dGFibGVFbmQoKTsKKyAgICByZXR1cm4gaXRlcmF0b3IodGFibGVF bmQsIHRhYmxlRW5kKTsKIH0KIAogaW5saW5lIFByb3BlcnR5VGFibGU6OmNvbnN0X2l0ZXJhdG9y IFByb3BlcnR5VGFibGU6OmJlZ2luKCkgY29uc3QKIHsKLSAgICByZXR1cm4gY29uc3RfaXRlcmF0 b3Ioc2tpcERlbGV0ZWRFbnRyaWVzKHRhYmxlKCkpKTsKKyAgICBhdXRvKiB0YWJsZUVuZCA9IHRo aXMtPnRhYmxlRW5kKCk7CisgICAgcmV0dXJuIGNvbnN0X2l0ZXJhdG9yKHNraXBEZWxldGVkRW50 cmllcyh0YWJsZSgpLCB0YWJsZUVuZCksIHRhYmxlRW5kKTsKIH0KIAogaW5saW5lIFByb3BlcnR5 VGFibGU6OmNvbnN0X2l0ZXJhdG9yIFByb3BlcnR5VGFibGU6OmVuZCgpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGNvbnN0X2l0ZXJhdG9yKHRhYmxlKCkgKyB1c2VkQ291bnQoKSk7CisgICAgYXV0byog dGFibGVFbmQgPSB0aGlzLT50YWJsZUVuZCgpOworICAgIHJldHVybiBjb25zdF9pdGVyYXRvcih0 YWJsZUVuZCwgdGFibGVFbmQpOwogfQogCiBpbmxpbmUgUHJvcGVydHlUYWJsZTo6ZmluZF9pdGVy YXRvciBQcm9wZXJ0eVRhYmxlOjpmaW5kKGNvbnN0IEtleVR5cGUmIGtleSkKQEAgLTUyMCw5ICs1 MjksOSBAQCBpbmxpbmUgdW5zaWduZWQgUHJvcGVydHlUYWJsZTo6dGFibGVDYXBhCiBpbmxpbmUg dW5zaWduZWQgUHJvcGVydHlUYWJsZTo6ZGVsZXRlZEVudHJ5SW5kZXgoKSBjb25zdCB7IHJldHVy biB0YWJsZUNhcGFjaXR5KCkgKyAxOyB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+Ci1pbmxpbmUg VCogUHJvcGVydHlUYWJsZTo6c2tpcERlbGV0ZWRFbnRyaWVzKFQqIHZhbHVlUHRyKQoraW5saW5l IFQqIFByb3BlcnR5VGFibGU6OnNraXBEZWxldGVkRW50cmllcyhUKiB2YWx1ZVB0ciwgVCogZW5k VmFsdWVQdHIpCiB7Ci0gICAgd2hpbGUgKHZhbHVlUHRyLT5rZXkgPT0gUFJPUEVSVFlfTUFQX0RF TEVURURfRU5UUllfS0VZKQorICAgIHdoaWxlICh2YWx1ZVB0ciA8IGVuZFZhbHVlUHRyICYmIHZh bHVlUHRyLT5rZXkgPT0gUFJPUEVSVFlfTUFQX0RFTEVURURfRU5UUllfS0VZKQogICAgICAgICAr K3ZhbHVlUHRyOwogICAgIHJldHVybiB2YWx1ZVB0cjsKIH0K