188529 2018-08-13 12:54:27 -0700 Remove unused CSSSelector::parseNth 2018-08-13 14:18:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen commit-queue koivisto simon.fraser webkit-bug-importer oldest_to_newest 1449737 0 achristensen 2018-08-13 12:54:27 -0700 Remove unused CSSSelector::parseNth 1449738 1 347028 achristensen 2018-08-13 12:55:58 -0700 Created attachment 347028 Patch 1449762 2 347028 commit-queue 2018-08-13 14:17:17 -0700 Comment on attachment 347028 Patch Clearing flags on attachment: 347028 Committed r234817: <https://trac.webkit.org/changeset/234817> 1449763 3 commit-queue 2018-08-13 14:17:18 -0700 All reviewed patches have been landed. Closing bug. 1449764 4 webkit-bug-importer 2018-08-13 14:18:24 -0700 <rdar://problem/43251707> 347028 2018-08-13 12:55:58 -0700 2018-08-13 14:17:17 -0700 Patch bug-188529-20180813125557.patch text/plain 9930 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNDgxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA4LTEzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIHVu dXNlZCBDU1NTZWxlY3Rvcjo6cGFyc2VOdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4ODUyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgd2FzIGNvbmNlcHR1YWxseSByZXBsYWNlZCBieSB0aGUg Y2FsbCB0byBzZXROdGggaW4gQ1NTU2VsZWN0b3JQYXJzZXI6OmNvbnN1bWVQc2V1ZG8uCisKKyAg ICAgICAgKiBjc3MvQ1NTU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2VsZWN0 b3I6OkNTU1NlbGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1NlbGVjdG9yOjpzZXROdGgp OgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2VsZWN0b3I6Om50aEEgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6Q1NTU2VsZWN0b3I6Om50aEIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q1NT U2VsZWN0b3I6OnBhcnNlTnRoIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNT U1NlbGVjdG9yOjpSYXJlRGF0YTo6cGFyc2VOdGgpOiBEZWxldGVkLgorICAgICAgICAqIGNzcy9D U1NTZWxlY3Rvci5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU2VsZWN0b3I6OkNTU1NlbGVjdG9y KToKKyAgICAgICAgKiBjc3MvU2VsZWN0b3JDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tPbmUgY29uc3QpOgorICAgICAgICAqIGNzc2ppdC9TZWxl Y3RvckNvbXBpbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6OmFk ZE50aENoaWxkVHlwZSk6CisKIDIwMTgtMDgtMTMgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIE1lYW5pbmcgb2YgT3B0aW9uU2V0Ojpjb250YWlucyBpcyB1bmNs ZWFyIHdoZW4gdXNlZCB3aXRoIE9wdGlvblNldCBhcmd1bWVudApJbmRleDogU291cmNlL1dlYkNv cmUvY3NzL0NTU1NlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU2VsZWN0b3IuY3BwCShyZXZpc2lvbiAyMzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Miw3ICs1Miw2IEBAIENTU1NlbGVj dG9yOjpDU1NTZWxlY3Rvcihjb25zdCBRdWFsaWZpZWQKICAgICA6IG1fcmVsYXRpb24oRGVzY2Vu ZGFudFNwYWNlKQogICAgICwgbV9tYXRjaChUYWcpCiAgICAgLCBtX3BzZXVkb1R5cGUoMCkKLSAg ICAsIG1fcGFyc2VkTnRoKGZhbHNlKQogICAgICwgbV9pc0xhc3RJblNlbGVjdG9yTGlzdChmYWxz ZSkKICAgICAsIG1faXNMYXN0SW5UYWdIaXN0b3J5KHRydWUpCiAgICAgLCBtX2hhc1JhcmVEYXRh KGZhbHNlKQpAQCAtNzg3LDIyICs3ODYsOSBAQCB2b2lkIENTU1NlbGVjdG9yOjpzZXRTZWxlY3Rv ckxpc3Qoc3RkOjp1CiB2b2lkIENTU1NlbGVjdG9yOjpzZXROdGgoaW50IGEsIGludCBiKQogewog ICAgIGNyZWF0ZVJhcmVEYXRhKCk7Ci0gICAgbV9wYXJzZWROdGggPSB0cnVlOyAvLyBGSVhNRS1O RVdQQVJTRVI6IENhbiByZW1vdmUgdGhpcyBwYXJzZWQgYm9vbGVhbiBvbmNlIG9sZCBwYXJzZXIg aXMgZ29uZS4KICAgICBtX2RhdGEubV9yYXJlRGF0YS0+bV9hID0gYTsKICAgICBtX2RhdGEubV9y YXJlRGF0YS0+bV9iID0gYjsKIH0KLSAgICAKLS8vIEZJWE1FLU5FV1BBUlNFUjogQWxsIHRoZSBj b2RlIHRvIHBhcnNlIG50aC1jaGlsZCBzdHVmZiBjYW4gYmUgcmVtb3ZlZCB3aGVuCi0vLyB0aGUg bmV3IHBhcnNlciBpcyBlbmFibGVkLgotYm9vbCBDU1NTZWxlY3Rvcjo6cGFyc2VOdGgoKSBjb25z dAotewotICAgIGlmICghbV9oYXNSYXJlRGF0YSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IGlmIChtX3BhcnNlZE50aCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgbV9wYXJzZWROdGgg PSBtX2RhdGEubV9yYXJlRGF0YS0+cGFyc2VOdGgoKTsKLSAgICByZXR1cm4gbV9wYXJzZWROdGg7 Ci19CiAKIGJvb2wgQ1NTU2VsZWN0b3I6Om1hdGNoTnRoKGludCBjb3VudCkgY29uc3QKIHsKQEAg LTgxMywxNCArNzk5LDEyIEBAIGJvb2wgQ1NTU2VsZWN0b3I6Om1hdGNoTnRoKGludCBjb3VudCkg Y28KIGludCBDU1NTZWxlY3Rvcjo6bnRoQSgpIGNvbnN0CiB7CiAgICAgQVNTRVJUKG1faGFzUmFy ZURhdGEpOwotICAgIEFTU0VSVChtX3BhcnNlZE50aCk7CiAgICAgcmV0dXJuIG1fZGF0YS5tX3Jh cmVEYXRhLT5tX2E7CiB9CiAKIGludCBDU1NTZWxlY3Rvcjo6bnRoQigpIGNvbnN0CiB7CiAgICAg QVNTRVJUKG1faGFzUmFyZURhdGEpOwotICAgIEFTU0VSVChtX3BhcnNlZE50aCk7CiAgICAgcmV0 dXJuIG1fZGF0YS5tX3JhcmVEYXRhLT5tX2I7CiB9CiAKQEAgLTgzNiw2NyArODIwLDYgQEAgQ1NT U2VsZWN0b3I6OlJhcmVEYXRhOjpSYXJlRGF0YShBdG9taWNTdAogCiBDU1NTZWxlY3Rvcjo6UmFy ZURhdGE6On5SYXJlRGF0YSgpID0gZGVmYXVsdDsKIAotLy8gYSBoZWxwZXIgZnVuY3Rpb24gZm9y IHBhcnNpbmcgbnRoLWFyZ3VtZW50cwotYm9vbCBDU1NTZWxlY3Rvcjo6UmFyZURhdGE6OnBhcnNl TnRoKCkKLXsKLSAgICBpZiAobV9hcmd1bWVudC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBm YWxzZTsKLQotICAgIGlmIChlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZShtX2FyZ3VtZW50 LCAib2RkIikpIHsKLSAgICAgICAgbV9hID0gMjsKLSAgICAgICAgbV9iID0gMTsKLSAgICB9IGVs c2UgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1fYXJndW1lbnQsICJldmVuIikp IHsKLSAgICAgICAgbV9hID0gMjsKLSAgICAgICAgbV9iID0gMDsKLSAgICB9IGVsc2UgewotICAg ICAgICBtX2EgPSAwOwotICAgICAgICBtX2IgPSAwOwotCi0gICAgICAgIHNpemVfdCBuID0gc3Rk OjptaW4obV9hcmd1bWVudC5maW5kKCduJyksIG1fYXJndW1lbnQuZmluZCgnTicpKTsKLSAgICAg ICAgaWYgKG4gIT0gbm90Rm91bmQpIHsKLSAgICAgICAgICAgIGlmIChtX2FyZ3VtZW50WzBdID09 ICctJykgewotICAgICAgICAgICAgICAgIGlmIChuID09IDEpCi0gICAgICAgICAgICAgICAgICAg IG1fYSA9IC0xOyAvLyAtbiA9PSAtMW4KLSAgICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAg ICAgICAgICAgICAgYm9vbCBvazsKLSAgICAgICAgICAgICAgICAgICAgbV9hID0gU3RyaW5nVmll dyhtX2FyZ3VtZW50KS5zdWJzdHJpbmcoMCwgbikudG9JbnRTdHJpY3Qob2spOwotICAgICAgICAg ICAgICAgICAgICBpZiAoIW9rKQotICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAoIW4pCi0gICAgICAg ICAgICAgICAgbV9hID0gMTsgLy8gbiA9PSAxbgotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAg ICAgICAgICAgYm9vbCBvazsKLSAgICAgICAgICAgICAgICBtX2EgPSBTdHJpbmdWaWV3KG1fYXJn dW1lbnQpLnN1YnN0cmluZygwLCBuKS50b0ludFN0cmljdChvayk7Ci0gICAgICAgICAgICAgICAg aWYgKCFvaykKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAg fQotCi0gICAgICAgICAgICBzaXplX3QgcCA9IG1fYXJndW1lbnQuZmluZCgnKycsIG4pOwotICAg ICAgICAgICAgaWYgKHAgIT0gbm90Rm91bmQpIHsKLSAgICAgICAgICAgICAgICBib29sIG9rOwot ICAgICAgICAgICAgICAgIG1fYiA9IFN0cmluZ1ZpZXcobV9hcmd1bWVudCkuc3Vic3RyaW5nKHAg KyAxKS50b0ludFN0cmljdChvayk7Ci0gICAgICAgICAgICAgICAgaWYgKCFvaykKLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgICAgICBwID0gbV9hcmd1bWVudC5maW5kKCctJywgbik7Ci0gICAgICAgICAgICAgICAgaWYg KHAgIT0gbm90Rm91bmQpIHsKLSAgICAgICAgICAgICAgICAgICAgYm9vbCBvazsKLSAgICAgICAg ICAgICAgICAgICAgbV9iID0gLVN0cmluZ1ZpZXcobV9hcmd1bWVudCkuc3Vic3RyaW5nKHAgKyAx KS50b0ludFN0cmljdChvayk7Ci0gICAgICAgICAgICAgICAgICAgIGlmICghb2spCi0gICAgICAg ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgfQotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYm9vbCBvazsKLSAgICAgICAg ICAgIG1fYiA9IG1fYXJndW1lbnQuc3RyaW5nKCkudG9JbnRTdHJpY3QoJm9rKTsKLSAgICAgICAg ICAgIGlmICghb2spCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0g ICAgfQotICAgIHJldHVybiB0cnVlOwotfQotCiAvLyBhIGhlbHBlciBmdW5jdGlvbiBmb3IgY2hl Y2tpbmcgbnRoLWFyZ3VtZW50cwogYm9vbCBDU1NTZWxlY3Rvcjo6UmFyZURhdGE6Om1hdGNoTnRo KGludCBjb3VudCkKIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvci5oCShyZXZpc2lvbiAy MzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3IuaAkod29ya2luZyBjb3B5 KQpAQCAtMjUxLDcgKzI1MSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBz ZXRMYW5nQXJndW1lbnRMaXN0KHN0ZDo6dW5pcXVlX3B0cjxWZWN0b3I8QXRvbWljU3RyaW5nPj4p OwogICAgICAgICB2b2lkIHNldFNlbGVjdG9yTGlzdChzdGQ6OnVuaXF1ZV9wdHI8Q1NTU2VsZWN0 b3JMaXN0Pik7CiAKLSAgICAgICAgYm9vbCBwYXJzZU50aCgpIGNvbnN0OwogICAgICAgICBib29s IG1hdGNoTnRoKGludCBjb3VudCkgY29uc3Q7CiAgICAgICAgIGludCBudGhBKCkgY29uc3Q7CiAg ICAgICAgIGludCBudGhCKCkgY29uc3Q7CkBAIC0zMjYsNyArMzI1LDYgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB1bnNpZ25lZCBtX3JlbGF0aW9uICAgICAgICAgICAgICA6IDQ7IC8v IGVudW0gUmVsYXRpb25UeXBlLgogICAgICAgICBtdXRhYmxlIHVuc2lnbmVkIG1fbWF0Y2ggICAg ICAgICA6IDQ7IC8vIGVudW0gTWF0Y2guCiAgICAgICAgIG11dGFibGUgdW5zaWduZWQgbV9wc2V1 ZG9UeXBlICAgIDogODsgLy8gUHNldWRvVHlwZS4KLSAgICAgICAgbXV0YWJsZSB1bnNpZ25lZCBt X3BhcnNlZE50aCAgICAgOiAxOyAvLyBVc2VkIGZvciA6bnRoLSouCiAgICAgICAgIHVuc2lnbmVk IG1faXNMYXN0SW5TZWxlY3Rvckxpc3QgIDogMTsKICAgICAgICAgdW5zaWduZWQgbV9pc0xhc3RJ blRhZ0hpc3RvcnkgICAgOiAxOwogICAgICAgICB1bnNpZ25lZCBtX2hhc1JhcmVEYXRhICAgICAg ICAgICA6IDE7CkBAIC0zNDcsNyArMzQ1LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICAgICAgc3RhdGljIFJlZjxSYXJlRGF0YT4gY3JlYXRlKEF0b21pY1N0cmluZyYmIHZhbHVlKSB7 IHJldHVybiBhZG9wdFJlZigqbmV3IFJhcmVEYXRhKFdURk1vdmUodmFsdWUpKSk7IH0KICAgICAg ICAgICAgIH5SYXJlRGF0YSgpOwogCi0gICAgICAgICAgICBib29sIHBhcnNlTnRoKCk7CiAgICAg ICAgICAgICBib29sIG1hdGNoTnRoKGludCBjb3VudCk7CiAKICAgICAgICAgICAgIC8vIEZvciBx dWlya3MgbW9kZSwgY2xhc3MgYW5kIGlkIGFyZSBjYXNlLWluc2Vuc2l0aXZlLiBJbiB0aGUgY2Fz ZSB3aGVyZSB1cHBlcmNhc2UKQEAgLTQ4NCw3ICs0ODEsNiBAQCBpbmxpbmUgQ1NTU2VsZWN0b3I6 OkNTU1NlbGVjdG9yKCkKICAgICA6IG1fcmVsYXRpb24oRGVzY2VuZGFudFNwYWNlKQogICAgICwg bV9tYXRjaChVbmtub3duKQogICAgICwgbV9wc2V1ZG9UeXBlKDApCi0gICAgLCBtX3BhcnNlZE50 aChmYWxzZSkKICAgICAsIG1faXNMYXN0SW5TZWxlY3Rvckxpc3QoZmFsc2UpCiAgICAgLCBtX2lz TGFzdEluVGFnSGlzdG9yeSh0cnVlKQogICAgICwgbV9oYXNSYXJlRGF0YShmYWxzZSkKQEAgLTUw Miw3ICs0OTgsNiBAQCBpbmxpbmUgQ1NTU2VsZWN0b3I6OkNTU1NlbGVjdG9yKGNvbnN0IENTCiAg ICAgOiBtX3JlbGF0aW9uKG8ubV9yZWxhdGlvbikKICAgICAsIG1fbWF0Y2goby5tX21hdGNoKQog ICAgICwgbV9wc2V1ZG9UeXBlKG8ubV9wc2V1ZG9UeXBlKQotICAgICwgbV9wYXJzZWROdGgoby5t X3BhcnNlZE50aCkKICAgICAsIG1faXNMYXN0SW5TZWxlY3Rvckxpc3Qoby5tX2lzTGFzdEluU2Vs ZWN0b3JMaXN0KQogICAgICwgbV9pc0xhc3RJblRhZ0hpc3Rvcnkoby5tX2lzTGFzdEluVGFnSGlz dG9yeSkKICAgICAsIG1faGFzUmFyZURhdGEoby5tX2hhc1JhcmVEYXRhKQpJbmRleDogU291cmNl L1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAJKHJldmlzaW9uIDIzNDY2MykKKysrIFNvdXJj ZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Mzcs OCArODM3LDYgQEAgYm9vbCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrT25lKENoZWNraW5nQwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBjYXNlIENTU1Nl bGVjdG9yOjpQc2V1ZG9DbGFzc050aENoaWxkOgotICAgICAgICAgICAgaWYgKCFzZWxlY3Rvci5w YXJzZU50aCgpKQotICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgaWYgKGF1dG8q IHBhcmVudEVsZW1lbnQgPSBlbGVtZW50LnBhcmVudEVsZW1lbnQoKSkgewogICAgICAgICAgICAg ICAgIGF1dG8gcmVsYXRpb24gPSBjb250ZXh0LmlzU3ViamVjdE9yQWRqYWNlbnRFbGVtZW50ID8g U3R5bGU6OlJlbGF0aW9uOjpDaGlsZHJlbkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVz IDogU3R5bGU6OlJlbGF0aW9uOjpEZXNjZW5kYW50c0FmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25h bFJ1bGVzOwogICAgICAgICAgICAgICAgIGFkZFN0eWxlUmVsYXRpb24oY2hlY2tpbmdDb250ZXh0 LCAqcGFyZW50RWxlbWVudCwgcmVsYXRpb24pOwpAQCAtODY3LDkgKzg2NSw2IEBAIGJvb2wgU2Vs ZWN0b3JDaGVja2VyOjpjaGVja09uZShDaGVja2luZ0MKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc050aE9mVHlw ZToKLSAgICAgICAgICAgIGlmICghc2VsZWN0b3IucGFyc2VOdGgoKSkKLSAgICAgICAgICAgICAg ICBicmVhazsKLQogICAgICAgICAgICAgaWYgKGF1dG8qIHBhcmVudEVsZW1lbnQgPSBlbGVtZW50 LnBhcmVudEVsZW1lbnQoKSkgewogICAgICAgICAgICAgICAgIGF1dG8gcmVsYXRpb24gPSBjb250 ZXh0LmlzU3ViamVjdE9yQWRqYWNlbnRFbGVtZW50ID8gU3R5bGU6OlJlbGF0aW9uOjpDaGlsZHJl bkFmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzIDogU3R5bGU6OlJlbGF0aW9uOjpEZXNj ZW5kYW50c0FmZmVjdGVkQnlGb3J3YXJkUG9zaXRpb25hbFJ1bGVzOwogICAgICAgICAgICAgICAg IGFkZFN0eWxlUmVsYXRpb24oY2hlY2tpbmdDb250ZXh0LCAqcGFyZW50RWxlbWVudCwgcmVsYXRp b24pOwpAQCAtODgwLDggKzg3NSw2IEBAIGJvb2wgU2VsZWN0b3JDaGVja2VyOjpjaGVja09uZShD aGVja2luZ0MKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IENTU1NlbGVjdG9yOjpQc2V1ZG9DbGFzc050aExhc3RDaGlsZDoKLSAgICAgICAgICAgIGlmICgh c2VsZWN0b3IucGFyc2VOdGgoKSkKLSAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAg IGlmIChFbGVtZW50KiBwYXJlbnRFbGVtZW50ID0gZWxlbWVudC5wYXJlbnRFbGVtZW50KCkpIHsK ICAgICAgICAgICAgICAgICBpZiAoY29uc3QgQ1NTU2VsZWN0b3JMaXN0KiBzZWxlY3Rvckxpc3Qg PSBzZWxlY3Rvci5zZWxlY3Rvckxpc3QoKSkgewogICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBzZWxlY3Rvckxpc3RTcGVjaWZpY2l0eTsKQEAgLTkxMyw4ICs5MDYsNiBAQCBib29sIFNlbGVj dG9yQ2hlY2tlcjo6Y2hlY2tPbmUoQ2hlY2tpbmdDCiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBDU1NTZWxlY3Rvcjo6UHNldWRvQ2xhc3NOdGhMYXN0T2ZU eXBlOgotICAgICAgICAgICAgaWYgKCFzZWxlY3Rvci5wYXJzZU50aCgpKQotICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgaWYgKEVsZW1lbnQqIHBhcmVudEVsZW1lbnQgPSBlbGVt ZW50LnBhcmVudEVsZW1lbnQoKSkgewogICAgICAgICAgICAgICAgIGF1dG8gcmVsYXRpb24gPSBj b250ZXh0LmlzU3ViamVjdE9yQWRqYWNlbnRFbGVtZW50ID8gU3R5bGU6OlJlbGF0aW9uOjpDaGls ZHJlbkFmZmVjdGVkQnlCYWNrd2FyZFBvc2l0aW9uYWxSdWxlcyA6IFN0eWxlOjpSZWxhdGlvbjo6 RGVzY2VuZGFudHNBZmZlY3RlZEJ5QmFja3dhcmRQb3NpdGlvbmFsUnVsZXM7CiAgICAgICAgICAg ICAgICAgYWRkU3R5bGVSZWxhdGlvbihjaGVja2luZ0NvbnRleHQsICpwYXJlbnRFbGVtZW50LCBy ZWxhdGlvbik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JDb21waWxlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9yQ29tcGlsZXIu Y3BwCShyZXZpc2lvbiAyMzQ2NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3NqaXQvU2VsZWN0b3JD b21waWxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1MSw5ICs0NTEsNiBAQCBzdGF0aWMgaW5s aW5lIEZ1bmN0aW9uVHlwZSBhZGRTY3JvbGxiYXJQCiAvLyBIYW5kbGUgdGhlIGZvcndhcmQgOm50 aC1jaGlsZCgpIGFuZCBiYWNrd2FyZCA6bnRoLWxhc3QtY2hpbGQoKS4KIHN0YXRpYyBGdW5jdGlv blR5cGUgYWRkTnRoQ2hpbGRUeXBlKGNvbnN0IENTU1NlbGVjdG9yJiBzZWxlY3RvciwgU2VsZWN0 b3JDb250ZXh0IHNlbGVjdG9yQ29udGV4dCwgRnJhZ21lbnRQb3NpdGlvbkluUm9vdEZyYWdtZW50 cyBwb3NpdGlvbkluUm9vdEZyYWdtZW50cywgQ1NTU2VsZWN0b3I6OlBzZXVkb0NsYXNzVHlwZSBm aXJzdE1hdGNoQWx0ZXJuYXRpdmUsIGJvb2wgdmlzaXRlZE1hdGNoRW5hYmxlZCwgVmVjdG9yPHN0 ZDo6cGFpcjxpbnQsIGludD4sIDI+JiBzaW1wbGVDYXNlcywgVmVjdG9yPE50aENoaWxkT2ZTZWxl Y3RvckluZm8+JiBmaWx0ZXJlZENhc2VzLCBIYXNoU2V0PHVuc2lnbmVkPiYgcHNldWRvQ2xhc3Nl cywgdW5zaWduZWQmIGludGVybmFsU3BlY2lmaWNpdHkpCiB7Ci0gICAgaWYgKCFzZWxlY3Rvci5w YXJzZU50aCgpKQotICAgICAgICByZXR1cm4gRnVuY3Rpb25UeXBlOjpDYW5ub3RNYXRjaEFueXRo aW5nOwotCiAgICAgaW50IGEgPSBzZWxlY3Rvci5udGhBKCk7CiAgICAgaW50IGIgPSBzZWxlY3Rv ci5udGhCKCk7CiAK