216477 2020-09-14 05:23:33 -0700 REGRESSION(r266885): WebDriver is broken since r266885 2020-09-14 23:26:41 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=216302 InRadar P2 Normal --- 1 cgarcia webkit-unassigned bburg hi webkit-bug-importer oldest_to_newest 1688228 0 cgarcia 2020-09-14 05:23:33 -0700 There are several issues introduced in r266885, most of them related to JSValue::get methods now returning an optional. In some cases of boolean values, the optional is checked instead of the contained bool or the logic is inverted. JSONValue::getString() is problematic too because it doesn't use optional, when you call getString() and null is returned it could be because the property is not present in the object or because the property is not a string. In several cases we need to know that so we need to first get the value and then call asString(9 instead of calling getString() directly. 1688230 1 408702 cgarcia 2020-09-14 05:33:03 -0700 Created attachment 408702 Patch 1688324 2 408702 hi 2020-09-14 11:18:47 -0700 Comment on attachment 408702 Patch r=me, wow I can't believe I missed some of these subtleties 😳 thanks for fixing! Is there no EWS for WebDriver or anything? I wouldn't have landed the change if I'd known that things were broken 😞 1688604 3 cgarcia 2020-09-14 23:25:12 -0700 Committed r267078: <https://trac.webkit.org/changeset/267078> 1688606 4 webkit-bug-importer 2020-09-14 23:26:18 -0700 <rdar://problem/68903288> 1688607 5 cgarcia 2020-09-14 23:26:41 -0700 (In reply to Devin Rousso from comment #2) > Comment on attachment 408702 [details] > Patch > > r=me, wow I can't believe I missed some of these subtleties 😳 thanks for > fixing! > > Is there no EWS for WebDriver or anything? I wouldn't have landed the > change if I'd known that things were broken 😞 No, we don't have EWS for WebDriver, the bots detected the issue. 408702 2020-09-14 05:33:03 -0700 2020-09-14 11:18:47 -0700 Patch wd-fix.diff text/plain 9253 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggZWY3NGRkZGZhYWQxLi5hNmNkYmU2ZTZmNDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjI2Njg4NSk6IFdlYkRy aXZlciBpcyBicm9rZW4gc2luY2UgcjI2Njg4NQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NDc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHNldmVyYWwgaXNzdWVzIGludHJvZHVjZWQg aW4gcjI2Njg4NSwgbW9zdCBvZiB0aGVtIHJlbGF0ZWQgdG8gSlNWYWx1ZTo6Z2V0IG1ldGhvZHMg bm93IHJldHVybmluZyBhbgorICAgICAgICBvcHRpb25hbC4gSW4gc29tZSBjYXNlcyBvZiBib29s ZWFuIHZhbHVlcywgdGhlIG9wdGlvbmFsIGlzIGNoZWNrZWQgaW5zdGVhZCBvZiB0aGUgY29udGFp bmVkIGJvb2wgb3IgdGhlIGxvZ2ljIGlzCisgICAgICAgIGludmVydGVkLiBKU09OVmFsdWU6Omdl dFN0cmluZygpIGlzIHByb2JsZW1hdGljIHRvbyBiZWNhdXNlIGl0IGRvZXNuJ3QgdXNlIG9wdGlv bmFsLCB3aGVuIHlvdSBjYWxsIGdldFN0cmluZygpCisgICAgICAgIGFuZCBudWxsIGlzIHJldHVy bmVkIGl0IGNvdWxkIGJlIGJlY2F1c2UgdGhlIHByb3BlcnR5IGlzIG5vdCBwcmVzZW50IGluIHRo ZSBvYmplY3Qgb3IgYmVjYXVzZSB0aGUgcHJvcGVydHkgaXMKKyAgICAgICAgbm90IGEgc3RyaW5n LiBJbiBzZXZlcmFsIGNhc2VzIHdlIG5lZWQgdG8ga25vdyB0aGF0IHNvIHdlIG5lZWQgdG8gZmly c3QgZ2V0IHRoZSB2YWx1ZSBhbmQgdGhlbiBjYWxsIGFzU3RyaW5nKDkKKyAgICAgICAgaW5zdGVh ZCBvZiBjYWxsaW5nIGdldFN0cmluZygpIGRpcmVjdGx5LgorCisgICAgICAgICogU2Vzc2lvbi5j cHA6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmhhbmRsZVVzZXJQcm9tcHRzKTogQ2hl Y2sgdGhlIHZhbHVlIG9mIGlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2csIG5vdCB0aGUgb3B0aW9u YWwuCisgICAgICAgIChXZWJEcml2ZXI6OnBhcnNlQXV0b21hdGlvbkNvb2tpZSk6IENoZWNrIGFs c28gdGhlIHZhbHVlIG9mIHRoZSBzZXNzaW9uIG9wdGlvbmFsIGJvb2wsIG5vdCBvbmx5IHRoZSBv cHRpb25hbC4KKyAgICAgICAgKiBTZXNzaW9uSG9zdC5jcHA6CisgICAgICAgIChXZWJEcml2ZXI6 OlNlc3Npb25Ib3N0OjpkaXNwYXRjaE1lc3NhZ2UpOiBPbmx5IHNldCB0aGUgcmVzcG9uc2VPYmpl Y3QgaWYgdGhlIG9iamVjdCBpcyBub3QgZW1wdHkuCisgICAgICAgICogV2ViRHJpdmVyU2Vydmlj ZS5jcHA6CisgICAgICAgIChXZWJEcml2ZXI6OldlYkRyaXZlclNlcnZpY2U6Om5ld1dpbmRvdyk6 IFVua25vd24gdmFsdWVzIG9mIHR5cGUgaGludCBhcmUgbm90IGFuIGVycm9yLgorICAgICAgICAo V2ViRHJpdmVyOjpXZWJEcml2ZXJTZXJ2aWNlOjpkZWxldGVDb29raWUpOiBGaXggaW5kZW50YXRp b24uCisgICAgICAgIChXZWJEcml2ZXI6OnByb2Nlc3NLZXlBY3Rpb24pOiBFbXB0eSBrZXkgdmFs dWUgaXMgYW4gZXJyb3IsIG5vdCB0aGUgb3Bwb3NpdGUuCisgICAgICAgICogZ3RrL1dlYkRyaXZl clNlcnZpY2VHdGsuY3BwOgorICAgICAgICAoV2ViRHJpdmVyOjpXZWJEcml2ZXJTZXJ2aWNlOjpw bGF0Zm9ybVZhbGlkYXRlQ2FwYWJpbGl0eSBjb25zdCk6IE9ubHkgZmFpbCBpZiBvcHRpb25hbCB2 YWx1ZXMgYXJlIHdyb25nIHR5cGUsCisgICAgICAgIG5vdCBpZiB0aGV5IGFyZSBub3QgcHJlc2Vu dC4KKyAgICAgICAgKiB3cGUvV2ViRHJpdmVyU2VydmljZVdQRS5jcHA6CisgICAgICAgIChXZWJE cml2ZXI6OldlYkRyaXZlclNlcnZpY2U6OnBsYXRmb3JtVmFsaWRhdGVDYXBhYmlsaXR5IGNvbnN0 KTogRGl0dG8uCisKIDIwMjAtMDktMTAgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlA c29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBEZWJ1ZyBidWlsZCBmaXggZm9yIFdQRSBh bmQgV2luQ2Fpcm8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAgYi9T b3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwCmluZGV4IDRiNDJiZjgwMDFlMi4uZjNhNDg0Nzc4 NDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJEcml2ZXIvU2Vzc2lvbi5jcHAKQEAgLTIxNCw3ICsyMTQsNyBAQCB2b2lkIFNlc3Npb246 OmhhbmRsZVVzZXJQcm9tcHRzKEZ1bmN0aW9uPHZvaWQgKENvbW1hbmRSZXN1bHQmJik+JiYgY29t cGxldGlvbkhhbgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYg KCFpc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9nKSB7CisgICAgICAgIGlmICghaXNTaG93aW5nSmF2 YVNjcmlwdERpYWxvZy52YWx1ZSgpKSB7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihD b21tYW5kUmVzdWx0OjpzdWNjZXNzKCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CkBAIC0yMzY4LDcgKzIzNjgsNyBAQCBzdGF0aWMgT3B0aW9uYWw8U2Vzc2lvbjo6Q29va2llPiBw YXJzZUF1dG9tYXRpb25Db29raWUoY29uc3QgSlNPTjo6T2JqZWN0JiBjb29raQogICAgICAgICBj b29raWUuaHR0cE9ubHkgPSAqaHR0cE9ubHk7CiAKICAgICBhdXRvIHNlc3Npb24gPSBjb29raWVP YmplY3QuZ2V0Qm9vbGVhbigic2Vzc2lvbiJfcyk7Ci0gICAgaWYgKCFzZXNzaW9uKSB7CisgICAg aWYgKCFzZXNzaW9uIHx8ICEqc2Vzc2lvbikgewogICAgICAgICBpZiAoYXV0byBleHBpcnkgPSBj b29raWVPYmplY3QuZ2V0RG91YmxlKCJleHBpcmVzIl9zKSkKICAgICAgICAgICAgIGNvb2tpZS5l eHBpcnkgPSAqZXhwaXJ5OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vz c2lvbkhvc3QuY3BwIGIvU291cmNlL1dlYkRyaXZlci9TZXNzaW9uSG9zdC5jcHAKaW5kZXggNDcy ZWJkZmFmNGE2Li4yN2RlZTEyZmIxMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vz c2lvbkhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbkhvc3QuY3BwCkBAIC04 MSw4ICs4MSwxMCBAQCB2b2lkIFNlc3Npb25Ib3N0OjpkaXNwYXRjaE1lc3NhZ2UoY29uc3QgU3Ry aW5nJiBtZXNzYWdlKQogICAgIGlmIChhdXRvIGVycm9yT2JqZWN0ID0gbWVzc2FnZU9iamVjdC0+ Z2V0T2JqZWN0KCJlcnJvciJfcykpIHsKICAgICAgICAgcmVzcG9uc2UucmVzcG9uc2VPYmplY3Qg PSBXVEZNb3ZlKGVycm9yT2JqZWN0KTsKICAgICAgICAgcmVzcG9uc2UuaXNFcnJvciA9IHRydWU7 Ci0gICAgfSBlbHNlIGlmIChhdXRvIHJlc3VsdE9iamVjdCA9IG1lc3NhZ2VPYmplY3QtPmdldE9i amVjdCgicmVzdWx0Il9zKSkKLSAgICAgICAgcmVzcG9uc2UucmVzcG9uc2VPYmplY3QgPSBXVEZN b3ZlKHJlc3VsdE9iamVjdCk7CisgICAgfSBlbHNlIGlmIChhdXRvIHJlc3VsdE9iamVjdCA9IG1l c3NhZ2VPYmplY3QtPmdldE9iamVjdCgicmVzdWx0Il9zKSkgeworICAgICAgICBpZiAocmVzdWx0 T2JqZWN0LT5zaXplKCkpCisgICAgICAgICAgICByZXNwb25zZS5yZXNwb25zZU9iamVjdCA9IFdU Rk1vdmUocmVzdWx0T2JqZWN0KTsKKyAgICB9CiAKICAgICByZXNwb25zZUhhbmRsZXIoV1RGTW92 ZShyZXNwb25zZSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJT ZXJ2aWNlLmNwcCBiL1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2VydmljZS5jcHAKaW5kZXgg MzFlNmRkZTFmYzI4Li5lNjVjYThkZGE1NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJEcml2ZXIv V2ViRHJpdmVyU2VydmljZS5jcHAKKysrIGIvU291cmNlL1dlYkRyaXZlci9XZWJEcml2ZXJTZXJ2 aWNlLmNwcApAQCAtMTE4MSw5ICsxMTgxLDEwIEBAIHZvaWQgV2ViRHJpdmVyU2VydmljZTo6bmV3 V2luZG93KFJlZlB0cjxKU09OOjpPYmplY3Q+JiYgcGFyYW1ldGVycywgRnVuY3Rpb248dm9pCiAg ICAgT3B0aW9uYWw8U3RyaW5nPiB0eXBlSGludDsKICAgICBpZiAoYXV0byB2YWx1ZSA9IHBhcmFt ZXRlcnMtPmdldFZhbHVlKCJ0eXBlIl9zKSkgewogICAgICAgICBhdXRvIHZhbHVlU3RyaW5nID0g dmFsdWUtPmFzU3RyaW5nKCk7Ci0gICAgICAgIGlmICh2YWx1ZVN0cmluZyA9PSAid2luZG93IiB8 fCB2YWx1ZVN0cmluZyA9PSAidGFiIikKLSAgICAgICAgICAgIHR5cGVIaW50ID0gdmFsdWVTdHJp bmc7Ci0gICAgICAgIGVsc2UgaWYgKCF2YWx1ZS0+aXNOdWxsKCkpIHsKKyAgICAgICAgaWYgKCEh dmFsdWVTdHJpbmcpIHsKKyAgICAgICAgICAgIGlmICh2YWx1ZVN0cmluZyA9PSAid2luZG93IiB8 fCB2YWx1ZVN0cmluZyA9PSAidGFiIikKKyAgICAgICAgICAgICAgICB0eXBlSGludCA9IHZhbHVl U3RyaW5nOworICAgICAgICB9IGVsc2UgaWYgKCF2YWx1ZS0+aXNOdWxsKCkpIHsKICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6 RXJyb3JDb2RlOjpJbnZhbGlkQXJndW1lbnQpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQpAQCAtMTc2MSw3ICsxNzYyLDcgQEAgdm9pZCBXZWJEcml2ZXJTZXJ2aWNlOjpkZWxldGVD b29raWUoUmVmUHRyPEpTT046Ok9iamVjdD4mJiBwYXJhbWV0ZXJzLCBGdW5jdGlvbjwKICAgICBp ZiAoIWZpbmRTZXNzaW9uT3JDb21wbGV0ZVdpdGhFcnJvcigqcGFyYW1ldGVycywgY29tcGxldGlv bkhhbmRsZXIpKQogICAgICAgICByZXR1cm47CiAKLWF1dG8gbmFtZSA9IHBhcmFtZXRlcnMtPmdl dFN0cmluZygibmFtZSJfcyk7CisgICAgYXV0byBuYW1lID0gcGFyYW1ldGVycy0+Z2V0U3RyaW5n KCJuYW1lIl9zKTsKICAgICBpZiAoIW5hbWUpIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo Q29tbWFuZFJlc3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6OkludmFsaWRBcmd1 bWVudCkpOwogICAgICAgICByZXR1cm47CkBAIC0xODUzLDcgKzE4NTQsNyBAQCBzdGF0aWMgT3B0 aW9uYWw8QWN0aW9uPiBwcm9jZXNzS2V5QWN0aW9uKGNvbnN0IFN0cmluZyYgaWQsIEpTT046Ok9i amVjdCYgYWN0aW9uSQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICAgICAg fQogICAgICAgICBhdXRvIGtleSA9IGtleVZhbHVlLT5hc1N0cmluZygpOwotICAgICAgICBpZiAo IWtleS5pc0VtcHR5KCkpIHsKKyAgICAgICAgaWYgKGtleS5pc0VtcHR5KCkpIHsKICAgICAgICAg ICAgIGVycm9yTWVzc2FnZSA9IFN0cmluZygiVGhlIHBhcmFtYXRlciAndmFsdWUnIGlzIGludmFs aWQgZm9yIGtleSB1cC9kb3duIGFjdGlvbiIpOwogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkRyaXZlci9ndGsvV2ViRHJp dmVyU2VydmljZUd0ay5jcHAgYi9Tb3VyY2UvV2ViRHJpdmVyL2d0ay9XZWJEcml2ZXJTZXJ2aWNl R3RrLmNwcAppbmRleCA0NGM5MWFhNWY2NzMuLjc0Y2VmZDNmZGFmNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkRyaXZlci9ndGsvV2ViRHJpdmVyU2VydmljZUd0ay5jcHAKKysrIGIvU291cmNlL1dl YkRyaXZlci9ndGsvV2ViRHJpdmVyU2VydmljZUd0ay5jcHAKQEAgLTUyLDE1ICs1MiwyMSBAQCBi b29sIFdlYkRyaXZlclNlcnZpY2U6OnBsYXRmb3JtVmFsaWRhdGVDYXBhYmlsaXR5KGNvbnN0IFN0 cmluZyYgbmFtZSwgY29uc3QgUmVmPAogICAgIGlmIChicm93c2VyT3B0aW9ucy0+aXNOdWxsKCkp CiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgYXV0byBiaW5hcnkgPSBicm93c2VyT3B0aW9u cy0+Z2V0U3RyaW5nKCJiaW5hcnkiX3MpOwotICAgIGlmICghYmluYXJ5KQotICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgaWYgKGF1dG8gYmluYXJ5VmFsdWUgPSBicm93c2VyT3B0aW9ucy0+Z2V0 VmFsdWUoImJpbmFyeSJfcykpIHsKKyAgICAgICAgaWYgKCFiaW5hcnlWYWx1ZS0+YXNTdHJpbmco KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKLSAgICBhdXRvIHVzZU92ZXJs YXlTY3JvbGxiYXJzID0gYnJvd3Nlck9wdGlvbnMtPmdldEJvb2xlYW4oInVzZU92ZXJsYXlTY3Jv bGxiYXJzIl9zKTsKLSAgICBpZiAoIXVzZU92ZXJsYXlTY3JvbGxiYXJzKQotICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgaWYgKGF1dG8gdXNlT3ZlcmxheVNjcm9sbGJhcnNWYWx1ZSA9IGJyb3dz ZXJPcHRpb25zLT5nZXRWYWx1ZSgidXNlT3ZlcmxheVNjcm9sbGJhcnMiX3MpKSB7CisgICAgICAg IGlmICghdXNlT3ZlcmxheVNjcm9sbGJhcnNWYWx1ZS0+YXNCb29sZWFuKCkpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgaWYgKGF1dG8gYnJvd3NlckFyZ3VtZW50c1Zh bHVlID0gYnJvd3Nlck9wdGlvbnMtPmdldFZhbHVlKCJhcmdzIl9zKSkgeworICAgICAgICBhdXRv IGJyb3dzZXJBcmd1bWVudHMgPSBicm93c2VyQXJndW1lbnRzVmFsdWUtPmFzQXJyYXkoKTsKKyAg ICAgICAgaWYgKCFicm93c2VyQXJndW1lbnRzKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgaWYgKGF1dG8gYnJvd3NlckFyZ3VtZW50cyA9IGJyb3dzZXJPcHRpb25zLT5nZXRBcnJh eSgiYXJncyJfcykpIHsKICAgICAgICAgdW5zaWduZWQgYnJvd3NlckFyZ3VtZW50c0xlbmd0aCA9 IGJyb3dzZXJBcmd1bWVudHMtPmxlbmd0aCgpOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgYnJvd3NlckFyZ3VtZW50c0xlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICBhdXRvIGFy Z3VtZW50ID0gYnJvd3NlckFyZ3VtZW50cy0+Z2V0KGkpLT5hc1N0cmluZygpOwpAQCAtNjksNyAr NzUsMTEgQEAgYm9vbCBXZWJEcml2ZXJTZXJ2aWNlOjpwbGF0Zm9ybVZhbGlkYXRlQ2FwYWJpbGl0 eShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFJlZjwKICAgICAgICAgfQogICAgIH0KIAotICAg IGlmIChhdXRvIGNlcnRpZmljYXRlcyA9IGJyb3dzZXJPcHRpb25zLT5nZXRBcnJheSgiY2VydGlm aWNhdGVzIl9zKSkgeworICAgIGlmIChhdXRvIGNlcnRpZmljYXRlc1ZhbHVlID0gYnJvd3Nlck9w dGlvbnMtPmdldFZhbHVlKCJjZXJ0aWZpY2F0ZXMiX3MpKSB7CisgICAgICAgIGF1dG8gY2VydGlm aWNhdGVzID0gY2VydGlmaWNhdGVzVmFsdWUtPmFzQXJyYXkoKTsKKyAgICAgICAgaWYgKCFjZXJ0 aWZpY2F0ZXMpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICAgICAgdW5zaWduZWQg Y2VydGlmaWNhdGVzTGVuZ3RoID0gY2VydGlmaWNhdGVzLT5sZW5ndGgoKTsKICAgICAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGNlcnRpZmljYXRlc0xlbmd0aDsgKytpKSB7CiAgICAgICAg ICAgICBhdXRvIGNlcnRpZmljYXRlID0gY2VydGlmaWNhdGVzLT5nZXQoaSktPmFzT2JqZWN0KCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL3dwZS9XZWJEcml2ZXJTZXJ2aWNlV1BFLmNw cCBiL1NvdXJjZS9XZWJEcml2ZXIvd3BlL1dlYkRyaXZlclNlcnZpY2VXUEUuY3BwCmluZGV4IDJi N2IxNzFmMjJkYS4uMWEyZWU3ZjczYTA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViRHJpdmVyL3dw ZS9XZWJEcml2ZXJTZXJ2aWNlV1BFLmNwcAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL3dwZS9XZWJE cml2ZXJTZXJ2aWNlV1BFLmNwcApAQCAtNTcsMTggKzU3LDI0IEBAIGJvb2wgV2ViRHJpdmVyU2Vy dmljZTo6cGxhdGZvcm1WYWxpZGF0ZUNhcGFiaWxpdHkoY29uc3QgU3RyaW5nJiBuYW1lLCBjb25z dCBSZWY8CiAgICAgaWYgKCFiaW5hcnkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGF1 dG8gYnJvd3NlckFyZ3VtZW50cyA9IGJyb3dzZXJPcHRpb25zLT5nZXRBcnJheSgiYXJncyJfcyk7 Ci0gICAgaWYgKCFicm93c2VyQXJndW1lbnRzKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICB1bnNpZ25lZCBicm93c2VyQXJndW1lbnRzTGVuZ3RoID0gYnJvd3NlckFyZ3VtZW50cy0+bGVu Z3RoKCk7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGJyb3dzZXJBcmd1bWVudHNMZW5n dGg7ICsraSkgewotICAgICAgICBhdXRvIGFyZ3VtZW50ID0gYnJvd3NlckFyZ3VtZW50cy0+Z2V0 KGkpLT5hc1N0cmluZygpOwotICAgICAgICBpZiAoIWFyZ3VtZW50KQorICAgIGlmIChhdXRvIGJy b3dzZXJBcmd1bWVudHNWYWx1ZSA9IGJyb3dzZXJPcHRpb25zLT5nZXRWYWx1ZSgiYXJncyJfcykp IHsKKyAgICAgICAgYXV0byBicm93c2VyQXJndW1lbnRzID0gYnJvd3NlckFyZ3VtZW50c1ZhbHVl LT5hc0FycmF5KCk7CisgICAgICAgIGlmICghYnJvd3NlckFyZ3VtZW50cykKICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgICAgICB1bnNpZ25lZCBicm93c2VyQXJndW1lbnRzTGVuZ3Ro ID0gYnJvd3NlckFyZ3VtZW50cy0+bGVuZ3RoKCk7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBicm93c2VyQXJndW1lbnRzTGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIGF1dG8g YXJndW1lbnQgPSBicm93c2VyQXJndW1lbnRzLT5nZXQoaSktPmFzU3RyaW5nKCk7CisgICAgICAg ICAgICBpZiAoIWFyZ3VtZW50KQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgfQogICAgIH0KIAotICAgIGlmIChhdXRvIGNlcnRpZmljYXRlcyA9IGJyb3dzZXJPcHRpb25z LT5nZXRBcnJheSgiY2VydGlmaWNhdGVzIl9zKSkgeworICAgIGlmIChhdXRvIGNlcnRpZmljYXRl c1ZhbHVlID0gYnJvd3Nlck9wdGlvbnMtPmdldFZhbHVlKCJjZXJ0aWZpY2F0ZXMiX3MpKSB7Cisg ICAgICAgIGF1dG8gY2VydGlmaWNhdGVzID0gY2VydGlmaWNhdGVzVmFsdWUtPmFzQXJyYXkoKTsK KyAgICAgICAgaWYgKCFjZXJ0aWZpY2F0ZXMpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisK ICAgICAgICAgdW5zaWduZWQgY2VydGlmaWNhdGVzTGVuZ3RoID0gY2VydGlmaWNhdGVzLT5sZW5n dGgoKTsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGNlcnRpZmljYXRlc0xlbmd0 aDsgKytpKSB7CiAgICAgICAgICAgICBhdXRvIGNlcnRpZmljYXRlID0gY2VydGlmaWNhdGVzLT5n ZXQoaSktPmFzT2JqZWN0KCk7Cg==