214586 2020-07-20 20:44:40 -0700 Fix FinalizationRegistry GC finalizer interation 2020-07-21 12:38:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1673363 0 keith_miller 2020-07-20 20:44:40 -0700 Fix FinalizationRegistry GC finalizer interation 1673366 1 404791 keith_miller 2020-07-20 20:53:20 -0700 Created attachment 404791 Patch 1673374 2 404791 mark.lam 2020-07-20 22:04:26 -0700 Comment on attachment 404791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404791&action=review r=me > Source/JavaScriptCore/ChangeLog:9 > + Turns out when you remove the ith element from an table and you /an table/a Vector/. I think the data structure you're using is a Vector, right? 1673375 3 mark.lam 2020-07-20 22:05:53 -0700 Can you also check why the jsc EWS bot is failing? Please fix if it's your failure. Please file a bug if the failure is not yours. Thanks. 1673441 4 404791 ysuzuki 2020-07-21 07:47:39 -0700 Comment on attachment 404791 Patch r=me too. 1673550 5 404846 keith_miller 2020-07-21 12:00:50 -0700 Created attachment 404846 Patch for landing 1673556 6 404847 keith_miller 2020-07-21 12:04:30 -0700 Created attachment 404847 Patch for landing 1673557 7 404846 mark.lam 2020-07-21 12:05:11 -0700 Comment on attachment 404846 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=404846&action=review > Source/JavaScriptCore/runtime/DeferredWorkTimer.cpp:113 > + ASSERT(vm.currentThreadIsHoldingAPILock() || (Thread::mayBeGCThread() && ticket->vm().heap.worldIsStopped())); Why ticket->vm()? You have the VM& right there. 1673558 8 404848 keith_miller 2020-07-21 12:07:09 -0700 Created attachment 404848 Patch for landing 1673561 9 keith_miller 2020-07-21 12:12:22 -0700 (In reply to Mark Lam from comment #7) > Comment on attachment 404846 [details] > Patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=404846&action=review > > > Source/JavaScriptCore/runtime/DeferredWorkTimer.cpp:113 > > + ASSERT(vm.currentThreadIsHoldingAPILock() || (Thread::mayBeGCThread() && ticket->vm().heap.worldIsStopped())); > > Why ticket->vm()? You have the VM& right there. Fair enough, twas a copy paste artifact. 1673576 10 ews-feeder 2020-07-21 12:37:02 -0700 Committed r264673: <https://trac.webkit.org/changeset/264673> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404848. 1673577 11 webkit-bug-importer 2020-07-21 12:38:16 -0700 <rdar://problem/65897598> 404791 2020-07-20 20:53:20 -0700 2020-07-21 12:00:49 -0700 Patch bug-214586-20200720205319.patch text/plain 4145 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NmNiNGVjNDk5ZTVjM2M2M2YzNWQwZTBkY2I3NDgyNWE4ZDQ0OWQ5Li4yNjU0Yzg5ZjBmYTE2Njgz ZjIwZjI0MjdmZjM1OGQ3ZTc0ZDQyZGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMC0wNy0yMCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggRmluYWxpemF0aW9uUmVnaXN0cnkgR0MgZmluYWxpemVyIGlu dGVyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDU4NgorICAgICAgICA8cmRhcjovLzY1ODU0MjY0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR1cm5zIG91dCB3aGVuIHlvdSByZW1vdmUgdGhl IGl0aCBlbGVtZW50IGZyb20gYW4gdGFibGUgYW5kIHlvdQorICAgICAgICBpbmNyZW1lbnQgdGhl IGluZGV4IGFueXdheSB5b3Ugc2tpcCB0aGluZ3MuLi4gIFVzZSB0aGUgaGVscGVyCisgICAgICAg IGZ1bmN0aW9ucyBpbnN0ZWFkLiBUaGlzIGZpeGVzIGFuIEFTQU4gY3Jhc2ggb24gb3VyCisgICAg ICAgIEZpbmFsaXphdGlvblJlZ2lzdHJ5IHRlc3RzLgorCisgICAgICAgICogcnVudGltZS9KU0Zp bmFsaXphdGlvblJlZ2lzdHJ5LmNwcDoKKyAgICAgICAgKEpTQzo6SlNGaW5hbGl6YXRpb25SZWdp c3RyeTo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorCiAyMDIwLTA3LTIwICBZdXN1a2UgU3V6 dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IGR1cGxp Y2F0ZSBmb3J3YXJkIGRlY2xhcmF0aW9uIGludHJvZHVjZWQgYnkgbWVyZ2UgY29uZmxpY3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRmluYWxpemF0aW9uUmVn aXN0cnkuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6YXRpb25S ZWdpc3RyeS5jcHAKaW5kZXggZjI4M2Q2M2RmMjUwOGQ0ZjU3ZTg0ZmFlZjFiMWRkNjEwMzY3ZDJl My4uMjJhYjhkNDkxZDg3OTg5NjU1NjM1OTBlNTQ1NGY5NzhiOWQyMDMzYSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6YXRpb25SZWdpc3RyeS5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6YXRpb25SZWdpc3Ry eS5jcHAKQEAgLTkyLDM4ICs5MiwzOSBAQCB2b2lkIEpTRmluYWxpemF0aW9uUmVnaXN0cnk6OmZp bmFsaXplVW5jb25kaXRpb25hbGx5KFZNJiB2bSkKIHsKICAgICBhdXRvIGxvY2tlciA9IGhvbGRM b2NrKGNlbGxMb2NrKCkpOwogCi0gICAgYXV0byByZW1vdmVGcm9tVmVjdG9yID0gW10gKGF1dG8m IHZlY3Rvciwgc2l6ZV90IHBvc2l0aW9uKSB7Ci0gICAgICAgIHN0ZDo6c3dhcCh2ZWN0b3JbcG9z aXRpb25dLCB2ZWN0b3IubGFzdCgpKTsKLSAgICAgICAgcmV0dXJuIHZlY3Rvci50YWtlTGFzdCgp OwotICAgIH07Ci0KICAgICBib29sIHJlYWRpZWRDZWxsID0gZmFsc2U7Ci0gICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmUuc2l6ZSgpOyArK2kpIHsKLSAg ICAgICAgQVNTRVJUKCFtX25vVW5yZWdpc3RyYXRpb25MaXZlW2ldLmhvbGRpbmdzLmdldCgpLmlz Q2VsbCgpIHx8IHZtLmhlYXAuaXNNYXJrZWQobV9ub1VucmVnaXN0cmF0aW9uTGl2ZVtpXS5ob2xk aW5ncy5nZXQoKS5hc0NlbGwoKSkpOwotICAgICAgICBpZiAoIXZtLmhlYXAuaXNNYXJrZWQobV9u b1VucmVnaXN0cmF0aW9uTGl2ZVtpXS50YXJnZXQpKSB7Ci0gICAgICAgICAgICBtX25vVW5yZWdp c3RyYXRpb25EZWFkLmFwcGVuZChyZW1vdmVGcm9tVmVjdG9yKG1fbm9VbnJlZ2lzdHJhdGlvbkxp dmUsIGkpLmhvbGRpbmdzKTsKKyAgICBtX25vVW5yZWdpc3RyYXRpb25MaXZlLnJlbW92ZUFsbE1h dGNoaW5nKFsmXSAoY29uc3QgUmVnaXN0cmF0aW9uJiByZWcpIHsKKyAgICAgICAgQVNTRVJUKCFy ZWcuaG9sZGluZ3MuZ2V0KCkuaXNDZWxsKCkgfHwgdm0uaGVhcC5pc01hcmtlZChyZWcuaG9sZGlu Z3MuZ2V0KCkuYXNDZWxsKCkpKTsKKyAgICAgICAgaWYgKCF2bS5oZWFwLmlzTWFya2VkKHJlZy50 YXJnZXQpKSB7CisgICAgICAgICAgICBtX25vVW5yZWdpc3RyYXRpb25EZWFkLmFwcGVuZChyZWcu aG9sZGluZ3MpOwogICAgICAgICAgICAgcmVhZGllZENlbGwgPSB0cnVlOworICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgIH0KLSAgICB9CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9KTsKIAogICAgIG1fbGl2ZVJlZ2lzdHJhdGlvbnMucmVtb3ZlSWYoWyZdIChhdXRvJiBidWNr ZXQpIC0+IGJvb2wgewogICAgICAgICBBU1NFUlQoYnVja2V0LnZhbHVlLnNpemUoKSk7CiAKICAg ICAgICAgYm9vbCBrZXlJc0RlYWQgPSAhdm0uaGVhcC5pc01hcmtlZChidWNrZXQua2V5KTsKKyAg ICAgICAgYXV0byogZGVhZExpc3QgPSBrZXlJc0RlYWQgPyBudWxscHRyIDogJm1fZGVhZFJlZ2lz dHJhdGlvbnMuYWRkKGJ1Y2tldC5rZXksIERlYWRSZWdpc3RyYXRpb25zKCkpLml0ZXJhdG9yLT52 YWx1ZTsKIAotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGJ1Y2tldC52YWx1ZS5zaXpl KCk7IGkrKykgewotICAgICAgICAgICAgQVNTRVJUKCFidWNrZXQudmFsdWVbaV0uaG9sZGluZ3Mu Z2V0KCkuaXNDZWxsKCkgfHwgdm0uaGVhcC5pc01hcmtlZChidWNrZXQudmFsdWVbaV0uaG9sZGlu Z3MuZ2V0KCkuYXNDZWxsKCkpKTsKLSAgICAgICAgICAgIGlmICghdm0uaGVhcC5pc01hcmtlZChi dWNrZXQudmFsdWVbaV0udGFyZ2V0KSkgeworICAgICAgICBidWNrZXQudmFsdWUucmVtb3ZlQWxs TWF0Y2hpbmcoWyZdIChjb25zdCBSZWdpc3RyYXRpb24mIHJlZykgeworICAgICAgICAgICAgQVNT RVJUKCFyZWcuaG9sZGluZ3MuZ2V0KCkuaXNDZWxsKCkgfHwgdm0uaGVhcC5pc01hcmtlZChyZWcu aG9sZGluZ3MuZ2V0KCkuYXNDZWxsKCkpKTsKKyAgICAgICAgICAgIGlmICghdm0uaGVhcC5pc01h cmtlZChyZWcudGFyZ2V0KSkgewogICAgICAgICAgICAgICAgIGlmIChrZXlJc0RlYWQpCi0gICAg ICAgICAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkRlYWQuYXBwZW5kKHJlbW92ZUZyb21W ZWN0b3IoYnVja2V0LnZhbHVlLCBpKS5ob2xkaW5ncyk7Ci0gICAgICAgICAgICAgICAgZWxzZSB7 Ci0gICAgICAgICAgICAgICAgICAgIGF1dG8gZGVhZExpc3QgPSBtX2RlYWRSZWdpc3RyYXRpb25z LmFkZChidWNrZXQua2V5LCBEZWFkUmVnaXN0cmF0aW9ucygpKTsKLSAgICAgICAgICAgICAgICAg ICAgZGVhZExpc3QuaXRlcmF0b3ItPnZhbHVlLmFwcGVuZChyZW1vdmVGcm9tVmVjdG9yKGJ1Y2tl dC52YWx1ZSwgaSkuaG9sZGluZ3MpOwotICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICAgICAgbV9ub1VucmVnaXN0cmF0aW9uRGVhZC5hcHBlbmQocmVnLmhvbGRpbmdzKTsKKyAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGRlYWRMaXN0LT5hcHBlbmQocmVn LmhvbGRpbmdzKTsKICAgICAgICAgICAgICAgICByZWFkaWVkQ2VsbCA9IHRydWU7Ci0gICAgICAg ICAgICB9IGVsc2UgaWYgKGtleUlzRGVhZCkKLSAgICAgICAgICAgICAgICBtX25vVW5yZWdpc3Ry YXRpb25MaXZlLmFwcGVuZChyZW1vdmVGcm9tVmVjdG9yKGJ1Y2tldC52YWx1ZSwgaSkpOwotICAg ICAgICB9CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICBpZiAoa2V5SXNEZWFkKSB7CisgICAgICAgICAgICAgICAgbV9ub1VucmVnaXN0cmF0 aW9uTGl2ZS5hcHBlbmQocmVnKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSk7CiAKICAgICAg ICAgcmV0dXJuICFidWNrZXQudmFsdWUuc2l6ZSgpOwogICAgIH0pOwo= 404846 2020-07-21 12:00:50 -0700 2020-07-21 12:04:28 -0700 Patch for landing bug-214586-20200721120049.patch text/plain 7728 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NmNiNGVjNDk5ZTVjM2M2M2YzNWQwZTBkY2I3NDgyNWE4ZDQ0OWQ5Li45M2NiNDNmZjQ5MGI3ODc4 OTQzNmFiMWE3NjZmNzVlNmRiM2FjZjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMC0wNy0yMCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggRmluYWxpemF0aW9uUmVnaXN0cnkgR0MgZmluYWxpemVyIGlu dGVyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDU4NgorICAgICAgICA8cmRhcjovLzY1ODU0MjY0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE1hcmsgTGFtLgorCisgICAgICAgIFR1cm5zIG91dCB3aGVuIHlvdSByZW1vdmUgdGhlIGl0aCBl bGVtZW50IGZyb20gYW4gdGFibGUgYW5kIHlvdQorICAgICAgICBpbmNyZW1lbnQgdGhlIGluZGV4 IGFueXdheSB5b3Ugc2tpcCB0aGluZ3MuLi4gIFVzZSB0aGUgaGVscGVyCisgICAgICAgIGZ1bmN0 aW9ucyBpbnN0ZWFkLiBUaGlzIGZpeGVzIGFuIEFTQU4gY3Jhc2ggb24gb3VyCisgICAgICAgIEZp bmFsaXphdGlvblJlZ2lzdHJ5IHRlc3RzLgorCisgICAgICAgICogcnVudGltZS9KU0ZpbmFsaXph dGlvblJlZ2lzdHJ5LmNwcDoKKyAgICAgICAgKEpTQzo6SlNGaW5hbGl6YXRpb25SZWdpc3RyeTo6 ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorCiAyMDIwLTA3LTIwICBZdXN1a2UgU3V6dWtpICA8 eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IGR1cGxpY2F0ZSBm b3J3YXJkIGRlY2xhcmF0aW9uIGludHJvZHVjZWQgYnkgbWVyZ2UgY29uZmxpY3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hlYXAuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvSGVhcC5jcHAKaW5kZXggZDgxYWRlZmY1Zjg0MjZhODUzMjQyYzRlN2ExN2I1 N2E2NTIxYzZlMC4uNGQxZjE5ZWQyZmMzZTYxN2Q2NTY1YzM3YjE4NmRiMjQ0MDFiZjFmMSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKQEAgLTYxMiw2ICs2MTIsOCBAQCB2b2lkIEhl YXA6OmZpbmFsaXplVW5jb25kaXRpb25hbEZpbmFsaXplcnMoKQogICAgICAgICBmaW5hbGl6ZU1h cmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEpTV2Vha09iamVjdFJlZj4oKnZtKCkubV93ZWFr T2JqZWN0UmVmU3BhY2UpOwogICAgIGlmICh2bSgpLm1fZXJyb3JJbnN0YW5jZVNwYWNlKQogICAg ICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEVycm9ySW5zdGFuY2U+ KCp2bSgpLm1fZXJyb3JJbnN0YW5jZVNwYWNlKTsKKworICAgIC8vIEZpbmFsaXphdGlvblJlZ2lz dHJpZXMgY3VycmVudGx5IHJlbHkgb24gc2VyaWFsIGZpbmFsaXphdGlvbiBiZWNhdXNlIHRoZXkg Y2FuIHBvc3QgdGFza3MgdG8gdGhlIGRlZmVycmVkV29ya1RpbWVyLCB3aGljaCBub3JtYWxseSBl eHBlY3RzIHRhc2tzIHRvIG9ubHkgYmUgcG9zdGVkIGJ5IHRoZSBBUEkgbG9jayBob2xkZXIuCiAg ICAgaWYgKHZtKCkubV9maW5hbGl6YXRpb25SZWdpc3RyeVNwYWNlKQogICAgICAgICBmaW5hbGl6 ZU1hcmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEpTRmluYWxpemF0aW9uUmVnaXN0cnk+KCp2 bSgpLm1fZmluYWxpemF0aW9uUmVnaXN0cnlTcGFjZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0RlZmVycmVkV29ya1RpbWVyLmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0RlZmVycmVkV29ya1RpbWVyLmNwcAppbmRleCA4MzM0ZWIxNWE3 ZGY3OGJjOTRjZjY0Nzg0NzJjOGI2ZDhkZDUzN2RjLi5mNDkyZTA5NDEwY2Q3NzY5YjI4MWIxYzdj ZTg3ZDFlN2VmNWQwZmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9EZWZlcnJlZFdvcmtUaW1lci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvRGVmZXJyZWRXb3JrVGltZXIuY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAgdm9pZCBEZWZlcnJl ZFdvcmtUaW1lcjo6cnVuUnVuTG9vcCgpCiAKIHZvaWQgRGVmZXJyZWRXb3JrVGltZXI6OmFkZFBl bmRpbmdXb3JrKFZNJiB2bSwgVGlja2V0IHRpY2tldCwgVmVjdG9yPFN0cm9uZzxKU0NlbGw+PiYm IGRlcGVuZGVuY2llcykKIHsKLSAgICBBU1NFUlQodm0uY3VycmVudFRocmVhZElzSG9sZGluZ0FQ SUxvY2soKSk7CisgICAgQVNTRVJUKHZtLmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdBUElMb2NrKCkg fHwgKFRocmVhZDo6bWF5QmVHQ1RocmVhZCgpICYmIHRpY2tldC0+dm0oKS5oZWFwLndvcmxkSXNT dG9wcGVkKCkpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZGVwZW5kZW5jaWVzLnNp emUoKTsgKytpKQogICAgICAgICBBU1NFUlQoZGVwZW5kZW5jaWVzW2ldLmdldCgpICE9IHRpY2tl dCk7CiAKQEAgLTEyNywxMyArMTI3LDEzIEBAIHZvaWQgRGVmZXJyZWRXb3JrVGltZXI6OmFkZFBl bmRpbmdXb3JrKFZNJiB2bSwgVGlja2V0IHRpY2tldCwgVmVjdG9yPFN0cm9uZzxKU0NlCiAKIGJv b2wgRGVmZXJyZWRXb3JrVGltZXI6Omhhc1BlbmRpbmdXb3JrKFRpY2tldCB0aWNrZXQpCiB7Ci0g ICAgQVNTRVJUKHRpY2tldC0+dm0oKS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJTG9jaygpKTsK KyAgICBBU1NFUlQodGlja2V0LT52bSgpLmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdBUElMb2NrKCkg fHwgKFRocmVhZDo6bWF5QmVHQ1RocmVhZCgpICYmIHRpY2tldC0+dm0oKS5oZWFwLndvcmxkSXNT dG9wcGVkKCkpKTsKICAgICByZXR1cm4gbV9wZW5kaW5nVGlja2V0cy5jb250YWlucyh0aWNrZXQp OwogfQogCiBib29sIERlZmVycmVkV29ya1RpbWVyOjpoYXNEZXBlbmRhbmN5SW5QZW5kaW5nV29y ayhUaWNrZXQgdGlja2V0LCBKU0NlbGwqIGRlcGVuZGVuY3kpCiB7Ci0gICAgQVNTRVJUKHRpY2tl dC0+dm0oKS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJTG9jaygpKTsKKyAgICBBU1NFUlQodGlj a2V0LT52bSgpLmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdBUElMb2NrKCkgfHwgKFRocmVhZDo6bWF5 QmVHQ1RocmVhZCgpICYmIHRpY2tldC0+dm0oKS5oZWFwLndvcmxkSXNTdG9wcGVkKCkpKTsKICAg ICBBU1NFUlQobV9wZW5kaW5nVGlja2V0cy5jb250YWlucyh0aWNrZXQpKTsKIAogICAgIGF1dG8g cmVzdWx0ID0gbV9wZW5kaW5nVGlja2V0cy5nZXQodGlja2V0KTsKQEAgLTE0Miw3ICsxNDIsNyBA QCBib29sIERlZmVycmVkV29ya1RpbWVyOjpoYXNEZXBlbmRhbmN5SW5QZW5kaW5nV29yayhUaWNr ZXQgdGlja2V0LCBKU0NlbGwqIGRlcGVuZAogCiBib29sIERlZmVycmVkV29ya1RpbWVyOjpjYW5j ZWxQZW5kaW5nV29yayhUaWNrZXQgdGlja2V0KQogewotICAgIEFTU0VSVCh0aWNrZXQtPnZtKCku Y3VycmVudFRocmVhZElzSG9sZGluZ0FQSUxvY2soKSk7CisgICAgQVNTRVJUKHRpY2tldC0+dm0o KS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJTG9jaygpIHx8IChUaHJlYWQ6Om1heUJlR0NUaHJl YWQoKSAmJiB0aWNrZXQtPnZtKCkuaGVhcC53b3JsZElzU3RvcHBlZCgpKSk7CiAgICAgYm9vbCBy ZXN1bHQgPSBtX3BlbmRpbmdUaWNrZXRzLnJlbW92ZSh0aWNrZXQpOwogCiAgICAgaWYgKHJlc3Vs dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTRmluYWxpemF0 aW9uUmVnaXN0cnkuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6 YXRpb25SZWdpc3RyeS5jcHAKaW5kZXggZjI4M2Q2M2RmMjUwOGQ0ZjU3ZTg0ZmFlZjFiMWRkNjEw MzY3ZDJlMy4uNTQ5YjlkOTA5MjVjNjI3OGQxNzFmM2NlNzgwMTk5YWNhNTQ4OGEwMiAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6YXRpb25SZWdpc3Ry eS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6YXRpb25S ZWdpc3RyeS5jcHAKQEAgLTkyLDM4ICs5Miw1MSBAQCB2b2lkIEpTRmluYWxpemF0aW9uUmVnaXN0 cnk6OmZpbmFsaXplVW5jb25kaXRpb25hbGx5KFZNJiB2bSkKIHsKICAgICBhdXRvIGxvY2tlciA9 IGhvbGRMb2NrKGNlbGxMb2NrKCkpOwogCi0gICAgYXV0byByZW1vdmVGcm9tVmVjdG9yID0gW10g KGF1dG8mIHZlY3Rvciwgc2l6ZV90IHBvc2l0aW9uKSB7Ci0gICAgICAgIHN0ZDo6c3dhcCh2ZWN0 b3JbcG9zaXRpb25dLCB2ZWN0b3IubGFzdCgpKTsKLSAgICAgICAgcmV0dXJuIHZlY3Rvci50YWtl TGFzdCgpOwotICAgIH07CisjaWYgQVNTRVJUX0VOQUJMRUQKKyAgICBmb3IgKGNvbnN0IGF1dG8m IGl0ZXIgOiBtX2RlYWRSZWdpc3RyYXRpb25zKQorICAgICAgICBSRUxFQVNFX0FTU0VSVChpdGVy LnZhbHVlLnNpemUoKSk7CisjZW5kaWYKIAogICAgIGJvb2wgcmVhZGllZENlbGwgPSBmYWxzZTsK LSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9ub1VucmVnaXN0cmF0aW9uTGl2ZS5zaXpl KCk7ICsraSkgewotICAgICAgICBBU1NFUlQoIW1fbm9VbnJlZ2lzdHJhdGlvbkxpdmVbaV0uaG9s ZGluZ3MuZ2V0KCkuaXNDZWxsKCkgfHwgdm0uaGVhcC5pc01hcmtlZChtX25vVW5yZWdpc3RyYXRp b25MaXZlW2ldLmhvbGRpbmdzLmdldCgpLmFzQ2VsbCgpKSk7Ci0gICAgICAgIGlmICghdm0uaGVh cC5pc01hcmtlZChtX25vVW5yZWdpc3RyYXRpb25MaXZlW2ldLnRhcmdldCkpIHsKLSAgICAgICAg ICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkRlYWQuYXBwZW5kKHJlbW92ZUZyb21WZWN0b3IobV9ub1Vu cmVnaXN0cmF0aW9uTGl2ZSwgaSkuaG9sZGluZ3MpOworICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkxp dmUucmVtb3ZlQWxsTWF0Y2hpbmcoWyZdIChjb25zdCBSZWdpc3RyYXRpb24mIHJlZykgeworICAg ICAgICBBU1NFUlQoIXJlZy5ob2xkaW5ncy5nZXQoKS5pc0NlbGwoKSB8fCB2bS5oZWFwLmlzTWFy a2VkKHJlZy5ob2xkaW5ncy5nZXQoKS5hc0NlbGwoKSkpOworICAgICAgICBpZiAoIXZtLmhlYXAu aXNNYXJrZWQocmVnLnRhcmdldCkpIHsKKyAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkRl YWQuYXBwZW5kKHJlZy5ob2xkaW5ncyk7CiAgICAgICAgICAgICByZWFkaWVkQ2VsbCA9IHRydWU7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQotICAgIH0KKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIH0pOwogCiAgICAgbV9saXZlUmVnaXN0cmF0aW9ucy5yZW1vdmVJZihb Jl0gKGF1dG8mIGJ1Y2tldCkgLT4gYm9vbCB7CiAgICAgICAgIEFTU0VSVChidWNrZXQudmFsdWUu c2l6ZSgpKTsKIAogICAgICAgICBib29sIGtleUlzRGVhZCA9ICF2bS5oZWFwLmlzTWFya2VkKGJ1 Y2tldC5rZXkpOwotCi0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYnVja2V0LnZhbHVl LnNpemUoKTsgaSsrKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIWJ1Y2tldC52YWx1ZVtpXS5ob2xk aW5ncy5nZXQoKS5pc0NlbGwoKSB8fCB2bS5oZWFwLmlzTWFya2VkKGJ1Y2tldC52YWx1ZVtpXS5o b2xkaW5ncy5nZXQoKS5hc0NlbGwoKSkpOwotICAgICAgICAgICAgaWYgKCF2bS5oZWFwLmlzTWFy a2VkKGJ1Y2tldC52YWx1ZVtpXS50YXJnZXQpKSB7CisgICAgICAgIERlYWRSZWdpc3RyYXRpb25z KiBkZWFkTGlzdCA9IG51bGxwdHI7CisgICAgICAgIGF1dG8gZ2V0RGVhZExpc3QgPSBbJl0gKCkg LT4gRGVhZFJlZ2lzdHJhdGlvbnMmIHsKKyAgICAgICAgICAgIGlmIChVTkxJS0VMWSghZGVhZExp c3QpKQorICAgICAgICAgICAgICAgIGRlYWRMaXN0ID0gJm1fZGVhZFJlZ2lzdHJhdGlvbnMuYWRk KGJ1Y2tldC5rZXksIERlYWRSZWdpc3RyYXRpb25zKCkpLml0ZXJhdG9yLT52YWx1ZTsKKyAgICAg ICAgICAgIHJldHVybiAqZGVhZExpc3Q7CisgICAgICAgIH07CisKKyAgICAgICAgYnVja2V0LnZh bHVlLnJlbW92ZUFsbE1hdGNoaW5nKFsmXSAoY29uc3QgUmVnaXN0cmF0aW9uJiByZWcpIHsKKyAg ICAgICAgICAgIEFTU0VSVCghcmVnLmhvbGRpbmdzLmdldCgpLmlzQ2VsbCgpIHx8IHZtLmhlYXAu aXNNYXJrZWQocmVnLmhvbGRpbmdzLmdldCgpLmFzQ2VsbCgpKSk7CisgICAgICAgICAgICBpZiAo IXZtLmhlYXAuaXNNYXJrZWQocmVnLnRhcmdldCkpIHsKICAgICAgICAgICAgICAgICBpZiAoa2V5 SXNEZWFkKQotICAgICAgICAgICAgICAgICAgICBtX25vVW5yZWdpc3RyYXRpb25EZWFkLmFwcGVu ZChyZW1vdmVGcm9tVmVjdG9yKGJ1Y2tldC52YWx1ZSwgaSkuaG9sZGluZ3MpOwotICAgICAgICAg ICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAgICBhdXRvIGRlYWRMaXN0ID0gbV9kZWFk UmVnaXN0cmF0aW9ucy5hZGQoYnVja2V0LmtleSwgRGVhZFJlZ2lzdHJhdGlvbnMoKSk7Ci0gICAg ICAgICAgICAgICAgICAgIGRlYWRMaXN0Lml0ZXJhdG9yLT52YWx1ZS5hcHBlbmQocmVtb3ZlRnJv bVZlY3RvcihidWNrZXQudmFsdWUsIGkpLmhvbGRpbmdzKTsKLSAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkRlYWQuYXBwZW5kKHJlZy5ob2xk aW5ncyk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBnZXREZWFk TGlzdCgpLmFwcGVuZChyZWcuaG9sZGluZ3MpOwogICAgICAgICAgICAgICAgIHJlYWRpZWRDZWxs ID0gdHJ1ZTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoa2V5SXNEZWFkKQotICAgICAgICAgICAg ICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmUuYXBwZW5kKHJlbW92ZUZyb21WZWN0b3IoYnVja2V0 LnZhbHVlLCBpKSk7Ci0gICAgICAgIH0KKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGtleUlzRGVhZCkgeworICAgICAgICAgICAg ICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmUuYXBwZW5kKHJlZyk7CisgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICAgICAgfSk7CiAKICAgICAgICAgcmV0dXJuICFidWNrZXQudmFsdWUuc2l6ZSgpOwogICAg IH0pOwpAQCAtMTY5LDEwICsxODIsMTAgQEAgSlNWYWx1ZSBKU0ZpbmFsaXphdGlvblJlZ2lzdHJ5 Ojp0YWtlRGVhZEhvbGRpbmdzVmFsdWUoKQogICAgICAgICAgICAgbV9kZWFkUmVnaXN0cmF0aW9u cy5yZW1vdmUoaXRlcik7CiAgICAgfQogCi0gICAgaWYgY29uc3RleHByIChBU1NFUlRfRU5BQkxF RCkgewotICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGl0ZXIgOiBtX2RlYWRSZWdpc3RyYXRpb25z KQotICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoaXRlci52YWx1ZS5zaXplKCkpOwotICAgIH0K KyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIGZvciAoY29uc3QgYXV0byYgaXRlciA6IG1fZGVhZFJl Z2lzdHJhdGlvbnMpCisgICAgICAgIFJFTEVBU0VfQVNTRVJUKGl0ZXIudmFsdWUuc2l6ZSgpKTsK KyNlbmRpZgogCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K 404847 2020-07-21 12:04:30 -0700 2020-07-21 12:07:07 -0700 Patch for landing bug-214586-20200721120429.patch text/plain 8151 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NmNiNGVjNDk5ZTVjM2M2M2YzNWQwZTBkY2I3NDgyNWE4ZDQ0OWQ5Li5kNzM2OTBiYjIyN2JlMGM0 YjQ2Yjg1YWFmZTE2ZjU3Nzk2M2Q4MjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAyMC0wNy0yMSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggRmluYWxpemF0aW9uUmVnaXN0cnkgR0MgZmluYWxpemVyIGlu dGVyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDU4NgorICAgICAgICA8cmRhcjovLzY1ODU0MjY0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE1hcmsgTGFtIGFuZCBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgIFR1cm5zIG91dCB3aGVuIHlv dSByZW1vdmUgdGhlIGl0aCBlbGVtZW50IGZyb20gYSBWZWN0b3IgYW5kIHlvdQorICAgICAgICBp bmNyZW1lbnQgdGhlIGluZGV4IGFueXdheSB5b3Ugc2tpcCB0aGluZ3MuLi4gIFVzZSB0aGUgaGVs cGVyCisgICAgICAgIGZ1bmN0aW9ucyBpbnN0ZWFkLiBUaGlzIGZpeGVzIGFuIEFTQU4gY3Jhc2gg b24gb3VyCisgICAgICAgIEZpbmFsaXphdGlvblJlZ2lzdHJ5IHRlc3RzLgorCisgICAgICAgICog aGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVhcDo6ZmluYWxpemVVbmNvbmRpdGlvbmFs RmluYWxpemVycyk6CisgICAgICAgICogcnVudGltZS9EZWZlcnJlZFdvcmtUaW1lci5jcHA6Cisg ICAgICAgIChKU0M6OkRlZmVycmVkV29ya1RpbWVyOjphZGRQZW5kaW5nV29yayk6CisgICAgICAg IChKU0M6OkRlZmVycmVkV29ya1RpbWVyOjpoYXNQZW5kaW5nV29yayk6CisgICAgICAgIChKU0M6 OkRlZmVycmVkV29ya1RpbWVyOjpoYXNEZXBlbmRhbmN5SW5QZW5kaW5nV29yayk6CisgICAgICAg IChKU0M6OkRlZmVycmVkV29ya1RpbWVyOjpjYW5jZWxQZW5kaW5nV29yayk6CisgICAgICAgICog cnVudGltZS9KU0ZpbmFsaXphdGlvblJlZ2lzdHJ5LmNwcDoKKyAgICAgICAgKEpTQzo6SlNGaW5h bGl6YXRpb25SZWdpc3RyeTo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorICAgICAgICAoSlND OjpKU0ZpbmFsaXphdGlvblJlZ2lzdHJ5Ojp0YWtlRGVhZEhvbGRpbmdzVmFsdWUpOgorCiAyMDIw LTA3LTIwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgZml4IGR1cGxpY2F0ZSBmb3J3YXJkIGRlY2xhcmF0aW9uIGludHJvZHVjZWQgYnkg bWVyZ2UgY29uZmxpY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hl YXAuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKaW5kZXggZDgxYWRl ZmY1Zjg0MjZhODUzMjQyYzRlN2ExN2I1N2E2NTIxYzZlMC4uNGQxZjE5ZWQyZmMzZTYxN2Q2NTY1 YzM3YjE4NmRiMjQ0MDFiZjFmMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKQEAg LTYxMiw2ICs2MTIsOCBAQCB2b2lkIEhlYXA6OmZpbmFsaXplVW5jb25kaXRpb25hbEZpbmFsaXpl cnMoKQogICAgICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEpTV2Vh a09iamVjdFJlZj4oKnZtKCkubV93ZWFrT2JqZWN0UmVmU3BhY2UpOwogICAgIGlmICh2bSgpLm1f ZXJyb3JJbnN0YW5jZVNwYWNlKQogICAgICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxG aW5hbGl6ZXJzPEVycm9ySW5zdGFuY2U+KCp2bSgpLm1fZXJyb3JJbnN0YW5jZVNwYWNlKTsKKwor ICAgIC8vIEZpbmFsaXphdGlvblJlZ2lzdHJpZXMgY3VycmVudGx5IHJlbHkgb24gc2VyaWFsIGZp bmFsaXphdGlvbiBiZWNhdXNlIHRoZXkgY2FuIHBvc3QgdGFza3MgdG8gdGhlIGRlZmVycmVkV29y a1RpbWVyLCB3aGljaCBub3JtYWxseSBleHBlY3RzIHRhc2tzIHRvIG9ubHkgYmUgcG9zdGVkIGJ5 IHRoZSBBUEkgbG9jayBob2xkZXIuCiAgICAgaWYgKHZtKCkubV9maW5hbGl6YXRpb25SZWdpc3Ry eVNwYWNlKQogICAgICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEpT RmluYWxpemF0aW9uUmVnaXN0cnk+KCp2bSgpLm1fZmluYWxpemF0aW9uUmVnaXN0cnlTcGFjZSk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RlZmVycmVkV29y a1RpbWVyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RlZmVycmVkV29ya1Rp bWVyLmNwcAppbmRleCA4MzM0ZWIxNWE3ZGY3OGJjOTRjZjY0Nzg0NzJjOGI2ZDhkZDUzN2RjLi5m NDkyZTA5NDEwY2Q3NzY5YjI4MWIxYzdjZTg3ZDFlN2VmNWQwZmMwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EZWZlcnJlZFdvcmtUaW1lci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRGVmZXJyZWRXb3JrVGltZXIuY3BwCkBAIC0xMTAs NyArMTEwLDcgQEAgdm9pZCBEZWZlcnJlZFdvcmtUaW1lcjo6cnVuUnVuTG9vcCgpCiAKIHZvaWQg RGVmZXJyZWRXb3JrVGltZXI6OmFkZFBlbmRpbmdXb3JrKFZNJiB2bSwgVGlja2V0IHRpY2tldCwg VmVjdG9yPFN0cm9uZzxKU0NlbGw+PiYmIGRlcGVuZGVuY2llcykKIHsKLSAgICBBU1NFUlQodm0u Y3VycmVudFRocmVhZElzSG9sZGluZ0FQSUxvY2soKSk7CisgICAgQVNTRVJUKHZtLmN1cnJlbnRU aHJlYWRJc0hvbGRpbmdBUElMb2NrKCkgfHwgKFRocmVhZDo6bWF5QmVHQ1RocmVhZCgpICYmIHRp Y2tldC0+dm0oKS5oZWFwLndvcmxkSXNTdG9wcGVkKCkpKTsKICAgICBmb3IgKHVuc2lnbmVkIGkg PSAwOyBpIDwgZGVwZW5kZW5jaWVzLnNpemUoKTsgKytpKQogICAgICAgICBBU1NFUlQoZGVwZW5k ZW5jaWVzW2ldLmdldCgpICE9IHRpY2tldCk7CiAKQEAgLTEyNywxMyArMTI3LDEzIEBAIHZvaWQg RGVmZXJyZWRXb3JrVGltZXI6OmFkZFBlbmRpbmdXb3JrKFZNJiB2bSwgVGlja2V0IHRpY2tldCwg VmVjdG9yPFN0cm9uZzxKU0NlCiAKIGJvb2wgRGVmZXJyZWRXb3JrVGltZXI6Omhhc1BlbmRpbmdX b3JrKFRpY2tldCB0aWNrZXQpCiB7Ci0gICAgQVNTRVJUKHRpY2tldC0+dm0oKS5jdXJyZW50VGhy ZWFkSXNIb2xkaW5nQVBJTG9jaygpKTsKKyAgICBBU1NFUlQodGlja2V0LT52bSgpLmN1cnJlbnRU aHJlYWRJc0hvbGRpbmdBUElMb2NrKCkgfHwgKFRocmVhZDo6bWF5QmVHQ1RocmVhZCgpICYmIHRp Y2tldC0+dm0oKS5oZWFwLndvcmxkSXNTdG9wcGVkKCkpKTsKICAgICByZXR1cm4gbV9wZW5kaW5n VGlja2V0cy5jb250YWlucyh0aWNrZXQpOwogfQogCiBib29sIERlZmVycmVkV29ya1RpbWVyOjpo YXNEZXBlbmRhbmN5SW5QZW5kaW5nV29yayhUaWNrZXQgdGlja2V0LCBKU0NlbGwqIGRlcGVuZGVu Y3kpCiB7Ci0gICAgQVNTRVJUKHRpY2tldC0+dm0oKS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJ TG9jaygpKTsKKyAgICBBU1NFUlQodGlja2V0LT52bSgpLmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdB UElMb2NrKCkgfHwgKFRocmVhZDo6bWF5QmVHQ1RocmVhZCgpICYmIHRpY2tldC0+dm0oKS5oZWFw LndvcmxkSXNTdG9wcGVkKCkpKTsKICAgICBBU1NFUlQobV9wZW5kaW5nVGlja2V0cy5jb250YWlu cyh0aWNrZXQpKTsKIAogICAgIGF1dG8gcmVzdWx0ID0gbV9wZW5kaW5nVGlja2V0cy5nZXQodGlj a2V0KTsKQEAgLTE0Miw3ICsxNDIsNyBAQCBib29sIERlZmVycmVkV29ya1RpbWVyOjpoYXNEZXBl bmRhbmN5SW5QZW5kaW5nV29yayhUaWNrZXQgdGlja2V0LCBKU0NlbGwqIGRlcGVuZAogCiBib29s IERlZmVycmVkV29ya1RpbWVyOjpjYW5jZWxQZW5kaW5nV29yayhUaWNrZXQgdGlja2V0KQogewot ICAgIEFTU0VSVCh0aWNrZXQtPnZtKCkuY3VycmVudFRocmVhZElzSG9sZGluZ0FQSUxvY2soKSk7 CisgICAgQVNTRVJUKHRpY2tldC0+dm0oKS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJTG9jaygp IHx8IChUaHJlYWQ6Om1heUJlR0NUaHJlYWQoKSAmJiB0aWNrZXQtPnZtKCkuaGVhcC53b3JsZElz U3RvcHBlZCgpKSk7CiAgICAgYm9vbCByZXN1bHQgPSBtX3BlbmRpbmdUaWNrZXRzLnJlbW92ZSh0 aWNrZXQpOwogCiAgICAgaWYgKHJlc3VsdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTRmluYWxpemF0aW9uUmVnaXN0cnkuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNGaW5hbGl6YXRpb25SZWdpc3RyeS5jcHAKaW5kZXggZjI4M2Q2M2Rm MjUwOGQ0ZjU3ZTg0ZmFlZjFiMWRkNjEwMzY3ZDJlMy4uNTQ5YjlkOTA5MjVjNjI3OGQxNzFmM2Nl NzgwMTk5YWNhNTQ4OGEwMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNGaW5hbGl6YXRpb25SZWdpc3RyeS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNGaW5hbGl6YXRpb25SZWdpc3RyeS5jcHAKQEAgLTkyLDM4ICs5Miw1MSBAQCB2 b2lkIEpTRmluYWxpemF0aW9uUmVnaXN0cnk6OmZpbmFsaXplVW5jb25kaXRpb25hbGx5KFZNJiB2 bSkKIHsKICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGNlbGxMb2NrKCkpOwogCi0gICAgYXV0 byByZW1vdmVGcm9tVmVjdG9yID0gW10gKGF1dG8mIHZlY3Rvciwgc2l6ZV90IHBvc2l0aW9uKSB7 Ci0gICAgICAgIHN0ZDo6c3dhcCh2ZWN0b3JbcG9zaXRpb25dLCB2ZWN0b3IubGFzdCgpKTsKLSAg ICAgICAgcmV0dXJuIHZlY3Rvci50YWtlTGFzdCgpOwotICAgIH07CisjaWYgQVNTRVJUX0VOQUJM RUQKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGl0ZXIgOiBtX2RlYWRSZWdpc3RyYXRpb25zKQorICAg ICAgICBSRUxFQVNFX0FTU0VSVChpdGVyLnZhbHVlLnNpemUoKSk7CisjZW5kaWYKIAogICAgIGJv b2wgcmVhZGllZENlbGwgPSBmYWxzZTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9u b1VucmVnaXN0cmF0aW9uTGl2ZS5zaXplKCk7ICsraSkgewotICAgICAgICBBU1NFUlQoIW1fbm9V bnJlZ2lzdHJhdGlvbkxpdmVbaV0uaG9sZGluZ3MuZ2V0KCkuaXNDZWxsKCkgfHwgdm0uaGVhcC5p c01hcmtlZChtX25vVW5yZWdpc3RyYXRpb25MaXZlW2ldLmhvbGRpbmdzLmdldCgpLmFzQ2VsbCgp KSk7Ci0gICAgICAgIGlmICghdm0uaGVhcC5pc01hcmtlZChtX25vVW5yZWdpc3RyYXRpb25MaXZl W2ldLnRhcmdldCkpIHsKLSAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkRlYWQuYXBwZW5k KHJlbW92ZUZyb21WZWN0b3IobV9ub1VucmVnaXN0cmF0aW9uTGl2ZSwgaSkuaG9sZGluZ3MpOwor ICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmUucmVtb3ZlQWxsTWF0Y2hpbmcoWyZdIChjb25zdCBS ZWdpc3RyYXRpb24mIHJlZykgeworICAgICAgICBBU1NFUlQoIXJlZy5ob2xkaW5ncy5nZXQoKS5p c0NlbGwoKSB8fCB2bS5oZWFwLmlzTWFya2VkKHJlZy5ob2xkaW5ncy5nZXQoKS5hc0NlbGwoKSkp OworICAgICAgICBpZiAoIXZtLmhlYXAuaXNNYXJrZWQocmVnLnRhcmdldCkpIHsKKyAgICAgICAg ICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkRlYWQuYXBwZW5kKHJlZy5ob2xkaW5ncyk7CiAgICAgICAg ICAgICByZWFkaWVkQ2VsbCA9IHRydWU7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAg ICAgfQotICAgIH0KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0pOwogCiAgICAgbV9saXZl UmVnaXN0cmF0aW9ucy5yZW1vdmVJZihbJl0gKGF1dG8mIGJ1Y2tldCkgLT4gYm9vbCB7CiAgICAg ICAgIEFTU0VSVChidWNrZXQudmFsdWUuc2l6ZSgpKTsKIAogICAgICAgICBib29sIGtleUlzRGVh ZCA9ICF2bS5oZWFwLmlzTWFya2VkKGJ1Y2tldC5rZXkpOwotCi0gICAgICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgYnVja2V0LnZhbHVlLnNpemUoKTsgaSsrKSB7Ci0gICAgICAgICAgICBBU1NF UlQoIWJ1Y2tldC52YWx1ZVtpXS5ob2xkaW5ncy5nZXQoKS5pc0NlbGwoKSB8fCB2bS5oZWFwLmlz TWFya2VkKGJ1Y2tldC52YWx1ZVtpXS5ob2xkaW5ncy5nZXQoKS5hc0NlbGwoKSkpOwotICAgICAg ICAgICAgaWYgKCF2bS5oZWFwLmlzTWFya2VkKGJ1Y2tldC52YWx1ZVtpXS50YXJnZXQpKSB7Cisg ICAgICAgIERlYWRSZWdpc3RyYXRpb25zKiBkZWFkTGlzdCA9IG51bGxwdHI7CisgICAgICAgIGF1 dG8gZ2V0RGVhZExpc3QgPSBbJl0gKCkgLT4gRGVhZFJlZ2lzdHJhdGlvbnMmIHsKKyAgICAgICAg ICAgIGlmIChVTkxJS0VMWSghZGVhZExpc3QpKQorICAgICAgICAgICAgICAgIGRlYWRMaXN0ID0g Jm1fZGVhZFJlZ2lzdHJhdGlvbnMuYWRkKGJ1Y2tldC5rZXksIERlYWRSZWdpc3RyYXRpb25zKCkp Lml0ZXJhdG9yLT52YWx1ZTsKKyAgICAgICAgICAgIHJldHVybiAqZGVhZExpc3Q7CisgICAgICAg IH07CisKKyAgICAgICAgYnVja2V0LnZhbHVlLnJlbW92ZUFsbE1hdGNoaW5nKFsmXSAoY29uc3Qg UmVnaXN0cmF0aW9uJiByZWcpIHsKKyAgICAgICAgICAgIEFTU0VSVCghcmVnLmhvbGRpbmdzLmdl dCgpLmlzQ2VsbCgpIHx8IHZtLmhlYXAuaXNNYXJrZWQocmVnLmhvbGRpbmdzLmdldCgpLmFzQ2Vs bCgpKSk7CisgICAgICAgICAgICBpZiAoIXZtLmhlYXAuaXNNYXJrZWQocmVnLnRhcmdldCkpIHsK ICAgICAgICAgICAgICAgICBpZiAoa2V5SXNEZWFkKQotICAgICAgICAgICAgICAgICAgICBtX25v VW5yZWdpc3RyYXRpb25EZWFkLmFwcGVuZChyZW1vdmVGcm9tVmVjdG9yKGJ1Y2tldC52YWx1ZSwg aSkuaG9sZGluZ3MpOwotICAgICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgICAg ICBhdXRvIGRlYWRMaXN0ID0gbV9kZWFkUmVnaXN0cmF0aW9ucy5hZGQoYnVja2V0LmtleSwgRGVh ZFJlZ2lzdHJhdGlvbnMoKSk7Ci0gICAgICAgICAgICAgICAgICAgIGRlYWRMaXN0Lml0ZXJhdG9y LT52YWx1ZS5hcHBlbmQocmVtb3ZlRnJvbVZlY3RvcihidWNrZXQudmFsdWUsIGkpLmhvbGRpbmdz KTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJh dGlvbkRlYWQuYXBwZW5kKHJlZy5ob2xkaW5ncyk7CisgICAgICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgICAgICBnZXREZWFkTGlzdCgpLmFwcGVuZChyZWcuaG9sZGluZ3MpOwogICAg ICAgICAgICAgICAgIHJlYWRpZWRDZWxsID0gdHJ1ZTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAo a2V5SXNEZWFkKQotICAgICAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmUuYXBwZW5k KHJlbW92ZUZyb21WZWN0b3IoYnVja2V0LnZhbHVlLCBpKSk7Ci0gICAgICAgIH0KKyAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGtl eUlzRGVhZCkgeworICAgICAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmUuYXBwZW5k KHJlZyk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfSk7CiAKICAgICAgICAgcmV0dXJuICFi dWNrZXQudmFsdWUuc2l6ZSgpOwogICAgIH0pOwpAQCAtMTY5LDEwICsxODIsMTAgQEAgSlNWYWx1 ZSBKU0ZpbmFsaXphdGlvblJlZ2lzdHJ5Ojp0YWtlRGVhZEhvbGRpbmdzVmFsdWUoKQogICAgICAg ICAgICAgbV9kZWFkUmVnaXN0cmF0aW9ucy5yZW1vdmUoaXRlcik7CiAgICAgfQogCi0gICAgaWYg Y29uc3RleHByIChBU1NFUlRfRU5BQkxFRCkgewotICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGl0 ZXIgOiBtX2RlYWRSZWdpc3RyYXRpb25zKQotICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoaXRl ci52YWx1ZS5zaXplKCkpOwotICAgIH0KKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIGZvciAoY29u c3QgYXV0byYgaXRlciA6IG1fZGVhZFJlZ2lzdHJhdGlvbnMpCisgICAgICAgIFJFTEVBU0VfQVNT RVJUKGl0ZXIudmFsdWUuc2l6ZSgpKTsKKyNlbmRpZgogCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0K 404848 2020-07-21 12:07:09 -0700 2020-07-21 12:37:03 -0700 Patch for landing bug-214586-20200721120708.patch text/plain 8141 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NmNiNGVjNDk5ZTVjM2M2M2YzNWQwZTBkY2I3NDgyNWE4ZDQ0OWQ5Li5kNzM2OTBiYjIyN2JlMGM0 YjQ2Yjg1YWFmZTE2ZjU3Nzk2M2Q4MjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAyMC0wNy0yMSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBGaXggRmluYWxpemF0aW9uUmVnaXN0cnkgR0MgZmluYWxpemVyIGlu dGVyYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDU4NgorICAgICAgICA8cmRhcjovLzY1ODU0MjY0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE1hcmsgTGFtIGFuZCBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgIFR1cm5zIG91dCB3aGVuIHlv dSByZW1vdmUgdGhlIGl0aCBlbGVtZW50IGZyb20gYSBWZWN0b3IgYW5kIHlvdQorICAgICAgICBp bmNyZW1lbnQgdGhlIGluZGV4IGFueXdheSB5b3Ugc2tpcCB0aGluZ3MuLi4gIFVzZSB0aGUgaGVs cGVyCisgICAgICAgIGZ1bmN0aW9ucyBpbnN0ZWFkLiBUaGlzIGZpeGVzIGFuIEFTQU4gY3Jhc2gg b24gb3VyCisgICAgICAgIEZpbmFsaXphdGlvblJlZ2lzdHJ5IHRlc3RzLgorCisgICAgICAgICog aGVhcC9IZWFwLmNwcDoKKyAgICAgICAgKEpTQzo6SGVhcDo6ZmluYWxpemVVbmNvbmRpdGlvbmFs RmluYWxpemVycyk6CisgICAgICAgICogcnVudGltZS9EZWZlcnJlZFdvcmtUaW1lci5jcHA6Cisg ICAgICAgIChKU0M6OkRlZmVycmVkV29ya1RpbWVyOjphZGRQZW5kaW5nV29yayk6CisgICAgICAg IChKU0M6OkRlZmVycmVkV29ya1RpbWVyOjpoYXNQZW5kaW5nV29yayk6CisgICAgICAgIChKU0M6 OkRlZmVycmVkV29ya1RpbWVyOjpoYXNEZXBlbmRhbmN5SW5QZW5kaW5nV29yayk6CisgICAgICAg IChKU0M6OkRlZmVycmVkV29ya1RpbWVyOjpjYW5jZWxQZW5kaW5nV29yayk6CisgICAgICAgICog cnVudGltZS9KU0ZpbmFsaXphdGlvblJlZ2lzdHJ5LmNwcDoKKyAgICAgICAgKEpTQzo6SlNGaW5h bGl6YXRpb25SZWdpc3RyeTo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkpOgorICAgICAgICAoSlND OjpKU0ZpbmFsaXphdGlvblJlZ2lzdHJ5Ojp0YWtlRGVhZEhvbGRpbmdzVmFsdWUpOgorCiAyMDIw LTA3LTIwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgZml4IGR1cGxpY2F0ZSBmb3J3YXJkIGRlY2xhcmF0aW9uIGludHJvZHVjZWQgYnkg bWVyZ2UgY29uZmxpY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0hl YXAuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKaW5kZXggZDgxYWRl ZmY1Zjg0MjZhODUzMjQyYzRlN2ExN2I1N2E2NTIxYzZlMC4uNGQxZjE5ZWQyZmMzZTYxN2Q2NTY1 YzM3YjE4NmRiMjQ0MDFiZjFmMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvSGVhcC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvSGVhcC5jcHAKQEAg LTYxMiw2ICs2MTIsOCBAQCB2b2lkIEhlYXA6OmZpbmFsaXplVW5jb25kaXRpb25hbEZpbmFsaXpl cnMoKQogICAgICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEpTV2Vh a09iamVjdFJlZj4oKnZtKCkubV93ZWFrT2JqZWN0UmVmU3BhY2UpOwogICAgIGlmICh2bSgpLm1f ZXJyb3JJbnN0YW5jZVNwYWNlKQogICAgICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxG aW5hbGl6ZXJzPEVycm9ySW5zdGFuY2U+KCp2bSgpLm1fZXJyb3JJbnN0YW5jZVNwYWNlKTsKKwor ICAgIC8vIEZpbmFsaXphdGlvblJlZ2lzdHJpZXMgY3VycmVudGx5IHJlbHkgb24gc2VyaWFsIGZp bmFsaXphdGlvbiBiZWNhdXNlIHRoZXkgY2FuIHBvc3QgdGFza3MgdG8gdGhlIGRlZmVycmVkV29y a1RpbWVyLCB3aGljaCBub3JtYWxseSBleHBlY3RzIHRhc2tzIHRvIG9ubHkgYmUgcG9zdGVkIGJ5 IHRoZSBBUEkgbG9jayBob2xkZXIuCiAgICAgaWYgKHZtKCkubV9maW5hbGl6YXRpb25SZWdpc3Ry eVNwYWNlKQogICAgICAgICBmaW5hbGl6ZU1hcmtlZFVuY29uZGl0aW9uYWxGaW5hbGl6ZXJzPEpT RmluYWxpemF0aW9uUmVnaXN0cnk+KCp2bSgpLm1fZmluYWxpemF0aW9uUmVnaXN0cnlTcGFjZSk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RlZmVycmVkV29y a1RpbWVyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RlZmVycmVkV29ya1Rp bWVyLmNwcAppbmRleCA4MzM0ZWIxNWE3ZGY3OGJjOTRjZjY0Nzg0NzJjOGI2ZDhkZDUzN2RjLi4w NjVjZWM5ZjA1ZGJlODRkYWZkODExM2NhYTk0MzA3NzIwZTcwMmFjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9EZWZlcnJlZFdvcmtUaW1lci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRGVmZXJyZWRXb3JrVGltZXIuY3BwCkBAIC0xMTAs NyArMTEwLDcgQEAgdm9pZCBEZWZlcnJlZFdvcmtUaW1lcjo6cnVuUnVuTG9vcCgpCiAKIHZvaWQg RGVmZXJyZWRXb3JrVGltZXI6OmFkZFBlbmRpbmdXb3JrKFZNJiB2bSwgVGlja2V0IHRpY2tldCwg VmVjdG9yPFN0cm9uZzxKU0NlbGw+PiYmIGRlcGVuZGVuY2llcykKIHsKLSAgICBBU1NFUlQodm0u Y3VycmVudFRocmVhZElzSG9sZGluZ0FQSUxvY2soKSk7CisgICAgQVNTRVJUKHZtLmN1cnJlbnRU aHJlYWRJc0hvbGRpbmdBUElMb2NrKCkgfHwgKFRocmVhZDo6bWF5QmVHQ1RocmVhZCgpICYmIHZt LmhlYXAud29ybGRJc1N0b3BwZWQoKSkpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBk ZXBlbmRlbmNpZXMuc2l6ZSgpOyArK2kpCiAgICAgICAgIEFTU0VSVChkZXBlbmRlbmNpZXNbaV0u Z2V0KCkgIT0gdGlja2V0KTsKIApAQCAtMTI3LDEzICsxMjcsMTMgQEAgdm9pZCBEZWZlcnJlZFdv cmtUaW1lcjo6YWRkUGVuZGluZ1dvcmsoVk0mIHZtLCBUaWNrZXQgdGlja2V0LCBWZWN0b3I8U3Ry b25nPEpTQ2UKIAogYm9vbCBEZWZlcnJlZFdvcmtUaW1lcjo6aGFzUGVuZGluZ1dvcmsoVGlja2V0 IHRpY2tldCkKIHsKLSAgICBBU1NFUlQodGlja2V0LT52bSgpLmN1cnJlbnRUaHJlYWRJc0hvbGRp bmdBUElMb2NrKCkpOworICAgIEFTU0VSVCh0aWNrZXQtPnZtKCkuY3VycmVudFRocmVhZElzSG9s ZGluZ0FQSUxvY2soKSB8fCAoVGhyZWFkOjptYXlCZUdDVGhyZWFkKCkgJiYgdGlja2V0LT52bSgp LmhlYXAud29ybGRJc1N0b3BwZWQoKSkpOwogICAgIHJldHVybiBtX3BlbmRpbmdUaWNrZXRzLmNv bnRhaW5zKHRpY2tldCk7CiB9CiAKIGJvb2wgRGVmZXJyZWRXb3JrVGltZXI6Omhhc0RlcGVuZGFu Y3lJblBlbmRpbmdXb3JrKFRpY2tldCB0aWNrZXQsIEpTQ2VsbCogZGVwZW5kZW5jeSkKIHsKLSAg ICBBU1NFUlQodGlja2V0LT52bSgpLmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdBUElMb2NrKCkpOwor ICAgIEFTU0VSVCh0aWNrZXQtPnZtKCkuY3VycmVudFRocmVhZElzSG9sZGluZ0FQSUxvY2soKSB8 fCAoVGhyZWFkOjptYXlCZUdDVGhyZWFkKCkgJiYgdGlja2V0LT52bSgpLmhlYXAud29ybGRJc1N0 b3BwZWQoKSkpOwogICAgIEFTU0VSVChtX3BlbmRpbmdUaWNrZXRzLmNvbnRhaW5zKHRpY2tldCkp OwogCiAgICAgYXV0byByZXN1bHQgPSBtX3BlbmRpbmdUaWNrZXRzLmdldCh0aWNrZXQpOwpAQCAt MTQyLDcgKzE0Miw3IEBAIGJvb2wgRGVmZXJyZWRXb3JrVGltZXI6Omhhc0RlcGVuZGFuY3lJblBl bmRpbmdXb3JrKFRpY2tldCB0aWNrZXQsIEpTQ2VsbCogZGVwZW5kCiAKIGJvb2wgRGVmZXJyZWRX b3JrVGltZXI6OmNhbmNlbFBlbmRpbmdXb3JrKFRpY2tldCB0aWNrZXQpCiB7Ci0gICAgQVNTRVJU KHRpY2tldC0+dm0oKS5jdXJyZW50VGhyZWFkSXNIb2xkaW5nQVBJTG9jaygpKTsKKyAgICBBU1NF UlQodGlja2V0LT52bSgpLmN1cnJlbnRUaHJlYWRJc0hvbGRpbmdBUElMb2NrKCkgfHwgKFRocmVh ZDo6bWF5QmVHQ1RocmVhZCgpICYmIHRpY2tldC0+dm0oKS5oZWFwLndvcmxkSXNTdG9wcGVkKCkp KTsKICAgICBib29sIHJlc3VsdCA9IG1fcGVuZGluZ1RpY2tldHMucmVtb3ZlKHRpY2tldCk7CiAK ICAgICBpZiAocmVzdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNGaW5hbGl6YXRpb25SZWdpc3RyeS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU0ZpbmFsaXphdGlvblJlZ2lzdHJ5LmNwcAppbmRleCBmMjgzZDYzZGYyNTA4ZDRmNTdl ODRmYWVmMWIxZGQ2MTAzNjdkMmUzLi41NDliOWQ5MDkyNWM2Mjc4ZDE3MWYzY2U3ODAxOTlhY2E1 NDg4YTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0ZpbmFs aXphdGlvblJlZ2lzdHJ5LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0ZpbmFsaXphdGlvblJlZ2lzdHJ5LmNwcApAQCAtOTIsMzggKzkyLDUxIEBAIHZvaWQgSlNGaW5h bGl6YXRpb25SZWdpc3RyeTo6ZmluYWxpemVVbmNvbmRpdGlvbmFsbHkoVk0mIHZtKQogewogICAg IGF1dG8gbG9ja2VyID0gaG9sZExvY2soY2VsbExvY2soKSk7CiAKLSAgICBhdXRvIHJlbW92ZUZy b21WZWN0b3IgPSBbXSAoYXV0byYgdmVjdG9yLCBzaXplX3QgcG9zaXRpb24pIHsKLSAgICAgICAg c3RkOjpzd2FwKHZlY3Rvcltwb3NpdGlvbl0sIHZlY3Rvci5sYXN0KCkpOwotICAgICAgICByZXR1 cm4gdmVjdG9yLnRha2VMYXN0KCk7Ci0gICAgfTsKKyNpZiBBU1NFUlRfRU5BQkxFRAorICAgIGZv ciAoY29uc3QgYXV0byYgaXRlciA6IG1fZGVhZFJlZ2lzdHJhdGlvbnMpCisgICAgICAgIFJFTEVB U0VfQVNTRVJUKGl0ZXIudmFsdWUuc2l6ZSgpKTsKKyNlbmRpZgogCiAgICAgYm9vbCByZWFkaWVk Q2VsbCA9IGZhbHNlOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX25vVW5yZWdpc3Ry YXRpb25MaXZlLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIEFTU0VSVCghbV9ub1VucmVnaXN0cmF0 aW9uTGl2ZVtpXS5ob2xkaW5ncy5nZXQoKS5pc0NlbGwoKSB8fCB2bS5oZWFwLmlzTWFya2VkKG1f bm9VbnJlZ2lzdHJhdGlvbkxpdmVbaV0uaG9sZGluZ3MuZ2V0KCkuYXNDZWxsKCkpKTsKLSAgICAg ICAgaWYgKCF2bS5oZWFwLmlzTWFya2VkKG1fbm9VbnJlZ2lzdHJhdGlvbkxpdmVbaV0udGFyZ2V0 KSkgewotICAgICAgICAgICAgbV9ub1VucmVnaXN0cmF0aW9uRGVhZC5hcHBlbmQocmVtb3ZlRnJv bVZlY3RvcihtX25vVW5yZWdpc3RyYXRpb25MaXZlLCBpKS5ob2xkaW5ncyk7CisgICAgbV9ub1Vu cmVnaXN0cmF0aW9uTGl2ZS5yZW1vdmVBbGxNYXRjaGluZyhbJl0gKGNvbnN0IFJlZ2lzdHJhdGlv biYgcmVnKSB7CisgICAgICAgIEFTU0VSVCghcmVnLmhvbGRpbmdzLmdldCgpLmlzQ2VsbCgpIHx8 IHZtLmhlYXAuaXNNYXJrZWQocmVnLmhvbGRpbmdzLmdldCgpLmFzQ2VsbCgpKSk7CisgICAgICAg IGlmICghdm0uaGVhcC5pc01hcmtlZChyZWcudGFyZ2V0KSkgeworICAgICAgICAgICAgbV9ub1Vu cmVnaXN0cmF0aW9uRGVhZC5hcHBlbmQocmVnLmhvbGRpbmdzKTsKICAgICAgICAgICAgIHJlYWRp ZWRDZWxsID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9Ci0gICAg fQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfSk7CiAKICAgICBtX2xpdmVSZWdpc3RyYXRp b25zLnJlbW92ZUlmKFsmXSAoYXV0byYgYnVja2V0KSAtPiBib29sIHsKICAgICAgICAgQVNTRVJU KGJ1Y2tldC52YWx1ZS5zaXplKCkpOwogCiAgICAgICAgIGJvb2wga2V5SXNEZWFkID0gIXZtLmhl YXAuaXNNYXJrZWQoYnVja2V0LmtleSk7Ci0KLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBidWNrZXQudmFsdWUuc2l6ZSgpOyBpKyspIHsKLSAgICAgICAgICAgIEFTU0VSVCghYnVja2V0 LnZhbHVlW2ldLmhvbGRpbmdzLmdldCgpLmlzQ2VsbCgpIHx8IHZtLmhlYXAuaXNNYXJrZWQoYnVj a2V0LnZhbHVlW2ldLmhvbGRpbmdzLmdldCgpLmFzQ2VsbCgpKSk7Ci0gICAgICAgICAgICBpZiAo IXZtLmhlYXAuaXNNYXJrZWQoYnVja2V0LnZhbHVlW2ldLnRhcmdldCkpIHsKKyAgICAgICAgRGVh ZFJlZ2lzdHJhdGlvbnMqIGRlYWRMaXN0ID0gbnVsbHB0cjsKKyAgICAgICAgYXV0byBnZXREZWFk TGlzdCA9IFsmXSAoKSAtPiBEZWFkUmVnaXN0cmF0aW9ucyYgeworICAgICAgICAgICAgaWYgKFVO TElLRUxZKCFkZWFkTGlzdCkpCisgICAgICAgICAgICAgICAgZGVhZExpc3QgPSAmbV9kZWFkUmVn aXN0cmF0aW9ucy5hZGQoYnVja2V0LmtleSwgRGVhZFJlZ2lzdHJhdGlvbnMoKSkuaXRlcmF0b3It PnZhbHVlOworICAgICAgICAgICAgcmV0dXJuICpkZWFkTGlzdDsKKyAgICAgICAgfTsKKworICAg ICAgICBidWNrZXQudmFsdWUucmVtb3ZlQWxsTWF0Y2hpbmcoWyZdIChjb25zdCBSZWdpc3RyYXRp b24mIHJlZykgeworICAgICAgICAgICAgQVNTRVJUKCFyZWcuaG9sZGluZ3MuZ2V0KCkuaXNDZWxs KCkgfHwgdm0uaGVhcC5pc01hcmtlZChyZWcuaG9sZGluZ3MuZ2V0KCkuYXNDZWxsKCkpKTsKKyAg ICAgICAgICAgIGlmICghdm0uaGVhcC5pc01hcmtlZChyZWcudGFyZ2V0KSkgewogICAgICAgICAg ICAgICAgIGlmIChrZXlJc0RlYWQpCi0gICAgICAgICAgICAgICAgICAgIG1fbm9VbnJlZ2lzdHJh dGlvbkRlYWQuYXBwZW5kKHJlbW92ZUZyb21WZWN0b3IoYnVja2V0LnZhbHVlLCBpKS5ob2xkaW5n cyk7Ci0gICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIGF1dG8gZGVh ZExpc3QgPSBtX2RlYWRSZWdpc3RyYXRpb25zLmFkZChidWNrZXQua2V5LCBEZWFkUmVnaXN0cmF0 aW9ucygpKTsKLSAgICAgICAgICAgICAgICAgICAgZGVhZExpc3QuaXRlcmF0b3ItPnZhbHVlLmFw cGVuZChyZW1vdmVGcm9tVmVjdG9yKGJ1Y2tldC52YWx1ZSwgaSkuaG9sZGluZ3MpOwotICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgbV9ub1VucmVnaXN0cmF0aW9uRGVhZC5h cHBlbmQocmVnLmhvbGRpbmdzKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAg ICAgICAgIGdldERlYWRMaXN0KCkuYXBwZW5kKHJlZy5ob2xkaW5ncyk7CiAgICAgICAgICAgICAg ICAgcmVhZGllZENlbGwgPSB0cnVlOwotICAgICAgICAgICAgfSBlbHNlIGlmIChrZXlJc0RlYWQp Ci0gICAgICAgICAgICAgICAgbV9ub1VucmVnaXN0cmF0aW9uTGl2ZS5hcHBlbmQocmVtb3ZlRnJv bVZlY3RvcihidWNrZXQudmFsdWUsIGkpKTsKLSAgICAgICAgfQorICAgICAgICAgICAgICAgIHJl dHVybiB0cnVlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoa2V5SXNEZWFkKSB7 CisgICAgICAgICAgICAgICAgbV9ub1VucmVnaXN0cmF0aW9uTGl2ZS5hcHBlbmQocmVnKTsKKyAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICB9KTsKIAogICAgICAgICByZXR1cm4gIWJ1Y2tldC52YWx1 ZS5zaXplKCk7CiAgICAgfSk7CkBAIC0xNjksMTAgKzE4MiwxMCBAQCBKU1ZhbHVlIEpTRmluYWxp emF0aW9uUmVnaXN0cnk6OnRha2VEZWFkSG9sZGluZ3NWYWx1ZSgpCiAgICAgICAgICAgICBtX2Rl YWRSZWdpc3RyYXRpb25zLnJlbW92ZShpdGVyKTsKICAgICB9CiAKLSAgICBpZiBjb25zdGV4cHIg KEFTU0VSVF9FTkFCTEVEKSB7Ci0gICAgICAgIGZvciAoY29uc3QgYXV0byYgaXRlciA6IG1fZGVh ZFJlZ2lzdHJhdGlvbnMpCi0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChpdGVyLnZhbHVlLnNp emUoKSk7Ci0gICAgfQorI2lmIEFTU0VSVF9FTkFCTEVECisgICAgZm9yIChjb25zdCBhdXRvJiBp dGVyIDogbV9kZWFkUmVnaXN0cmF0aW9ucykKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoaXRlci52 YWx1ZS5zaXplKCkpOworI2VuZGlmCiAKICAgICByZXR1cm4gcmVzdWx0OwogfQo=