32400 2009-12-10 16:41:47 -0800 Switch remaining cases of string addition to use ropes. 2009-12-11 14:59:07 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough abarth webkit.review.bot oldest_to_newest 170587 0 barraclough 2009-12-10 16:41:47 -0800 Because. 170589 1 44650 barraclough 2009-12-10 16:42:48 -0800 Created attachment 44650 The patch 170591 2 webkit.review.bot 2009-12-10 16:44:33 -0800 style-queue ran check-webkit-style on attachment 44650 without any errors. 170608 3 barraclough 2009-12-10 18:07:58 -0800 Transmitting file data ..... Committed revision 51975. 170620 4 44650 abarth 2009-12-10 19:43:31 -0800 Comment on attachment 44650 The patch Rolled out in http://trac.webkit.org/changeset/51978. This broke fast/js/exception-sequencing-binops.html 170621 5 abarth 2009-12-10 19:43:48 -0800 x 170632 6 barraclough 2009-12-10 21:02:55 -0800 Gah, missed that, cheers Adam. 170944 7 barraclough 2009-12-11 14:58:45 -0800 Transmitting file data ...... Committed revision 52026. 170945 8 barraclough 2009-12-11 14:59:07 -0800 relanded fixed. 44650 2009-12-10 16:42:48 -0800 2009-12-10 19:43:31 -0800 The patch patch.ropenums.txt text/plain 10645 barraclough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUxOTY0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMTItMTAgIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjQwMAorICAgICAgICBTd2l0Y2ggcmVtYWluaW5nIGNhc2VzIG9mIHN0cmlu ZyBhZGRpdGlvbiB0byB1c2Ugcm9wZXMuCisKKyAgICAgICAgfjAuNSUgcHJvZ3Jlc3Npb24gb24g U3Vuc3BpZGV5LgorCisgICAgICAgICogaml0L0pJVFN0dWJzLmNwcDoKKyAgICAgICAgKEpTQzo6 REVGSU5FX1NUVUJfRlVOQ1RJT04pOgorICAgICAgICAqIHJ1bnRpbWUvSlNTdHJpbmcuaDoKKyAg ICAgICAgKEpTQzo6SlNTdHJpbmc6OkpTU3RyaW5nKToKKyAgICAgICAgKEpTQzo6SlNTdHJpbmc6 OmFwcGVuZFN0cmluZ0luQ29uc3RydWN0KToKKyAgICAgICAgKiBydW50aW1lL09wZXJhdGlvbnMu Y3BwOgorICAgICAgICAoSlNDOjpqc0FkZFNsb3dDYXNlKToKKyAgICAgICAgKiBydW50aW1lL09w ZXJhdGlvbnMuaDoKKyAgICAgICAgKEpTQzo6anNTdHJpbmcpOgorICAgICAgICAoSlNDOjpqc0Fk ZCk6CisKIDIwMDktMTItMTAgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUu Y29tPgogCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAJKHJldmlzaW9uIDUxOTY0KQorKysg SmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAzMSwz NSArMTAzMSwyMCBAQCBERUZJTkVfU1RVQl9GVU5DVElPTihFbmNvZGVkSlNWYWx1ZSwgb3BfCiAK ICAgICBKU1ZhbHVlIHYxID0gc3RhY2tGcmFtZS5hcmdzWzBdLmpzVmFsdWUoKTsKICAgICBKU1Zh bHVlIHYyID0gc3RhY2tGcmFtZS5hcmdzWzFdLmpzVmFsdWUoKTsKLQotICAgIGRvdWJsZSBsZWZ0 OwotICAgIGRvdWJsZSByaWdodCA9IDAuMDsKLQotICAgIGJvb2wgcmlnaHRJc051bWJlciA9IHYy LmdldE51bWJlcihyaWdodCk7Ci0gICAgaWYgKHJpZ2h0SXNOdW1iZXIgJiYgdjEuZ2V0TnVtYmVy KGxlZnQpKQotICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTnVtYmVyKHN0YWNrRnJh bWUuZ2xvYmFsRGF0YSwgbGVmdCArIHJpZ2h0KSk7Ci0gICAgCiAgICAgQ2FsbEZyYW1lKiBjYWxs RnJhbWUgPSBzdGFja0ZyYW1lLmNhbGxGcmFtZTsKIAotICAgIGJvb2wgbGVmdElzU3RyaW5nID0g djEuaXNTdHJpbmcoKTsKLSAgICBpZiAobGVmdElzU3RyaW5nICYmIHYyLmlzU3RyaW5nKCkpIHsK LSAgICAgICAgSlNWYWx1ZSByZXN1bHQgPSBqc1N0cmluZyhjYWxsRnJhbWUsIGFzU3RyaW5nKHYx KSwgYXNTdHJpbmcodjIpKTsKKyAgICBpZiAodjEuaXNTdHJpbmcoKSkgeworICAgICAgICBKU1Zh bHVlIHJlc3VsdCA9IHYyLmlzU3RyaW5nKCkKKyAgICAgICAgICAgID8ganNTdHJpbmcoY2FsbEZy YW1lLCBhc1N0cmluZyh2MSksIGFzU3RyaW5nKHYyKSkKKyAgICAgICAgICAgIDoganNTdHJpbmco Y2FsbEZyYW1lLCBhc1N0cmluZyh2MSksIHYyLnRvU3RyaW5nKGNhbGxGcmFtZSkpOwogICAgICAg ICBDSEVDS19GT1JfRVhDRVBUSU9OX0FUX0VORCgpOwogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6 ZW5jb2RlKHJlc3VsdCk7CiAgICAgfQogCi0gICAgaWYgKHJpZ2h0SXNOdW1iZXIgJiBsZWZ0SXNT dHJpbmcpIHsKLSAgICAgICAgUmVmUHRyPFVTdHJpbmc6OlJlcD4gdmFsdWUgPSB2Mi5pc0ludDMy KCkgPwotICAgICAgICAgICAgY29uY2F0ZW5hdGUoYXNTdHJpbmcodjEpLT52YWx1ZShjYWxsRnJh bWUpLnJlcCgpLCB2Mi5hc0ludDMyKCkpIDoKLSAgICAgICAgICAgIGNvbmNhdGVuYXRlKGFzU3Ry aW5nKHYxKS0+dmFsdWUoY2FsbEZyYW1lKS5yZXAoKSwgcmlnaHQpOwotCi0gICAgICAgIGlmIChV TkxJS0VMWSghdmFsdWUpKSB7Ci0gICAgICAgICAgICB0aHJvd091dE9mTWVtb3J5RXJyb3IoY2Fs bEZyYW1lKTsKLSAgICAgICAgICAgIFZNX1RIUk9XX0VYQ0VQVElPTigpOwotICAgICAgICB9Ci0g ICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNTdHJpbmcoc3RhY2tGcmFtZS5nbG9iYWxE YXRhLCB2YWx1ZS5yZWxlYXNlKCkpKTsKLSAgICB9Ci0KKyAgICBkb3VibGUgbGVmdCA9IDAuMCwg cmlnaHQ7CisgICAgaWYgKHYxLmdldE51bWJlcihsZWZ0KSwgdjIuZ2V0TnVtYmVyKHJpZ2h0KSkK KyAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc051bWJlcihzdGFja0ZyYW1lLmdsb2Jh bERhdGEsIGxlZnQgKyByaWdodCkpOworICAgIAogICAgIC8vIEFsbCBvdGhlciBjYXNlcyBhcmUg cHJldHR5IHVuY29tbW9uCiAgICAgSlNWYWx1ZSByZXN1bHQgPSBqc0FkZFNsb3dDYXNlKGNhbGxG cmFtZSwgdjEsIHYyKTsKICAgICBDSEVDS19GT1JfRVhDRVBUSU9OX0FUX0VORCgpOwpJbmRleDog SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0cmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNTdHJpbmcuaAkocmV2aXNpb24gNTE5NjQpCisrKyBKYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTU3RyaW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTIwMyw2ICsyMDMsMzIg QEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICBhcHBlbmRTdHJpbmdJbkNvbnN0cnVjdChp bmRleCwgczIpOwogICAgICAgICAgICAgQVNTRVJUKHJvcGVMZW5ndGggPT0gaW5kZXgpOwogICAg ICAgICB9CisgICAgICAgIC8vIFRoaXMgY29uc3RydWN0b3IgY29uc3RydWN0cyBhIG5ldyBzdHJp bmcgYnkgY29uY2F0ZW5hdGluZyBzMSAmIHMyLgorICAgICAgICAvLyBUaGlzIHNob3VsZCBvbmx5 IGJlIGNhbGxlZCB3aXRoIHJvcGVMZW5ndGggPD0gMy4KKyAgICAgICAgSlNTdHJpbmcoSlNHbG9i YWxEYXRhKiBnbG9iYWxEYXRhLCB1bnNpZ25lZCByb3BlTGVuZ3RoLCBKU1N0cmluZyogczEsIGNv bnN0IFVTdHJpbmcmIHUyKQorICAgICAgICAgICAgOiBKU0NlbGwoZ2xvYmFsRGF0YS0+c3RyaW5n U3RydWN0dXJlLmdldCgpKQorICAgICAgICAgICAgLCBtX3N0cmluZ0xlbmd0aChzMS0+bGVuZ3Ro KCkgKyB1Mi5zaXplKCkpCisgICAgICAgICAgICAsIG1fcm9wZUxlbmd0aChyb3BlTGVuZ3RoKQor ICAgICAgICB7CisgICAgICAgICAgICBBU1NFUlQocm9wZUxlbmd0aCA8PSBzX21heEludGVybmFs Um9wZUxlbmd0aCk7CisgICAgICAgICAgICB1bnNpZ25lZCBpbmRleCA9IDA7CisgICAgICAgICAg ICBhcHBlbmRTdHJpbmdJbkNvbnN0cnVjdChpbmRleCwgczEpOworICAgICAgICAgICAgYXBwZW5k U3RyaW5nSW5Db25zdHJ1Y3QoaW5kZXgsIHUyKTsKKyAgICAgICAgICAgIEFTU0VSVChyb3BlTGVu Z3RoID09IGluZGV4KTsKKyAgICAgICAgfQorICAgICAgICAvLyBUaGlzIGNvbnN0cnVjdG9yIGNv bnN0cnVjdHMgYSBuZXcgc3RyaW5nIGJ5IGNvbmNhdGVuYXRpbmcgczEgJiBzMi4KKyAgICAgICAg Ly8gVGhpcyBzaG91bGQgb25seSBiZSBjYWxsZWQgd2l0aCByb3BlTGVuZ3RoIDw9IDMuCisgICAg ICAgIEpTU3RyaW5nKEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSwgdW5zaWduZWQgcm9wZUxlbmd0 aCwgY29uc3QgVVN0cmluZyYgdTEsIEpTU3RyaW5nKiBzMikKKyAgICAgICAgICAgIDogSlNDZWxs KGdsb2JhbERhdGEtPnN0cmluZ1N0cnVjdHVyZS5nZXQoKSkKKyAgICAgICAgICAgICwgbV9zdHJp bmdMZW5ndGgodTEuc2l6ZSgpICsgczItPmxlbmd0aCgpKQorICAgICAgICAgICAgLCBtX3JvcGVM ZW5ndGgocm9wZUxlbmd0aCkKKyAgICAgICAgeworICAgICAgICAgICAgQVNTRVJUKHJvcGVMZW5n dGggPD0gc19tYXhJbnRlcm5hbFJvcGVMZW5ndGgpOworICAgICAgICAgICAgdW5zaWduZWQgaW5k ZXggPSAwOworICAgICAgICAgICAgYXBwZW5kU3RyaW5nSW5Db25zdHJ1Y3QoaW5kZXgsIHUxKTsK KyAgICAgICAgICAgIGFwcGVuZFN0cmluZ0luQ29uc3RydWN0KGluZGV4LCBzMik7CisgICAgICAg ICAgICBBU1NFUlQocm9wZUxlbmd0aCA9PSBpbmRleCk7CisgICAgICAgIH0KICAgICAgICAgLy8g VGhpcyBjb25zdHJ1Y3RvciBjb25zdHJ1Y3RzIGEgbmV3IHN0cmluZyBieSBjb25jYXRlbmF0aW5n IHYxLCB2MiAmIHYzLgogICAgICAgICAvLyBUaGlzIHNob3VsZCBvbmx5IGJlIGNhbGxlZCB3aXRo IHJvcGVMZW5ndGggPD0gMyAuLi4gd2hpY2ggc2luY2UgZXZlcnkKICAgICAgICAgLy8gdmFsdWUg bXVzdCByZXF1aXJlIGEgcm9wZUxlbmd0aCBvZiBhdCBsZWFzdCBvbmUgaW1wbGllcyB0aGF0IHRo ZSBsZW5ndGgKQEAgLTI1OCwxMyArMjg0LDE4IEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgICAg IHZvaWQgcmVzb2x2ZVJvcGUoRXhlY1N0YXRlKikgY29uc3Q7CiAKKyAgICAgICAgdm9pZCBhcHBl bmRTdHJpbmdJbkNvbnN0cnVjdCh1bnNpZ25lZCYgaW5kZXgsIGNvbnN0IFVTdHJpbmcmIHN0cmlu ZykKKyAgICAgICAgeworICAgICAgICAgICAgbV9maWJlcnNbaW5kZXgrK10gPSBSb3BlOjpGaWJl cihzdHJpbmcucmVwKCktPnJlZigpKTsKKyAgICAgICAgfQorCiAgICAgICAgIHZvaWQgYXBwZW5k U3RyaW5nSW5Db25zdHJ1Y3QodW5zaWduZWQmIGluZGV4LCBKU1N0cmluZyoganNTdHJpbmcpCiAg ICAgICAgIHsKICAgICAgICAgICAgIGlmIChqc1N0cmluZy0+aXNSb3BlKCkpIHsKICAgICAgICAg ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwganNTdHJpbmctPm1fcm9wZUxlbmd0aDsg KytpKQogICAgICAgICAgICAgICAgICAgICBtX2ZpYmVyc1tpbmRleCsrXSA9IGpzU3RyaW5nLT5t X2ZpYmVyc1tpXS5yZWYoKTsKICAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAgIG1f ZmliZXJzW2luZGV4KytdID0gUm9wZTo6RmliZXIoanNTdHJpbmctPnN0cmluZygpLnJlcCgpLT5y ZWYoKSk7CisgICAgICAgICAgICAgICAgYXBwZW5kU3RyaW5nSW5Db25zdHJ1Y3QoaW5kZXgsIGpz U3RyaW5nLT5zdHJpbmcoKSk7CiAgICAgICAgIH0KIAogICAgICAgICB2b2lkIGFwcGVuZFZhbHVl SW5Db25zdHJ1Y3RBbmRJbmNyZW1lbnRMZW5ndGgoRXhlY1N0YXRlKiBleGVjLCB1bnNpZ25lZCYg aW5kZXgsIEpTVmFsdWUgdikKQEAgLTMxMSw2ICszNDIsOCBAQCBuYW1lc3BhY2UgSlNDIHsKICAg ICAgICAgdW5zaWduZWQgcm9wZUxlbmd0aCgpIHsgcmV0dXJuIG1fcm9wZUxlbmd0aCA/IG1fcm9w ZUxlbmd0aCA6IDE7IH0KIAogICAgICAgICBmcmllbmQgSlNWYWx1ZSBqc1N0cmluZyhFeGVjU3Rh dGUqIGV4ZWMsIEpTU3RyaW5nKiBzMSwgSlNTdHJpbmcqIHMyKTsKKyAgICAgICAgZnJpZW5kIEpT VmFsdWUganNTdHJpbmcoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBVU3RyaW5nJiB1MSwgSlNTdHJp bmcqIHMyKTsKKyAgICAgICAgZnJpZW5kIEpTVmFsdWUganNTdHJpbmcoRXhlY1N0YXRlKiBleGVj LCBKU1N0cmluZyogczEsIGNvbnN0IFVTdHJpbmcmIHUyKTsKICAgICAgICAgZnJpZW5kIEpTVmFs dWUganNTdHJpbmcoRXhlY1N0YXRlKiBleGVjLCBSZWdpc3Rlciogc3RyaW5ncywgdW5zaWduZWQg Y291bnQpOwogICAgIH07CiAKSW5kZXg6IEphdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3BlcmF0aW9u cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcGVyYXRpb25zLmNw cAkocmV2aXNpb24gNTE5NjIpCisrKyBKYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wZXJhdGlvbnMu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCwxMiArNTQsMTMgQEAgTkVWRVJfSU5MSU5FIEpTVmFs dWUganNBZGRTbG93Q2FzZShDYWxsRgogICAgIEpTVmFsdWUgcDEgPSB2MS50b1ByaW1pdGl2ZShj YWxsRnJhbWUpOwogICAgIEpTVmFsdWUgcDIgPSB2Mi50b1ByaW1pdGl2ZShjYWxsRnJhbWUpOwog Ci0gICAgaWYgKHAxLmlzU3RyaW5nKCkgfHwgcDIuaXNTdHJpbmcoKSkgewotICAgICAgICBSZWZQ dHI8VVN0cmluZzo6UmVwPiB2YWx1ZSA9IGNvbmNhdGVuYXRlKHAxLnRvU3RyaW5nKGNhbGxGcmFt ZSkucmVwKCksIHAyLnRvU3RyaW5nKGNhbGxGcmFtZSkucmVwKCkpOwotICAgICAgICBpZiAoIXZh bHVlKQotICAgICAgICAgICAgcmV0dXJuIHRocm93T3V0T2ZNZW1vcnlFcnJvcihjYWxsRnJhbWUp OwotICAgICAgICByZXR1cm4ganNTdHJpbmcoY2FsbEZyYW1lLCB2YWx1ZS5yZWxlYXNlKCkpOwor ICAgIGlmIChwMS5pc1N0cmluZygpKSB7CisgICAgICAgIHJldHVybiBwMi5pc1N0cmluZygpCisg ICAgICAgICAgICA/IGpzU3RyaW5nKGNhbGxGcmFtZSwgYXNTdHJpbmcocDEpLCBhc1N0cmluZyhw MikpCisgICAgICAgICAgICA6IGpzU3RyaW5nKGNhbGxGcmFtZSwgYXNTdHJpbmcocDEpLCBwMi50 b1N0cmluZyhjYWxsRnJhbWUpKTsKICAgICB9CisgICAgaWYgKHAyLmlzU3RyaW5nKCkpCisgICAg ICAgIHJldHVybiBqc1N0cmluZyhjYWxsRnJhbWUsIHAxLnRvU3RyaW5nKGNhbGxGcmFtZSksIGFz U3RyaW5nKHAyKSk7CiAKICAgICByZXR1cm4ganNOdW1iZXIoY2FsbEZyYW1lLCBwMS50b051bWJl cihjYWxsRnJhbWUpICsgcDIudG9OdW1iZXIoY2FsbEZyYW1lKSk7CiB9CkluZGV4OiBKYXZhU2Ny aXB0Q29yZS9ydW50aW1lL09wZXJhdGlvbnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29y ZS9ydW50aW1lL09wZXJhdGlvbnMuaAkocmV2aXNpb24gNTE5NjQpCisrKyBKYXZhU2NyaXB0Q29y ZS9ydW50aW1lL09wZXJhdGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsMTEgQEAg bmFtZXNwYWNlIEpTQyB7CiAKICAgICBBTFdBWVNfSU5MSU5FIEpTVmFsdWUganNTdHJpbmcoRXhl Y1N0YXRlKiBleGVjLCBKU1N0cmluZyogczEsIEpTU3RyaW5nKiBzMikKICAgICB7CisgICAgICAg IGlmICghczEtPmxlbmd0aCgpKQorICAgICAgICAgICAgcmV0dXJuIHMyOworICAgICAgICBpZiAo IXMyLT5sZW5ndGgoKSkKKyAgICAgICAgICAgIHJldHVybiBzMTsKKwogICAgICAgICB1bnNpZ25l ZCByb3BlTGVuZ3RoID0gczEtPnJvcGVMZW5ndGgoKSArIHMyLT5yb3BlTGVuZ3RoKCk7CiAgICAg ICAgIEpTR2xvYmFsRGF0YSogZ2xvYmFsRGF0YSA9ICZleGVjLT5nbG9iYWxEYXRhKCk7CiAKQEAg LTUzLDYgKzU4LDQyIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICByZXR1cm4gbmV3IChnbG9i YWxEYXRhKSBKU1N0cmluZyhnbG9iYWxEYXRhLCByb3BlLnJlbGVhc2UoKSk7CiAgICAgfQogCisg ICAgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGpzU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgY29uc3Qg VVN0cmluZyYgdTEsIEpTU3RyaW5nKiBzMikKKyAgICB7CisgICAgICAgIHVuc2lnbmVkIHJvcGVM ZW5ndGggPSAxICsgczItPnJvcGVMZW5ndGgoKTsKKyAgICAgICAgSlNHbG9iYWxEYXRhKiBnbG9i YWxEYXRhID0gJmV4ZWMtPmdsb2JhbERhdGEoKTsKKworICAgICAgICBpZiAocm9wZUxlbmd0aCA8 PSBKU1N0cmluZzo6c19tYXhJbnRlcm5hbFJvcGVMZW5ndGgpCisgICAgICAgICAgICByZXR1cm4g bmV3IChnbG9iYWxEYXRhKSBKU1N0cmluZyhnbG9iYWxEYXRhLCByb3BlTGVuZ3RoLCB1MSwgczIp OworCisgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKKyAgICAgICAgUmVmUHRyPEpTU3RyaW5n OjpSb3BlPiByb3BlID0gSlNTdHJpbmc6OlJvcGU6OmNyZWF0ZU9yTnVsbChyb3BlTGVuZ3RoKTsK KyAgICAgICAgaWYgKFVOTElLRUxZKCFyb3BlKSkKKyAgICAgICAgICAgIHJldHVybiB0aHJvd091 dE9mTWVtb3J5RXJyb3IoZXhlYyk7CisgICAgICAgIHJvcGUtPmFwcGVuZChpbmRleCwgdTEpOwor ICAgICAgICByb3BlLT5hcHBlbmQoaW5kZXgsIHMyKTsKKyAgICAgICAgQVNTRVJUKGluZGV4ID09 IHJvcGVMZW5ndGgpOworICAgICAgICByZXR1cm4gbmV3IChnbG9iYWxEYXRhKSBKU1N0cmluZyhn bG9iYWxEYXRhLCByb3BlLnJlbGVhc2UoKSk7CisgICAgfQorCisgICAgQUxXQVlTX0lOTElORSBK U1ZhbHVlIGpzU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgSlNTdHJpbmcqIHMxLCBjb25zdCBVU3Ry aW5nJiB1MikKKyAgICB7CisgICAgICAgIHVuc2lnbmVkIHJvcGVMZW5ndGggPSBzMS0+cm9wZUxl bmd0aCgpICsgMTsKKyAgICAgICAgSlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gJmV4ZWMtPmds b2JhbERhdGEoKTsKKworICAgICAgICBpZiAocm9wZUxlbmd0aCA8PSBKU1N0cmluZzo6c19tYXhJ bnRlcm5hbFJvcGVMZW5ndGgpCisgICAgICAgICAgICByZXR1cm4gbmV3IChnbG9iYWxEYXRhKSBK U1N0cmluZyhnbG9iYWxEYXRhLCByb3BlTGVuZ3RoLCBzMSwgdTIpOworCisgICAgICAgIHVuc2ln bmVkIGluZGV4ID0gMDsKKyAgICAgICAgUmVmUHRyPEpTU3RyaW5nOjpSb3BlPiByb3BlID0gSlNT dHJpbmc6OlJvcGU6OmNyZWF0ZU9yTnVsbChyb3BlTGVuZ3RoKTsKKyAgICAgICAgaWYgKFVOTElL RUxZKCFyb3BlKSkKKyAgICAgICAgICAgIHJldHVybiB0aHJvd091dE9mTWVtb3J5RXJyb3IoZXhl Yyk7CisgICAgICAgIHJvcGUtPmFwcGVuZChpbmRleCwgczEpOworICAgICAgICByb3BlLT5hcHBl bmQoaW5kZXgsIHUyKTsKKyAgICAgICAgQVNTRVJUKGluZGV4ID09IHJvcGVMZW5ndGgpOworICAg ICAgICByZXR1cm4gbmV3IChnbG9iYWxEYXRhKSBKU1N0cmluZyhnbG9iYWxEYXRhLCByb3BlLnJl bGVhc2UoKSk7CisgICAgfQorCiAgICAgQUxXQVlTX0lOTElORSBKU1ZhbHVlIGpzU3RyaW5nKEV4 ZWNTdGF0ZSogZXhlYywgUmVnaXN0ZXIqIHN0cmluZ3MsIHVuc2lnbmVkIGNvdW50KQogICAgIHsK ICAgICAgICAgQVNTRVJUKGNvdW50ID49IDMpOwpAQCAtMjQ3LDMwICsyODgsMTQgQEAgbmFtZXNw YWNlIEpTQyB7CiAKICAgICBBTFdBWVNfSU5MSU5FIEpTVmFsdWUganNBZGQoQ2FsbEZyYW1lKiBj YWxsRnJhbWUsIEpTVmFsdWUgdjEsIEpTVmFsdWUgdjIpCiAgICAgewotICAgICAgICBkb3VibGUg bGVmdDsKLSAgICAgICAgZG91YmxlIHJpZ2h0ID0gMC4wOwotCi0gICAgICAgIGJvb2wgcmlnaHRJ c051bWJlciA9IHYyLmdldE51bWJlcihyaWdodCk7Ci0gICAgICAgIGlmIChyaWdodElzTnVtYmVy ICYmIHYxLmdldE51bWJlcihsZWZ0KSkKKyAgICAgICAgZG91YmxlIGxlZnQgPSAwLjAsIHJpZ2h0 OworICAgICAgICBpZiAodjEuZ2V0TnVtYmVyKGxlZnQpLCB2Mi5nZXROdW1iZXIocmlnaHQpKQog ICAgICAgICAgICAgcmV0dXJuIGpzTnVtYmVyKGNhbGxGcmFtZSwgbGVmdCArIHJpZ2h0KTsKICAg ICAgICAgCi0gICAgICAgIGJvb2wgbGVmdElzU3RyaW5nID0gdjEuaXNTdHJpbmcoKTsKLSAgICAg ICAgaWYgKGxlZnRJc1N0cmluZyAmJiB2Mi5pc1N0cmluZygpKSB7Ci0gICAgICAgICAgICBpZiAo IWFzU3RyaW5nKHYxKS0+bGVuZ3RoKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGFzU3RyaW5n KHYyKTsKLSAgICAgICAgICAgIGlmICghYXNTdHJpbmcodjIpLT5sZW5ndGgoKSkKLSAgICAgICAg ICAgICAgICByZXR1cm4gYXNTdHJpbmcodjEpOwotICAgICAgICAgICAgcmV0dXJuIGpzU3RyaW5n KGNhbGxGcmFtZSwgYXNTdHJpbmcodjEpLCBhc1N0cmluZyh2MikpOwotICAgICAgICB9Ci0KLSAg ICAgICAgaWYgKHJpZ2h0SXNOdW1iZXIgJiBsZWZ0SXNTdHJpbmcpIHsKLSAgICAgICAgICAgIFJl ZlB0cjxVU3RyaW5nOjpSZXA+IHZhbHVlID0gdjIuaXNJbnQzMigpID8KLSAgICAgICAgICAgICAg ICBjb25jYXRlbmF0ZShhc1N0cmluZyh2MSktPnZhbHVlKGNhbGxGcmFtZSkucmVwKCksIHYyLmFz SW50MzIoKSkgOgotICAgICAgICAgICAgICAgIGNvbmNhdGVuYXRlKGFzU3RyaW5nKHYxKS0+dmFs dWUoY2FsbEZyYW1lKS5yZXAoKSwgcmlnaHQpOwotCi0gICAgICAgICAgICBpZiAoIXZhbHVlKQot ICAgICAgICAgICAgICAgIHJldHVybiB0aHJvd091dE9mTWVtb3J5RXJyb3IoY2FsbEZyYW1lKTsK LSAgICAgICAgICAgIHJldHVybiBqc1N0cmluZyhjYWxsRnJhbWUsIHZhbHVlLnJlbGVhc2UoKSk7 CisgICAgICAgIGlmICh2MS5pc1N0cmluZygpKSB7CisgICAgICAgICAgICByZXR1cm4gdjIuaXNT dHJpbmcoKQorICAgICAgICAgICAgICAgID8ganNTdHJpbmcoY2FsbEZyYW1lLCBhc1N0cmluZyh2 MSksIGFzU3RyaW5nKHYyKSkKKyAgICAgICAgICAgICAgICA6IGpzU3RyaW5nKGNhbGxGcmFtZSwg YXNTdHJpbmcodjEpLCB2Mi50b1N0cmluZyhjYWxsRnJhbWUpKTsKICAgICAgICAgfQogCiAgICAg ICAgIC8vIEFsbCBvdGhlciBjYXNlcyBhcmUgcHJldHR5IHVuY29tbW9uCg==