32720 2009-12-18 09:40:28 -0800 Remove use of UString append / addition from WebCore 2009-12-18 12:03:04 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 173200 0 barraclough 2009-12-18 09:40:28 -0800 Required to allow us to remove these altogether. 173202 1 45159 barraclough 2009-12-18 09:45:03 -0800 Created attachment 45159 The patch 173250 2 barraclough 2009-12-18 12:03:04 -0800 Transmitting file data ........ Committed revision 52329. 45159 2009-12-18 09:45:03 -0800 2009-12-18 09:49:36 -0800 The patch patch.webcoreappend.txt text/plain 9688 barraclough SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyMzEzKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMTItMTggIEdhdmluIEJh cnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjcyMAorCisgICAgICAgICogSmF2YVNjcmlwdENvcmUuZXhwOgorICAgICAg ICAgICAgLSBSZW1vdmUgZXhwb3J0cyBmb3IgVVN0cmluZzo6YXBwZW5kCisgICAgICAgICogSmF2 YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgICAgIC0gTWFr ZSBTdHJpbmdCdWlsZGVyIGEgcHJpdmF0ZSBoZWFkZXIgKHdhcyBwcm9qZWN0KS4KKwogMjAwOS0x Mi0xOCAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL0ph dmFTY3JpcHRDb3JlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0 Q29yZS5leHAJKHJldmlzaW9uIDUyMjE5KQorKysgSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENv cmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzYsMTAgKzIzNiw5IEBAIF9fWk4zSlNDN1VTdHJp bmc0ZnJvbUVkCiBfX1pOM0pTQzdVU3RyaW5nNGZyb21FaQogX19aTjNKU0M3VVN0cmluZzRmcm9t RWoKIF9fWk4zSlNDN1VTdHJpbmc0ZnJvbUVsCi1fX1pOM0pTQzdVU3RyaW5nNmFwcGVuZEVQS2MK LV9fWk4zSlNDN1VTdHJpbmc2YXBwZW5kRVJLUzBfCiBfX1pOM0pTQzdVU3RyaW5nQzFFUEtjCiBf X1pOM0pTQzdVU3RyaW5nQzFFUEt0aQorX19aTjNKU0M3VVN0cmluZ0MxRVB0aWIKIF9fWk4zSlND N1VTdHJpbmdhU0VQS2MKIF9fWk4zSlNDOERlYnVnZ2VyMjNyZWNvbXBpbGVBbGxKU0Z1bmN0aW9u c0VQTlNfMTJKU0dsb2JhbERhdGFFCiBfX1pOM0pTQzhEZWJ1Z2dlcjZhdHRhY2hFUE5TXzE0SlNH bG9iYWxPYmplY3RFCkluZGV4OiBKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDUyMjE5KQorKysgSmF2 YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29y a2luZyBjb3B5KQpAQCAtMjA1LDcgKzIwNSw3IEBACiAJCTg2M0IyM0UwMEZDNjExODkwMDcwM0FB NCAvKiBNYWNyb0Fzc2VtYmxlckNvZGVSZWYuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDg2M0IyM0RGMEZDNjBFNjIwMDcwM0FBNCAvKiBNYWNyb0Fzc2Vt YmxlckNvZGVSZWYuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OwogCQk4NjkwODMxNTBFNjUxOEQ3MDAwRDM2RUQgLyogV1JFQy5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4NjkwODMxMzBFNjUxOEQ3MDAwRDM2 RUQgLyogV1JFQy5jcHAgKi87IH07CiAJCTg2OTA4MzE2MEU2NTE4RDcwMDBEMzZFRCAvKiBXUkVD LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4NjkwODMx NDBFNjUxOEQ3MDAwRDM2RUQgLyogV1JFQy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0g KFByaXZhdGUsICk7IH07IH07Ci0JCTg2OThCODY5MTBENDREOTQwMEQ4RDAxQiAvKiBTdHJpbmdC dWlsZGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4 Njk4Qjg2ODEwRDQ0RDk0MDBEOEQwMUIgLyogU3RyaW5nQnVpbGRlci5oICovOyB9OworCQk4Njk4 Qjg2OTEwRDQ0RDk0MDBEOEQwMUIgLyogU3RyaW5nQnVpbGRlci5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODY5OEI4NjgxMEQ0NEQ5NDAwRDhEMDFCIC8q IFN0cmluZ0J1aWxkZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCAp OyB9OyB9OwogCQk4NjlFQkNCNzBFOEM2RDRBMDA4NzIyQ0MgLyogUmVzdWx0VHlwZS5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODY5RUJDQjYwRThDNkQ0 QTAwODcyMkNDIC8qIFJlc3VsdFR5cGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ cml2YXRlLCApOyB9OyB9OwogCQk4NkE5MEVEMDBFRTdENTFGMDBBQjM1MEQgLyogSklUQXJpdGht ZXRpYy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4 NkE5MEVDRjBFRTdENTFGMDBBQjM1MEQgLyogSklUQXJpdGhtZXRpYy5jcHAgKi87IH07CiAJCTg2 QUREMTQ1MEZEREVBOTgwMDA2RUVDMiAvKiBBUk12N0Fzc2VtYmxlci5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODZBREQxNDMwRkRERUE5ODAwMDZFRUMy IC8qIEFSTXY3QXNzZW1ibGVyLmggKi87IH07CkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNTIzMTMpCisrKyBXZWJDb3Jl L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDA5LTEyLTE4ICBH YXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzI3MjAKKyAgICAgICAgUmVwbGFjZSBVU3RyaW5nIGFkZGl0aW9u L2FwcGVuZCB3aXRoIHVzZSBvZiBKU0M6OlN0cmluZ0J1aWxkZXIuCisKKyAgICAgICAgKiBGb3J3 YXJkaW5nSGVhZGVycy9ydW50aW1lL1N0cmluZ0J1aWxkZXIuaDogQWRkZWQuCisgICAgICAgICog YmluZGluZ3MvanMvU2NyaXB0U3RyaW5nLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRTdHJp bmc6Om9wZXJhdG9yKz0pOgorICAgICAgICAqIGJyaWRnZS9qbmkvam5pX3J1bnRpbWUuY3BwOgor ICAgICAgICAoYXBwZW5kQ2xhc3NOYW1lKToKKyAgICAgICAgKEphdmFNZXRob2Q6OnNpZ25hdHVy ZSk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6YWRkUHJvZmlsZUZpbmlzaGVkTWVzc2Fn ZVRvQ29uc29sZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjphZGRT dGFydFByb2ZpbGluZ01lc3NhZ2VUb0NvbnNvbGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6Z2V0Q3VycmVudFVzZXJJbml0aWF0ZWRQcm9maWxlTmFtZSk6CisKIDIw MDktMTItMTggIFNodSBDaGFuZyAgPENoYW5nLlNodUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL0ZvcndhcmRpbmdIZWFkZXJzL3J1 bnRpbWUvU3RyaW5nQnVpbGRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvRm9yd2FyZGluZ0hl YWRlcnMvcnVudGltZS9TdHJpbmdCdWlsZGVyLmgJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL0Zv cndhcmRpbmdIZWFkZXJzL3J1bnRpbWUvU3RyaW5nQnVpbGRlci5oCShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDQgQEAKKyNpZm5kZWYgV2ViQ29yZV9GV0RfU3RyaW5nQnVpbGRlcl9oCisjZGVmaW5l IFdlYkNvcmVfRldEX1N0cmluZ0J1aWxkZXJfaAorI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1N0 cmluZ0J1aWxkZXIuaD4KKyNlbmRpZgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRT dHJpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFN0cmluZy5o CShyZXZpc2lvbiA1MjIxOSkKKysrIFdlYkNvcmUvYmluZGluZ3MvanMvU2NyaXB0U3RyaW5nLmgJ KHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcgQEAKIAogI2luY2x1ZGUgIlBsYXRmb3JtU3Ry aW5nLmgiCiAjaW5jbHVkZSA8cnVudGltZS9VU3RyaW5nLmg+CisjaW5jbHVkZSA8cnVudGltZS9T dHJpbmdCdWlsZGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNTcsNyArNTgsMTAg QEAgcHVibGljOgogCiAgICAgU2NyaXB0U3RyaW5nJiBvcGVyYXRvcis9KGNvbnN0IFN0cmluZyYg cykKICAgICB7Ci0gICAgICAgIG1fc3RyICs9IHM7CisgICAgICAgIEpTQzo6U3RyaW5nQnVpbGRl ciBidWZmZXI7CisgICAgICAgIGJ1ZmZlci5hcHBlbmQobV9zdHIpOworICAgICAgICBidWZmZXIu YXBwZW5kKHMpOworICAgICAgICBtX3N0ciA9IGJ1ZmZlci5yZWxlYXNlKCk7CiAgICAgICAgIHJl dHVybiAqdGhpczsKICAgICB9CiAKSW5kZXg6IFdlYkNvcmUvYnJpZGdlL2puaS9qbmlfcnVudGlt ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2Uvam5pL2puaV9ydW50aW1lLmNwcAko cmV2aXNpb24gNTIyMTkpCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvam5pX3J1bnRpbWUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAicnVudGltZV9yb290Lmgi CiAjaW5jbHVkZSA8cnVudGltZS9FcnJvci5oPgogI2luY2x1ZGUgPHJ1bnRpbWUvSlNMb2NrLmg+ CisjaW5jbHVkZSA8cnVudGltZS9TdHJpbmdCdWlsZGVyLmg+CiAKICNpZmRlZiBOREVCVUcKICNk ZWZpbmUgSlNfTE9HKGZvcm1hdEFuZEFyZ3MuLi4pICgodm9pZCkwKQpAQCAtMjk2LDcgKzI5Nyw3 IEBAIEphdmFNZXRob2Q6On5KYXZhTWV0aG9kKCkgCiAKIC8vIEpOSSBtZXRob2Qgc2lnbmF0dXJl cyB1c2UgJy8nIGJldHdlZW4gY29tcG9uZW50cyBvZiBhIGNsYXNzIG5hbWUsIGJ1dAogLy8gd2Ug Z2V0ICcuJyBiZXR3ZWVuIGNvbXBvbmVudHMgZnJvbSB0aGUgcmVmbGVjdGlvbiBBUEkuCi1zdGF0 aWMgdm9pZCBhcHBlbmRDbGFzc05hbWUoVVN0cmluZyYgYVN0cmluZywgY29uc3QgY2hhciogY2xh c3NOYW1lKQorc3RhdGljIHZvaWQgYXBwZW5kQ2xhc3NOYW1lKFN0cmluZ0J1aWxkZXImIGJ1aWxk ZXIsIGNvbnN0IGNoYXIqIGNsYXNzTmFtZSkKIHsKICAgICBBU1NFUlQoSlNMb2NrOjpsb2NrQ291 bnQoKSA+IDApOwogICAgIApAQCAtMzA5LDkgKzMxMCw5IEBAIHN0YXRpYyB2b2lkIGFwcGVuZENs YXNzTmFtZShVU3RyaW5nJiBhU3QKICAgICAgICAgY3ArKzsKICAgICB9CiAgICAgICAgIAotICAg IGFTdHJpbmcuYXBwZW5kKHJlc3VsdCk7CisgICAgYnVpbGRlci5hcHBlbmQocmVzdWx0KTsKIAot ICAgIGZyZWUgKHJlc3VsdCk7CisgICAgZnJlZShyZXN1bHQpOwogfQogCiBjb25zdCBjaGFyICpK YXZhTWV0aG9kOjpzaWduYXR1cmUoKSBjb25zdCAKQEAgLTMxOSw3ICszMjAsOCBAQCBjb25zdCBj aGFyICpKYXZhTWV0aG9kOjpzaWduYXR1cmUoKSBjb25zCiAgICAgaWYgKCFfc2lnbmF0dXJlKSB7 CiAgICAgICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAKLSAgICAgICAg VVN0cmluZyBzaWduYXR1cmVCdWlsZGVyKCIoIik7CisgICAgICAgIFN0cmluZ0J1aWxkZXIgc2ln bmF0dXJlQnVpbGRlcjsKKyAgICAgICAgc2lnbmF0dXJlQnVpbGRlci5hcHBlbmQoIigiKTsKICAg ICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBfbnVtUGFyYW1ldGVyczsgaSsrKSB7CiAgICAgICAg ICAgICBKYXZhUGFyYW1ldGVyKiBhUGFyYW1ldGVyID0gcGFyYW1ldGVyQXQoaSk7CiAgICAgICAg ICAgICBKTklUeXBlIF9KTklUeXBlID0gYVBhcmFtZXRlci0+Z2V0Sk5JVHlwZSgpOwpAQCAtMzQ2 LDcgKzM0OCw4IEBAIGNvbnN0IGNoYXIgKkphdmFNZXRob2Q6OnNpZ25hdHVyZSgpIGNvbnMKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICAKLSAgICAgICAgX3NpZ25hdHVyZSA9IHN0 cmR1cChzaWduYXR1cmVCdWlsZGVyLmFzY2lpKCkpOworICAgICAgICBVU3RyaW5nIHNpZ25hdHVy ZVVTdHJpbmcgPSBzaWduYXR1cmVCdWlsZGVyLnJlbGVhc2UoKTsKKyAgICAgICAgX3NpZ25hdHVy ZSA9IHN0cmR1cChzaWduYXR1cmVVU3RyaW5nLmFzY2lpKCkpOwogICAgIH0KICAgICAKICAgICBy ZXR1cm4gX3NpZ25hdHVyZTsKSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRy b2xsZXIuY3BwCShyZXZpc2lvbiA1MjIxOSkKKysrIFdlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNiArMTAwLDcgQEAKICNpbmNs dWRlIDxwcm9maWxlci9Qcm9maWxlLmg+CiAjaW5jbHVkZSA8cHJvZmlsZXIvUHJvZmlsZXIuaD4K ICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgorI2luY2x1ZGUgPHJ1bnRpbWUvU3RyaW5nQnVp bGRlci5oPgogI2luY2x1ZGUgPHJ1bnRpbWUvVVN0cmluZy5oPgogCiB1c2luZyBuYW1lc3BhY2Ug SlNDOwpAQCAtMTM1NSwyNCArMTM1NiwyNiBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmFk ZFByb2ZpbGVGaW5pCiB7CiAgICAgUmVmUHRyPFByb2ZpbGU+IHByb2ZpbGUgPSBwcnBQcm9maWxl OwogCi0gICAgVVN0cmluZyBtZXNzYWdlID0gIlByb2ZpbGUgXCJ3ZWJraXQtcHJvZmlsZTovLyI7 Ci0gICAgbWVzc2FnZSArPSBlbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKENQVVByb2ZpbGVU eXBlKTsKLSAgICBtZXNzYWdlICs9ICIvIjsKLSAgICBtZXNzYWdlICs9IGVuY29kZVdpdGhVUkxF c2NhcGVTZXF1ZW5jZXMocHJvZmlsZS0+dGl0bGUoKSk7Ci0gICAgbWVzc2FnZSArPSAiIyI7Ci0g ICAgbWVzc2FnZSArPSBVU3RyaW5nOjpmcm9tKHByb2ZpbGUtPnVpZCgpKTsKLSAgICBtZXNzYWdl ICs9ICJcIiBmaW5pc2hlZC4iOwotICAgIGFkZE1lc3NhZ2VUb0NvbnNvbGUoSlNNZXNzYWdlU291 cmNlLCBMb2dNZXNzYWdlVHlwZSwgTG9nTWVzc2FnZUxldmVsLCBtZXNzYWdlLCBsaW5lTnVtYmVy LCBzb3VyY2VVUkwpOworICAgIEpTQzo6U3RyaW5nQnVpbGRlciBtZXNzYWdlOworICAgIG1lc3Nh Z2UuYXBwZW5kKCJQcm9maWxlIFwid2Via2l0LXByb2ZpbGU6Ly8iKTsKKyAgICBtZXNzYWdlLmFw cGVuZCgoVVN0cmluZyllbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKENQVVByb2ZpbGVUeXBl KSk7CisgICAgbWVzc2FnZS5hcHBlbmQoIi8iKTsKKyAgICBtZXNzYWdlLmFwcGVuZCgoVVN0cmlu ZyllbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKHByb2ZpbGUtPnRpdGxlKCkpKTsKKyAgICBt ZXNzYWdlLmFwcGVuZCgiIyIpOworICAgIG1lc3NhZ2UuYXBwZW5kKFVTdHJpbmc6OmZyb20ocHJv ZmlsZS0+dWlkKCkpKTsKKyAgICBtZXNzYWdlLmFwcGVuZCgiXCIgZmluaXNoZWQuIik7CisgICAg YWRkTWVzc2FnZVRvQ29uc29sZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBMb2dN ZXNzYWdlTGV2ZWwsIG1lc3NhZ2UucmVsZWFzZSgpLCBsaW5lTnVtYmVyLCBzb3VyY2VVUkwpOwog fQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmFkZFN0YXJ0UHJvZmlsaW5nTWVzc2FnZVRv Q29uc29sZShjb25zdCBVU3RyaW5nJiB0aXRsZSwgdW5zaWduZWQgbGluZU51bWJlciwgY29uc3Qg VVN0cmluZyYgc291cmNlVVJMKQogewotICAgIFVTdHJpbmcgbWVzc2FnZSA9ICJQcm9maWxlIFwi d2Via2l0LXByb2ZpbGU6Ly8iOwotICAgIG1lc3NhZ2UgKz0gZW5jb2RlV2l0aFVSTEVzY2FwZVNl cXVlbmNlcyhDUFVQcm9maWxlVHlwZSk7Ci0gICAgbWVzc2FnZSArPSAiLyI7Ci0gICAgbWVzc2Fn ZSArPSBlbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKHRpdGxlKTsKLSAgICBtZXNzYWdlICs9 ICIjMFwiIHN0YXJ0ZWQuIjsKLSAgICBhZGRNZXNzYWdlVG9Db25zb2xlKEpTTWVzc2FnZVNvdXJj ZSwgTG9nTWVzc2FnZVR5cGUsIExvZ01lc3NhZ2VMZXZlbCwgbWVzc2FnZSwgbGluZU51bWJlciwg c291cmNlVVJMKTsKKyAgICBKU0M6OlN0cmluZ0J1aWxkZXIgbWVzc2FnZTsKKyAgICBtZXNzYWdl LmFwcGVuZCgiUHJvZmlsZSBcIndlYmtpdC1wcm9maWxlOi8vIik7CisgICAgbWVzc2FnZS5hcHBl bmQoZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhDUFVQcm9maWxlVHlwZSkpOworICAgIG1l c3NhZ2UuYXBwZW5kKCIvIik7CisgICAgbWVzc2FnZS5hcHBlbmQoZW5jb2RlV2l0aFVSTEVzY2Fw ZVNlcXVlbmNlcyh0aXRsZSkpOworICAgIG1lc3NhZ2UuYXBwZW5kKCIjMFwiIHN0YXJ0ZWQuIik7 CisgICAgYWRkTWVzc2FnZVRvQ29uc29sZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBl LCBMb2dNZXNzYWdlTGV2ZWwsIG1lc3NhZ2UucmVsZWFzZSgpLCBsaW5lTnVtYmVyLCBzb3VyY2VV UkwpOwogfQogCiB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmdldFByb2ZpbGVIZWFkZXJzKGxv bmcgY2FsbElkKQpAQCAtMTQxMCwxMSArMTQxMywxMiBAQCBVU3RyaW5nIEluc3BlY3RvckNvbnRy b2xsZXI6OmdldEN1cnJlbnRVCiAgICAgaWYgKGluY3JlbWVudFByb2ZpbGVOdW1iZXIpCiAgICAg ICAgIG1fY3VycmVudFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyID0gbV9uZXh0VXNlckluaXRp YXRlZFByb2ZpbGVOdW1iZXIrKzsgICAgICAgIAogCi0gICAgVVN0cmluZyB0aXRsZSA9IFVzZXJJ bml0aWF0ZWRQcm9maWxlTmFtZTsKLSAgICB0aXRsZSArPSAiLiI7Ci0gICAgdGl0bGUgKz0gVVN0 cmluZzo6ZnJvbShtX2N1cnJlbnRVc2VySW5pdGlhdGVkUHJvZmlsZU51bWJlcik7CisgICAgSlND OjpTdHJpbmdCdWlsZGVyIHRpdGxlOworICAgIHRpdGxlLmFwcGVuZChVc2VySW5pdGlhdGVkUHJv ZmlsZU5hbWUpOworICAgIHRpdGxlLmFwcGVuZCgiLiIpOworICAgIHRpdGxlLmFwcGVuZChVU3Ry aW5nOjpmcm9tKG1fY3VycmVudFVzZXJJbml0aWF0ZWRQcm9maWxlTnVtYmVyKSk7CiAgICAgCi0g ICAgcmV0dXJuIHRpdGxlOworICAgIHJldHVybiB0aXRsZS5yZWxlYXNlKCk7CiB9CiAKIHZvaWQg SW5zcGVjdG9yQ29udHJvbGxlcjo6c3RhcnRVc2VySW5pdGlhdGVkUHJvZmlsaW5nU29vbigpCg==