218113 2020-10-22 20:43:29 -0700 IPC testing API should expose ArrayBuffer for an unknown decoded argument 2020-10-23 17:03:27 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa achristensen beidson cdumez darin ggaren webkit-bug-importer oldest_to_newest 1700922 0 rniwa 2020-10-22 20:43:29 -0700 When IPC interception API doesn't know how to encode the decoded argument as a JS value, we should expose expose it as an ArrayBuffer. 1700924 1 412154 rniwa 2020-10-22 21:00:02 -0700 Created attachment 412154 Patch 1701167 2 rniwa 2020-10-23 17:02:47 -0700 Committed r268946: <https://trac.webkit.org/changeset/268946> 1701168 3 webkit-bug-importer 2020-10-23 17:03:27 -0700 <rdar://problem/70639963> 412154 2020-10-22 21:00:02 -0700 2020-10-23 10:03:47 -0700 Patch bug-218113-20201022205958.patch text/plain 15442 rniwa SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNjg4NTQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDIwLTEwLTIyICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIElQQyB0ZXN0aW5nIEFQSSBzaG91bGQg ZXhwb3NlIEFycmF5QnVmZmVyIGZvciBhbiB1bmtub3duIGRlY29kZWQgYXJndW1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODExMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4cG9zZSB0aGUgZGVj b2RlZCBhcmd1bWVudCBhcyBhbiBBcnJheUJ1ZmZlciB3aGVuIGl0IGNhbid0IGJlIGVuY29kZWQg YXMgYSBKUyB2YWx1ZS4KKworICAgICAgICBBbHNvIG1ha2UgdGhlIHRyZWF0bWVudCBvZiBhIEpT IGFycmF5IGFzIGEgdHVwbGUgb3IgYSBWZWN0b3IgZXhwbGljaXQgaW4gYXJndW1lbnQgZW5jb2Rp bmcuCisKKyAgICAgICAgVGVzdDogVGVzdFdlYktpdEFQSS5JUENUZXN0aW5nQVBJLkNhbkludGVy Y2VwdEFsZXJ0CisKKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvRGVjb2Rlci5oOgorICAgICAgICAo SVBDOjpEZWNvZGVyOjpjdXJyZW50QnVmZmVyUG9zaXRpb24gY29uc3QpOiBBZGRlZC4KKyAgICAg ICAgKiBQbGF0Zm9ybS9JUEMvSlNJUENCaW5kaW5nLmNwcDoKKyAgICAgICAgKElQQzo6cHV0SlNW YWx1ZUZvckRlY29kZWRBcmd1bWVudEF0SW5kZXhPckFycmF5QnVmZmVySWZVbmRlZmluZWQpOiBB ZGRlZC4KKyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvSlNJUENCaW5kaW5nLmg6CisgICAgICAgIChJ UEM6OkRlY29kZWRBcmd1bWVudEpTVmFsdWVDb252ZXJ0ZXIpOiBEZWxldGVkLgorICAgICAgICAo SVBDOjpwdXRKU1ZhbHVlRm9yRGVjb2RlQXJndW1lbnRJbkFycmF5KTogUmVwbGFjZWQgRGVjb2Rl ZEFyZ3VtZW50SlNWYWx1ZUNvbnZlcnRlci4KKyAgICAgICAgVGFrZSBEZWNvZGVyIGFuZCBkZWNv ZGUgZWFjaCB0dXBsZSBhcmd1bWVudCBhbmQgY3JlYXRlIGEgSlMgdmFsdWUgYXQgYSB0aW1lLgor ICAgICAgICAoSVBDOjpqc1ZhbHVlRm9yQXJndW1lbnRUdXBsZSk6IERlbGV0ZWQuIE1lcmdlZCBp bnRvIGpzVmFsdWVGb3JEZWNvZGVkQXJndW1lbnRzLgorICAgICAgICAoSVBDOjpqc1ZhbHVlRm9y RGVjb2RlZEFyZ3VtZW50cyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0lQQ1Rlc3Rp bmdBUEkuY3BwOgorICAgICAgICAoV2ViS2l0OjpJUENUZXN0aW5nQVBJOjpWZWN0b3JFbmNvZGVI ZWxwZXI6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OklQQ1Rlc3RpbmdBUEk6OmVu Y29kZUFycmF5QXJndW1lbnQpOiBFeHRyYWN0ZWQgb3V0IG9mIGVuY29kZUFyZ3VtZW50LgorICAg ICAgICAoV2ViS2l0OjpJUENUZXN0aW5nQVBJOjplbmNvZGVBcmd1bWVudCk6IFRyZWF0IGFuIGFy cmF5IGFzIGEgdHVwbGUgdW5sZXNzIGl0J3MgZXhwbGljaXRseQorICAgICAgICBzcGVjaWZpZWQg dGhhdCB0aGUgYXJndW1lbnQncyB0eXBlIGlzIGEgVmVjdG9yLgorCiAyMDIwLTEwLTIxICBSeW9z dWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1vdmUgZnVuY3Rpb24gZGVm aW5pdGlvbnMgaW4gSlNJUENCaW5kaW5nLmggaW50byBjcHAgZmlsZQpJbmRleDogU291cmNlL1dl YktpdC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv UGxhdGZvcm0vSVBDL0RlY29kZXIuaAkocmV2aXNpb24gMjY4ODUyKQorKysgU291cmNlL1dlYktp dC9QbGF0Zm9ybS9JUEMvRGVjb2Rlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3Myw3IEBA IHB1YmxpYzoKICAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPERlY29kZXI+IHVud3JhcEZvclRl c3RpbmcoRGVjb2RlciYpOwogCiAgICAgY29uc3QgdWludDhfdCogYnVmZmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9idWZmZXI7IH0KKyAgICBzaXplX3QgY3VycmVudEJ1ZmZlclBvc2l0aW9uKCkgY29u c3QgeyByZXR1cm4gbV9idWZmZXJQb3MgLSBtX2J1ZmZlcjsgfQogICAgIHNpemVfdCBsZW5ndGgo KSBjb25zdCB7IHJldHVybiBtX2J1ZmZlckVuZCAtIG1fYnVmZmVyOyB9CiAKICAgICBXQVJOX1VO VVNFRF9SRVRVUk4gYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9idWZmZXJQb3MgIT0g bnVsbHB0cjsgfQpJbmRleDogU291cmNlL1dlYktpdC9QbGF0Zm9ybS9JUEMvSlNJUENCaW5kaW5n LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9KU0lQQ0JpbmRp bmcuY3BwCShyZXZpc2lvbiAyNjg4NTQpCisrKyBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9K U0lQQ0JpbmRpbmcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODcsNiArMTg3LDIyIEBAIEpTQzo6 SlNWYWx1ZSBqc1ZhbHVlRm9yRGVjb2RlZEFyZ3VtZW50VmEKICAgICByZXR1cm4ganNWYWx1ZUZv ckRlY29kZWRBcmd1bWVudFJlY3QoZ2xvYmFsT2JqZWN0LCB2YWx1ZSwgIkZsb2F0UmVjdCIpOwog fQogCitib29sIHB1dEpTVmFsdWVGb3JEZWNvZGVkQXJndW1lbnRBdEluZGV4T3JBcnJheUJ1ZmZl cklmVW5kZWZpbmVkKEpTQzo6SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNDOjpKU0Fy cmF5KiBhcnJheSwgdW5zaWduZWQgaW5kZXgsIEpTQzo6SlNWYWx1ZSB2YWx1ZSwgY29uc3QgdWlu dDhfdCogYnVmZmVyLCBzaXplX3QgbGVuZ3RoKQoreworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJF X1RIUk9XX1NDT1BFKGdsb2JhbE9iamVjdC0+dm0oKSk7CisKKyAgICBpZiAodmFsdWUuaXNVbmRl ZmluZWQoKSkgeworICAgICAgICBhdXRvIGFycmF5QnVmZmVyID0gSlNDOjpBcnJheUJ1ZmZlcjo6 Y3JlYXRlKGJ1ZmZlciwgbGVuZ3RoKTsKKyAgICAgICAgaWYgKGF1dG8qIHN0cnVjdHVyZSA9IGds b2JhbE9iamVjdC0+YXJyYXlCdWZmZXJTdHJ1Y3R1cmUoYXJyYXlCdWZmZXItPnNoYXJpbmdNb2Rl KCkpKQorICAgICAgICAgICAgdmFsdWUgPSBKU0M6OkpTQXJyYXlCdWZmZXI6OmNyZWF0ZShnbG9i YWxPYmplY3QtPnZtKCksIHN0cnVjdHVyZSwgV1RGTW92ZShhcnJheUJ1ZmZlcikpOworICAgIH0K KworICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChnbG9iYWxPYmplY3QsIGluZGV4LCB2YWx1ZSk7 CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZmFsc2UpOworCisgICAgcmV0dXJuIHRy dWU7Cit9CisKIH0KIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9K U0lQQ0JpbmRpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1BsYXRmb3JtL0lQQy9K U0lQQ0JpbmRpbmcuaAkocmV2aXNpb24gMjY4ODU0KQorKysgU291cmNlL1dlYktpdC9QbGF0Zm9y bS9JUEMvSlNJUENCaW5kaW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICNp bmNsdWRlICJEZWNvZGVyLmgiCiAjaW5jbHVkZSAiSGFuZGxlTWVzc2FnZS5oIgogI2luY2x1ZGUg PEphdmFTY3JpcHRDb3JlL0pTQXJyYXkuaD4KKyNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU0Fy cmF5QnVmZmVyLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSlNHbG9iYWxPYmplY3QuaD4K ICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU09iamVjdC5oPgogI2luY2x1ZGUgPEphdmFTY3Jp cHRDb3JlL09iamVjdENvbnN0cnVjdG9yLmg+CkBAIC0xMDcsNTEgKzEwOCw0NSBAQCBKU0M6OkpT VmFsdWUganNWYWx1ZUZvckRlY29kZWRBcmd1bWVudFZhCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K IAotdGVtcGxhdGU8c2l6ZV90IHJlbWFpbmluZ1NpemUsIHR5cGVuYW1lLi4uIEVsZW1lbnRzPgot c3RydWN0IERlY29kZWRBcmd1bWVudEpTVmFsdWVDb252ZXJ0ZXIgewotICAgIHN0YXRpYyBib29s IGNvbnZlcnQoSlNDOjpKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU0M6OkpTQXJyYXkq IGFycmF5LCBjb25zdCBzdGQ6OnR1cGxlPEVsZW1lbnRzLi4uPiYgdHVwbGUpCi0gICAgewotICAg ICAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRShnbG9iYWxPYmplY3QtPnZtKCkp OwotCi0gICAgICAgIGF1dG8ganNWYWx1ZSA9IGpzVmFsdWVGb3JEZWNvZGVkQXJndW1lbnRWYWx1 ZShnbG9iYWxPYmplY3QsIHN0ZDo6Z2V0PHNpemVvZi4uLihFbGVtZW50cykgLSByZW1haW5pbmdT aXplPih0dXBsZSkpOwotICAgICAgICBpZiAoanNWYWx1ZS5pc0VtcHR5KCkpCi0gICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAgdW5zaWduZWQgaW5kZXggPSBzaXplb2YuLi4oRWxl bWVudHMpIC0gcmVtYWluaW5nU2l6ZTsKLSAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGds b2JhbE9iamVjdCwgaW5kZXgsIGpzVmFsdWUpOwotICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBmYWxzZSk7Ci0KLSAgICAgICAgcmV0dXJuIERlY29kZWRBcmd1bWVudEpTVmFsdWVD b252ZXJ0ZXI8cmVtYWluaW5nU2l6ZSAtIDEsIEVsZW1lbnRzLi4uPjo6Y29udmVydChnbG9iYWxP YmplY3QsIGFycmF5LCB0dXBsZSk7Ci0gICAgfQotfTsKK2Jvb2wgcHV0SlNWYWx1ZUZvckRlY29k ZWRBcmd1bWVudEF0SW5kZXhPckFycmF5QnVmZmVySWZVbmRlZmluZWQoSlNDOjpKU0dsb2JhbE9i amVjdCosIEpTQzo6SlNBcnJheSosIHVuc2lnbmVkIGluZGV4LCBKU0M6OkpTVmFsdWUsIGNvbnN0 IHVpbnQ4X3QqIGJ1ZmZlciwgc2l6ZV90IGxlbmd0aCk7CiAKIHRlbXBsYXRlPHR5cGVuYW1lLi4u IEVsZW1lbnRzPgotc3RydWN0IERlY29kZWRBcmd1bWVudEpTVmFsdWVDb252ZXJ0ZXI8MCwgRWxl bWVudHMuLi4+IHsKLSAgICBzdGF0aWMgYm9vbCBjb252ZXJ0KEpTQzo6SlNHbG9iYWxPYmplY3Qq LCBKU0M6OkpTQXJyYXkqLCBjb25zdCBzdGQ6OnR1cGxlPEVsZW1lbnRzLi4uPiYpCi0gICAgewot ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci19OworT3B0aW9uYWw8SlNDOjpKU1ZhbHVlPiBw dXRKU1ZhbHVlRm9yRGVjb2RlQXJndW1lbnRJbkFycmF5KEpTQzo6SlNHbG9iYWxPYmplY3QqLCBJ UEM6OkRlY29kZXImLCBKU0M6OkpTQXJyYXkqLCBzaXplX3QgY3VycmVudEluZGV4LCBzdGQ6OnR1 cGxlPEVsZW1lbnRzLi4uPiopOwogCi10ZW1wbGF0ZTx0eXBlbmFtZS4uLiBFbGVtZW50cz4KLXN0 YXRpYyBKU0M6OkpTVmFsdWUganNWYWx1ZUZvckFyZ3VtZW50VHVwbGUoSlNDOjpKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBjb25zdCBzdGQ6OnR1cGxlPEVsZW1lbnRzLi4uPiYgdHVwbGUp Cit0ZW1wbGF0ZTw+CitpbmxpbmUgT3B0aW9uYWw8SlNDOjpKU1ZhbHVlPiBwdXRKU1ZhbHVlRm9y RGVjb2RlQXJndW1lbnRJbkFycmF5KEpTQzo6SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwg SVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBKU0M6OkpTQXJyYXkqIGFycmF5LCBzaXplX3QgY3VycmVu dEluZGV4LCBzdGQ6OnR1cGxlPD4qKQogewotICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9X X1NDT1BFKGdsb2JhbE9iamVjdC0+dm0oKSk7Ci0gICAgYXV0byogYXJyYXkgPSBKU0M6OmNvbnN0 cnVjdEVtcHR5QXJyYXkoZ2xvYmFsT2JqZWN0LCBudWxscHRyKTsKLSAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHNjb3BlLCBKU0M6OkpTVmFsdWUoKSk7Ci0gICAgaWYgKCFEZWNvZGVkQXJndW1lbnRK U1ZhbHVlQ29udmVydGVyPHNpemVvZi4uLihFbGVtZW50cyksIEVsZW1lbnRzLi4uPjo6Y29udmVy dChnbG9iYWxPYmplY3QsIGFycmF5LCB0dXBsZSkpCi0gICAgICAgIHJldHVybiBKU0M6OkpTVmFs dWUoKTsKLSAgICByZXR1cm4gSlNDOjpKU1ZhbHVlKGFycmF5KTsKKyAgICByZXR1cm4gSlNDOjpK U1ZhbHVlIHsgYXJyYXkgfTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUuLi4g RWxlbWVudHM+CitPcHRpb25hbDxKU0M6OkpTVmFsdWU+IHB1dEpTVmFsdWVGb3JEZWNvZGVBcmd1 bWVudEluQXJyYXkoSlNDOjpKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBJUEM6OkRlY29k ZXImIGRlY29kZXIsIEpTQzo6SlNBcnJheSogYXJyYXksIHNpemVfdCBjdXJyZW50SW5kZXgsIHN0 ZDo6dHVwbGU8VCwgRWxlbWVudHMuLi4+KikKK3sKKyAgICBhdXRvIHN0YXJ0aW5nQnVmZmVyUG9z aXRpb24gPSBkZWNvZGVyLmN1cnJlbnRCdWZmZXJQb3NpdGlvbigpOworICAgIE9wdGlvbmFsPFQ+ IHZhbHVlOworICAgIGRlY29kZXIgPj4gdmFsdWU7CisgICAgaWYgKCF2YWx1ZSkKKyAgICAgICAg cmV0dXJuIFdURjo6bnVsbG9wdDsKKworICAgIGF1dG8ganNWYWx1ZSA9IGpzVmFsdWVGb3JEZWNv ZGVkQXJndW1lbnRWYWx1ZShnbG9iYWxPYmplY3QsICp2YWx1ZSk7CisgICAgaWYgKGpzVmFsdWUu aXNFbXB0eSgpKQorICAgICAgICByZXR1cm4ganNWYWx1ZTsKKworICAgIHB1dEpTVmFsdWVGb3JE ZWNvZGVkQXJndW1lbnRBdEluZGV4T3JBcnJheUJ1ZmZlcklmVW5kZWZpbmVkKGdsb2JhbE9iamVj dCwgYXJyYXksIGN1cnJlbnRJbmRleCwganNWYWx1ZSwKKyAgICAgICAgZGVjb2Rlci5idWZmZXIo KSArIHN0YXJ0aW5nQnVmZmVyUG9zaXRpb24sIGRlY29kZXIuY3VycmVudEJ1ZmZlclBvc2l0aW9u KCkgLSBzdGFydGluZ0J1ZmZlclBvc2l0aW9uKTsKKworICAgIHN0ZDo6dHVwbGU8RWxlbWVudHMu Li4+KiBkdW1teUFyZ3VtZW50cyA9IG51bGxwdHI7CisgICAgcmV0dXJuIHB1dEpTVmFsdWVGb3JE ZWNvZGVBcmd1bWVudEluQXJyYXk8RWxlbWVudHMuLi4+KGdsb2JhbE9iamVjdCwgZGVjb2Rlciwg YXJyYXksIGN1cnJlbnRJbmRleCArIDEsIGR1bW15QXJndW1lbnRzKTsKIH0KIAogdGVtcGxhdGU8 dHlwZW5hbWUgVD4KIHN0YXRpYyBPcHRpb25hbDxKU0M6OkpTVmFsdWU+IGpzVmFsdWVGb3JEZWNv ZGVkQXJndW1lbnRzKEpTQzo6SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSVBDOjpEZWNv ZGVyJiBkZWNvZGVyKQogewotICAgIE9wdGlvbmFsPHR5cGVuYW1lIElQQzo6Q29kaW5nVHlwZTxU Pjo6VHlwZT4gYXJndW1lbnRzOwotICAgIGRlY29kZXIgPj4gYXJndW1lbnRzOwotICAgIGlmICgh YXJndW1lbnRzKQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIHJldHVybiBqc1Zh bHVlRm9yQXJndW1lbnRUdXBsZShnbG9iYWxPYmplY3QsICphcmd1bWVudHMpOworICAgIGF1dG8g c2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKGdsb2JhbE9iamVjdC0+dm0oKSk7CisgICAgYXV0 byogYXJyYXkgPSBKU0M6OmNvbnN0cnVjdEVtcHR5QXJyYXkoZ2xvYmFsT2JqZWN0LCBudWxscHRy KTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU0M6OkpTVmFsdWUoKSk7CisgICAg dHlwZW5hbWUgSVBDOjpDb2RpbmdUeXBlPFQ+OjpUeXBlKiBkdW1teUFyZ3VtZW50cyA9IG51bGxw dHI7CisgICAgcmV0dXJuIHB1dEpTVmFsdWVGb3JEZWNvZGVBcmd1bWVudEluQXJyYXk8PihnbG9i YWxPYmplY3QsIGRlY29kZXIsIGFycmF5LCAwLCBkdW1teUFyZ3VtZW50cyk7CiB9CiAKIH0KSW5k ZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0lQQ1Rlc3RpbmdBUEkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0lQQ1Rlc3RpbmdB UEkuY3BwCShyZXZpc2lvbiAyNjg4NTIpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9JUENUZXN0aW5nQVBJLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzY0LDggKzM2NCw3IEBA IHRlbXBsYXRlPHR5cGVuYW1lIEludGVncmFsVHlwZT4gYm9vbCBlbmMKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAotZW51bSBjbGFzcyBBcnJheU1vZGUgeyBUdXBsZSwgVmVjdG9yIH07Ci1zdGF0aWMg Ym9vbCBlbmNvZGVBcmd1bWVudChJUEM6OkVuY29kZXImLCBKU0lQQyYsIEpTQ29udGV4dFJlZiwg SlNWYWx1ZVJlZiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uLCBBcnJheU1vZGUgPSBBcnJheU1vZGU6 OlR1cGxlKTsKK3N0YXRpYyBib29sIGVuY29kZUFyZ3VtZW50KElQQzo6RW5jb2RlciYsIEpTSVBD JiwgSlNDb250ZXh0UmVmLCBKU1ZhbHVlUmVmLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pOwogCiBz dHJ1Y3QgVmVjdG9yRW5jb2RlSGVscGVyIHsKICAgICBSZWY8SlNJUEM+IGpzSVBDOwpAQCAtMzc4 LDExICszNzcsNDggQEAgc3RydWN0IFZlY3RvckVuY29kZUhlbHBlciB7CiAgICAgewogICAgICAg ICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHN1Y2Nlc3MgPSBl bmNvZGVBcmd1bWVudChlbmNvZGVyLCBqc0lQQy5nZXQoKSwgY29udGV4dCwgdmFsdWVSZWYsIGV4 Y2VwdGlvbiwgQXJyYXlNb2RlOjpWZWN0b3IpOworICAgICAgICBzdWNjZXNzID0gZW5jb2RlQXJn dW1lbnQoZW5jb2RlciwganNJUEMuZ2V0KCksIGNvbnRleHQsIHZhbHVlUmVmLCBleGNlcHRpb24p OwogICAgIH0KIH07CiAKLXN0YXRpYyBib29sIGVuY29kZUFyZ3VtZW50KElQQzo6RW5jb2RlciYg ZW5jb2RlciwgSlNJUEMmIGpzSVBDLCBKU0NvbnRleHRSZWYgY29udGV4dCwgSlNWYWx1ZVJlZiB2 YWx1ZVJlZiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uLCBBcnJheU1vZGUgYXJyYXlNb2RlKQorZW51 bSBjbGFzcyBBcnJheU1vZGUgeyBUdXBsZSwgVmVjdG9yIH07CitzdGF0aWMgYm9vbCBlbmNvZGVB cnJheUFyZ3VtZW50KElQQzo6RW5jb2RlciYgZW5jb2RlciwgSlNJUEMmIGpzSVBDLCBBcnJheU1v ZGUgYXJyYXlNb2RlLCBKU0NvbnRleHRSZWYgY29udGV4dCwgSlNWYWx1ZVJlZiB2YWx1ZVJlZiwg SlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIGF1dG8gb2JqZWN0UmVmID0gSlNWYWx1ZVRv T2JqZWN0KGNvbnRleHQsIHZhbHVlUmVmLCBleGNlcHRpb24pOworICAgIEFTU0VSVChvYmplY3RS ZWYpOworCisgICAgYXV0byogZ2xvYmFsT2JqZWN0ID0gdG9KUyhjb250ZXh0KTsKKyAgICBhdXRv JiB2bSA9IGdsb2JhbE9iamVjdC0+dm0oKTsKKyAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKHZt KTsKKyAgICBhdXRvIHNjb3BlID0gREVDTEFSRV9DQVRDSF9TQ09QRShnbG9iYWxPYmplY3QtPnZt KCkpOworICAgIGF1dG8qIGpzT2JqZWN0ID0gdG9KUyhvYmplY3RSZWYpOworCisgICAgYXV0byBq c0xlbmd0aCA9IGpzT2JqZWN0LT5nZXQoZ2xvYmFsT2JqZWN0LCBKU0M6OklkZW50aWZpZXI6OmZy b21TdHJpbmcodm0sICJsZW5ndGgiX3MpKTsKKyAgICBpZiAoc2NvcGUuZXhjZXB0aW9uKCkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWpzTGVuZ3RoLmlzTnVtYmVyKCkpIHsKKyAg ICAgICAgKmV4Y2VwdGlvbiA9IGNyZWF0ZVR5cGVFcnJvcihjb250ZXh0LCAiQXJyYXkgbGVuZ3Ro IGlzIG5vdCBhIG51bWJlciJfcyk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAg YXV0byBsZW5ndGggPSBqc0xlbmd0aC5hc051bWJlcigpOworCisgICAgVmVjdG9yPFZlY3RvckVu Y29kZUhlbHBlcj4gdmVjdG9yOworICAgIGJvb2wgc3VjY2VzcyA9IHRydWU7CisgICAgZm9yICh1 bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7CisgICAgICAgIGF1dG8gaXRlbVJlZiA9 IEpTT2JqZWN0R2V0UHJvcGVydHlBdEluZGV4KGNvbnRleHQsIG9iamVjdFJlZiwgaSwgZXhjZXB0 aW9uKTsKKyAgICAgICAgaWYgKCFpdGVtUmVmKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgICAgICB2ZWN0b3IuYXBwZW5kKFZlY3RvckVuY29kZUhlbHBlciB7IGpzSVBDLCBjb250ZXh0 LCBpdGVtUmVmLCBleGNlcHRpb24sIHN1Y2Nlc3MgfSk7CisgICAgfQorICAgIGlmIChhcnJheU1v ZGUgPT0gQXJyYXlNb2RlOjpUdXBsZSkgeworICAgICAgICBmb3IgKGF1dG8mIGl0ZW0gOiB2ZWN0 b3IpCisgICAgICAgICAgICBpdGVtLmVuY29kZShlbmNvZGVyKTsKKyAgICB9IGVsc2UKKyAgICAg ICAgZW5jb2RlciA8PCB2ZWN0b3I7CisgICAgcmV0dXJuIHN1Y2Nlc3M7Cit9CisKK3N0YXRpYyBi b29sIGVuY29kZUFyZ3VtZW50KElQQzo6RW5jb2RlciYgZW5jb2RlciwgSlNJUEMmIGpzSVBDLCBK U0NvbnRleHRSZWYgY29udGV4dCwgSlNWYWx1ZVJlZiB2YWx1ZVJlZiwgSlNWYWx1ZVJlZiogZXhj ZXB0aW9uKQogewogICAgIGF1dG8gb2JqZWN0UmVmID0gSlNWYWx1ZVRvT2JqZWN0KGNvbnRleHQs IHZhbHVlUmVmLCBleGNlcHRpb24pOwogICAgIGlmICghb2JqZWN0UmVmKQpAQCAtMzkxLDM4ICs0 MjcsMTUgQEAgc3RhdGljIGJvb2wgZW5jb2RlQXJndW1lbnQoSVBDOjpFbmNvZGVyJgogICAgIGlm IChhdXRvIHR5cGUgPSBKU1ZhbHVlR2V0VHlwZWRBcnJheVR5cGUoY29udGV4dCwgb2JqZWN0UmVm LCBleGNlcHRpb24pOyB0eXBlICE9IGtKU1R5cGVkQXJyYXlUeXBlTm9uZSkKICAgICAgICAgcmV0 dXJuIGVuY29kZVR5cGVkQXJyYXkoZW5jb2RlciwgY29udGV4dCwgb2JqZWN0UmVmLCB0eXBlLCBl eGNlcHRpb24pOwogCisgICAgaWYgKEpTVmFsdWVJc0FycmF5KGNvbnRleHQsIG9iamVjdFJlZikp CisgICAgICAgIHJldHVybiBlbmNvZGVBcnJheUFyZ3VtZW50KGVuY29kZXIsIGpzSVBDLCBBcnJh eU1vZGU6OlR1cGxlLCBjb250ZXh0LCBvYmplY3RSZWYsIGV4Y2VwdGlvbik7CisKICAgICBhdXRv KiBnbG9iYWxPYmplY3QgPSB0b0pTKGNvbnRleHQpOwogICAgIGF1dG8mIHZtID0gZ2xvYmFsT2Jq ZWN0LT52bSgpOwogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2sodm0pOwogICAgIGF1dG8gc2Nv cGUgPSBERUNMQVJFX0NBVENIX1NDT1BFKGdsb2JhbE9iamVjdC0+dm0oKSk7CiAgICAgYXV0byog anNPYmplY3QgPSB0b0pTKGdsb2JhbE9iamVjdCwgb2JqZWN0UmVmKS5nZXRPYmplY3QoKTsKICAg ICBBU1NFUlQoanNPYmplY3QpOwotICAgIGlmIChKU1ZhbHVlSXNBcnJheShjb250ZXh0LCBvYmpl Y3RSZWYpKSB7Ci0gICAgICAgIGF1dG8ganNMZW5ndGggPSBqc09iamVjdC0+Z2V0KGdsb2JhbE9i amVjdCwgSlNDOjpJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAibGVuZ3RoIl9zKSk7Ci0gICAg ICAgIGlmIChzY29wZS5leGNlcHRpb24oKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAgICAgaWYgKCFqc0xlbmd0aC5pc051bWJlcigpKSB7Ci0gICAgICAgICAgICAqZXhjZXB0aW9u ID0gY3JlYXRlVHlwZUVycm9yKGNvbnRleHQsICJBcnJheSBsZW5ndGggaXMgbm90IGEgbnVtYmVy Il9zKTsKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotICAgICAgICBhdXRv IGxlbmd0aCA9IGpzTGVuZ3RoLmFzTnVtYmVyKCk7Ci0KLSAgICAgICAgVmVjdG9yPFZlY3RvckVu Y29kZUhlbHBlcj4gdmVjdG9yOwotICAgICAgICBib29sIHN1Y2Nlc3MgPSB0cnVlOwotICAgICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAgIGF1 dG8gaXRlbVJlZiA9IEpTT2JqZWN0R2V0UHJvcGVydHlBdEluZGV4KGNvbnRleHQsIG9iamVjdFJl ZiwgaSwgZXhjZXB0aW9uKTsKLSAgICAgICAgICAgIGlmICghaXRlbVJlZikKLSAgICAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICB2ZWN0b3IuYXBwZW5kKFZlY3RvckVuY29k ZUhlbHBlciB7IGpzSVBDLCBjb250ZXh0LCBpdGVtUmVmLCBleGNlcHRpb24sIHN1Y2Nlc3MgfSk7 Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGFycmF5TW9kZSA9PSBBcnJheU1vZGU6OlR1cGxlKSB7 Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIGl0ZW0gOiB2ZWN0b3IpCi0gICAgICAgICAgICAgICAg aXRlbS5lbmNvZGUoZW5jb2Rlcik7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgZW5jb2Rl ciA8PCB2ZWN0b3I7Ci0gICAgICAgIHJldHVybiBzdWNjZXNzOwotICAgIH0KLQogICAgIGF1dG8g anNUeXBlID0ganNPYmplY3QtPmdldChnbG9iYWxPYmplY3QsIEpTQzo6SWRlbnRpZmllcjo6ZnJv bVN0cmluZyh2bSwgInR5cGUiX3MpKTsKICAgICBpZiAoc2NvcGUuZXhjZXB0aW9uKCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKQEAgLTQ3Nyw2ICs0OTAsMTQgQEAgc3RhdGljIGJvb2wgZW5jb2Rl QXJndW1lbnQoSVBDOjpFbmNvZGVyJgogICAgIGlmIChzY29wZS5leGNlcHRpb24oKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKHR5cGUgPT0gIlZlY3RvciIpIHsKKyAgICAgICAg aWYgKCFqc1ZhbHVlLmlzT2JqZWN0KCkgfHwgIWpzVmFsdWUuaW5oZXJpdHM8SlNDOjpKU0FycmF5 Pih2bSkpIHsKKyAgICAgICAgICAgICpleGNlcHRpb24gPSBjcmVhdGVUeXBlRXJyb3IoY29udGV4 dCwgIlZlY3RvciB2YWx1ZSBtdXN0IGJlIGFuIGFycmF5Il9zKTsKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gZW5jb2RlQXJyYXlBcmd1bWVudChl bmNvZGVyLCBqc0lQQywgQXJyYXlNb2RlOjpWZWN0b3IsIGNvbnRleHQsIHRvUmVmKGdsb2JhbE9i amVjdCwganNWYWx1ZSksIGV4Y2VwdGlvbik7CisgICAgfQorCiAgICAgaWYgKHR5cGUgPT0gIlN0 cmluZyIpIHsKICAgICAgICAgaWYgKGpzVmFsdWUuaXNVbmRlZmluZWRPck51bGwoKSkgewogICAg ICAgICAgICAgZW5jb2RlciA8PCBTdHJpbmcgeyB9OwpJbmRleDogVG9vbHMvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjY4OTAyKQorKysgVG9vbHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMTAtMjIgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSVBDIHRlc3RpbmcgQVBJ IHNob3VsZCBleHBvc2UgQXJyYXlCdWZmZXIgZm9yIGFuIHVua25vd24gZGVjb2RlZCBhcmd1bWVu dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE4MTEz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl ZCBhIHRlc3QgY2FzZSB0byBjaGVjayB0aGF0IHRoZSB1bmtub3duIHR5cGUgcHJvZHVjZXMgYW4g QXJyYXlCdWZmZXIuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L0lQQ1Rlc3RpbmdBUEkubW06CisgICAgICAgIChJUENUZXN0aW5nQVBJLkNhbkludGVyY2VwdEFs ZXJ0KToKKwogMjAyMC0xMC0yMiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+ CiAKICAgICAgICAgW3dlYmtpdHB5XSBVc2Ugd2Via2l0Y29yZXB5J3MgYXV0b2luc3RhbGxlciBm b3IgY2hyb21lIGFuZCBnZWNrbyBkcml2ZXJzCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0lQQ1Rlc3RpbmdBUEkubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JUENUZXN0aW5nQVBJLm1tCShyZXZpc2lvbiAy Njg4NTIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0lQQ1Rlc3Rp bmdBUEkubW0JKHdvcmtpbmcgY29weSkKQEAgLTIyMiw3ICsyMjIsMTIgQEAgVEVTVChJUENUZXN0 aW5nQVBJLCBDYW5JbnRlcmNlcHRBbGVydCkKICAgICBFWFBFQ1RfU1RSRVEoW2FsZXJ0TWVzc2Fn ZSBVVEY4U3RyaW5nXSwgIm9rIik7CiAgICAgRVhQRUNUX1NUUkVRKFt3ZWJWaWV3IHN0cmluZ0J5 RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJtZXNzYWdlcyA9IG1lc3NhZ2VzLmZpbHRlcigobWVzc2Fn ZSkgPT4gbWVzc2FnZS5uYW1lID09IElQQy5tZXNzYWdlcy5XZWJQYWdlUHJveHlfUnVuSmF2YVNj cmlwdEFsZXJ0Lm5hbWUpOyBtZXNzYWdlcy5sZW5ndGgiXS5VVEY4U3RyaW5nLCAiMSIpOwogICAg IEVYUEVDVF9TVFJFUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAibWVz c2FnZXNbMF0uZGVzY3JpcHRpb24iXS5VVEY4U3RyaW5nLCAiV2ViUGFnZVByb3h5X1J1bkphdmFT Y3JpcHRBbGVydCIpOwotICAgIEVYUEVDVF9FUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdK YXZhU2NyaXB0OkAibWVzc2FnZXNbMF0uYXJndW1lbnRzLmxlbmd0aCJdLmludFZhbHVlLCAzKTsK KyAgICBFWFBFQ1RfRVEoW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImFy Z3MgPSBtZXNzYWdlc1swXS5hcmd1bWVudHM7IGFyZ3MubGVuZ3RoIl0uaW50VmFsdWUsIDMpOwor ICAgIEVYUEVDVF9TVFJFUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAi YXJnc1swXS50eXBlIl0uVVRGOFN0cmluZywgInVpbnQ2NF90Iik7CisgICAgRVhQRUNUX0VRKFt3 ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJhcmdzWzBdLnZhbHVlIl0uaW50 VmFsdWUsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJJUEMuZnJhbWVJ RC50b1N0cmluZygpIl0uaW50VmFsdWUpOworICAgIEVYUEVDVF9FUShbd2ViVmlldyBzdHJpbmdC eUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiYXJnc1sxXSBpbnN0YW5jZW9mIEFycmF5QnVmZmVyIl0u Ym9vbFZhbHVlLCBZRVMpOworICAgIEVYUEVDVF9TVFJFUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1 YXRpbmdKYXZhU2NyaXB0OkAiYXJnc1syXS50eXBlIl0uVVRGOFN0cmluZywgIlN0cmluZyIpOwor ICAgIEVYUEVDVF9TVFJFUShbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAi YXJnc1syXS52YWx1ZSJdLlVURjhTdHJpbmcsICJvayIpOwogICAgIEVYUEVDVF9TVFJFUShbd2Vi VmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAidHlwZW9mKG1lc3NhZ2VzWzBdLnN5 bmNSZXF1ZXN0SUQpIl0uVVRGOFN0cmluZywgIm51bWJlciIpOwogICAgIEVYUEVDVF9FUShbd2Vi VmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAibWVzc2FnZXNbMF0uZGVzdGluYXRp b25JRCJdLmludFZhbHVlLAogICAgICAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZh U2NyaXB0OkAiSVBDLndlYlBhZ2VQcm94eUlELnRvU3RyaW5nKCkiXS5pbnRWYWx1ZSk7Cg==