189016 2018-08-27 15:26:54 -0700 WebKitMediaSession should be GC collectable when its document is being stopped 2018-08-30 09:00:28 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=189018 InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson jer.noble ryanhaddad simon.fraser tsavell webkit-bug-importer youennf oldest_to_newest 1454138 0 youennf 2018-08-27 15:26:54 -0700 MediaDevices and WebKitMediaSession should be GC collectable when their document is being stopped 1454151 1 348220 youennf 2018-08-27 15:39:25 -0700 Created attachment 348220 Patch 1454175 2 348220 simon.fraser 2018-08-27 16:12:54 -0700 Comment on attachment 348220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348220&action=review > Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:44 > +class WebKitMediaKeySession final : public RefCounted<WebKitMediaKeySession>, public EventTargetWithInlineData, public ActiveDOMObject, private LegacyCDMSessionClient { Why was this change required? > LayoutTests/http/tests/media/clearkey/collect-webkit-media-session.html:42 > +}, "Ensuring frame document gets collected after being stopped while doing some webkit media session calls"); This reads oddly. Maybe "Ensure that the frame's document get collected after being stopped while doing some webkit media session calls" 1454267 3 348220 youennf 2018-08-27 19:40:13 -0700 Comment on attachment 348220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348220&action=review >> Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:44 >> +class WebKitMediaKeySession final : public RefCounted<WebKitMediaKeySession>, public EventTargetWithInlineData, public ActiveDOMObject, private LegacyCDMSessionClient { > > Why was this change required? Needed for bug 189018, but not needed for this one, I'll remove the change here. 1454381 4 348295 youennf 2018-08-28 08:34:51 -0700 Created attachment 348295 Patch 1454448 5 348295 commit-queue 2018-08-28 11:00:07 -0700 Comment on attachment 348295 Patch Clearing flags on attachment: 348295 Committed r235429: <https://trac.webkit.org/changeset/235429> 1454449 6 commit-queue 2018-08-28 11:00:08 -0700 All reviewed patches have been landed. Closing bug. 1454456 7 webkit-bug-importer 2018-08-28 11:02:56 -0700 <rdar://problem/43804904> 1454573 8 tsavell 2018-08-28 15:12:51 -0700 The new test http/tests/media/clearkey/collect-webkit-media-session.html is flakey, Test History: http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=http%2Ftests%2Fmedia%2Fclearkey%2Fcollect-webkit-media-session.html Diff: --- /Volumes/Data/slave/highsierra-leaks/build/layout-test-results/http/tests/media/clearkey/collect-webkit-media-session-expected.txt +++ /Volumes/Data/slave/highsierra-leaks/build/layout-test-results/http/tests/media/clearkey/collect-webkit-media-session-actual.txt @@ -1,4 +1,4 @@ -PASS Ensure that the frame's document get collected after being stopped while doing some webkit media session calls +FAIL Ensure that the frame's document get collected after being stopped while doing some webkit media session calls promise_test: Unhandled rejection with value: "Test failed" 1454658 9 youennf 2018-08-28 18:38:18 -0700 Reopening to attach new patch. 1454659 10 348373 youennf 2018-08-28 18:38:19 -0700 Created attachment 348373 Unflake test 1454668 11 348373 commit-queue 2018-08-28 19:37:16 -0700 Comment on attachment 348373 Unflake test Clearing flags on attachment: 348373 Committed r235453: <https://trac.webkit.org/changeset/235453> 1454669 12 commit-queue 2018-08-28 19:37:18 -0700 All reviewed patches have been landed. Closing bug. 1454962 13 ryanhaddad 2018-08-29 15:41:49 -0700 (In reply to WebKit Commit Bot from comment #11) > Comment on attachment 348373 [details] > Unflake test > > Clearing flags on attachment: 348373 > > Committed r235453: <https://trac.webkit.org/changeset/235453> http/tests/media/clearkey/collect-webkit-media-session.html is still flaky after this change. It fails with the same diff as above. 1455234 14 youennf 2018-08-30 09:00:28 -0700 (In reply to Ryan Haddad from comment #13) > (In reply to WebKit Commit Bot from comment #11) > > Comment on attachment 348373 [details] > > Unflake test > > > > Clearing flags on attachment: 348373 > > > > Committed r235453: <https://trac.webkit.org/changeset/235453> > http/tests/media/clearkey/collect-webkit-media-session.html is still flaky > after this change. It fails with the same diff as above. I saw that and tried to reproduce it on my local machine but was not able to reproduce. I'll try again. 348220 2018-08-27 15:39:25 -0700 2018-08-28 08:34:49 -0700 Patch bug-189016-20180827153925.patch text/plain 8232 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc2MTM1Y2E0MTE5NTFk YTc1YTI0Y2U1MWQ0ZmNiZjUzNjg0NDgxMy4uZTJmMzMzZWYwNmJkMDFjNDYwYzgxYzI0YTUwYzcw NGFmYWQ0Yjk1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA4LTI3ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXRNZWRpYVNlc3Np b24gc2hvdWxkIGJlIEdDIGNvbGxlY3RhYmxlIHdoZW4gaXRzIGRvY3VtZW50IGlzIGJlaW5nIHN0 b3BwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTAxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1h a2Ugc3VyZSBXZWJLaXRNZWRpYVNlc3Npb24gaXMgIGNvbGxlY3RhYmxlIGFmdGVyIGl0cyBkb2N1 bWVudCBpcyBzdG9wcGVkLgorICAgICAgICBUaGlzIGlzIGRvbmUgYnkgbnVsbGlmeWluZyBtX3Nl c3Npb24gd2hlbiBjYWxsaW5nIGNsb3NlLgorICAgICAgICBUaGlzIHdheSBoYXNQZW5kaW5nQWN0 aXZpdHkoKSByZXR1cm5zIGZhbHNlIHdoZW4gc3RvcCgpIGlzIGNhbGxlZC4KKworICAgICAgICBU ZXN0OiBodHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Np b24uaHRtbAorCisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0 TWVkaWFLZXlTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYktpdE1lZGlhS2V5U2Vz c2lvbjo6V2ViS2l0TWVkaWFLZXlTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OldlYktpdE1l ZGlhS2V5U2Vzc2lvbjo6Y2xvc2UpOgorICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEv bGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lvbi5oOgorCiAyMDE4LTA4LTI3ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBWYXJpb3VzIEluZGV4REIgdGVzdHMg YWJhbmRvbiBkb2N1bWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5j cnlwdGVkbWVkaWEvbGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24u Y3BwCmluZGV4IGI2YWE1ZDg1Njg0YjU2YjYwMDUzNjA1OThmNzc5OGNmNGY2YTMyNzQuLmU2NjZj ZTk3OTM2NzQ1ZWRhMDEwNjYwNzk3OGY2ZTk4MDlmZjBiMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvbGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kv V2ViS2l0TWVkaWFLZXlTZXNzaW9uLmNwcApAQCAtNTYsNiArNTYsOCBAQCBXZWJLaXRNZWRpYUtl eVNlc3Npb246OldlYktpdE1lZGlhS2V5U2Vzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBj b250ZXh0LCBXZQogICAgICwgbV9rZXlSZXF1ZXN0VGltZXIoKnRoaXMsICZXZWJLaXRNZWRpYUtl eVNlc3Npb246OmtleVJlcXVlc3RUaW1lckZpcmVkKQogICAgICwgbV9hZGRLZXlUaW1lcigqdGhp cywgJldlYktpdE1lZGlhS2V5U2Vzc2lvbjo6YWRkS2V5VGltZXJGaXJlZCkKIHsKKyAgICBpZiAo bV9zZXNzaW9uKQorICAgICAgICBtX3Nlc3Npb25JZCA9IG1fc2Vzc2lvbi0+c2Vzc2lvbklkKCk7 CiB9CiAKIFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6fldlYktpdE1lZGlhS2V5U2Vzc2lvbigpCkBA IC02OCw4ICs3MCwxMCBAQCBXZWJLaXRNZWRpYUtleVNlc3Npb246On5XZWJLaXRNZWRpYUtleVNl c3Npb24oKQogCiB2b2lkIFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6Y2xvc2UoKQogewotICAgIGlm IChtX3Nlc3Npb24pCisgICAgaWYgKG1fc2Vzc2lvbikgewogICAgICAgICBtX3Nlc3Npb24tPnJl bGVhc2VLZXlzKCk7CisgICAgICAgIG1fc2Vzc2lvbiA9IG51bGxwdHI7CisgICAgfQogfQogCiBS ZWZQdHI8QXJyYXlCdWZmZXI+IFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6Y2FjaGVkS2V5Rm9yS2V5 SWQoY29uc3QgU3RyaW5nJiBrZXlJZCkgY29uc3QKQEAgLTc3LDExICs4MSw2IEBAIFJlZlB0cjxB cnJheUJ1ZmZlcj4gV2ViS2l0TWVkaWFLZXlTZXNzaW9uOjpjYWNoZWRLZXlGb3JLZXlJZChjb25z dCBTdHJpbmcmIGtleUlkCiAgICAgcmV0dXJuIG1fc2Vzc2lvbiA/IG1fc2Vzc2lvbi0+Y2FjaGVk S2V5Rm9yS2V5SUQoa2V5SWQpIDogbnVsbHB0cjsKIH0KIAotY29uc3QgU3RyaW5nJiBXZWJLaXRN ZWRpYUtleVNlc3Npb246OnNlc3Npb25JZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fc2Vzc2lv bi0+c2Vzc2lvbklkKCk7Ci19Ci0KIHZvaWQgV2ViS2l0TWVkaWFLZXlTZXNzaW9uOjpnZW5lcmF0 ZUtleVJlcXVlc3QoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgUmVmPFVpbnQ4QXJyYXk+JiYgaW5p dERhdGEpCiB7CiAgICAgbV9wZW5kaW5nS2V5UmVxdWVzdHMuYXBwZW5kKHsgbWltZVR5cGUsIFdU Rk1vdmUoaW5pdERhdGEpIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9l bmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0TWVkaWFLZXlTZXNzaW9uLmggYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24u aAppbmRleCAxZDBkYzdjNGFhYjBhOGI4OGM5NTc5MjhlYzZkZTQ3YTY1M2JkODg5Li4xZmUwYzU4 NzVjZWEyNjA1NDI3ZTVhODlhY2E1NzIwOTlhZDc2ODVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJL aXRNZWRpYUtleVNlc3Npb24uaApAQCAtNDEsMTQgKzQxLDE0IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIGNsYXNzIFdlYktpdE1lZGlhS2V5RXJyb3I7CiBjbGFzcyBXZWJLaXRNZWRpYUtleXM7CiAK LWNsYXNzIFdlYktpdE1lZGlhS2V5U2Vzc2lvbiBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPFdl YktpdE1lZGlhS2V5U2Vzc2lvbj4sIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxpbmVEYXRhLCBw cml2YXRlIEFjdGl2ZURPTU9iamVjdCwgcHJpdmF0ZSBMZWdhY3lDRE1TZXNzaW9uQ2xpZW50IHsK K2NsYXNzIFdlYktpdE1lZGlhS2V5U2Vzc2lvbiBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVkPFdl YktpdE1lZGlhS2V5U2Vzc2lvbj4sIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxpbmVEYXRhLCBw dWJsaWMgQWN0aXZlRE9NT2JqZWN0LCBwcml2YXRlIExlZ2FjeUNETVNlc3Npb25DbGllbnQgewog cHVibGljOgogICAgIHN0YXRpYyBSZWY8V2ViS2l0TWVkaWFLZXlTZXNzaW9uPiBjcmVhdGUoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCYsIFdlYktpdE1lZGlhS2V5cyYsIGNvbnN0IFN0cmluZyYga2V5 U3lzdGVtKTsKICAgICB+V2ViS2l0TWVkaWFLZXlTZXNzaW9uKCk7CiAKICAgICBXZWJLaXRNZWRp YUtleUVycm9yKiBlcnJvcigpIHsgcmV0dXJuIG1fZXJyb3IuZ2V0KCk7IH0KICAgICBjb25zdCBT dHJpbmcmIGtleVN5c3RlbSgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5U3lzdGVtOyB9Ci0gICAgY29u c3QgU3RyaW5nJiBzZXNzaW9uSWQoKSBjb25zdDsKKyAgICBjb25zdCBTdHJpbmcmIHNlc3Npb25J ZCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklkOyB9CiAgICAgRXhjZXB0aW9uT3I8dm9pZD4g dXBkYXRlKFJlZjxVaW50OEFycmF5PiYmIGtleSk7CiAgICAgdm9pZCBjbG9zZSgpOwogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggNmRkZWY1YzIzMzI0NTYwMjVjNTMyMmZjOTBhOTg5MDkxNmM3MTRlZS4uMGE1M2IwZTEyZDZi ZTI3YjAwNWYxYTI0NjY0YmVmNmM1ZGUxNTRmMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE4 LTA4LTI3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJL aXRNZWRpYVNlc3Npb24gc2hvdWxkIGJlIEdDIGNvbGxlY3RhYmxlIHdoZW4gaXRzIGRvY3VtZW50 IGlzIGJlaW5nIHN0b3BwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4OTAxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRp YS1zZXNzaW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRp YS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvY2xlYXJrZXkvcmVzb3VyY2VzL215d2Via2l0bWVkaWFz ZXNzaW9uZnJhbWUuaHRtOiBBZGRlZC4KKwogMjAxOC0wOC0yNyAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVmFyaW91cyBJbmRleERCIHRlc3RzIGFiYW5kb24g ZG9jdW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL2NsZWFy a2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Npb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9u LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOGJjM2ZmNjMxNTZmOGZjMTE2NWRlNjUyMmJlZWFk YWM2MDU3YTYyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRp YS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDQgQEAKKworCitQQVNTIEVuc3VyaW5nIGZyYW1lIGRvY3VtZW50IGdldHMgY29sbGVj dGVkIGFmdGVyIGJlaW5nIHN0b3BwZWQgd2hpbGUgZG9pbmcgc29tZSB3ZWJraXQgbWVkaWEgc2Vz c2lvbiBjYWxscyAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9j bGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Npb24uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5hN2U1ZmMwOTBiNzkxNzdmMTEwMGRmYWU1YjNkOTU5MWZlZGU2MWU5Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9j b2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFET0NU WVBFIGh0bWw+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNl cy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0 aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gd2FpdEZvcihk dXJhdGlvbikKK3sKKyAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHNldFRpbWVv dXQocmVzb2x2ZSwgZHVyYXRpb24pKTsKK30KKwordmFyIHJlc29sdmVDYWxsYmFjaywgcmVqZWN0 Q2FsbGJhY2s7Cit2YXIgcHJvbWlzZSA9IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+ IHsKKyAgICByZXNvbHZlQ2FsbGJhY2sgPSByZXNvbHZlOworICAgIHJlamVjdENhbGxiYWNrID0g cmVqZWN0OworfSk7CisKK2FzeW5jIGZ1bmN0aW9uIGRvbmUoKQoreworICAgIHRyeSB7CisgICAg ICAgIGNvbnN0IGZyYW1lSWRlbnRpZmllciA9IGludGVybmFscy5kb2N1bWVudElkZW50aWZpZXIo aWZyYW1lLmNvbnRlbnREb2N1bWVudCk7CisgICAgICAgIGlmcmFtZS5zcmMgPSAibm9uLWV4aXN0 ZW50LWZyYW1lIjsKKyAgICAgICAgbGV0IGNvdW50ZXIgPSAwOworICAgICAgICB3aGlsZSAoKytj b3VudGVyIDwgMTApIHsKKyAgICAgICAgICAgIGlmICghaW50ZXJuYWxzLmlzRG9jdW1lbnRBbGl2 ZShmcmFtZUlkZW50aWZpZXIpKSB7CisgICAgICAgICAgICAgICAgcmVzb2x2ZUNhbGxiYWNrKCk7 CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYg KHdpbmRvdy5HQ0NvbnRyb2xsZXIpCisgICAgICAgICAgICAgICAgR0NDb250cm9sbGVyLmNvbGxl Y3QoKTsKKworICAgICAgICAgICAgYXdhaXQgd2FpdEZvcig1MCk7CisgICAgICAgIH0KKyAgICB9 IGZpbmFsbHkgeworICAgICAgICByZWplY3RDYWxsYmFjaygiVGVzdCBmYWlsZWQiKTsKKyAgICB9 Cit9CisKK3Byb21pc2VfdGVzdCgodGVzdCkgPT4geworICAgIGlmICghd2luZG93LmludGVybmFs cykKKyAgICAgICAgcmVqZWN0Q2FsbGJhY2soIlRlc3QgcmVxdWlyZSBpbnRlcm5hbHMgQVBJIik7 CisgICAgcmV0dXJuIHByb21pc2U7Cit9LCAiRW5zdXJpbmcgZnJhbWUgZG9jdW1lbnQgZ2V0cyBj b2xsZWN0ZWQgYWZ0ZXIgYmVpbmcgc3RvcHBlZCB3aGlsZSBkb2luZyBzb21lIHdlYmtpdCBtZWRp YSBzZXNzaW9uIGNhbGxzIik7CisKKzwvc2NyaXB0PgorPGlmcmFtZSBzcmM9InJlc291cmNlcy9t eXdlYmtpdG1lZGlhc2Vzc2lvbmZyYW1lLmh0bSIgaWQ9ImlmcmFtZSI+PC9pZnJhbWU+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L3Jlc291cmNlcy9t eXdlYmtpdG1lZGlhc2Vzc2lvbmZyYW1lLmh0bSBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVk aWEvY2xlYXJrZXkvcmVzb3VyY2VzL215d2Via2l0bWVkaWFzZXNzaW9uZnJhbWUuaHRtCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLmFjZjU1ZjVkMDQzYTE1YWNhZDBiNTQ2OWZiMWI1Yzg1MThkNmZiZTEKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L3Jlc291cmNl cy9teXdlYmtpdG1lZGlhc2Vzc2lvbmZyYW1lLmh0bQpAQCAtMCwwICsxLDMyIEBACis8IURPQ1RZ UEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgdmFyIGtleUlk OworICAgICAgICB2YXIgc2Vzc2lvbjsKKworICAgICAgICBmdW5jdGlvbiBnbygpCisgICAgICAg IHsKKyAgICAgICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIoJ3dlYmtpdG5lZWRrZXknLCBu ZWVka2V5LCB0cnVlKTsKKyAgICAgICAgICAgIHZpZGVvLnNyYyA9ICcuLi8uLi9yZXNvdXJjZXMv aGxzL2NsZWFya2V5L3Byb2dfaW5kZXgubTN1OCc7CisgICAgICAgIH0KKworICAgICAgICBmdW5j dGlvbiBuZWVka2V5KGV2ZW50KQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXZpZGVvLndl YmtpdEtleXMpCisgICAgICAgICAgICAgICAgdmlkZW8ud2Via2l0U2V0TWVkaWFLZXlzKG5ldyBX ZWJLaXRNZWRpYUtleXMoJ29yZy53M2MuY2xlYXJrZXknKSk7CisKKyAgICAgICAgICAgIGlmICgh dmlkZW8ud2Via2l0S2V5cykgeworICAgICAgICAgICAgICAgIGxvZygnRXJyb3I6IG9yZy53M2Mu Y2xlYXJrZXkgbm90IHN1cHBvcnRlZC4nKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIHNlc3Npb24gPSB2aWRlby53ZWJraXRLZXlzLmNyZWF0 ZVNlc3Npb24oJ2FwcGxpY2F0aW9uL3gtbXBlZ3VybCcsIGV2ZW50LmluaXREYXRhKTsKKyAgICAg ICAgICAgIHBhcmVudC5kb25lKCk7CisgICAgICAgIH0KKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5IG9ubG9hZD0iZ28oKSI+CisgICAgPHZpZGVvIGlkPSJ2aWRlbyIgY29udHJvbHM+PC92 aWRlbz4KKzwvYm9keT4KKzwvaHRtbD4K 348295 2018-08-28 08:34:51 -0700 2018-08-28 18:38:16 -0700 Patch bug-189016-20180828083450.patch text/plain 7684 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1MzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjkwNTQ0OGFjMWY5NWU1 YjBhYTk3NWI4ZmRmNmYwNTM3Njc3OTFkZC4uNzBkMDk3MGExYzQ4NDY5ZjQ3MTBmY2YyYjMwYTky ZTVhM2MwZjQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA4LTI4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXRNZWRpYVNlc3Np b24gc2hvdWxkIGJlIEdDIGNvbGxlY3RhYmxlIHdoZW4gaXRzIGRvY3VtZW50IGlzIGJlaW5nIHN0 b3BwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 OTAxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1h a2Ugc3VyZSBXZWJLaXRNZWRpYVNlc3Npb24gaXMgIGNvbGxlY3RhYmxlIGFmdGVyIGl0cyBkb2N1 bWVudCBpcyBzdG9wcGVkLgorICAgICAgICBUaGlzIGlzIGRvbmUgYnkgbnVsbGlmeWluZyBtX3Nl c3Npb24gd2hlbiBjYWxsaW5nIGNsb3NlLgorICAgICAgICBUaGlzIHdheSBoYXNQZW5kaW5nQWN0 aXZpdHkoKSByZXR1cm5zIGZhbHNlIHdoZW4gc3RvcCgpIGlzIGNhbGxlZC4KKworICAgICAgICBU ZXN0OiBodHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Np b24uaHRtbAorCisgICAgICAgICogTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0 TWVkaWFLZXlTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYktpdE1lZGlhS2V5U2Vz c2lvbjo6V2ViS2l0TWVkaWFLZXlTZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OldlYktpdE1l ZGlhS2V5U2Vzc2lvbjo6Y2xvc2UpOgorICAgICAgICAqIE1vZHVsZXMvZW5jcnlwdGVkbWVkaWEv bGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lvbi5oOgorCiAyMDE4LTA4LTI3ICBZb3Vlbm4gRmFi bGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBWYXJpb3VzIEluZGV4REIgdGVzdHMg YWJhbmRvbiBkb2N1bWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5j cnlwdGVkbWVkaWEvbGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24u Y3BwCmluZGV4IGI2YWE1ZDg1Njg0YjU2YjYwMDUzNjA1OThmNzc5OGNmNGY2YTMyNzQuLmU2NjZj ZTk3OTM2NzQ1ZWRhMDEwNjYwNzk3OGY2ZTk4MDlmZjBiMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvbGVnYWN5L1dlYktpdE1lZGlhS2V5U2Vzc2lv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9sZWdhY3kv V2ViS2l0TWVkaWFLZXlTZXNzaW9uLmNwcApAQCAtNTYsNiArNTYsOCBAQCBXZWJLaXRNZWRpYUtl eVNlc3Npb246OldlYktpdE1lZGlhS2V5U2Vzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBj b250ZXh0LCBXZQogICAgICwgbV9rZXlSZXF1ZXN0VGltZXIoKnRoaXMsICZXZWJLaXRNZWRpYUtl eVNlc3Npb246OmtleVJlcXVlc3RUaW1lckZpcmVkKQogICAgICwgbV9hZGRLZXlUaW1lcigqdGhp cywgJldlYktpdE1lZGlhS2V5U2Vzc2lvbjo6YWRkS2V5VGltZXJGaXJlZCkKIHsKKyAgICBpZiAo bV9zZXNzaW9uKQorICAgICAgICBtX3Nlc3Npb25JZCA9IG1fc2Vzc2lvbi0+c2Vzc2lvbklkKCk7 CiB9CiAKIFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6fldlYktpdE1lZGlhS2V5U2Vzc2lvbigpCkBA IC02OCw4ICs3MCwxMCBAQCBXZWJLaXRNZWRpYUtleVNlc3Npb246On5XZWJLaXRNZWRpYUtleVNl c3Npb24oKQogCiB2b2lkIFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6Y2xvc2UoKQogewotICAgIGlm IChtX3Nlc3Npb24pCisgICAgaWYgKG1fc2Vzc2lvbikgewogICAgICAgICBtX3Nlc3Npb24tPnJl bGVhc2VLZXlzKCk7CisgICAgICAgIG1fc2Vzc2lvbiA9IG51bGxwdHI7CisgICAgfQogfQogCiBS ZWZQdHI8QXJyYXlCdWZmZXI+IFdlYktpdE1lZGlhS2V5U2Vzc2lvbjo6Y2FjaGVkS2V5Rm9yS2V5 SWQoY29uc3QgU3RyaW5nJiBrZXlJZCkgY29uc3QKQEAgLTc3LDExICs4MSw2IEBAIFJlZlB0cjxB cnJheUJ1ZmZlcj4gV2ViS2l0TWVkaWFLZXlTZXNzaW9uOjpjYWNoZWRLZXlGb3JLZXlJZChjb25z dCBTdHJpbmcmIGtleUlkCiAgICAgcmV0dXJuIG1fc2Vzc2lvbiA/IG1fc2Vzc2lvbi0+Y2FjaGVk S2V5Rm9yS2V5SUQoa2V5SWQpIDogbnVsbHB0cjsKIH0KIAotY29uc3QgU3RyaW5nJiBXZWJLaXRN ZWRpYUtleVNlc3Npb246OnNlc3Npb25JZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fc2Vzc2lv bi0+c2Vzc2lvbklkKCk7Ci19Ci0KIHZvaWQgV2ViS2l0TWVkaWFLZXlTZXNzaW9uOjpnZW5lcmF0 ZUtleVJlcXVlc3QoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgUmVmPFVpbnQ4QXJyYXk+JiYgaW5p dERhdGEpCiB7CiAgICAgbV9wZW5kaW5nS2V5UmVxdWVzdHMuYXBwZW5kKHsgbWltZVR5cGUsIFdU Rk1vdmUoaW5pdERhdGEpIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9l bmNyeXB0ZWRtZWRpYS9sZWdhY3kvV2ViS2l0TWVkaWFLZXlTZXNzaW9uLmggYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24u aAppbmRleCAxZDBkYzdjNGFhYjBhOGI4OGM5NTc5MjhlYzZkZTQ3YTY1M2JkODg5Li45MzAxZjA5 MzgxMDA3ZDZhNzY4NGVjMmJhMzIxMGQzMDVkMDY2YTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJLaXRNZWRpYUtleVNlc3Npb24u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL2xlZ2FjeS9XZWJL aXRNZWRpYUtleVNlc3Npb24uaApAQCAtNDgsNyArNDgsNyBAQCBwdWJsaWM6CiAKICAgICBXZWJL aXRNZWRpYUtleUVycm9yKiBlcnJvcigpIHsgcmV0dXJuIG1fZXJyb3IuZ2V0KCk7IH0KICAgICBj b25zdCBTdHJpbmcmIGtleVN5c3RlbSgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5U3lzdGVtOyB9Ci0g ICAgY29uc3QgU3RyaW5nJiBzZXNzaW9uSWQoKSBjb25zdDsKKyAgICBjb25zdCBTdHJpbmcmIHNl c3Npb25JZCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Vzc2lvbklkOyB9CiAgICAgRXhjZXB0aW9uT3I8 dm9pZD4gdXBkYXRlKFJlZjxVaW50OEFycmF5PiYmIGtleSk7CiAgICAgdm9pZCBjbG9zZSgpOwog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNGZlMzQ3MGRjMzY1MDkyODU3Mjc0NWE3N2Y0ZjhhYzE0NmIyZjc3NC4uYjk0MGE3 MmY0YWM2MTU3NWRkMDRiNmE1ZGJkZTAzYzgxOWE4MzgwZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDE4LTA4LTI4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAg ICBXZWJLaXRNZWRpYVNlc3Npb24gc2hvdWxkIGJlIEdDIGNvbGxlY3RhYmxlIHdoZW4gaXRzIGRv Y3VtZW50IGlzIGJlaW5nIHN0b3BwZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4OTAxNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtp dC1tZWRpYS1zZXNzaW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0 cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWw6IEFkZGVk LgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvY2xlYXJrZXkvcmVzb3VyY2VzL215d2Via2l0 bWVkaWFzZXNzaW9uZnJhbWUuaHRtOiBBZGRlZC4KKwogMjAxOC0wOC0yNyAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVmFyaW91cyBJbmRleERCIHRlc3RzIGFi YW5kb24gZG9jdW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlh L2NsZWFya2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Npb24tZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1z ZXNzaW9uLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOGZmYjg4ZjIzZmFhYjdhMzk5NmVjM2Zh NzFkZTJjNmU5MWIxODUwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDQgQEAKKworCitQQVNTIEVuc3VyZSB0aGF0IHRoZSBmcmFtZSdzIGRvY3Vt ZW50IGdldCBjb2xsZWN0ZWQgYWZ0ZXIgYmVpbmcgc3RvcHBlZCB3aGlsZSBkb2luZyBzb21lIHdl YmtpdCBtZWRpYSBzZXNzaW9uIGNhbGxzIAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL21lZGlhL2NsZWFya2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Npb24uaHRtbCBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvY2xlYXJrZXkvY29sbGVjdC13ZWJraXQtbWVk aWEtc2Vzc2lvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjgyOTc1ZGQ4YjJkNWM2NjQxZjQ4YWRmYzQ4ODk3 NDkyMWI5Yzg1ZTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21l ZGlhL2NsZWFya2V5L2NvbGxlY3Qtd2Via2l0LW1lZGlhLXNlc3Npb24uaHRtbApAQCAtMCwwICsx LDQ1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQg c3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIv cmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5j dGlvbiB3YWl0Rm9yKGR1cmF0aW9uKQoreworICAgIHJldHVybiBuZXcgUHJvbWlzZSgocmVzb2x2 ZSkgPT4gc2V0VGltZW91dChyZXNvbHZlLCBkdXJhdGlvbikpOworfQorCit2YXIgcmVzb2x2ZUNh bGxiYWNrLCByZWplY3RDYWxsYmFjazsKK3ZhciBwcm9taXNlID0gbmV3IFByb21pc2UoKHJlc29s dmUsIHJlamVjdCkgPT4geworICAgIHJlc29sdmVDYWxsYmFjayA9IHJlc29sdmU7CisgICAgcmVq ZWN0Q2FsbGJhY2sgPSByZWplY3Q7Cit9KTsKKworYXN5bmMgZnVuY3Rpb24gZG9uZSgpCit7Cisg ICAgdHJ5IHsKKyAgICAgICAgY29uc3QgZnJhbWVJZGVudGlmaWVyID0gaW50ZXJuYWxzLmRvY3Vt ZW50SWRlbnRpZmllcihpZnJhbWUuY29udGVudERvY3VtZW50KTsKKyAgICAgICAgaWZyYW1lLnNy YyA9ICJub24tZXhpc3RlbnQtZnJhbWUiOworICAgICAgICBsZXQgY291bnRlciA9IDA7CisgICAg ICAgIHdoaWxlICgrK2NvdW50ZXIgPCAxMCkgeworICAgICAgICAgICAgaWYgKCFpbnRlcm5hbHMu aXNEb2N1bWVudEFsaXZlKGZyYW1lSWRlbnRpZmllcikpIHsKKyAgICAgICAgICAgICAgICByZXNv bHZlQ2FsbGJhY2soKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICBpZiAod2luZG93LkdDQ29udHJvbGxlcikKKyAgICAgICAgICAgICAgICBHQ0Nv bnRyb2xsZXIuY29sbGVjdCgpOworCisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKDUwKTsKKyAg ICAgICAgfQorICAgIH0gZmluYWxseSB7CisgICAgICAgIHJlamVjdENhbGxiYWNrKCJUZXN0IGZh aWxlZCIpOworICAgIH0KK30KKworcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CisgICAgaWYgKCF3 aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICByZWplY3RDYWxsYmFjaygiVGVzdCByZXF1aXJlIGlu dGVybmFscyBBUEkiKTsKKyAgICByZXR1cm4gcHJvbWlzZTsKK30sICJFbnN1cmUgdGhhdCB0aGUg ZnJhbWUncyBkb2N1bWVudCBnZXQgY29sbGVjdGVkIGFmdGVyIGJlaW5nIHN0b3BwZWQgd2hpbGUg ZG9pbmcgc29tZSB3ZWJraXQgbWVkaWEgc2Vzc2lvbiBjYWxscyIpOworCis8L3NjcmlwdD4KKzxp ZnJhbWUgc3JjPSJyZXNvdXJjZXMvbXl3ZWJraXRtZWRpYXNlc3Npb25mcmFtZS5odG0iIGlkPSJp ZnJhbWUiPjwvaWZyYW1lPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRp YS9jbGVhcmtleS9yZXNvdXJjZXMvbXl3ZWJraXRtZWRpYXNlc3Npb25mcmFtZS5odG0gYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL2NsZWFya2V5L3Jlc291cmNlcy9teXdlYmtpdG1lZGlh c2Vzc2lvbmZyYW1lLmh0bQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hY2Y1NWY1ZDA0M2ExNWFjYWQwYjU0NjlmYjFi NWM4NTE4ZDZmYmUxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9t ZWRpYS9jbGVhcmtleS9yZXNvdXJjZXMvbXl3ZWJraXRtZWRpYXNlc3Npb25mcmFtZS5odG0KQEAg LTAsMCArMSwzMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3Jp cHQ+CisgICAgICAgIHZhciBrZXlJZDsKKyAgICAgICAgdmFyIHNlc3Npb247CisKKyAgICAgICAg ZnVuY3Rpb24gZ28oKQorICAgICAgICB7CisgICAgICAgICAgICB2aWRlby5hZGRFdmVudExpc3Rl bmVyKCd3ZWJraXRuZWVka2V5JywgbmVlZGtleSwgdHJ1ZSk7CisgICAgICAgICAgICB2aWRlby5z cmMgPSAnLi4vLi4vcmVzb3VyY2VzL2hscy9jbGVhcmtleS9wcm9nX2luZGV4Lm0zdTgnOworICAg ICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gbmVlZGtleShldmVudCkKKyAgICAgICAgeworICAg ICAgICAgICAgaWYgKCF2aWRlby53ZWJraXRLZXlzKQorICAgICAgICAgICAgICAgIHZpZGVvLndl YmtpdFNldE1lZGlhS2V5cyhuZXcgV2ViS2l0TWVkaWFLZXlzKCdvcmcudzNjLmNsZWFya2V5Jykp OworCisgICAgICAgICAgICBpZiAoIXZpZGVvLndlYmtpdEtleXMpIHsKKyAgICAgICAgICAgICAg ICBsb2coJ0Vycm9yOiBvcmcudzNjLmNsZWFya2V5IG5vdCBzdXBwb3J0ZWQuJyk7CisgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBzZXNzaW9uID0g dmlkZW8ud2Via2l0S2V5cy5jcmVhdGVTZXNzaW9uKCdhcHBsaWNhdGlvbi94LW1wZWd1cmwnLCBl dmVudC5pbml0RGF0YSk7CisgICAgICAgICAgICBwYXJlbnQuZG9uZSgpOworICAgICAgICB9Cisg ICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9ImdvKCkiPgorICAgIDx2aWRlbyBp ZD0idmlkZW8iIGNvbnRyb2xzPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 348373 2018-08-28 18:38:19 -0700 2018-08-28 19:37:16 -0700 Unflake test bug-189016-20180828183818.patch text/plain 2385 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDUxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWViYzk5Mzk5Nzc1MDRkZGE5NGFl YTQxZmUxZjJhNTFmMjY2YTliYy4uN2NiMjNlMWJmNmY4ZjdkZmE2NmYwZmNmN2M2NzRlZDU5NjI0 NmZjNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE4LTA4LTI4ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXRNZWRpYVNlc3Npb24gc2hvdWxkIGJl IEdDIGNvbGxlY3RhYmxlIHdoZW4gaXRzIGRvY3VtZW50IGlzIGJlaW5nIHN0b3BwZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4OTAxNgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDM4MDQ5MDQ+CisKKyAgICAgICAgVW5yZXZpZXdlZC4KKyAgICAg ICAgSW5jcmVhc2luZyBudW1iZXIgb2YgR0MgYW5kIGNoZWNrcyB0byB1bmZsYWtlIHRlc3RzIG9u IGJvdHMuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL0luZGV4ZWREQi9jb2xsZWN0LUlEQi1vYmpl Y3RzLmh0dHBzLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9jb2xs ZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWw6CisKIDIwMTgtMDgtMjcgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBXZWJSVEMgbGVnYWN5IEFQ SSBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9JbmRl eGVkREIvY29sbGVjdC1JREItb2JqZWN0cy5odHRwcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9JbmRleGVkREIvY29sbGVjdC1JREItb2JqZWN0cy5odHRwcy5odG1sCmluZGV4IDExNDJm MjY0NTBmOGZkZWU1ZWNkNWFjYzJmYzQ4MjliOTJkZWNhNzMuLjNjMjgzZGU1ZGNjN2U2ZmIwNzgx ZjZhOTkzYzhlNjk3MmJhMTU0MTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv SW5kZXhlZERCL2NvbGxlY3QtSURCLW9iamVjdHMuaHR0cHMuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL0luZGV4ZWREQi9jb2xsZWN0LUlEQi1vYmplY3RzLmh0dHBzLmh0bWwKQEAg LTIwLDcgKzIwLDcgQEAgYXN5bmMgZnVuY3Rpb24gZG9uZSgpCiAgICAgICAgIGNvbnN0IGZyYW1l SWRlbnRpZmllciA9IGludGVybmFscy5kb2N1bWVudElkZW50aWZpZXIoaWZyYW1lLmNvbnRlbnRE b2N1bWVudCk7CiAgICAgICAgIGlmcmFtZS5zcmMgPSAibm9uLWV4aXN0ZW50LWZyYW1lIjsKICAg ICAgICAgbGV0IGNvdW50ZXIgPSAwOwotICAgICAgICB3aGlsZSAoKytjb3VudGVyIDwgMTApIHsK KyAgICAgICAgd2hpbGUgKCsrY291bnRlciA8IDUwKSB7CiAgICAgICAgICAgICBpZiAoIWludGVy bmFscy5pc0RvY3VtZW50QWxpdmUoZnJhbWVJZGVudGlmaWVyKSkgewogICAgICAgICAgICAgICAg IHJlc29sdmVDYWxsYmFjaygpOwogICAgICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvY2xlYXJrZXkvY29sbGVjdC13ZWJraXQtbWVk aWEtc2Vzc2lvbi5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9j b2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWwKaW5kZXggODI5NzVkZDhiMmQ1YzY2NDFm NDhhZGZjNDg4OTc0OTIxYjljODVlNC4uNTE1ZWE3NzM1ZjNlZTZjYjJiNTMxNjRkNTM3MDZmYWVi NDFlNzE2MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9jbGVhcmtl eS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9tZWRpYS9jbGVhcmtleS9jb2xsZWN0LXdlYmtpdC1tZWRpYS1zZXNzaW9uLmh0bWwK QEAgLTIwLDcgKzIwLDcgQEAgYXN5bmMgZnVuY3Rpb24gZG9uZSgpCiAgICAgICAgIGNvbnN0IGZy YW1lSWRlbnRpZmllciA9IGludGVybmFscy5kb2N1bWVudElkZW50aWZpZXIoaWZyYW1lLmNvbnRl bnREb2N1bWVudCk7CiAgICAgICAgIGlmcmFtZS5zcmMgPSAibm9uLWV4aXN0ZW50LWZyYW1lIjsK ICAgICAgICAgbGV0IGNvdW50ZXIgPSAwOwotICAgICAgICB3aGlsZSAoKytjb3VudGVyIDwgMTAp IHsKKyAgICAgICAgd2hpbGUgKCsrY291bnRlciA8IDUwKSB7CiAgICAgICAgICAgICBpZiAoIWlu dGVybmFscy5pc0RvY3VtZW50QWxpdmUoZnJhbWVJZGVudGlmaWVyKSkgewogICAgICAgICAgICAg ICAgIHJlc29sdmVDYWxsYmFjaygpOwogICAgICAgICAgICAgICAgIHJldHVybjsK