155329 2016-03-10 15:14:56 -0800 [ES6] Instanceof isn't spec compliant when the RHS is a Proxy with a target that is a function 2016-03-10 16:43:58 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1173387 0 saam 2016-03-10 15:14:56 -0800 ({} instance (new Proxy(function(){}, {})) should not throw a type error. 1173421 1 273644 saam 2016-03-10 16:11:22 -0800 Created attachment 273644 patch 1173425 2 273644 mark.lam 2016-03-10 16:19:27 -0800 Comment on attachment 273644 patch r=me 1173453 3 saam 2016-03-10 16:43:58 -0800 landed in: http://trac.webkit.org/changeset/197970 273644 2016-03-10 16:11:22 -0800 2016-03-10 16:19:27 -0800 patch b-backup.diff text/plain 12042 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3OTY1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQzIEBA CisyMDE2LTAzLTEwICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IFtFUzZdIEluc3RhbmNlb2YgaXNuJ3Qgc3BlYyBjb21wbGlhbnQgd2hlbiB0aGUgUkhTIGlzIGEg UHJveHkgd2l0aCBhIHRhcmdldCB0aGF0IGlzIGEgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTMyOQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIHVzZSB0eXBlIGluZm8gZmxhZ3Mgb24g dGhlIHN0cnVjdHVyZSB0byBkaWN0YXRlIHdoZXRoZXIgb3Igbm90IAorICAgICAgICB0aGUgUkhT IG9mIGFuIGluc3RhbmNlb2YgaXMgYSB2YWxpZCBSSFMgKGkuZSwgYSBmdW5jdGlvbikuIFRoZSBz b2x1dGlvbgorICAgICAgICB0byBtYWtlIFByb3h5IGEgdmFsaWQgUkhTIHdoZW4gdGhlIFByb3h5 J3MgdGFyZ2V0IGlzIGNhbGxhYmxlIGlzIHRvIGhhdmUKKyAgICAgICAgdHdvIGRpZmZlcmVudCBz dHJ1Y3R1cmVzIGZvciBQcm94eU9iamVjdDogb25lIGZvciBhIG5vbi1jYWxsYWJsZSB0YXJnZXQg CisgICAgICAgIGFuZCBvbmUgZm9yIGEgY2FsbGFibGUgdGFyZ2V0LgorCisgICAgICAgICogcnVu dGltZS9KU0dsb2JhbE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0Ojpp bml0KToKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxPYmplY3Q6OnZpc2l0Q2hpbGRyZW4pOgorICAg ICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuaDoKKyAgICAgICAgKEpTQzo6SlNHbG9iYWxP YmplY3Q6Om1vZHVsZVJlY29yZFN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2Jq ZWN0Ojptb2R1bGVOYW1lc3BhY2VPYmplY3RTdHJ1Y3R1cmUpOgorICAgICAgICAoSlNDOjpKU0ds b2JhbE9iamVjdDo6cHJveHlPYmplY3RTdHJ1Y3R1cmUpOgorICAgICAgICAoSlNDOjpKU0dsb2Jh bE9iamVjdDo6Y2FsbGFibGVQcm94eU9iamVjdFN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6OkpT R2xvYmFsT2JqZWN0Ojpwcm94eVJldm9rZVN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6OkpTR2xv YmFsT2JqZWN0Ojp3YXNtTW9kdWxlU3RydWN0dXJlKToKKyAgICAgICAgKiBydW50aW1lL1Byb3h5 Q29uc3RydWN0b3IuY3BwOgorICAgICAgICAoSlNDOjptYWtlUmV2b2NhYmxlUHJveHkpOgorICAg ICAgICAoSlNDOjpjb25zdHJ1Y3RQcm94eU9iamVjdCk6CisgICAgICAgIChKU0M6OlByb3h5Q29u c3RydWN0b3I6OmdldENvbnN0cnVjdERhdGEpOgorICAgICAgICAqIHJ1bnRpbWUvUHJveHlPYmpl Y3QuY3BwOgorICAgICAgICAoSlNDOjpQcm94eU9iamVjdDo6UHJveHlPYmplY3QpOgorICAgICAg ICAoSlNDOjpQcm94eU9iamVjdDo6c3RydWN0dXJlRm9yVGFyZ2V0KToKKyAgICAgICAgKEpTQzo6 UHJveHlPYmplY3Q6OmZpbmlzaENyZWF0aW9uKToKKyAgICAgICAgKiBydW50aW1lL1Byb3h5T2Jq ZWN0Lmg6CisgICAgICAgIChKU0M6OlByb3h5T2JqZWN0OjpjcmVhdGUpOgorICAgICAgICAoSlND OjpQcm94eU9iamVjdDo6Y3JlYXRlU3RydWN0dXJlKToKKyAgICAgICAgKiB0ZXN0cy9lczYueWFt bDoKKyAgICAgICAgKiB0ZXN0cy9zdHJlc3MvcHJveHktaW5zdGFuY2VvZi5qczogQWRkZWQuCisg ICAgICAgIChhc3NlcnQpOgorICAgICAgICAodGVzdCk6CisgICAgICAgIChDKToKKwogMjAxNi0w My0xMCAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBbRVM2 XSBSZWdFeHAgc3RpY2t5IGZsYWcgc2hvdWxkIGJlIGlnbm9yZWQgaW4gU3RyaW5nLm1hdGNoIHdo ZW4gZ2xvYmFsIGZsYWcgaXMgZ2l2ZW4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAJKHJldmlzaW9uIDE5Nzk2MSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzcwLDcgKzM3MCwxMiBAQCB2b2lkIEpTR2xvYmFsT2JqZWN0Ojppbml0KFZNJiB2bSkK IAogICAgIG1fbW9kdWxlUmVjb3JkU3RydWN0dXJlLnNldCh2bSwgdGhpcywgSlNNb2R1bGVSZWNv cmQ6OmNyZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywgbV9vYmplY3RQcm90b3R5cGUuZ2V0KCkpKTsK ICAgICBtX21vZHVsZU5hbWVzcGFjZU9iamVjdFN0cnVjdHVyZS5zZXQodm0sIHRoaXMsIEpTTW9k dWxlTmFtZXNwYWNlT2JqZWN0OjpjcmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIGpzTnVsbCgpKSk7 Ci0gICAgbV9wcm94eU9iamVjdFN0cnVjdHVyZS5zZXQodm0sIHRoaXMsIFByb3h5T2JqZWN0Ojpj cmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIG1fb2JqZWN0UHJvdG90eXBlLmdldCgpKSk7CisgICAg eworICAgICAgICBib29sIGlzQ2FsbGFibGUgPSBmYWxzZTsKKyAgICAgICAgbV9wcm94eU9iamVj dFN0cnVjdHVyZS5zZXQodm0sIHRoaXMsIFByb3h5T2JqZWN0OjpjcmVhdGVTdHJ1Y3R1cmUodm0s IHRoaXMsIG1fb2JqZWN0UHJvdG90eXBlLmdldCgpLCBpc0NhbGxhYmxlKSk7CisgICAgICAgIGlz Q2FsbGFibGUgPSB0cnVlOworICAgICAgICBtX2NhbGxhYmxlUHJveHlPYmplY3RTdHJ1Y3R1cmUu c2V0KHZtLCB0aGlzLCBQcm94eU9iamVjdDo6Y3JlYXRlU3RydWN0dXJlKHZtLCB0aGlzLCBtX29i amVjdFByb3RvdHlwZS5nZXQoKSwgaXNDYWxsYWJsZSkpOworICAgIH0KICAgICBtX3Byb3h5UmV2 b2tlU3RydWN0dXJlLnNldCh2bSwgdGhpcywgUHJveHlSZXZva2U6OmNyZWF0ZVN0cnVjdHVyZSh2 bSwgdGhpcywgbV9mdW5jdGlvblByb3RvdHlwZS5nZXQoKSkpOwogICAgIAogI2lmIEVOQUJMRShX RUJBU1NFTUJMWSkKQEAgLTkxMyw2ICs5MTgsNyBAQCB2b2lkIEpTR2xvYmFsT2JqZWN0Ojp2aXNp dENoaWxkcmVuKEpTQ2VsCiAgICAgdmlzaXRvci5hcHBlbmQoJnRoaXNPYmplY3QtPm1fZG9sbGFy Vk1TdHJ1Y3R1cmUpOwogICAgIHZpc2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX2ludGVybmFs RnVuY3Rpb25TdHJ1Y3R1cmUpOwogICAgIHZpc2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX3By b3h5T2JqZWN0U3RydWN0dXJlKTsKKyAgICB2aXNpdG9yLmFwcGVuZCgmdGhpc09iamVjdC0+bV9j YWxsYWJsZVByb3h5T2JqZWN0U3RydWN0dXJlKTsKICAgICB2aXNpdG9yLmFwcGVuZCgmdGhpc09i amVjdC0+bV9wcm94eVJldm9rZVN0cnVjdHVyZSk7CiAjaWYgRU5BQkxFKFdFQkFTU0VNQkxZKQog ICAgIHZpc2l0b3IuYXBwZW5kKCZ0aGlzT2JqZWN0LT5tX3dhc21Nb2R1bGVTdHJ1Y3R1cmUpOwpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5o CShyZXZpc2lvbiAxOTc5NjEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0ds b2JhbE9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODIsNiArMjgyLDcgQEAgcHJvdGVjdGVk OgogICAgIFdyaXRlQmFycmllcjxTdHJ1Y3R1cmU+IG1fbW9kdWxlUmVjb3JkU3RydWN0dXJlOwog ICAgIFdyaXRlQmFycmllcjxTdHJ1Y3R1cmU+IG1fbW9kdWxlTmFtZXNwYWNlT2JqZWN0U3RydWN0 dXJlOwogICAgIFdyaXRlQmFycmllcjxTdHJ1Y3R1cmU+IG1fcHJveHlPYmplY3RTdHJ1Y3R1cmU7 CisgICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9jYWxsYWJsZVByb3h5T2JqZWN0U3RydWN0 dXJlOwogICAgIFdyaXRlQmFycmllcjxTdHJ1Y3R1cmU+IG1fcHJveHlSZXZva2VTdHJ1Y3R1cmU7 CiAjaWYgRU5BQkxFKFdFQkFTU0VNQkxZKQogICAgIFdyaXRlQmFycmllcjxTdHJ1Y3R1cmU+IG1f d2FzbU1vZHVsZVN0cnVjdHVyZTsKQEAgLTUzNiw2ICs1MzcsNyBAQCBwdWJsaWM6CiAgICAgU3Ry dWN0dXJlKiBtb2R1bGVSZWNvcmRTdHJ1Y3R1cmUoKSBjb25zdCB7IHJldHVybiBtX21vZHVsZVJl Y29yZFN0cnVjdHVyZS5nZXQoKTsgfQogICAgIFN0cnVjdHVyZSogbW9kdWxlTmFtZXNwYWNlT2Jq ZWN0U3RydWN0dXJlKCkgY29uc3QgeyByZXR1cm4gbV9tb2R1bGVOYW1lc3BhY2VPYmplY3RTdHJ1 Y3R1cmUuZ2V0KCk7IH0KICAgICBTdHJ1Y3R1cmUqIHByb3h5T2JqZWN0U3RydWN0dXJlKCkgY29u c3QgeyByZXR1cm4gbV9wcm94eU9iamVjdFN0cnVjdHVyZS5nZXQoKTsgfQorICAgIFN0cnVjdHVy ZSogY2FsbGFibGVQcm94eU9iamVjdFN0cnVjdHVyZSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FsbGFi bGVQcm94eU9iamVjdFN0cnVjdHVyZS5nZXQoKTsgfQogICAgIFN0cnVjdHVyZSogcHJveHlSZXZv a2VTdHJ1Y3R1cmUoKSBjb25zdCB7IHJldHVybiBtX3Byb3h5UmV2b2tlU3RydWN0dXJlLmdldCgp OyB9CiAjaWYgRU5BQkxFKFdFQkFTU0VNQkxZKQogICAgIFN0cnVjdHVyZSogd2FzbU1vZHVsZVN0 cnVjdHVyZSgpIGNvbnN0IHsgcmV0dXJuIG1fd2FzbU1vZHVsZVN0cnVjdHVyZS5nZXQoKTsgfQpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlDb25zdHJ1Y3Rvci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlDb25zdHJ1 Y3Rvci5jcHAJKHJldmlzaW9uIDE5Nzk2MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL1Byb3h5Q29uc3RydWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBA IHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIG1ha2UKICAgICBBcmdMaXN0IGFy Z3MoZXhlYyk7CiAgICAgSlNWYWx1ZSB0YXJnZXQgPSBhcmdzLmF0KDApOwogICAgIEpTVmFsdWUg aGFuZGxlciA9IGFyZ3MuYXQoMSk7Ci0gICAgUHJveHlPYmplY3QqIHByb3h5ID0gUHJveHlPYmpl Y3Q6OmNyZWF0ZShleGVjLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCktPnByb3h5T2JqZWN0 U3RydWN0dXJlKCksIHRhcmdldCwgaGFuZGxlcik7CisgICAgUHJveHlPYmplY3QqIHByb3h5ID0g UHJveHlPYmplY3Q6OmNyZWF0ZShleGVjLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIHRh cmdldCwgaGFuZGxlcik7CiAgICAgaWYgKHZtLmV4Y2VwdGlvbigpKQogICAgICAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKEpTVmFsdWUoKSk7CiAgICAgUHJveHlSZXZva2UqIHJldm9rZSA9IFBy b3h5UmV2b2tlOjpjcmVhdGUodm0sIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKS0+cHJveHlS ZXZva2VTdHJ1Y3R1cmUoKSwgcHJveHkpOwpAQCAtMTAwLDcgKzEwMCw3IEBAIHN0YXRpYyBFbmNv ZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnMKICAgICBBcmdMaXN0IGFyZ3MoZXhlYyk7CiAg ICAgSlNWYWx1ZSB0YXJnZXQgPSBhcmdzLmF0KDApOwogICAgIEpTVmFsdWUgaGFuZGxlciA9IGFy Z3MuYXQoMSk7Ci0gICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShQcm94eU9iamVjdDo6Y3JlYXRl KGV4ZWMsIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKS0+cHJveHlPYmplY3RTdHJ1Y3R1cmUo KSwgdGFyZ2V0LCBoYW5kbGVyKSk7CisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShQcm94eU9i amVjdDo6Y3JlYXRlKGV4ZWMsIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSwgdGFyZ2V0LCBo YW5kbGVyKSk7CiB9CiAKIENvbnN0cnVjdFR5cGUgUHJveHlDb25zdHJ1Y3Rvcjo6Z2V0Q29uc3Ry dWN0RGF0YShKU0NlbGwqLCBDb25zdHJ1Y3REYXRhJiBjb25zdHJ1Y3REYXRhKQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1Byb3h5T2JqZWN0LmNwcAkocmV2aXNpb24g MTk3OTYxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSwxNyBAQCBQcm94eU9iamVjdDo6UHJveHlPYmpl Y3QoVk0mIHZtLCBTdHJ1Y3R1CiB7CiB9CiAKK1N0cnVjdHVyZSogUHJveHlPYmplY3Q6OnN0cnVj dHVyZUZvclRhcmdldChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHRhcmdl dCkKK3sKKyAgICBpZiAoIXRhcmdldC5pc09iamVjdCgpKQorICAgICAgICByZXR1cm4gZ2xvYmFs T2JqZWN0LT5wcm94eU9iamVjdFN0cnVjdHVyZSgpOworCisgICAgSlNPYmplY3QqIHRhcmdldEFz T2JqZWN0ID0ganNDYXN0PEpTT2JqZWN0Kj4odGFyZ2V0KTsKKyAgICBDYWxsRGF0YSBpZ25vcmVk Q2FsbERhdGE7CisgICAgYm9vbCBpc0NhbGxhYmxlID0gdGFyZ2V0QXNPYmplY3QtPm1ldGhvZFRh YmxlKCktPmdldENhbGxEYXRhKHRhcmdldEFzT2JqZWN0LCBpZ25vcmVkQ2FsbERhdGEpICE9IENh bGxUeXBlOjpOb25lOworICAgIHJldHVybiBpc0NhbGxhYmxlID8gZ2xvYmFsT2JqZWN0LT5jYWxs YWJsZVByb3h5T2JqZWN0U3RydWN0dXJlKCkgOiBnbG9iYWxPYmplY3QtPnByb3h5T2JqZWN0U3Ry dWN0dXJlKCk7Cit9CisKIHZvaWQgUHJveHlPYmplY3Q6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwg RXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHRhcmdldCwgSlNWYWx1ZSBoYW5kbGVyKQogewogICAg IEJhc2U6OmZpbmlzaENyZWF0aW9uKHZtKTsKQEAgLTY3LDYgKzc4LDEwIEBAIHZvaWQgUHJveHlP YmplY3Q6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwKIAogICAgIENhbGxEYXRhIGlnbm9yZWRDYWxs RGF0YTsKICAgICBtX2lzQ2FsbGFibGUgPSB0YXJnZXRBc09iamVjdC0+bWV0aG9kVGFibGUodm0p LT5nZXRDYWxsRGF0YSh0YXJnZXRBc09iamVjdCwgaWdub3JlZENhbGxEYXRhKSAhPSBDYWxsVHlw ZTo6Tm9uZTsKKyAgICBpZiAobV9pc0NhbGxhYmxlKSB7CisgICAgICAgIFR5cGVJbmZvIGluZm8g PSBzdHJ1Y3R1cmUodm0pLT50eXBlSW5mbygpOworICAgICAgICBSRUxFQVNFX0FTU0VSVChpbmZv LmltcGxlbWVudHNIYXNJbnN0YW5jZSgpICYmIGluZm8uaW1wbGVtZW50c0RlZmF1bHRIYXNJbnN0 YW5jZSgpKTsKKyAgICB9CiAKICAgICBDb25zdHJ1Y3REYXRhIGlnbm9yZWRDb25zdHJ1Y3REYXRh OwogICAgIG1faXNDb25zdHJ1Y3RpYmxlID0ganNDYXN0PEpTT2JqZWN0Kj4odGFyZ2V0KS0+bWV0 aG9kVGFibGUodm0pLT5nZXRDb25zdHJ1Y3REYXRhKGpzQ2FzdDxKU09iamVjdCo+KHRhcmdldCks IGlnbm9yZWRDb25zdHJ1Y3REYXRhKSAhPSBDb25zdHJ1Y3RUeXBlOjpOb25lOwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUHJveHlPYmplY3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5oCShyZXZpc2lvbiAxOTc5 NjEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm94eU9iamVjdC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC00MCwxNyArNDAsMjAgQEAgcHVibGljOgogICAgIC8vIHByb3BlcnR5IG5h bWUgZW51bWVyYXRpb24gY2FjaGluZy4KICAgICBjb25zdCBzdGF0aWMgdW5zaWduZWQgU3RydWN0 dXJlRmxhZ3MgPSBCYXNlOjpTdHJ1Y3R1cmVGbGFncyB8IE92ZXJyaWRlc0dldE93blByb3BlcnR5 U2xvdCB8IFR5cGVPZlNob3VsZENhbGxHZXRDYWxsRGF0YSB8IEludGVyY2VwdHNHZXRPd25Qcm9w ZXJ0eVNsb3RCeUluZGV4RXZlbldoZW5MZW5ndGhJc05vdFplcm8gfCBPdmVycmlkZXNHZXRQcm9w ZXJ0eU5hbWVzIHwgUHJvaGliaXRzUHJvcGVydHlDYWNoaW5nOwogCi0gICAgc3RhdGljIFByb3h5 T2JqZWN0KiBjcmVhdGUoRXhlY1N0YXRlKiBleGVjLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSlNW YWx1ZSB0YXJnZXQsIEpTVmFsdWUgaGFuZGxlcikKKyAgICBzdGF0aWMgUHJveHlPYmplY3QqIGNy ZWF0ZShFeGVjU3RhdGUqIGV4ZWMsIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTVmFs dWUgdGFyZ2V0LCBKU1ZhbHVlIGhhbmRsZXIpCiAgICAgewogICAgICAgICBWTSYgdm0gPSBleGVj LT52bSgpOwotICAgICAgICBQcm94eU9iamVjdCogcHJveHkgPSBuZXcgKE5vdE51bGwsIGFsbG9j YXRlQ2VsbDxQcm94eU9iamVjdD4odm0uaGVhcCkpIFByb3h5T2JqZWN0KHZtLCBzdHJ1Y3R1cmUp OworICAgICAgICBQcm94eU9iamVjdCogcHJveHkgPSBuZXcgKE5vdE51bGwsIGFsbG9jYXRlQ2Vs bDxQcm94eU9iamVjdD4odm0uaGVhcCkpIFByb3h5T2JqZWN0KHZtLCBQcm94eU9iamVjdDo6c3Ry dWN0dXJlRm9yVGFyZ2V0KGdsb2JhbE9iamVjdCwgdGFyZ2V0KSk7CiAgICAgICAgIHByb3h5LT5m aW5pc2hDcmVhdGlvbih2bSwgZXhlYywgdGFyZ2V0LCBoYW5kbGVyKTsKICAgICAgICAgcmV0dXJu IHByb3h5OwogICAgIH0KIAotICAgIHN0YXRpYyBTdHJ1Y3R1cmUqIGNyZWF0ZVN0cnVjdHVyZShW TSYgdm0sIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIEpTVmFsdWUgcHJvdG90eXBlKQor ICAgIHN0YXRpYyBTdHJ1Y3R1cmUqIGNyZWF0ZVN0cnVjdHVyZShWTSYgdm0sIEpTR2xvYmFsT2Jq ZWN0KiBnbG9iYWxPYmplY3QsIEpTVmFsdWUgcHJvdG90eXBlLCBib29sIGlzQ2FsbGFibGUpCiAg ICAgewotICAgICAgICBTdHJ1Y3R1cmUqIHJlc3VsdCA9IFN0cnVjdHVyZTo6Y3JlYXRlKHZtLCBn bG9iYWxPYmplY3QsIHByb3RvdHlwZSwgVHlwZUluZm8oUHJveHlPYmplY3RUeXBlLCBTdHJ1Y3R1 cmVGbGFncyksIGluZm8oKSwgTm9uQXJyYXkgfCBNYXlIYXZlSW5kZXhlZEFjY2Vzc29ycyk7Cisg ICAgICAgIHVuc2lnbmVkIGZsYWdzID0gU3RydWN0dXJlRmxhZ3M7CisgICAgICAgIGlmIChpc0Nh bGxhYmxlKQorICAgICAgICAgICAgZmxhZ3MgfD0gKEltcGxlbWVudHNIYXNJbnN0YW5jZSB8IElt cGxlbWVudHNEZWZhdWx0SGFzSW5zdGFuY2UpOworICAgICAgICBTdHJ1Y3R1cmUqIHJlc3VsdCA9 IFN0cnVjdHVyZTo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QsIHByb3RvdHlwZSwgVHlwZUluZm8o UHJveHlPYmplY3RUeXBlLCBmbGFncyksIGluZm8oKSwgTm9uQXJyYXkgfCBNYXlIYXZlSW5kZXhl ZEFjY2Vzc29ycyk7CiAgICAgICAgIHJlc3VsdC0+c2V0SXNRdWlja1Byb3BlcnR5QWNjZXNzQWxs b3dlZEZvckVudW1lcmF0aW9uKGZhbHNlKTsKICAgICAgICAgUkVMRUFTRV9BU1NFUlQoIXJlc3Vs dC0+Y2FuQWNjZXNzUHJvcGVydGllc1F1aWNrbHlGb3JFbnVtZXJhdGlvbigpKTsKICAgICAgICAg UkVMRUFTRV9BU1NFUlQoIXJlc3VsdC0+Y2FuQ2FjaGVQcm9wZXJ0eU5hbWVFbnVtZXJhdG9yKCkp OwpAQCAtNzIsNiArNzUsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFByb3h5T2JqZWN0KFZN JiwgU3RydWN0dXJlKik7CiAgICAgdm9pZCBmaW5pc2hDcmVhdGlvbihWTSYsIEV4ZWNTdGF0ZSos IEpTVmFsdWUgdGFyZ2V0LCBKU1ZhbHVlIGhhbmRsZXIpOworICAgIHN0YXRpYyBTdHJ1Y3R1cmUq IHN0cnVjdHVyZUZvclRhcmdldChKU0dsb2JhbE9iamVjdCosIEpTVmFsdWUgdGFyZ2V0KTsKIAog ICAgIHN0YXRpYyBib29sIGdldE93blByb3BlcnR5U2xvdChKU09iamVjdCosIEV4ZWNTdGF0ZSos IFByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90Jik7CiAgICAgc3RhdGljIGJvb2wgZ2V0T3duUHJv cGVydHlTbG90QnlJbmRleChKU09iamVjdCosIEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5 TmFtZSwgUHJvcGVydHlTbG90Jik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMv ZXM2LnlhbWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL2VzNi55 YW1sCShyZXZpc2lvbiAxOTc5NjEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvZXM2 LnlhbWwJKHdvcmtpbmcgY29weSkKQEAgLTk3OSw3ICs5NzksNyBAQAogLSBwYXRoOiBlczYvUHJv eHlfaW50ZXJuYWxfZ2V0X2NhbGxzX0hhc0JpbmRpbmcuanMKICAgY21kOiBydW5FUzYgOm5vcm1h bAogLSBwYXRoOiBlczYvUHJveHlfaW50ZXJuYWxfZ2V0X2NhbGxzX2luc3RhbmNlb2Zfb3BlcmF0 b3IuanMKLSAgY21kOiBydW5FUzYgOmZhaWwKKyAgY21kOiBydW5FUzYgOm5vcm1hbAogLSBwYXRo OiBlczYvUHJveHlfaW50ZXJuYWxfZ2V0X2NhbGxzX0l0ZXJhdG9yQ29tcGxldGVfSXRlcmF0b3JW YWx1ZS5qcwogICBjbWQ6IHJ1bkVTNiA6bm9ybWFsCiAtIHBhdGg6IGVzNi9Qcm94eV9pbnRlcm5h bF9nZXRfY2FsbHNfSlNPTi5zdHJpbmdpZnkuanMKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS90ZXN0cy9zdHJlc3MvcHJveHktaW5zdGFuY2VvZi5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3Byb3h5LWluc3RhbmNlb2YuanMJKHJldmlzaW9u IDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3Byb3h5LWluc3RhbmNl b2YuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzOSBAQAorZnVuY3Rpb24gYXNzZXJ0KGIp IHsKKyAgICBpZiAoIWIpCisgICAgICAgIHRocm93IG5ldyBFcnJvcigiQmFkIGFzc2VydGlvbiIp OworfQorCitmdW5jdGlvbiB0ZXN0KGYpIHsKKyAgICBmb3IgKGxldCBpID0gMDsgaSA8IDEwMDA7 IGkrKykKKyAgICAgICAgZigpOworfQorCitsZXQgY29uc3RydWN0b3JzID0gW0Vycm9yLCBTdHJp bmcsIFJlZ0V4cCwgZnVuY3Rpb24oKSB7fSwgY2xhc3MgQyB7fV07CisKK2ZvciAobGV0IGNvbnN0 cnVjdG9yIG9mIGNvbnN0cnVjdG9ycykgeworICAgIHRlc3QoZnVuY3Rpb24oKSB7CisgICAgICAg IGxldCBwcm94eSA9IG5ldyBQcm94eShjb25zdHJ1Y3Rvciwge30pOworICAgICAgICBhc3NlcnQo bmV3IGNvbnN0cnVjdG9yIGluc3RhbmNlb2YgcHJveHkpOworICAgIH0pOworfQorCit0ZXN0KGZ1 bmN0aW9uKCkgeworICAgIGxldCBjYWxsZWQgPSBmYWxzZTsKKyAgICBsZXQgcHJveHkgPSBuZXcg UHJveHkoZnVuY3Rpb24oKXsgY2FsbGVkID0gdHJ1ZTsgfSwge30pOworICAgIGFzc2VydChuZXcg cHJveHkgaW5zdGFuY2VvZiBwcm94eSk7CisgICAgYXNzZXJ0KGNhbGxlZCk7Cit9KTsKKwordGVz dChmdW5jdGlvbigpIHsKKyAgICBsZXQgY2FsbGVkID0gZmFsc2U7CisgICAgbGV0IGhhbmRsZXIg PSB7CisgICAgICAgIGdldDogZnVuY3Rpb24odGFyZ2V0LCBwcm9wKSB7CisgICAgICAgICAgICBp ZiAocHJvcCA9PT0gInByb3RvdHlwZSIpCisgICAgICAgICAgICAgICAgcmV0dXJuIHt9OworICAg ICAgICAgICAgcmV0dXJuIHRhcmdldFtwcm9wXTsKKyAgICAgICAgfQorICAgIH07CisgICAgbGV0 IHByb3h5ID0gbmV3IFByb3h5KGZ1bmN0aW9uKCl7IGNhbGxlZCA9IHRydWU7IH0sIGhhbmRsZXIp OworICAgIGFzc2VydCghKG5ldyBwcm94eSBpbnN0YW5jZW9mIHByb3h5KSk7CisgICAgYXNzZXJ0 KGNhbGxlZCk7Cit9KTsK