128214 2014-02-04 15:20:37 -0800 Rename the substring sharing StringImpl::create variants to better indicate what they do 2014-02-04 15:35:50 -0800 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 976528 0 andersca 2014-02-04 15:20:37 -0800 Rename the substring sharing StringImpl::create variants to better indicate what they do 976529 1 223169 andersca 2014-02-04 15:25:09 -0800 Created attachment 223169 Patch 976532 2 223169 ggaren 2014-02-04 15:28:05 -0800 Comment on attachment 223169 Patch r=me 976539 3 andersca 2014-02-04 15:35:50 -0800 Committed r163410: <http://trac.webkit.org/changeset/163410> 223169 2014-02-04 15:25:09 -0800 2014-02-04 15:28:05 -0800 Patch bug-128214-20140204152508.patch text/plain 10755 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj YWZjNDIxYjNkNTIxYWU0NjVkNTYwMGNhNWM0ZGZiOTllMGU1NmU0Li45N2ViZTU4OTdmZmIyYTE5 ODdkN2ZlNDIzOTMzYTZiZjZhNDVkNmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMyBAQAogMjAxNC0wMi0wNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCisgICAgICAgIFJlbmFtZSB0aGUgc3Vic3RyaW5nIHNoYXJpbmcgU3RyaW5nSW1wbDo6 Y3JlYXRlIHZhcmlhbnRzIHRvIGJldHRlciBpbmRpY2F0ZSB3aGF0IHRoZXkgZG8KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODIxNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9KU1N0cmlu Zy5oOgorICAgICAgICAoSlNDOjpqc1NpbmdsZUNoYXJhY3RlclN1YnN0cmluZyk6CisgICAgICAg IChKU0M6OmpzU3Vic3RyaW5nOCk6CisgICAgICAgIChKU0M6OmpzU3Vic3RyaW5nKToKKyAgICAg ICAgKiBydW50aW1lL1NtYWxsU3RyaW5ncy5jcHA6CisgICAgICAgIChKU0M6OlNtYWxsU3RyaW5n c1N0b3JhZ2U6OlNtYWxsU3RyaW5nc1N0b3JhZ2UpOgorICAgICAgICAqIHJ1bnRpbWUvU3RyaW5n UHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6anNTcGxpY2VTdWJzdHJpbmdzKToKKyAgICAg ICAgKEpTQzo6anNTcGxpY2VTdWJzdHJpbmdzV2l0aFNlcGFyYXRvcnMpOgorICAgICAgICAoSlND OjpyZXBsYWNlVXNpbmdTdHJpbmdTZWFyY2gpOgorCisyMDE0LTAyLTA0ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmVuYW1lIFN0cmluZ0ltcGw6Omdl dENoYXJhY3RlcnMgdG8gU3RyaW5nSW1wbDo6Y2hhcmFjdGVycwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MjA1CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nIGIvU291cmNlL1dURi9DaGFuZ2VMb2cKaW5kZXggNjJmODVkODFmMzZh MzkxODA0MWU4NWI4NGRjYTQ2NTUwODg0MjRmNy4uZGFhYjM2NGJhMDkxYmZhYzNkMGFmNzYwYzJh Njc4NzI3NjdjNTBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dURi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMyBAQAogMjAxNC0wMi0wNCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJlbmFtZSB0aGUgc3Vic3Ry aW5nIHNoYXJpbmcgU3RyaW5nSW1wbDo6Y3JlYXRlIHZhcmlhbnRzIHRvIGJldHRlciBpbmRpY2F0 ZSB3aGF0IHRoZXkgZG8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyODIxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL3RleHQvQXRvbWljU3RyaW5nLmNwcDoKKyAgICAgICAgKFdURjo6U3Vic3Ry aW5nVHJhbnNsYXRvcjo6dHJhbnNsYXRlKToKKyAgICAgICAgKiB3dGYvdGV4dC9TdHJpbmdCdWls ZGVyLmNwcDoKKyAgICAgICAgKFdURjo6U3RyaW5nQnVpbGRlcjo6cmVpZnlTdHJpbmcpOgorICAg ICAgICAoV1RGOjpTdHJpbmdCdWlsZGVyOjpyZXNpemUpOgorICAgICAgICAqIHd0Zi90ZXh0L1N0 cmluZ0ltcGwuaDoKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y3JlYXRlU3Vic3RyaW5nU2hh cmluZ0ltcGw4KToKKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y3JlYXRlU3Vic3RyaW5nU2hh cmluZ0ltcGwpOgorICAgICAgICAqIHd0Zi90ZXh0L1dURlN0cmluZy5jcHA6CisgICAgICAgIChX VEY6OlN0cmluZzo6c3Vic3RyaW5nU2hhcmluZ0ltcGwpOgorCisyMDE0LTAyLTA0ICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmVuYW1lIFN0cmluZ0lt cGw6OmdldENoYXJhY3RlcnMgdG8gU3RyaW5nSW1wbDo6Y2hhcmFjdGVycwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MjA1CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nLmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU1N0cmluZy5oCmluZGV4IDJiMWNkZGRjNTg0MWQ2MGQxNTdhMmU2 MWY3MDJiMGVlNWZhMWQ2NzYuLjRlYzgyZDg4YjEwNThjNzc4NmExZmEzNTJiNjRhMjk3NjE5OGUy NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nLmgK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTdHJpbmcuaApAQCAtMzYwLDcg KzM2MCw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBVQ2hhciBjID0gcy5jaGFyYWN0ZXJB dChvZmZzZXQpOwogICAgICAgICBpZiAoYyA8PSBtYXhTaW5nbGVDaGFyYWN0ZXJTdHJpbmcpCiAg ICAgICAgICAgICByZXR1cm4gdm0tPnNtYWxsU3RyaW5ncy5zaW5nbGVDaGFyYWN0ZXJTdHJpbmco Yyk7Ci0gICAgICAgIHJldHVybiBKU1N0cmluZzo6Y3JlYXRlKCp2bSwgU3RyaW5nSW1wbDo6Y3Jl YXRlKHMuaW1wbCgpLCBvZmZzZXQsIDEpKTsKKyAgICAgICAgcmV0dXJuIEpTU3RyaW5nOjpjcmVh dGUoKnZtLCBTdHJpbmdJbXBsOjpjcmVhdGVTdWJzdHJpbmdTaGFyaW5nSW1wbChzLmltcGwoKSwg b2Zmc2V0LCAxKSk7CiAgICAgfQogCiAgICAgaW5saW5lIEpTU3RyaW5nKiBqc05vbnRyaXZpYWxT dHJpbmcoVk0qIHZtLCBjb25zdCBTdHJpbmcmIHMpCkBAIC00MjgsNyArNDI4LDcgQEAgbmFtZXNw YWNlIEpTQyB7CiAgICAgICAgICAgICBpZiAoYyA8PSBtYXhTaW5nbGVDaGFyYWN0ZXJTdHJpbmcp CiAgICAgICAgICAgICAgICAgcmV0dXJuIHZtLT5zbWFsbFN0cmluZ3Muc2luZ2xlQ2hhcmFjdGVy U3RyaW5nKGMpOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBKU1N0cmluZzo6Y3JlYXRlSGFz T3RoZXJPd25lcigqdm0sIFN0cmluZ0ltcGw6OmNyZWF0ZTgocy5pbXBsKCksIG9mZnNldCwgbGVu Z3RoKSk7CisgICAgICAgIHJldHVybiBKU1N0cmluZzo6Y3JlYXRlSGFzT3RoZXJPd25lcigqdm0s IFN0cmluZ0ltcGw6OmNyZWF0ZVN1YnN0cmluZ1NoYXJpbmdJbXBsOChzLmltcGwoKSwgb2Zmc2V0 LCBsZW5ndGgpKTsKICAgICB9CiAKICAgICBpbmxpbmUgSlNTdHJpbmcqIGpzU3Vic3RyaW5nKFZN KiB2bSwgY29uc3QgU3RyaW5nJiBzLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCkK QEAgLTQ0Myw3ICs0NDMsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgICAgIGlmIChjIDw9 IG1heFNpbmdsZUNoYXJhY3RlclN0cmluZykKICAgICAgICAgICAgICAgICByZXR1cm4gdm0tPnNt YWxsU3RyaW5ncy5zaW5nbGVDaGFyYWN0ZXJTdHJpbmcoYyk7CiAgICAgICAgIH0KLSAgICAgICAg cmV0dXJuIEpTU3RyaW5nOjpjcmVhdGVIYXNPdGhlck93bmVyKCp2bSwgU3RyaW5nSW1wbDo6Y3Jl YXRlKHMuaW1wbCgpLCBvZmZzZXQsIGxlbmd0aCkpOworICAgICAgICByZXR1cm4gSlNTdHJpbmc6 OmNyZWF0ZUhhc090aGVyT3duZXIoKnZtLCBTdHJpbmdJbXBsOjpjcmVhdGVTdWJzdHJpbmdTaGFy aW5nSW1wbChzLmltcGwoKSwgb2Zmc2V0LCBsZW5ndGgpKTsKICAgICB9CiAKICAgICBpbmxpbmUg SlNTdHJpbmcqIGpzT3duZWRTdHJpbmcoVk0qIHZtLCBjb25zdCBTdHJpbmcmIHMpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TbWFsbFN0cmluZ3MuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU21hbGxTdHJpbmdzLmNwcAppbmRleCBmZjMwNDAz OWNiZDNmZjg4Y2E0MjNmOGMzZTQ0MDVmYzAyYmI4YTExLi5mODg5N2RmYTlkMGE2OGY2MjA0YThl NDU0OTgyMjI1N2RlMTA4YzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9TbWFsbFN0cmluZ3MuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1NtYWxsU3RyaW5ncy5jcHAKQEAgLTU4LDcgKzU4LDcgQEAgU21hbGxTdHJpbmdzU3RvcmFnZTo6 U21hbGxTdHJpbmdzU3RvcmFnZSgpCiAgICAgUmVmUHRyPFN0cmluZ0ltcGw+IGJhc2VTdHJpbmcg PSBTdHJpbmdJbXBsOjpjcmVhdGVVbmluaXRpYWxpemVkKHNpbmdsZUNoYXJhY3RlclN0cmluZ0Nv dW50LCBjaGFyYWN0ZXJCdWZmZXIpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaW5n bGVDaGFyYWN0ZXJTdHJpbmdDb3VudDsgKytpKSB7CiAgICAgICAgIGNoYXJhY3RlckJ1ZmZlcltp XSA9IGk7Ci0gICAgICAgIG1fcmVwc1tpXSA9IFN0cmluZ0ltcGw6OmNyZWF0ZShiYXNlU3RyaW5n LCBpLCAxKTsKKyAgICAgICAgbV9yZXBzW2ldID0gU3RyaW5nSW1wbDo6Y3JlYXRlU3Vic3RyaW5n U2hhcmluZ0ltcGwoYmFzZVN0cmluZywgaSwgMSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJpbmdQcm90b3R5cGUuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcAppbmRleCA0Yzk4MzI3 MmNiOGEwNWE1ODViMDhjZDgwM2UwMmNlM2IwNGFhOWY2Li5lZmNjNDBkNjY3Mzg3ZGYwOTU1ODM1 MjgyZmE3M2M3YzEwYzZmM2EyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9TdHJpbmdQcm90b3R5cGUuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKQEAgLTI2NSw3ICsyNjUsNyBAQCBzdGF0aWMgQUxXQVlT X0lOTElORSBKU1ZhbHVlIGpzU3BsaWNlU3Vic3RyaW5ncyhFeGVjU3RhdGUqIGV4ZWMsIEpTU3Ry aW5nKiBzb3VyYwogICAgICAgICBpZiAocG9zaXRpb24gPD0gMCAmJiBsZW5ndGggPj0gc291cmNl U2l6ZSkKICAgICAgICAgICAgIHJldHVybiBzb3VyY2VWYWw7CiAgICAgICAgIC8vIFdlIGNvdWxk IGNhbGwgU3RyaW5nOjpzdWJzdHJpbmdTaGFyaW5nSW1wbCgpLCBidXQgdGhpcyB3b3VsZCByZXN1 bHQgaW4gcmVkdW5kYW50IGNoZWNrcy4KLSAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIFN0 cmluZ0ltcGw6OmNyZWF0ZShzb3VyY2UuaW1wbCgpLCBzdGQ6Om1heCgwLCBwb3NpdGlvbiksIHN0 ZDo6bWluKHNvdXJjZVNpemUsIGxlbmd0aCkpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4 ZWMsIFN0cmluZ0ltcGw6OmNyZWF0ZVN1YnN0cmluZ1NoYXJpbmdJbXBsKHNvdXJjZS5pbXBsKCks IHN0ZDo6bWF4KDAsIHBvc2l0aW9uKSwgc3RkOjptaW4oc291cmNlU2l6ZSwgbGVuZ3RoKSkpOwog ICAgIH0KIAogICAgIGludCB0b3RhbExlbmd0aCA9IDA7CkBAIC0zMjAsNyArMzIwLDcgQEAgc3Rh dGljIEFMV0FZU19JTkxJTkUgSlNWYWx1ZSBqc1NwbGljZVN1YnN0cmluZ3NXaXRoU2VwYXJhdG9y cyhFeGVjU3RhdGUqIGV4ZWMsIEoKICAgICAgICAgaWYgKHBvc2l0aW9uIDw9IDAgJiYgbGVuZ3Ro ID49IHNvdXJjZVNpemUpCiAgICAgICAgICAgICByZXR1cm4gc291cmNlVmFsOwogICAgICAgICAv LyBXZSBjb3VsZCBjYWxsIFN0cmluZzo6c3Vic3RyaW5nU2hhcmluZ0ltcGwoKSwgYnV0IHRoaXMg d291bGQgcmVzdWx0IGluIHJlZHVuZGFudCBjaGVja3MuCi0gICAgICAgIHJldHVybiBqc1N0cmlu ZyhleGVjLCBTdHJpbmdJbXBsOjpjcmVhdGUoc291cmNlLmltcGwoKSwgc3RkOjptYXgoMCwgcG9z aXRpb24pLCBzdGQ6Om1pbihzb3VyY2VTaXplLCBsZW5ndGgpKSk7CisgICAgICAgIHJldHVybiBq c1N0cmluZyhleGVjLCBTdHJpbmdJbXBsOjpjcmVhdGVTdWJzdHJpbmdTaGFyaW5nSW1wbChzb3Vy Y2UuaW1wbCgpLCBzdGQ6Om1heCgwLCBwb3NpdGlvbiksIHN0ZDo6bWluKHNvdXJjZVNpemUsIGxl bmd0aCkpKTsKICAgICB9CiAKICAgICBDaGVja2VkPGludCwgUmVjb3JkT3ZlcmZsb3c+IHRvdGFs TGVuZ3RoID0gMDsKQEAgLTY1MCwxNCArNjUwLDE0IEBAIHN0YXRpYyBpbmxpbmUgRW5jb2RlZEpT VmFsdWUgcmVwbGFjZVVzaW5nU3RyaW5nU2VhcmNoKEV4ZWNTdGF0ZSogZXhlYywgSlNTdHJpbmcq CiAgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiAKICAgICBT dHJpbmdJbXBsKiBzdHJpbmdJbXBsID0gc3RyaW5nLmltcGwoKTsKLSAgICBTdHJpbmcgbGVmdFBh cnQoU3RyaW5nSW1wbDo6Y3JlYXRlKHN0cmluZ0ltcGwsIDAsIG1hdGNoU3RhcnQpKTsKKyAgICBT dHJpbmcgbGVmdFBhcnQoU3RyaW5nSW1wbDo6Y3JlYXRlU3Vic3RyaW5nU2hhcmluZ0ltcGwoc3Ry aW5nSW1wbCwgMCwgbWF0Y2hTdGFydCkpOwogCiAgICAgc2l6ZV90IG1hdGNoRW5kID0gbWF0Y2hT dGFydCArIHNlYXJjaFN0cmluZy5pbXBsKCktPmxlbmd0aCgpOwogICAgIGludCBvdmVjdG9yWzJd ID0geyBzdGF0aWNfY2FzdDxpbnQ+KG1hdGNoU3RhcnQpLCAgc3RhdGljX2Nhc3Q8aW50PihtYXRj aEVuZCl9OwogICAgIFN0cmluZyBtaWRkbGVQYXJ0ID0gc3Vic3RpdHV0ZUJhY2tyZWZlcmVuY2Vz KHJlcGxhY2VTdHJpbmcsIHN0cmluZywgb3ZlY3RvciwgMCk7CiAKICAgICBzaXplX3QgbGVmdExl bmd0aCA9IHN0cmluZ0ltcGwtPmxlbmd0aCgpIC0gbWF0Y2hFbmQ7Ci0gICAgU3RyaW5nIHJpZ2h0 UGFydChTdHJpbmdJbXBsOjpjcmVhdGUoc3RyaW5nSW1wbCwgbWF0Y2hFbmQsIGxlZnRMZW5ndGgp KTsKKyAgICBTdHJpbmcgcmlnaHRQYXJ0KFN0cmluZ0ltcGw6OmNyZWF0ZVN1YnN0cmluZ1NoYXJp bmdJbXBsKHN0cmluZ0ltcGwsIG1hdGNoRW5kLCBsZWZ0TGVuZ3RoKSk7CiAgICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShKU0M6OmpzU3RyaW5nKGV4ZWMsIGxlZnRQYXJ0LCBtaWRkbGVQYXJ0LCBy aWdodFBhcnQpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGV4dC9BdG9taWNT dHJpbmcuY3BwIGIvU291cmNlL1dURi93dGYvdGV4dC9BdG9taWNTdHJpbmcuY3BwCmluZGV4IDYz MTBlYjY2OTFmZGQzNzY4YTZiZWZjOWU2ZWNmZWRmMDYxOTQzODUuLjI4NWE1ZTFiMjUzOWM2NjUw NTYzZmRhZmUxZWI4N2FlZjMyOTE1NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQv QXRvbWljU3RyaW5nLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L0F0b21pY1N0cmluZy5j cHAKQEAgLTI5Myw3ICsyOTMsNyBAQCBzdHJ1Y3QgU3Vic3RyaW5nVHJhbnNsYXRvciB7CiAKICAg ICBzdGF0aWMgdm9pZCB0cmFuc2xhdGUoU3RyaW5nSW1wbComIGxvY2F0aW9uLCBjb25zdCBTdWJz dHJpbmdMb2NhdGlvbiYgYnVmZmVyLCB1bnNpZ25lZCBoYXNoKQogICAgIHsKLSAgICAgICAgbG9j YXRpb24gPSAmU3RyaW5nSW1wbDo6Y3JlYXRlKGJ1ZmZlci5iYXNlU3RyaW5nLCBidWZmZXIuc3Rh cnQsIGJ1ZmZlci5sZW5ndGgpLmxlYWtSZWYoKTsKKyAgICAgICAgbG9jYXRpb24gPSAmU3RyaW5n SW1wbDo6Y3JlYXRlU3Vic3RyaW5nU2hhcmluZ0ltcGwoYnVmZmVyLmJhc2VTdHJpbmcsIGJ1ZmZl ci5zdGFydCwgYnVmZmVyLmxlbmd0aCkubGVha1JlZigpOwogICAgICAgICBsb2NhdGlvbi0+c2V0 SGFzaChoYXNoKTsKICAgICAgICAgbG9jYXRpb24tPnNldElzQXRvbWljKHRydWUpOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuY3BwCmluZGV4IDg1NDFkYTUwN2E2NjM4YTJm YTM1NzZkOGI0ODM2YmYzNGM4ZmJiMzIuLjQ3ZDMyMWVhYjAyMGYzNjEzNWUzNjRkMDE5Y2UxMzA1 YjdjODNjOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nQnVpbGRlci5j cHAKKysrIGIvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmNwcApAQCAtNTgsNyAr NTgsNyBAQCB2b2lkIFN0cmluZ0J1aWxkZXI6OnJlaWZ5U3RyaW5nKCkgY29uc3QKICAgICBpZiAo bV9sZW5ndGggPT0gbV9idWZmZXItPmxlbmd0aCgpKQogICAgICAgICBtX3N0cmluZyA9IG1fYnVm ZmVyLmdldCgpOwogICAgIGVsc2UKLSAgICAgICAgbV9zdHJpbmcgPSBTdHJpbmdJbXBsOjpjcmVh dGUobV9idWZmZXIsIDAsIG1fbGVuZ3RoKTsKKyAgICAgICAgbV9zdHJpbmcgPSBTdHJpbmdJbXBs OjpjcmVhdGVTdWJzdHJpbmdTaGFyaW5nSW1wbChtX2J1ZmZlciwgMCwgbV9sZW5ndGgpOwogCiAg ICAgaWYgKG1fYnVmZmVyLT5oYXMxNkJpdFNoYWRvdygpICYmIG1fdmFsaWQxNkJpdFNoYWRvd0xl bmd0aCA8IG1fbGVuZ3RoKQogICAgICAgICBtX2J1ZmZlci0+dXBjb252ZXJ0Q2hhcmFjdGVycyht X3ZhbGlkMTZCaXRTaGFkb3dMZW5ndGgsIG1fbGVuZ3RoKTsKQEAgLTkyLDcgKzkyLDcgQEAgdm9p ZCBTdHJpbmdCdWlsZGVyOjpyZXNpemUodW5zaWduZWQgbmV3U2l6ZSkKICAgICBBU1NFUlQobV9s ZW5ndGggPT0gbV9zdHJpbmcubGVuZ3RoKCkpOwogICAgIEFTU0VSVChuZXdTaXplIDwgbV9zdHJp bmcubGVuZ3RoKCkpOwogICAgIG1fbGVuZ3RoID0gbmV3U2l6ZTsKLSAgICBtX3N0cmluZyA9IFN0 cmluZ0ltcGw6OmNyZWF0ZShtX3N0cmluZy5pbXBsKCksIDAsIG5ld1NpemUpOworICAgIG1fc3Ry aW5nID0gU3RyaW5nSW1wbDo6Y3JlYXRlU3Vic3RyaW5nU2hhcmluZ0ltcGwobV9zdHJpbmcuaW1w bCgpLCAwLCBuZXdTaXplKTsKIH0KIAogLy8gQWxsb2NhdGUgYSBuZXcgOCBiaXQgYnVmZmVyLCBj b3B5aW5nIGluIGN1cnJlbnRDaGFyYWN0ZXJzICh0aGVzZSBtYXkgY29tZSBmcm9tIGVpdGhlciBt X3N0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmggYi9T b3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAppbmRleCAyZDM1ZWQyNTY0NTQ5ZjJlMDhi OTc1NTFlY2QxNWQ2NmU3MTliMjJhLi5kY2I3NWY3MzNhNDZjMTdiNDhhNGRkNjVmODhjN2E3Mzc2 ODM5ZWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAorKysg Yi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaApAQCAtMzQyLDcgKzM0Miw3IEBAIHB1 YmxpYzoKICAgICBXVEZfRVhQT1JUX1NUUklOR19BUEkgc3RhdGljIFBhc3NSZWY8U3RyaW5nSW1w bD4gY3JlYXRlKGNvbnN0IExDaGFyKik7CiAgICAgQUxXQVlTX0lOTElORSBzdGF0aWMgUGFzc1Jl ZjxTdHJpbmdJbXBsPiBjcmVhdGUoY29uc3QgY2hhciogcykgeyByZXR1cm4gY3JlYXRlKHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgTENoYXIqPihzKSk7IH0KIAotICAgIHN0YXRpYyBBTFdBWVNfSU5M SU5FIFBhc3NSZWY8U3RyaW5nSW1wbD4gY3JlYXRlOChQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHJl cCwgdW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgpCisgICAgc3RhdGljIEFMV0FZU19J TkxJTkUgUGFzc1JlZjxTdHJpbmdJbXBsPiBjcmVhdGVTdWJzdHJpbmdTaGFyaW5nSW1wbDgoUGFz c1JlZlB0cjxTdHJpbmdJbXBsPiByZXAsIHVuc2lnbmVkIG9mZnNldCwgdW5zaWduZWQgbGVuZ3Ro KQogICAgIHsKICAgICAgICAgQVNTRVJUKHJlcCk7CiAgICAgICAgIEFTU0VSVChsZW5ndGggPD0g cmVwLT5sZW5ndGgoKSk7CkBAIC0zNTUsNyArMzU1LDcgQEAgcHVibGljOgogICAgICAgICByZXR1 cm4gYWRvcHRSZWYoKm5ldyBTdHJpbmdJbXBsKHJlcC0+bV9kYXRhOCArIG9mZnNldCwgbGVuZ3Ro LCBvd25lclJlcCkpOwogICAgIH0KIAotICAgIHN0YXRpYyBBTFdBWVNfSU5MSU5FIFBhc3NSZWY8 U3RyaW5nSW1wbD4gY3JlYXRlKFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gcmVwLCB1bnNpZ25lZCBv ZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCkKKyAgICBzdGF0aWMgQUxXQVlTX0lOTElORSBQYXNzUmVm PFN0cmluZ0ltcGw+IGNyZWF0ZVN1YnN0cmluZ1NoYXJpbmdJbXBsKFBhc3NSZWZQdHI8U3RyaW5n SW1wbD4gcmVwLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCkKICAgICB7CiAgICAg ICAgIEFTU0VSVChyZXApOwogICAgICAgICBBU1NFUlQobGVuZ3RoIDw9IHJlcC0+bGVuZ3RoKCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwIGIvU291cmNl L1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwCmluZGV4IGUwNDJjZjUyMTJmOGRlNzJlMWQyOTQ4 MzkxODkxNGUxMGM4ZDdiNmMuLjAzNmVhNmY3NzUwN2RiNzE0YzY5ZTljMDcxYTRiNzFmYjUxNjcz YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcAorKysgYi9T b3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5jcHAKQEAgLTMxNyw3ICszMTcsNyBAQCBTdHJp bmcgU3RyaW5nOjpzdWJzdHJpbmdTaGFyaW5nSW1wbCh1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVk IGxlbmd0aCkgY29uc3QKIAogICAgIGlmICghb2Zmc2V0ICYmIGxlbmd0aCA9PSBzdHJpbmdMZW5n dGgpCiAgICAgICAgIHJldHVybiAqdGhpczsKLSAgICByZXR1cm4gU3RyaW5nKFN0cmluZ0ltcGw6 OmNyZWF0ZShtX2ltcGwsIG9mZnNldCwgbGVuZ3RoKSk7CisgICAgcmV0dXJuIFN0cmluZyhTdHJp bmdJbXBsOjpjcmVhdGVTdWJzdHJpbmdTaGFyaW5nSW1wbChtX2ltcGwsIG9mZnNldCwgbGVuZ3Ro KSk7CiB9CiAKIFN0cmluZyBTdHJpbmc6Omxvd2VyKCkgY29uc3QK