163239 2016-10-10 14:03:50 -0700 Rename the StrictModeReadonlyPropertyWriteError string to ReadonlyPropertyWriteError. 2016-10-10 14:16:34 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1238517 0 mark.lam 2016-10-10 14:03:50 -0700 This string is also used for reporting the same error in cases which have nothing to do with strict mode. 1238522 1 291158 mark.lam 2016-10-10 14:06:56 -0700 Created attachment 291158 proposed patch. 1238529 2 mark.lam 2016-10-10 14:16:34 -0700 Thanks for the review. Landed in r207023: <http://trac.webkit.org/r207023>. 291158 2016-10-10 14:06:56 -0700 2016-10-10 14:08:18 -0700 proposed patch. bug-163239.patch text/plain 21435 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA3MDIwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU0IEBA CisyMDE2LTEwLTEwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgdGhlIFN0cmljdE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvciBzdHJpbmcgdG8g UmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMyMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHN0cmluZyBpcyBhbHNvIHVzZWQgZm9yIHJlcG9ydGlu ZyB0aGUgc2FtZSBlcnJvciBpbiBjYXNlcyB3aGljaCBoYXZlIG5vdGhpbmcKKyAgICAgICAgdG8g ZG8gd2l0aCBzdHJpY3QgbW9kZS4KKworICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0UmVhZE9u bHlFeGNlcHRpb25JZk5lZWRlZCk6CisgICAgICAgICogcnVudGltZS9Db21tb25TbG93UGF0aHMu Y3BwOgorICAgICAgICAoSlNDOjpTTE9XX1BBVEhfREVDTCk6CisgICAgICAgICogcnVudGltZS9H ZXR0ZXJTZXR0ZXIuY3BwOgorICAgICAgICAoSlNDOjpjYWxsU2V0dGVyKToKKyAgICAgICAgKiBy dW50aW1lL0pTQXJyYXkuY3BwOgorICAgICAgICAoSlNDOjpKU0FycmF5OjpzZXRMZW5ndGhXaXRo QXJyYXlTdG9yYWdlKToKKyAgICAgICAgKEpTQzo6SlNBcnJheTo6cG9wKToKKyAgICAgICAgKiBy dW50aW1lL0pTQ0pTVmFsdWUuY3BwOgorICAgICAgICAoSlNDOjpKU1ZhbHVlOjpwdXRUb1ByaW1p dGl2ZSk6CisgICAgICAgIChKU0M6OkpTVmFsdWU6OnB1dFRvUHJpbWl0aXZlQnlJbmRleCk6Cisg ICAgICAgICogcnVudGltZS9KU0Z1bmN0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6SlNGdW5jdGlv bjo6cHV0KToKKyAgICAgICAgKiBydW50aW1lL0pTTW9kdWxlRW52aXJvbm1lbnQuY3BwOgorICAg ICAgICAoSlNDOjpKU01vZHVsZUVudmlyb25tZW50OjpwdXQpOgorICAgICAgICAqIHJ1bnRpbWUv SlNNb2R1bGVOYW1lc3BhY2VPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpKU01vZHVsZU5hbWVz cGFjZU9iamVjdDo6cHV0KToKKyAgICAgICAgKEpTQzo6SlNNb2R1bGVOYW1lc3BhY2VPYmplY3Q6 OnB1dEJ5SW5kZXgpOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3QuY3BwOgorICAgICAgICAo SlNDOjpvcmRpbmFyeVNldFNsb3cpOgorICAgICAgICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5l U2xvdyk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpzZXRQcm90b3R5cGVXaXRoQ3ljbGVDaGVj ayk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXRCeUluZGV4QmV5b25kVmVjdG9yTGVuZ3Ro V2l0aEFycmF5U3RvcmFnZSk6CisgICAgICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3RJbmRl eEJleW9uZFZlY3Rvckxlbmd0aFdpdGhBcnJheVN0b3JhZ2UpOgorICAgICAgICAqIHJ1bnRpbWUv SlNPYmplY3QuaDoKKyAgICAgICAgKiBydW50aW1lL0pTT2JqZWN0SW5saW5lcy5oOgorICAgICAg ICAoSlNDOjpKU09iamVjdDo6cHV0SW5saW5lKToKKyAgICAgICAgKiBydW50aW1lL0pTU3ltYm9s VGFibGVPYmplY3QuaDoKKyAgICAgICAgKEpTQzo6c3ltYm9sVGFibGVQdXQpOgorICAgICAgICAq IHJ1bnRpbWUvTG9va3VwLmg6CisgICAgICAgIChKU0M6OnB1dEVudHJ5KToKKyAgICAgICAgKiBy dW50aW1lL1JlZ0V4cE9iamVjdC5oOgorICAgICAgICAoSlNDOjpSZWdFeHBPYmplY3Q6OnNldExh c3RJbmRleCk6CisgICAgICAgICogcnVudGltZS9TcGFyc2VBcnJheVZhbHVlTWFwLmNwcDoKKyAg ICAgICAgKEpTQzo6U3BhcnNlQXJyYXlWYWx1ZU1hcDo6cHV0RW50cnkpOgorICAgICAgICAoSlND OjpTcGFyc2VBcnJheUVudHJ5OjpwdXQpOgorICAgICAgICAqIHJ1bnRpbWUvU3RyaW5nT2JqZWN0 LmNwcDoKKyAgICAgICAgKEpTQzo6U3RyaW5nT2JqZWN0OjpwdXQpOgorICAgICAgICAoSlNDOjpT dHJpbmdPYmplY3Q6OnB1dEJ5SW5kZXgpOgorCiAyMDE2LTEwLTEwICBTYWFtIEJhcmF0aSAgPHNi YXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIGNvbXBpbGVDaGVja1N0cmluZ0lkZW50IGluIHRo ZSBGVEwgaXMgd3JvbmcKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIv Qnl0ZWNvZGVHZW5lcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAyMDcwMDApCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDEzMSw3ICs0MTMxLDcgQEAgYm9vbCBCeXRlY29kZUdlbmVy YXRvcjo6ZW1pdFJlYWRPbmx5RXhjZQogICAgIC8vIElmIHdlJ3JlIGluIHN0cmljdCBtb2RlLCB3 ZSBhbHdheXMgdGhyb3cuCiAgICAgLy8gSWYgd2UncmUgbm90IGluIHN0cmljdCBtb2RlLCB3ZSB0 aHJvdyBmb3IgImNvbnN0IiB2YXJpYWJsZXMgYnV0IG5vdCB0aGUgZnVuY3Rpb24gY2FsbGVlLgog ICAgIGlmIChpc1N0cmljdE1vZGUoKSB8fCB2YXJpYWJsZS5pc0NvbnN0KCkpIHsKLSAgICAgICAg ZW1pdFRocm93VHlwZUVycm9yKElkZW50aWZpZXI6OmZyb21TdHJpbmcobV92bSwgU3RyaWN0TW9k ZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKSk7CisgICAgICAgIGVtaXRUaHJvd1R5cGVFcnJv cihJZGVudGlmaWVyOjpmcm9tU3RyaW5nKG1fdm0sIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9y KSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5j cHAJKHJldmlzaW9uIDIwNzAwMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Nv bW1vblNsb3dQYXRocy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3Niw3ICsyNzYsNyBAQCBTTE9X X1BBVEhfREVDTChzbG93X3BhdGhfdGhyb3dfdGR6X2Vycm9yCiBTTE9XX1BBVEhfREVDTChzbG93 X3BhdGhfdGhyb3dfc3RyaWN0X21vZGVfcmVhZG9ubHlfcHJvcGVydHlfd3JpdGVfZXJyb3IpCiB7 CiAgICAgQkVHSU4oKTsKLSAgICBUSFJPVyhjcmVhdGVUeXBlRXJyb3IoZXhlYywgQVNDSUlMaXRl cmFsKFN0cmljdE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcikpKTsKKyAgICBUSFJPVyhj cmVhdGVUeXBlRXJyb3IoZXhlYywgQVNDSUlMaXRlcmFsKFJlYWRvbmx5UHJvcGVydHlXcml0ZUVy cm9yKSkpOwogfQogCiBTTE9XX1BBVEhfREVDTChzbG93X3BhdGhfbm90KQpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvR2V0dGVyU2V0dGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HZXR0ZXJTZXR0ZXIuY3BwCShyZXZpc2lvbiAy MDcwMDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9HZXR0ZXJTZXR0ZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC05NSw3ICs5NSw3IEBAIGJvb2wgY2FsbFNldHRlcihFeGVjU3Rh dGUqIGV4ZWMsIEpTVmFsdWUKIAogICAgIGlmIChnZXR0ZXJTZXR0ZXJPYmotPmlzU2V0dGVyTnVs bCgpKSB7CiAgICAgICAgIGlmIChlY21hTW9kZSA9PSBTdHJpY3RNb2RlKQotICAgICAgICAgICAg dGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFN0cmljdE1vZGVSZWFkb25seVByb3BlcnR5V3Jp dGVFcnJvcik7CisgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgUmVhZG9u bHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FycmF5LmNwcAkocmV2aXNpb24g MjA3MDAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNBcnJheS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQwNiw3ICs0MDYsNyBAQCBib29sIEpTQXJyYXk6OnNldExlbmd0aFdp dGhBcnJheVN0b3JhZ2UoCiAgICAgaWYgKFNwYXJzZUFycmF5VmFsdWVNYXAqIG1hcCA9IHN0b3Jh Z2UtPm1fc3BhcnNlTWFwLmdldCgpKSB7CiAgICAgICAgIC8vIEZhaWwgaWYgdGhlIGxlbmd0aCBp cyBub3Qgd3JpdGFibGUuCiAgICAgICAgIGlmIChtYXAtPmxlbmd0aElzUmVhZE9ubHkoKSkKLSAg ICAgICAgICAgIHJldHVybiByZWplY3QoZXhlYywgdGhyb3dFeGNlcHRpb24sIFN0cmljdE1vZGVS ZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CisgICAgICAgICAgICByZXR1cm4gcmVqZWN0KGV4 ZWMsIHRocm93RXhjZXB0aW9uLCBSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CiAKICAgICAg ICAgaWYgKG5ld0xlbmd0aCA8IGxlbmd0aCkgewogICAgICAgICAgICAgLy8gQ29weSBhbnkga2V5 cyB3ZSBtaWdodCBiZSBpbnRlcmVzdGVkIGluIGludG8gYSB2ZWN0b3IuCkBAIC02MjUsNyArNjI1 LDcgQEAgSlNWYWx1ZSBKU0FycmF5Ojpwb3AoRXhlY1N0YXRlKiBleGVjKQogICAgICAgICB1bnNp Z25lZCBsZW5ndGggPSBzdG9yYWdlLT5sZW5ndGgoKTsKICAgICAgICAgaWYgKCFsZW5ndGgpIHsK ICAgICAgICAgICAgIGlmICghaXNMZW5ndGhXcml0YWJsZSgpKQotICAgICAgICAgICAgICAgIHRo cm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRl RXJyb3IpOworICAgICAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBSZWFk b25seVByb3BlcnR5V3JpdGVFcnJvcik7CiAgICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQo KTsKICAgICAgICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NK U1ZhbHVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0NKU1ZhbHVlLmNwcAkocmV2aXNpb24gMjA3MDAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNDSlNWYWx1ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Myw3ICsxNjMsNyBA QCBib29sIEpTVmFsdWU6OnB1dFRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSogCiAgICAgICAgICAgICBw cm90b3R5cGUgPSBvYmotPmdldFByb3RvdHlwZURpcmVjdCgpOwogICAgICAgICAgICAgaWYgKHBy b3RvdHlwZS5pc051bGwoKSkgewogICAgICAgICAgICAgICAgIGlmIChzbG90LmlzU3RyaWN0TW9k ZSgpKQotICAgICAgICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgU3Ry aWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKKyAgICAgICAgICAgICAgICAgICAg dGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsK ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K QEAgLTE3NSw3ICsxNzUsNyBAQCBib29sIEpTVmFsdWU6OnB1dFRvUHJpbWl0aXZlKEV4ZWNTdGF0 ZSogCiAgICAgICAgIGlmIChvZmZzZXQgIT0gaW52YWxpZE9mZnNldCkgewogICAgICAgICAgICAg aWYgKGF0dHJpYnV0ZXMgJiBSZWFkT25seSkgewogICAgICAgICAgICAgICAgIGlmIChzbG90Lmlz U3RyaWN0TW9kZSgpKQotICAgICAgICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBz Y29wZSwgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKKyAgICAgICAgICAg ICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRvbmx5UHJvcGVydHlXcml0 ZUVycm9yKTsKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICB9CiAK QEAgLTE5OCw3ICsxOTgsNyBAQCBib29sIEpTVmFsdWU6OnB1dFRvUHJpbWl0aXZlKEV4ZWNTdGF0 ZSogCiAgICAgfQogICAgIAogICAgIGlmIChzbG90LmlzU3RyaWN0TW9kZSgpKQotICAgICAgICB0 aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0 ZUVycm9yKTsKKyAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRvbmx5UHJv cGVydHlXcml0ZUVycm9yKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTIyMiw3ICsyMjIs NyBAQCBib29sIEpTVmFsdWU6OnB1dFRvUHJpbWl0aXZlQnlJbmRleChFeGVjCiAgICAgICAgIHJl dHVybiBwdXRSZXN1bHQ7CiAgICAgCiAgICAgaWYgKHNob3VsZFRocm93KQotICAgICAgICB0aHJv d1R5cGVFcnJvcihleGVjLCBzY29wZSwgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVy cm9yKTsKKyAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRvbmx5UHJvcGVy dHlXcml0ZUVycm9yKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRnVuY3Rpb24uY3BwCShyZXZpc2lvbiAyMDcwMDApCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDU1LDcgKzQ1NSw3IEBAIGJvb2wgSlNGdW5jdGlvbjo6cHV0KEpTQ2VsbCogY2Vs bCwgRXhlY1MKICAgICB9CiAgICAgaWYgKHByb3BlcnR5TmFtZSA9PSB2bS5wcm9wZXJ0eU5hbWVz LT5hcmd1bWVudHMgfHwgcHJvcGVydHlOYW1lID09IHZtLnByb3BlcnR5TmFtZXMtPmNhbGxlcikg ewogICAgICAgICBpZiAoc2xvdC5pc1N0cmljdE1vZGUoKSkKLSAgICAgICAgICAgIHRocm93VHlw ZUVycm9yKGV4ZWMsIHNjb3BlLCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3Ip OworICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRvbmx5UHJvcGVy dHlXcml0ZUVycm9yKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICB0aGlzT2Jq ZWN0LT5yZWlmeUxhenlQcm9wZXJ0eUlmTmVlZGVkKHZtLCBleGVjLCBwcm9wZXJ0eU5hbWUpOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVFbnZpcm9ubWVudC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVF bnZpcm9ubWVudC5jcHAJKHJldmlzaW9uIDIwNzAwMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTTW9kdWxlRW52aXJvbm1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTks NyArMTE5LDcgQEAgYm9vbCBKU01vZHVsZUVudmlyb25tZW50OjpwdXQoSlNDZWxsKiBjZQogICAg IC8vIEFsbCBpbXBvcnRlZCBiaW5kaW5ncyBhcmUgaW1tdXRhYmxlLgogICAgIEpTTW9kdWxlUmVj b3JkOjpSZXNvbHV0aW9uIHJlc29sdXRpb24gPSB0aGlzT2JqZWN0LT5tb2R1bGVSZWNvcmQoKS0+ cmVzb2x2ZUltcG9ydChleGVjLCBJZGVudGlmaWVyOjpmcm9tVWlkKGV4ZWMsIHByb3BlcnR5TmFt ZS51aWQoKSkpOwogICAgIGlmIChyZXNvbHV0aW9uLnR5cGUgPT0gSlNNb2R1bGVSZWNvcmQ6OlJl c29sdXRpb246OlR5cGU6OlJlc29sdmVkKSB7Ci0gICAgICAgIHRocm93VHlwZUVycm9yKGV4ZWMs IHNjb3BlLCBBU0NJSUxpdGVyYWwoU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9y KSk7CisgICAgICAgIHRocm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBBU0NJSUxpdGVyYWwoUmVh ZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0K ICAgICByZXR1cm4gQmFzZTo6cHV0KHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFs dWUsIHNsb3QpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVO YW1lc3BhY2VPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTTW9kdWxlTmFtZXNwYWNlT2JqZWN0LmNwcAkocmV2aXNpb24gMjA3MDAwKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNNb2R1bGVOYW1lc3BhY2VPYmplY3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xNjcsNyArMTY3LDcgQEAgYm9vbCBKU01vZHVsZU5hbWVzcGFj ZU9iamVjdDo6cHV0KEpTQ2VsbAogCiAgICAgLy8gaHR0cDovL3d3dy5lY21hLWludGVybmF0aW9u YWwub3JnL2VjbWEtMjYyLzYuMC8jc2VjLW1vZHVsZS1uYW1lc3BhY2UtZXhvdGljLW9iamVjdHMt c2V0LXAtdi1yZWNlaXZlcgogICAgIGlmIChzbG90LmlzU3RyaWN0TW9kZSgpKQotICAgICAgICB0 aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgQVNDSUlMaXRlcmFsKFN0cmljdE1vZGVSZWFkb25s eVByb3BlcnR5V3JpdGVFcnJvcikpOworICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29w ZSwgQVNDSUlMaXRlcmFsKFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKSk7CiAgICAgcmV0dXJu IGZhbHNlOwogfQogCkBAIC0xNzcsNyArMTc3LDcgQEAgYm9vbCBKU01vZHVsZU5hbWVzcGFjZU9i amVjdDo6cHV0QnlJbmRleAogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZt KTsKIAogICAgIGlmIChzaG91bGRUaHJvdykKLSAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywg c2NvcGUsIEFTQ0lJTGl0ZXJhbChTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3Ip KTsKKyAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIEFTQ0lJTGl0ZXJhbChSZWFk b25seVByb3BlcnR5V3JpdGVFcnJvcikpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAkocmV2aXNpb24gMjA3 MDAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02MSw3ICs2MSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBsYXN0QXJyYXlTaXpl ID0gMDsKIFNUQVRJQ19BU1NFUlRfSVNfVFJJVklBTExZX0RFU1RSVUNUSUJMRShKU09iamVjdCk7 CiBTVEFUSUNfQVNTRVJUX0lTX1RSSVZJQUxMWV9ERVNUUlVDVElCTEUoSlNGaW5hbE9iamVjdCk7 CiAKLWNvbnN0IGNoYXIqIFN0cmljdE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvciA9ICJB dHRlbXB0ZWQgdG8gYXNzaWduIHRvIHJlYWRvbmx5IHByb3BlcnR5LiI7Citjb25zdCBjaGFyKiBS ZWFkb25seVByb3BlcnR5V3JpdGVFcnJvciA9ICJBdHRlbXB0ZWQgdG8gYXNzaWduIHRvIHJlYWRv bmx5IHByb3BlcnR5LiI7CiBjb25zdCBjaGFyKiBVbmNvbmZpZ3VyYWJsZVByb3BlcnR5Q2hhbmdl QWNjZXNzTWVjaGFuaXNtRXJyb3IgPSAiQXR0ZW1wdGluZyB0byBjaGFuZ2UgYWNjZXNzIG1lY2hh bmlzbSBmb3IgYW4gdW5jb25maWd1cmFibGUgcHJvcGVydHkuIjsKIAogY29uc3QgQ2xhc3NJbmZv IEpTT2JqZWN0OjpzX2luZm8gPSB7ICJPYmplY3QiLCAwLCAwLCBDUkVBVEVfTUVUSE9EX1RBQkxF KEpTT2JqZWN0KSB9OwpAQCAtMzg5LDExICszODksMTEgQEAgYm9vbCBvcmRpbmFyeVNldFNsb3co RXhlY1N0YXRlKiBleGVjLCBKUwogICAgIGlmIChvd25EZXNjcmlwdG9yLmlzRGF0YURlc2NyaXB0 b3IoKSkgewogICAgICAgICAvLyA5LjEuOS4xLTQtYSBJZiBvd25EZXNjLltbV3JpdGFibGVdXSBp cyBmYWxzZSwgcmV0dXJuIGZhbHNlLgogICAgICAgICBpZiAoIW93bkRlc2NyaXB0b3Iud3JpdGFi bGUoKSkKLSAgICAgICAgICAgIHJldHVybiByZWplY3QoZXhlYywgc2hvdWxkVGhyb3csIFN0cmlj dE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CisgICAgICAgICAgICByZXR1cm4gcmVq ZWN0KGV4ZWMsIHNob3VsZFRocm93LCBSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CiAKICAg ICAgICAgLy8gOS4xLjkuMS00LWIgSWYgVHlwZShSZWNlaXZlcikgaXMgbm90IE9iamVjdCwgcmV0 dXJuIGZhbHNlLgogICAgICAgICBpZiAoIXJlY2VpdmVyLmlzT2JqZWN0KCkpCi0gICAgICAgICAg ICByZXR1cm4gcmVqZWN0KGV4ZWMsIHNob3VsZFRocm93LCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9w ZXJ0eVdyaXRlRXJyb3IpOworICAgICAgICAgICAgcmV0dXJuIHJlamVjdChleGVjLCBzaG91bGRU aHJvdywgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogCiAgICAgICAgIC8vIEluIE9yZGlu YXJ5U2V0LCB0aGUgcmVjZWl2ZXIgbWF5IG5vdCBiZSB0aGUgc2FtZSB0byB0aGUgb2JqZWN0Lgog ICAgICAgICAvLyBTbywgd2UgcGVyZm9ybSBbW0dldE93blByb3BlcnR5XV0gb250byB0aGUgcmVj ZWl2ZXIgd2hpbGUgd2UgYWxyZWFkeSBwZXJmb3JtIFtbR2V0T3duUHJvcGVydHldXSBvbnRvIHRo ZSBvYmplY3QuCkBAIC00MDgsMTEgKzQwOCwxMSBAQCBib29sIG9yZGluYXJ5U2V0U2xvdyhFeGVj U3RhdGUqIGV4ZWMsIEpTCiAgICAgICAgIGlmIChleGlzdGluZ0Rlc2NyaXB0b3JGb3VuZCkgewog ICAgICAgICAgICAgLy8gOS4xLjkuMS00LWQtaSBJZiBJc0FjY2Vzc29yRGVzY3JpcHRvcihleGlz dGluZ0Rlc2NyaXB0b3IpIGlzIHRydWUsIHJldHVybiBmYWxzZS4KICAgICAgICAgICAgIGlmIChl eGlzdGluZ0Rlc2NyaXB0b3IuaXNBY2Nlc3NvckRlc2NyaXB0b3IoKSkKLSAgICAgICAgICAgICAg ICByZXR1cm4gcmVqZWN0KGV4ZWMsIHNob3VsZFRocm93LCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9w ZXJ0eVdyaXRlRXJyb3IpOworICAgICAgICAgICAgICAgIHJldHVybiByZWplY3QoZXhlYywgc2hv dWxkVGhyb3csIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKIAogICAgICAgICAgICAgLy8g OS4xLjkuMS00LWQtaWkgSWYgZXhpc3RpbmdEZXNjcmlwdG9yLltbV3JpdGFibGVdXSBpcyBmYWxz ZSwgcmV0dXJuIGZhbHNlLgogICAgICAgICAgICAgaWYgKCFleGlzdGluZ0Rlc2NyaXB0b3Iud3Jp dGFibGUoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gcmVqZWN0KGV4ZWMsIHNob3VsZFRocm93 LCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOworICAgICAgICAgICAgICAg IHJldHVybiByZWplY3QoZXhlYywgc2hvdWxkVGhyb3csIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVy cm9yKTsKIAogICAgICAgICAgICAgLy8gOS4xLjkuMS00LWQtaWlpIExldCB2YWx1ZURlc2MgYmUg dGhlIFByb3BlcnR5RGVzY3JpcHRvcntbW1ZhbHVlXV06IFZ9LgogICAgICAgICAgICAgUHJvcGVy dHlEZXNjcmlwdG9yIHZhbHVlRGVzY3JpcHRvcjsKQEAgLTQzNCw3ICs0MzQsNyBAQCBib29sIG9y ZGluYXJ5U2V0U2xvdyhFeGVjU3RhdGUqIGV4ZWMsIEpTCiAgICAgLy8gOS4xLjkuMS03IElmIHNl dHRlciBpcyB1bmRlZmluZWQsIHJldHVybiBmYWxzZS4KICAgICBKU1ZhbHVlIHNldHRlciA9IG93 bkRlc2NyaXB0b3Iuc2V0dGVyKCk7CiAgICAgaWYgKCFzZXR0ZXIuaXNPYmplY3QoKSkKLSAgICAg ICAgcmV0dXJuIHJlamVjdChleGVjLCBzaG91bGRUaHJvdywgU3RyaWN0TW9kZVJlYWRvbmx5UHJv cGVydHlXcml0ZUVycm9yKTsKKyAgICAgICAgcmV0dXJuIHJlamVjdChleGVjLCBzaG91bGRUaHJv dywgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogCiAgICAgLy8gOS4xLjkuMS04IFBlcmZv cm0gPyBDYWxsKHNldHRlciwgUmVjZWl2ZXIsIDw8IFYgPj4pLgogICAgIEpTT2JqZWN0KiBzZXR0 ZXJPYmplY3QgPSBhc09iamVjdChzZXR0ZXIpOwpAQCAtNDY4LDcgKzQ2OCw3IEBAIGJvb2wgSlNP YmplY3Q6OnB1dElubGluZVNsb3coRXhlY1N0YXRlKiAKICAgICAgICAgaWYgKGlzVmFsaWRPZmZz ZXQob2Zmc2V0KSkgewogICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZXMgJiBSZWFkT25seSkgewog ICAgICAgICAgICAgICAgIEFTU0VSVChzdHJ1Y3R1cmUodm0pLT5wcm90b3R5cGVDaGFpbk1heUlu dGVyY2VwdFN0b3JlVG8oZXhlYy0+dm0oKSwgcHJvcGVydHlOYW1lKSB8fCBvYmogPT0gdGhpcyk7 Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHJlamVjdChleGVjLCBzbG90LmlzU3RyaWN0TW9kZSgp LCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOworICAgICAgICAgICAgICAg IHJldHVybiByZWplY3QoZXhlYywgc2xvdC5pc1N0cmljdE1vZGUoKSwgUmVhZG9ubHlQcm9wZXJ0 eVdyaXRlRXJyb3IpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBKU1ZhbHVlIGdzID0g b2JqLT5nZXREaXJlY3Qob2Zmc2V0KTsKQEAgLTUxMyw3ICs1MTMsNyBAQCBib29sIEpTT2JqZWN0 OjpwdXRJbmxpbmVTbG93KEV4ZWNTdGF0ZSogCiAKICAgICBBU1NFUlQoIXN0cnVjdHVyZSh2bSkt PnByb3RvdHlwZUNoYWluTWF5SW50ZXJjZXB0U3RvcmVUbyhleGVjLT52bSgpLCBwcm9wZXJ0eU5h bWUpIHx8IG9iaiA9PSB0aGlzKTsKICAgICBpZiAoIXB1dERpcmVjdEludGVybmFsPFB1dE1vZGVQ dXQ+KHZtLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCAwLCBzbG90KSkKLSAgICAgICAgcmV0dXJuIHJl amVjdChleGVjLCBzbG90LmlzU3RyaWN0TW9kZSgpLCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0 eVdyaXRlRXJyb3IpOworICAgICAgICByZXR1cm4gcmVqZWN0KGV4ZWMsIHNsb3QuaXNTdHJpY3RN b2RlKCksIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IApAQCAtMTI5Nyw3ICsxMjk3LDcgQEAgYm9vbCBKU09iamVjdDo6c2V0UHJvdG90eXBlV2l0aEN5 Y2xlQ2hlYwogCiAgICAgaWYgKCFpc0V4dGVuc2libGUpIHsKICAgICAgICAgaWYgKHNob3VsZFRo cm93SWZDYW50U2V0KQotICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFN0 cmljdE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CisgICAgICAgICAgICB0aHJvd1R5 cGVFcnJvcihleGVjLCBzY29wZSwgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgfQogCkBAIC0yMjY0LDcgKzIyNjQsNyBAQCBib29sIEpTT2Jq ZWN0OjpwdXRCeUluZGV4QmV5b25kVmVjdG9yTGVuCiAgICAgICAgIC8vIFByb2hpYml0IGdyb3dp bmcgdGhlIGFycmF5IGlmIGxlbmd0aCBpcyBub3Qgd3JpdGFibGUuCiAgICAgICAgIGlmIChtYXAt Pmxlbmd0aElzUmVhZE9ubHkoKSB8fCAhaXNTdHJ1Y3R1cmVFeHRlbnNpYmxlKCkpIHsKICAgICAg ICAgICAgIGlmIChzaG91bGRUaHJvdykKLSAgICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihl eGVjLCBzY29wZSwgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKKyAgICAg ICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgUmVhZG9ubHlQcm9wZXJ0eVdy aXRlRXJyb3IpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CiAgICAgICAg IGxlbmd0aCA9IGkgKyAxOwpAQCAtMjQwMiw3ICsyNDAyLDcgQEAgYm9vbCBKU09iamVjdDo6cHV0 RGlyZWN0SW5kZXhCZXlvbmRWZWN0bwogICAgICAgICBpZiAobW9kZSAhPSBQdXREaXJlY3RJbmRl eExpa2VQdXREaXJlY3QpIHsKICAgICAgICAgICAgIC8vIFByb2hpYml0IGdyb3dpbmcgdGhlIGFy cmF5IGlmIGxlbmd0aCBpcyBub3Qgd3JpdGFibGUuCiAgICAgICAgICAgICBpZiAobWFwLT5sZW5n dGhJc1JlYWRPbmx5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHJlamVjdChleGVjLCBtb2Rl ID09IFB1dERpcmVjdEluZGV4U2hvdWxkVGhyb3csIFN0cmljdE1vZGVSZWFkb25seVByb3BlcnR5 V3JpdGVFcnJvcik7CisgICAgICAgICAgICAgICAgcmV0dXJuIHJlamVjdChleGVjLCBtb2RlID09 IFB1dERpcmVjdEluZGV4U2hvdWxkVGhyb3csIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsK ICAgICAgICAgICAgIGlmICghaXNTdHJ1Y3R1cmVFeHRlbnNpYmxlKCkpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIHJlamVjdChleGVjLCBtb2RlID09IFB1dERpcmVjdEluZGV4U2hvdWxkVGhyb3cs ICJBdHRlbXB0aW5nIHRvIGRlZmluZSBwcm9wZXJ0eSBvbiBvYmplY3QgdGhhdCBpcyBub3QgZXh0 ZW5zaWJsZS4iKTsKICAgICAgICAgfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU09iamVjdC5oCShyZXZpc2lvbiAyMDcwMDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU09iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCw3IEBAIHN0cnVj dCBIYXNoVGFibGU7CiBzdHJ1Y3QgSGFzaFRhYmxlVmFsdWU7CiAKIEpTX0VYUE9SVF9QUklWQVRF IEpTT2JqZWN0KiB0aHJvd1R5cGVFcnJvcihFeGVjU3RhdGUqLCBUaHJvd1Njb3BlJiwgY29uc3Qg U3RyaW5nJik7Ci1leHRlcm4gSlNfRVhQT1JUREFUQSBjb25zdCBjaGFyKiBTdHJpY3RNb2RlUmVh ZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3I7CitleHRlcm4gSlNfRVhQT1JUREFUQSBjb25zdCBjaGFy KiBSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcjsKIGV4dGVybiBKU19FWFBPUlREQVRBIGNvbnN0 IGNoYXIqIFVuY29uZmlndXJhYmxlUHJvcGVydHlDaGFuZ2VBY2Nlc3NNZWNoYW5pc21FcnJvcjsK IAogQ09NUElMRV9BU1NFUlQoTm9uZSA8IEZpcnN0SW50ZXJuYWxBdHRyaWJ1dGUsIE5vbmVfaXNf YmVsb3dfRmlyc3RJbnRlcm5hbEF0dHJpYnV0ZSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU09iamVjdElubGluZXMuaAkocmV2aXNpb24gMjA3MDAwKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3RJbmxpbmVzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTE3OSw3ICsxNzksNyBAQCBBTFdBWVNfSU5MSU5FIGJvb2wgSlNPYmplY3Q6OnB1 dElubGluZShKCiAgICAgICAgIEFTU0VSVCghdGhpc09iamVjdC0+c3RydWN0dXJlKHZtKS0+cHJv dG90eXBlQ2hhaW5NYXlJbnRlcmNlcHRTdG9yZVRvKHZtLCBwcm9wZXJ0eU5hbWUpKTsKICAgICAg ICAgaWYgKCF0aGlzT2JqZWN0LT5wdXREaXJlY3RJbnRlcm5hbDxQdXRNb2RlUHV0Pih2bSwgcHJv cGVydHlOYW1lLCB2YWx1ZSwgMCwgc2xvdCkpIHsKICAgICAgICAgICAgIGlmIChzbG90LmlzU3Ry aWN0TW9kZSgpKQotICAgICAgICAgICAgICAgIHRocm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBB U0NJSUxpdGVyYWwoU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKSk7CisgICAg ICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIEFTQ0lJTGl0ZXJhbChSZWFk b25seVByb3BlcnR5V3JpdGVFcnJvcikpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICB9CiAgICAgICAgIHJldHVybiB0cnVlOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNTeW1ib2xUYWJsZU9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTU3ltYm9sVGFibGVPYmplY3QuaAkocmV2aXNpb24gMjA3MDAw KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTeW1ib2xUYWJsZU9iamVjdC5o CSh3b3JraW5nIGNvcHkpCkBAIC0xODMsNyArMTgzLDcgQEAgaW5saW5lIGJvb2wgc3ltYm9sVGFi bGVQdXQoU3ltYm9sVGFibGVPYgogICAgICAgICBBU1NFUlQoIWZhc3RFbnRyeS5pc051bGwoKSk7 CiAgICAgICAgIGlmIChmYXN0RW50cnkuaXNSZWFkT25seSgpICYmICFpZ25vcmVSZWFkT25seUVy cm9ycykgewogICAgICAgICAgICAgaWYgKHNob3VsZFRocm93UmVhZE9ubHlFcnJvcikKLSAgICAg ICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgU3RyaWN0TW9kZVJlYWRvbmx5 UHJvcGVydHlXcml0ZUVycm9yKTsKKyAgICAgICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVj LCBzY29wZSwgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAgICAgICAgcHV0UmVz dWx0ID0gZmFsc2U7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQpJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTG9va3VwLmgJKHJldmlzaW9uIDIwNzAwMCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0xvb2t1cC5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNjIsMTEgKzI2MiwxMSBAQCBpbmxpbmUgYm9vbCBwdXRFbnRyeShFeGVjU3RhdGUqIGV4ZWMs IGNvCiAgICAgICAgICAgICAgICAgdGhpc09iamVjdC0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIHBy b3BlcnR5TmFtZSwgdmFsdWUpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0K LSAgICAgICAgcmV0dXJuIHJlamVjdChleGVjLCBzbG90LmlzU3RyaWN0TW9kZSgpLCBTdHJpY3RN b2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOworICAgICAgICByZXR1cm4gcmVqZWN0KGV4 ZWMsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAg ICB9CiAKICAgICBpZiAoZW50cnktPmF0dHJpYnV0ZXMoKSAmIEFjY2Vzc29yKQotICAgICAgICBy ZXR1cm4gcmVqZWN0KGV4ZWMsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFN0cmljdE1vZGVSZWFkb25s eVByb3BlcnR5V3JpdGVFcnJvcik7CisgICAgICAgIHJldHVybiByZWplY3QoZXhlYywgc2xvdC5p c1N0cmljdE1vZGUoKSwgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogCiAgICAgaWYgKCEo ZW50cnktPmF0dHJpYnV0ZXMoKSAmIFJlYWRPbmx5KSkgewogICAgICAgICBBU1NFUlRfV0lUSF9N RVNTQUdFKCEoZW50cnktPmF0dHJpYnV0ZXMoKSAmIERPTUpJVEF0dHJpYnV0ZSksICJET01KSVRB dHRyaWJ1dGUgc3VwcG9ydHMgcmVhZG9ubHkgYXR0cmlidXRlcyBjdXJyZW50bHkuIik7CkBAIC0y ODAsNyArMjgwLDcgQEAgaW5saW5lIGJvb2wgcHV0RW50cnkoRXhlY1N0YXRlKiBleGVjLCBjbwog ICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KIAotICAgIHJldHVybiByZWplY3QoZXhlYywg c2xvdC5pc1N0cmljdE1vZGUoKSwgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9y KTsKKyAgICByZXR1cm4gcmVqZWN0KGV4ZWMsIHNsb3QuaXNTdHJpY3RNb2RlKCksIFJlYWRvbmx5 UHJvcGVydHlXcml0ZUVycm9yKTsKIH0KIAogLyoqCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9SZWdFeHBPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9SZWdFeHBPYmplY3QuaAkocmV2aXNpb24gMjA3MDAwKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAg LTUwLDcgKzUwLDcgQEAgcHVibGljOgogICAgICAgICAgICAgbV9sYXN0SW5kZXguc2V0V2l0aG91 dFdyaXRlQmFycmllcihqc051bWJlcihsYXN0SW5kZXgpKTsKICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgICAgICB9Ci0gICAgICAgIHRocm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBTdHJp Y3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOworICAgICAgICB0aHJvd1R5cGVFcnJv cihleGVjLCBzY29wZSwgUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJyb3IpOwogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQogICAgIGJvb2wgc2V0TGFzdEluZGV4KEV4ZWNTdGF0ZSogZXhlYywg SlNWYWx1ZSBsYXN0SW5kZXgsIGJvb2wgc2hvdWxkVGhyb3cpCkBAIC02NCw3ICs2NCw3IEBAIHB1 YmxpYzoKICAgICAgICAgfQogCiAgICAgICAgIGlmIChzaG91bGRUaHJvdykKLSAgICAgICAgICAg IHRocm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdy aXRlRXJyb3IpOworICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRv bmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAg ICBKU1ZhbHVlIGdldExhc3RJbmRleCgpIGNvbnN0CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9TcGFyc2VBcnJheVZhbHVlTWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9TcGFyc2VBcnJheVZhbHVlTWFwLmNwcAkocmV2aXNpb24g MjA3MDAwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3BhcnNlQXJyYXlWYWx1 ZU1hcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw3ICsxMDMsNyBAQCBib29sIFNwYXJzZUFy cmF5VmFsdWVNYXA6OnB1dEVudHJ5KEV4ZWNTCiAgICAgaWYgKHJlc3VsdC5pc05ld0VudHJ5ICYm ICFhcnJheS0+aXNTdHJ1Y3R1cmVFeHRlbnNpYmxlKCkpIHsKICAgICAgICAgcmVtb3ZlKHJlc3Vs dC5pdGVyYXRvcik7CiAgICAgICAgIGlmIChzaG91bGRUaHJvdykKLSAgICAgICAgICAgIHRocm93 VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBTdHJpY3RNb2RlUmVhZG9ubHlQcm9wZXJ0eVdyaXRlRXJy b3IpOworICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFJlYWRvbmx5UHJv cGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICAKQEAg LTE1Niw3ICsxNTYsNyBAQCBib29sIFNwYXJzZUFycmF5RW50cnk6OnB1dChFeGVjU3RhdGUqIGV4 CiAgICAgaWYgKCEoYXR0cmlidXRlcyAmIEFjY2Vzc29yKSkgewogICAgICAgICBpZiAoYXR0cmli dXRlcyAmIFJlYWRPbmx5KSB7CiAgICAgICAgICAgICBpZiAoc2hvdWxkVGhyb3cpCi0gICAgICAg ICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywgc2NvcGUsIFN0cmljdE1vZGVSZWFkb25seVBy b3BlcnR5V3JpdGVFcnJvcik7CisgICAgICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3IoZXhlYywg c2NvcGUsIFJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAgICAgfQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9T dHJpbmdPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1N0cmluZ09iamVjdC5jcHAJKHJldmlzaW9uIDIwNzAwMCkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1N0cmluZ09iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcyLDcg KzcyLDcgQEAgYm9vbCBTdHJpbmdPYmplY3Q6OnB1dChKU0NlbGwqIGNlbGwsIEV4ZQogCiAgICAg aWYgKHByb3BlcnR5TmFtZSA9PSBleGVjLT5wcm9wZXJ0eU5hbWVzKCkubGVuZ3RoKSB7CiAgICAg ICAgIGlmIChzbG90LmlzU3RyaWN0TW9kZSgpKQotICAgICAgICAgICAgdGhyb3dUeXBlRXJyb3Io ZXhlYywgc2NvcGUsIFN0cmljdE1vZGVSZWFkb25seVByb3BlcnR5V3JpdGVFcnJvcik7CisgICAg ICAgICAgICB0aHJvd1R5cGVFcnJvcihleGVjLCBzY29wZSwgUmVhZG9ubHlQcm9wZXJ0eVdyaXRl RXJyb3IpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIGlmIChPcHRpb25hbDx1 aW50MzJfdD4gaW5kZXggPSBwYXJzZUluZGV4KHByb3BlcnR5TmFtZSkpCkBAIC04OCw3ICs4OCw3 IEBAIGJvb2wgU3RyaW5nT2JqZWN0OjpwdXRCeUluZGV4KEpTQ2VsbCogY2UKICAgICBTdHJpbmdP YmplY3QqIHRoaXNPYmplY3QgPSBqc0Nhc3Q8U3RyaW5nT2JqZWN0Kj4oY2VsbCk7CiAgICAgaWYg KHRoaXNPYmplY3QtPmludGVybmFsVmFsdWUoKS0+Y2FuR2V0SW5kZXgocHJvcGVydHlOYW1lKSkg ewogICAgICAgICBpZiAoc2hvdWxkVGhyb3cpCi0gICAgICAgICAgICB0aHJvd1R5cGVFcnJvcihl eGVjLCBzY29wZSwgU3RyaWN0TW9kZVJlYWRvbmx5UHJvcGVydHlXcml0ZUVycm9yKTsKKyAgICAg ICAgICAgIHRocm93VHlwZUVycm9yKGV4ZWMsIHNjb3BlLCBSZWFkb25seVByb3BlcnR5V3JpdGVF cnJvcik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgcmV0dXJuIEpTT2JqZWN0 OjpwdXRCeUluZGV4KGNlbGwsIGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNob3VsZFRocm93 KTsK