238462 2022-03-28 11:26:23 -0700 [macOS] Muted video is sometimes paused when entering fullscreen 2022-03-29 11:32:10 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=238472 InRadar P2 Normal --- 1 eric.carlson eric.carlson calvaris cdumez changseok esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble kondapallykalyan pdr philipj sergio webkit-bug-importer oldest_to_newest 1855692 0 eric.carlson 2022-03-28 11:26:23 -0700 Muted video is sometimes paused when entering fullscreen 1855693 1 eric.carlson 2022-03-28 11:27:09 -0700 rdar://89104216 1855697 2 455933 eric.carlson 2022-03-28 11:37:26 -0700 Created attachment 455933 Patch 1855712 3 455937 eric.carlson 2022-03-28 12:05:01 -0700 Created attachment 455937 Patch 1855766 4 455937 jer.noble 2022-03-28 14:07:56 -0700 Comment on attachment 455937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=455937&action=review > Source/WebCore/html/HTMLMediaElement.cpp:6058 > +#if ENABLE(FULLSCREEN_API) > + auto& fullscreenManager = document().fullscreenManager(); > + if (isVideo() && fullscreenManager.isFullscreen() && fullscreenManager.currentFullscreenElement()) > + return false; > +#endif > + > + if (m_videoFullscreenMode != VideoFullscreenModeNone) > + return false; > + > + return document().hidden(); I think this is incorrect long-term, insofar as element fullscreen on a background space (on macOS) shouldn't always be "visible", but we should file a bug to follow up later. > Source/WebCore/html/HTMLMediaElement.cpp:8344 > + queueTaskKeepingObjectAlive(*this, TaskSource::MediaElement, [this] { > + if (isContextStopped()) > + return; > + mediaSession().isVisibleInViewportChanged(); > + updateShouldAutoplay(); > + schedulePlaybackControlsManagerUpdate(); > + }); Is this necessary? 1855809 5 455937 eric.carlson 2022-03-28 15:48:34 -0700 Comment on attachment 455937 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=455937&action=review >> Source/WebCore/html/HTMLMediaElement.cpp:6058 >> + return document().hidden(); > > I think this is incorrect long-term, insofar as element fullscreen on a background space (on macOS) shouldn't always be "visible", but we should file a bug to follow up later. I filed bug 238472 >> Source/WebCore/html/HTMLMediaElement.cpp:8344 >> + }); > > Is this necessary? Oops! 1855814 6 455964 eric.carlson 2022-03-28 15:54:37 -0700 Created attachment 455964 Patch for landing 1856072 7 455964 eric.carlson 2022-03-29 10:17:52 -0700 Comment on attachment 455964 Patch for landing The failing tests don't seem to be related. 1856113 8 ews-feeder 2022-03-29 11:32:04 -0700 Committed r292049 (248986@main): <https://commits.webkit.org/248986@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455964. 455933 2022-03-28 11:37:26 -0700 2022-03-28 12:15:23 -0700 Patch bug-238462-20220328113725.patch text/plain 16014 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVjMDM1YTdmZDdiZmEx NDRkNGM5MGY4ZGI1N2NjYzE1NjczNGI0ZS4uM2U2NmUwNzgwZWU1ZTUwMDdmY2UzYjRhNDg2ZWNh ZWE3MjU3ZDQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIyLTAzLTI4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0 ZWQgdmlkZW8gaXMgc29tZXRpbWVzIHBhdXNlZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAg ICAgICByZGFyOi8vODkxMDQyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBtZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0ZWQuaHRtbAorCisg ICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OmRpZE1vdmVUb05ld0RvY3VtZW50KTogQWRkIGxvZ2dpbmcuCisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjplbGVtZW50SXNIaWRkZW4gY29uc3QpOiBD b25zaWRlciBib3RoIGVsZW1lbnQgZnVsbHNjcmVlbgorICAgICAgICBhbmQgdmlkZW8gZnVsbHNj cmVlbi4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnZpc2liaWxpdHlTdGF0 ZUNoYW5nZWQpOiBVc2UgZWxlbWVudElzSGlkZGVuLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6c2hvdWxkT3ZlcnJpZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbiBj b25zdCk6IEFkZAorICAgICAgICBsb2dnaW5nIGZvciB0aGUgb25lIGNhc2UgdGhhdCBkaWRuJ3Qg aGF2ZSBpdC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmlzVmlzaWJsZUlu Vmlld3BvcnRDaGFuZ2VkKTogRml4IGluZGVudGF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6SFRN TE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQbGF5ZXIpOiBOZXcsIHdyYXAgTWVkaWFQbGF5ZXIg ZnVuY3Rpb25zCisgICAgICAgIHRoYXQgYXJlIGNhbGxlZCBmcmVxdWVudGx5IGJ5IFJlbmRlclZp ZGVvIHNvIHdlIGNhbiBvbmx5IGNhbGwgdGhlbSB3aGVuIG5lY2Vzc2FyeS4KKyAgICAgICAgKiBo dG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OmVsZW1lbnRJc0hpZGRlbiBjb25zdCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBodG1sL01l ZGlhRWxlbWVudFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vz c2lvbjo6dmlzaWJpbGl0eUNoYW5nZWQpOiBKdXN0IHVzZSBlbGVtZW50SXNIaWRkZW4sIGl0IAor ICAgICAgICBhbHJlYWR5IGFjY291bnRzIGZvciBmdWxsc2NyZWVuLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXI6OnNldFZpc2libGVJblZpZXdwb3J0KTogRG8gbm90aGluZyB3aGVuIHZpc2liaWxpdHkg aXMgbm90IGNoYW5naW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRQYWdl SXNWaXNpYmxlKTogQWRkIGxvZ2dpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlkZW86OnVwZGF0ZVBsYXllcik6IENh bGwgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQbGF5ZXIgaW5zdGVhZAorICAgICAgICBv ZiBjYWxsaW5nIE1lZGlhUGxheWVyIGRpcmVjdGx5LgorCiAyMDIyLTAzLTE4ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQXZvaWQgZXh0cmEgcG9pbnRlciBkZXJl ZmVyZW5jZSBpbiBFdmVudExpc3RlbmVyTWFwOjptX2VudHJpZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNzEzNzg5 NDViMTllMDNmZGM4MjMzNzY1NWRlOTAwYjg4ZDc1N2VkYy4uMGY4OTBlZTNlM2I2N2U5OWI5NTMw ODU3YzlhZDcyMWRmZTAxMWEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMi0wMy0y OCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIE11dGVkIHZpZGVvIGlzIHNvbWV0aW1lcyBwYXVzZWQgd2hlbiBlbnRlcmluZyBmdWxsc2Ny ZWVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg0 NjIKKyAgICAgICAgcmRhcjovLzg5MTA0MjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclBy aXZhdGVSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXllclByaXZhdGVSZW1v dGU6OnNldFBhZ2VJc1Zpc2libGUpOiBUcmFjayB2aXNpYmlsaXR5IGFuZCBkbworICAgICAgICBu b3RoaW5nIHdoZW4gaXQgZG9lc24ndCBjaGFuZ2UuCisgICAgICAgIChXZWJLaXQ6Ok1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZTo6c2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyk6IERpdHRvIGZv ciBhc3BlY3QKKyAgICAgICAgcmF0aW8uCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEv TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmg6CisKIDIwMjItMDMtMTggIEJlbiBOaGFtICA8bmhh bUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHB1c2ggc3Vic2NyaXB0aW9ucyB3aGVuIGFz c29jaWF0ZWQgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9ucyBhcmUgcmVtb3ZlZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggODFhNWIyODdmOTg1MjE4NjNh MTQ1M2U5NTJjN2Q3YmFiMzhlMTM1Ny4uZGVlYzA3YjFiOWU4OTU0ZjMzZjU1NTNkYTgzOTdjYzIw NWMxMDE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC02 ODUsNiArNjg1LDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1bnJlZ2lzdGVyV2l0aERvY3Vt ZW50KERvY3VtZW50JiBkb2N1bWVudCkKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRNb3Zl VG9OZXdEb2N1bWVudChEb2N1bWVudCYgb2xkRG9jdW1lbnQsIERvY3VtZW50JiBuZXdEb2N1bWVu dCkKIHsKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOworCiAgICAgQVNTRVJUX1dJVEhf U0VDVVJJVFlfSU1QTElDQVRJT04oJmRvY3VtZW50KCkgPT0gJm5ld0RvY3VtZW50KTsKICAgICBp ZiAobV9zaG91bGREZWxheUxvYWRFdmVudCkgewogICAgICAgICBvbGREb2N1bWVudC5kZWNyZW1l bnRMb2FkRXZlbnREZWxheUNvdW50KCk7CkBAIC02MDQyLDkgKzYwNDQsMTggQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50OjptZWRpYVZvbHVtZURpZENoYW5nZSgpCiAjZW5kaWYKIH0KIAorYm9vbCBI VE1MTWVkaWFFbGVtZW50OjplbGVtZW50SXNIaWRkZW4oKSBjb25zdAoreworICAgIGF1dG8mIGZ1 bGxzY3JlZW5NYW5hZ2VyID0gZG9jdW1lbnQoKS5mdWxsc2NyZWVuTWFuYWdlcigpOworICAgIGlm ICgoaXNWaWRlbygpICYmIGZ1bGxzY3JlZW5NYW5hZ2VyLmlzRnVsbHNjcmVlbigpICYmIGZ1bGxz Y3JlZW5NYW5hZ2VyLmN1cnJlbnRGdWxsc2NyZWVuRWxlbWVudCgpKSB8fCBtX3ZpZGVvRnVsbHNj cmVlbk1vZGUgIT0gVmlkZW9GdWxsc2NyZWVuTW9kZU5vbmUpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIHJldHVybiBkb2N1bWVudCgpLmhpZGRlbigpOworfQorCiB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnZpc2liaWxpdHlTdGF0ZUNoYW5nZWQoKQogewotICAgIGJvb2wgZWxlbWVudElz SGlkZGVuID0gZG9jdW1lbnQoKS5oaWRkZW4oKSAmJiBtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0g VmlkZW9GdWxsc2NyZWVuTW9kZU5vbmU7CisgICAgYm9vbCBlbGVtZW50SXNIaWRkZW4gPSB0aGlz LT5lbGVtZW50SXNIaWRkZW4oKTsKICAgICBpZiAoZWxlbWVudElzSGlkZGVuID09IG1fZWxlbWVu dElzSGlkZGVuKQogICAgICAgICByZXR1cm47CiAKQEAgLTgwNTAsOCArODA2MSwxMCBAQCBib29s IEhUTUxNZWRpYUVsZW1lbnQ6OnNob3VsZE92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJp Y3Rpb24oUGxhdGZvcm1NZWRpYQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0K ICNpZiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCi0gICAgICAgIGlmIChtX3ZpZGVv RnVsbHNjcmVlbk1vZGUgPT0gVmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpCisg ICAgICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0gVmlkZW9GdWxsc2NyZWVuTW9kZVBp Y3R1cmVJblBpY3R1cmUpIHsKKyAgICAgICAgICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJy ZXR1cm5pbmcgdHJ1ZSwgaW4gUGlQIik7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgfQogI2VuZGlmCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICAgICAgaWYgKGhhc01l ZGlhU3RyZWFtU3JjT2JqZWN0KCkgJiYgbWVkaWFTdGF0ZSgpLmNvbnRhaW5zQW55KE1lZGlhUHJv ZHVjZXJNZWRpYVN0YXRlOjpJc1BsYXlpbmdBdWRpbykgJiYgZG9jdW1lbnQoKS5tZWRpYVN0YXRl KCkuY29udGFpbnNBbnkoTWVkaWFQcm9kdWNlck1lZGlhU3RhdGU6Okhhc0FjdGl2ZUF1ZGlvQ2Fw dHVyZURldmljZSkpIHsKQEAgLTgzMTcsMTMgKzgzMzAsMTMgQEAgdm9pZCBIVE1MTWVkaWFFbGVt ZW50Ojppc1Zpc2libGVJblZpZXdwb3J0Q2hhbmdlZCgpCiB7CiAgICAgaWYgKG1fcGxheWVyKQog ICAgICAgICBtX3BsYXllci0+c2V0VmlzaWJsZUluVmlld3BvcnQoaXNWaXNpYmxlSW5WaWV3cG9y dCgpKTsKLSAgICBxdWV1ZVRhc2tLZWVwaW5nT2JqZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6 Ok1lZGlhRWxlbWVudCwgW3RoaXNdIHsKLSAgICAgICAgaWYgKGlzQ29udGV4dFN0b3BwZWQoKSkK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbWVkaWFTZXNzaW9uKCkuaXNWaXNpYmxlSW5W aWV3cG9ydENoYW5nZWQoKTsKLSAgICAgICAgdXBkYXRlU2hvdWxkQXV0b3BsYXkoKTsKLSAgICAg ICAgc2NoZWR1bGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlclVwZGF0ZSgpOwotICAgIH0pOworICAg ICAgICBxdWV1ZVRhc2tLZWVwaW5nT2JqZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6Ok1lZGlh RWxlbWVudCwgW3RoaXNdIHsKKyAgICAgICAgICAgIGlmIChpc0NvbnRleHRTdG9wcGVkKCkpCisg ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgbWVkaWFTZXNzaW9uKCkuaXNWaXNp YmxlSW5WaWV3cG9ydENoYW5nZWQoKTsKKyAgICAgICAgICAgIHVwZGF0ZVNob3VsZEF1dG9wbGF5 KCk7CisgICAgICAgICAgICBzY2hlZHVsZVBsYXliYWNrQ29udHJvbHNNYW5hZ2VyVXBkYXRlKCk7 CisgICAgICAgIH0pOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0ZVNob3VsZEF1 dG9wbGF5KCkKQEAgLTg1MDcsNiArODUyMCwxNSBAQCBNZWRpYUVsZW1lbnRTZXNzaW9uJiBIVE1M TWVkaWFFbGVtZW50OjptZWRpYVNlc3Npb24oKSBjb25zdAogICAgIHJldHVybiAqbV9tZWRpYVNl c3Npb247CiB9CiAKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQbGF5ZXIoSW50 U2l6ZSBlbGVtZW50U2l6ZSwgYm9vbCBzaG91bGRNYWludGFpbkFzcGVjdFJhdGlvKQoreworICAg IEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CisgICAgbV9wbGF5ZXItPnNldFNpemUoZWxlbWVu dFNpemUpOworICAgIHZpc2liaWxpdHlTdGF0ZUNoYW5nZWQoKTsKKyAgICBtX3BsYXllci0+c2V0 VmlzaWJsZUluVmlld3BvcnQoaXNWaXNpYmxlSW5WaWV3cG9ydCgpKTsKKyAgICBtX3BsYXllci0+ c2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhzaG91bGRNYWludGFpbkFzcGVjdFJhdGlvKTsK K30KKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclF1ZXVlVGFza09uRXZlbnRM b29wKEZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQogewogICAgIGRvY3VtZW50KCkuZXZlbnRMb29w KCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgV1RGTW92ZSh0YXNrKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDg1MzVmZWQzYzk0YWZiMTQx ZWVmYTVlMTE2MmMzNDE3YjUzMjIxZGQuLmRiNzJkMWViN2NmMWYyZTY1ZWYwMjE2MDkyNTIxMDI2 ZTMzOGNlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCkBAIC0yOTUs OCArMjk1LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgd2Via2l0Q2xvc2Vk Q2FwdGlvbnNWaXNpYmxlKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRXZWJr aXRDbG9zZWRDYXB0aW9uc1Zpc2libGUoYm9vbCk7CiAKLSAgICBib29sIGVsZW1lbnRJc0hpZGRl bigpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudElzSGlkZGVuOyB9Ci0KICNpZiBFTkFCTEUoTUVE SUFfU1RBVElTVElDUykKIC8vIFN0YXRpc3RpY3MKICAgICB1bnNpZ25lZCB3ZWJraXRBdWRpb0Rl Y29kZWRCeXRlQ291bnQoKSBjb25zdDsKQEAgLTYwNSw2ICs2MDMsOSBAQCBwdWJsaWM6CiAKICAg ICBXRUJDT1JFX0VYUE9SVCBib29sIG1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRl ZCgpIGZpbmFsOwogCisgICAgdm9pZCB1cGRhdGVNZWRpYVBsYXllcihJbnRTaXplLCBib29sKTsK KyAgICBXRUJDT1JFX0VYUE9SVCBib29sIGVsZW1lbnRJc0hpZGRlbigpIGNvbnN0OworCiBwcm90 ZWN0ZWQ6CiAgICAgSFRNTE1lZGlhRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1l bnQmLCBib29sIGNyZWF0ZWRCeVBhcnNlcik7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhRWxlbWVu dCgpOwpAQCAtNjQxLDcgKzY0Miw2IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHNldENoYW5naW5n VmlkZW9GdWxsc2NyZWVuTW9kZShib29sIHZhbHVlKSB7IG1fY2hhbmdpbmdWaWRlb0Z1bGxzY3Jl ZW5Nb2RlID0gdmFsdWU7IH0KICAgICBib29sIGlzQ2hhbmdpbmdWaWRlb0Z1bGxzY3JlZW5Nb2Rl KCkgY29uc3QgeyByZXR1cm4gbV9jaGFuZ2luZ1ZpZGVvRnVsbHNjcmVlbk1vZGU7IH0KIAotcHJv dGVjdGVkOgogICAgIHZvaWQgbWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKCkgb3ZlcnJpZGU7CiAK IHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNl c3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcApp bmRleCBjNTlhNDE4MjU2M2U2YzAzZjc0MWZlNGNjNzZiY2NkZjRiOWFmNWMyLi4yZDgxZjE0NWFi MDVlOWI2YzBjNTgxY2M5OGNkOGI0N2RlOTkyNWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv TWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKQEAgLTI1Miw3ICsyNTIsNyBAQCB2b2lkIE1lZGlhRWxl bWVudFNlc3Npb246OnZpc2liaWxpdHlDaGFuZ2VkKCkKIAogICAgIGJvb2wgZWxlbWVudElzSGlk ZGVuID0gbV9lbGVtZW50LmVsZW1lbnRJc0hpZGRlbigpOwogCi0gICAgaWYgKGVsZW1lbnRJc0hp ZGRlbiAmJiAhbV9lbGVtZW50LmlzRnVsbHNjcmVlbigpKQorICAgIGlmIChlbGVtZW50SXNIaWRk ZW4pCiAgICAgICAgIG1fZWxlbWVudElzSGlkZGVuVW50aWxWaXNpYmxlSW5WaWV3cG9ydCA9IHRy dWU7CiAgICAgZWxzZSBpZiAobV9lbGVtZW50LmlzVmlzaWJsZUluVmlld3BvcnQoKSkKICAgICAg ICAgbV9lbGVtZW50SXNIaWRkZW5VbnRpbFZpc2libGVJblZpZXdwb3J0ID0gZmFsc2U7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKaW5kZXgg NmY0OWFmMDQ2ZDEyNDYzYTRkZWZhOWYxNDg5YTcxNTMyYThkYWY4YS4uMjhhY2NkMTM2OTIzODYz NjdhOWM4MTZlNDNiNjZjMzQ0YzdjYzI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtMTA1OSw2ICsxMDU5LDkgQEAgdm9pZCBN ZWRpYVBsYXllcjo6c2V0VmlzaWJsZUZvckNhbnZhcyhib29sIHZpc2libGUpCiAKIHZvaWQgTWVk aWFQbGF5ZXI6OnNldFZpc2libGVJblZpZXdwb3J0KGJvb2wgdmlzaWJsZSkKIHsKKyAgICBpZiAo dmlzaWJsZSA9PSBtX3Zpc2libGVJblZpZXdwb3J0KQorICAgICAgICByZXR1cm47CisKICAgICBt X3Zpc2libGVJblZpZXdwb3J0ID0gdmlzaWJsZTsKICAgICBtX3ByaXZhdGUtPnNldFZpc2libGVJ blZpZXdwb3J0KHZpc2libGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJl YW1BVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCmluZGV4IDRk ZDgxYmFhZjk1ODkwNWU2YWI5NjkyMWZiZmRjZDU3ZGQwZDIwNDMuLmNhYzM1NmZmMTExODM0MGRk NTBkZGE5NjM0NTA3ZjJmODkzOGY2OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KQEAg LTYzOSw2ICs2MzksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2Jq Qzo6c2V0UGFnZUlzVmlzaWJsZShib29sIGlzVmlzaWJsZSkKICAgICBpZiAobV9pc1BhZ2VWaXNp YmxlID09IGlzVmlzaWJsZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgQUxXQVlTX0xPRyhMT0dJ REVOVElGSUVSLCBpc1Zpc2libGUpOwogICAgIG1faXNQYWdlVmlzaWJsZSA9IGlzVmlzaWJsZTsK ICAgICBmbHVzaFJlbmRlcmVycygpOwogICAgIHJlZW5xdWV1ZUN1cnJlbnRWaWRlb1NhbXBsZUlm TmVlZGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAppbmRleCBm MGI2MzQwMDhhNTU2YzVkOTZiOGI4NGQ2NTFmODU4ZWJmYzc2MzFiLi5iYjE1OWU4ZTYyOWQzODNj ZjhlY2ZiMmM5ZGNhZWQyNjM0MmE5YzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVmlkZW8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJWaWRlby5jcHAKQEAgLTI3MiwxOCArMjcyLDEwIEBAIHZvaWQgUmVuZGVyVmlkZW86OnVwZGF0 ZVBsYXllcigpCiAgICAgaWYgKCFtZWRpYVBsYXllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAg aWYgKCF2aWRlb0VsZW1lbnQoKS5pbkFjdGl2ZURvY3VtZW50KCkpIHsKLSAgICAgICAgbWVkaWFQ bGF5ZXItPnNldFBhZ2VJc1Zpc2libGUoZmFsc2UpOwotICAgICAgICByZXR1cm47Ci0gICAgfQor ICAgIGlmICh2aWRlb0VsZW1lbnQoKS5pbkFjdGl2ZURvY3VtZW50KCkpCisgICAgICAgIGNvbnRl bnRDaGFuZ2VkKFZpZGVvQ2hhbmdlZCk7CiAKLSAgICBjb250ZW50Q2hhbmdlZChWaWRlb0NoYW5n ZWQpOwotICAgIAotICAgIEludFJlY3QgdmlkZW9Cb3VuZHMgPSB2aWRlb0JveCgpOyAKLSAgICBt ZWRpYVBsYXllci0+c2V0U2l6ZShJbnRTaXplKHZpZGVvQm91bmRzLndpZHRoKCksIHZpZGVvQm91 bmRzLmhlaWdodCgpKSk7Ci0gICAgbWVkaWFQbGF5ZXItPnNldFBhZ2VJc1Zpc2libGUoIXZpZGVv RWxlbWVudCgpLmVsZW1lbnRJc0hpZGRlbigpKTsKLSAgICBtZWRpYVBsYXllci0+c2V0VmlzaWJs ZUluVmlld3BvcnQodmlkZW9FbGVtZW50KCkuaXNWaXNpYmxlSW5WaWV3cG9ydCgpKTsKLSAgICBt ZWRpYVBsYXllci0+c2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhzdHlsZSgpLm9iamVjdEZp dCgpICE9IE9iamVjdEZpdDo6RmlsbCk7CisgICAgdmlkZW9FbGVtZW50KCkudXBkYXRlTWVkaWFQ bGF5ZXIodmlkZW9Cb3goKS5zaXplKCksIHN0eWxlKCkub2JqZWN0Rml0KCkgIT0gT2JqZWN0Rml0 OjpGaWxsKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJWaWRlbzo6Y29tcHV0ZVJlcGxhY2VkTG9n aWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkg Y29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVk aWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcAppbmRleCA0MjY0YTBlZWQxY2JkYjdi MGVkMzc5ZDVmMzRlMTMwMTgzMzY0MDY3Li40NWI1MGQ3MDc4ODQ0YTMyMTJhOTc3NWYwZjBjZGRi ZGUzODFiYTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlh L01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwCkBAIC01NjUsMTEgKzU2 NSwyMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6cHJlcGFyZUZvclJlbmRlcmlu ZygpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpzZXRQYWdlSXNWaXNpYmxlKGJv b2wgdmlzaWJsZSkKIHsKKyAgICBpZiAobV9wYWdlSXNWaXNpYmxlID09IHZpc2libGUpCisgICAg ICAgIHJldHVybjsKKworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgdmlzaWJsZSk7CisK KyAgICBtX3BhZ2VJc1Zpc2libGUgPSB2aXNpYmxlOwogICAgIGNvbm5lY3Rpb24oKS5zZW5kKE1l c3NhZ2VzOjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjpTZXRQYWdlSXNWaXNpYmxlKHZpc2libGUp LCBtX2lkKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFNob3VsZE1h aW50YWluQXNwZWN0UmF0aW8oYm9vbCBtYWludGFpblJhdGlvKQogeworICAgIGlmIChtYWludGFp blJhdGlvID09IG1fc2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbykKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9zaG91bGRNYWludGFpbkFzcGVjdFJhdGlvID0gbWFpbnRhaW5SYXRpbzsKICAgICBj b25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6U2V0U2hv dWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhtYWludGFpblJhdGlvKSwgbV9pZCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZS5oCmluZGV4IDc3NTI3YjBlZTE5Yjc4MTFkMmQ1ZjQzNjM5YmY2OWEw MzdlMDg0YmMuLjdjOGI0OGRlODE2MzNkYWFiNTU4YzQ4YzJlMWJkODA5MzBiYmM1MDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2 YXRlUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRp YVBsYXllclByaXZhdGVSZW1vdGUuaApAQCAtNDY2LDYgKzQ2Niw4IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX3dhaXRpbmdGb3JLZXkgeyBmYWxzZSB9OwogICAgIGJvb2wgbV90aW1lSXNQcm9ncmVz c2luZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQgeyBm YWxzZSB9OworICAgIGJvb2wgbV9zaG91bGRNYWludGFpbkFzcGVjdFJhdGlvIHsgZmFsc2UgfTsK KyAgICBib29sIG1fcGFnZUlzVmlzaWJsZSB7IGZhbHNlIH07CiAgICAgUmVmUHRyPFJlbW90ZVZp ZGVvRnJhbWVQcm94eT4gbV92aWRlb0ZyYW1lRm9yQ3VycmVudFRpbWU7CiAjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgUmV0YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+IG1fcGl4ZWxCdWZmZXJHYXRo ZXJlZFdpdGhWaWRlb0ZyYW1lTWV0YWRhdGE7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDg1YjMxYjJkMDhkMDUzMzNhOTlk NDM4NzZkZDdhZGY3Mjc5MDU0ZS4uZDE1MDczNjJhOGE2NjBlOTQ3NzNlNzhlNDRiMWEwMDQyYWY5 Y2RlNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAzLTI4ICBFcmljIENhcmxzb24gIDxl cmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0ZWQgdmlkZW8gaXMg c29tZXRpbWVzIHBhdXNlZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAgICAgICByZGFyOi8v ODkxMDQyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIG1lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIG1lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC5odG1sOiBBZGRlZC4KKwogMjAyMi0w My0xOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OIChyMjkwNjI4KTogU2NydWJiZXIgbWFrZXMgYSB2aXN1YWwgdHJhaWwgd2hlbiBz Y3J1YmJpbmcgb24gdHYueW91dHViZS5jb20KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlh L2Z1bGxzY3JlZW4td2hlbi1tdXRlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9m dWxsc2NyZWVuLXdoZW4tbXV0ZWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ5MDUwNWE3OTQ3 MmM4YmY3NzIzN2MxNjQwOGFiNjcyNmM3YWQ2ZGQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9tZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0ZWQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEs MTMgQEAKK011dGVkIHZpZGVvIHNob3VsZCBub3QgcGF1c2Ugd2hlbiBlbnRlcmluZyBmdWxsc2Ny ZWVuLgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VWRU5UKHBsYXlpbmcpCitFWFBFQ1RFRCAo dmlkZW8ubXV0ZWQgPT0gJ3RydWUnKSBPSworRVhQRUNURUQgKHZpZGVvLnBhdXNlZCA9PSAnZmFs c2UnKSBPSworRVZFTlQod2Via2l0ZnVsbHNjcmVlbmNoYW5nZSkKK0VYUEVDVEVEIChkb2N1bWVu dC53ZWJraXRGdWxsc2NyZWVuRWxlbWVudCA9PSAnW29iamVjdCBIVE1MSHRtbEVsZW1lbnRdJykg T0sKK0VYUEVDVEVEICh2aWRlby5tdXRlZCA9PSAndHJ1ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8u cGF1c2VkID09ICdmYWxzZScpIE9LCitFVkVOVCh3ZWJraXRmdWxsc2NyZWVuY2hhbmdlKQorRU5E IE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvZnVsbHNjcmVlbi13aGVu LW11dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0ZWQuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5jNjQxZTFlODg3NWI3YTZkMjVhZjEyZDk1ZmE4N2FiNjI0OTA5ODNkCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvZnVsbHNjcmVlbi13aGVuLW11dGVk Lmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+VGVzdCB0 aGF0IG11dGVkIHZpZGVvIGlzIG5vdCBwYXVzZWQgd2hlbiBlbnRlcmluZyBmdWxsc2NyZWVuPC90 aXRsZT4KKyAgICA8c2NyaXB0IHNyYz0ibWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNj cmlwdCBzcmM9InZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisKKyAgICB3 aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGFzeW5jIGV2ZW50ID0+IHsKKyAgICAgICAg ZmluZE1lZGlhRWxlbWVudCgpOworCisgICAgICAgIHZpZGVvLnNyYyA9IGZpbmRNZWRpYUZpbGUo J3ZpZGVvJywgJ2NvbnRlbnQvdGVzdCcpOworICAgICAgICBhd2FpdCB3YWl0Rm9yKHZpZGVvLCAn Y2FucGxheXRocm91Z2gnKTsKKyAgICAgICAgZmFpbFRlc3RJbigxMjAwMCk7CisKKyAgICAgICAg cnVuV2l0aEtleURvd24oKCkgPT4gdmlkZW8ucGxheSgpKTsKKyAgICAgICAgYXdhaXQgd2FpdEZv cih2aWRlbywgJ3BsYXlpbmcnKTsKKworICAgICAgICB0ZXN0RXhwZWN0ZWQoJ3ZpZGVvLm11dGVk JywgdHJ1ZSk7CisgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywgZmFsc2UpOwor CisgICAgICAgIHJ1bldpdGhLZXlEb3duKCgpID0+IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC53 ZWJraXRSZXF1ZXN0RnVsbHNjcmVlbigpICk7CisKKyAgICAgICAgYXdhaXQgd2FpdEZvcihkb2N1 bWVudC5kb2N1bWVudEVsZW1lbnQsICd3ZWJraXRmdWxsc2NyZWVuY2hhbmdlJyk7CisgICAgICAg IGF3YWl0IHNsZWVwRm9yKDI1MCk7CisKKyAgICAgICAgdGVzdEV4cGVjdGVkKCdkb2N1bWVudC53 ZWJraXRGdWxsc2NyZWVuRWxlbWVudCcsIGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCk7CisgICAg ICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ubXV0ZWQnLCB0cnVlKTsKKyAgICAgICAgdGVzdEV4cGVj dGVkKCd2aWRlby5wYXVzZWQnLCBmYWxzZSk7CisKKyAgICAgICAgcnVuV2l0aEtleURvd24oKCkg PT4gZG9jdW1lbnQud2Via2l0RXhpdEZ1bGxzY3JlZW4oKSApOworICAgICAgICBhd2FpdCB3YWl0 Rm9yKGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCwgJ3dlYmtpdGZ1bGxzY3JlZW5jaGFuZ2UnKTsK KworICAgICAgICBlbmRUZXN0KCk7CisgICAgfSk7CisKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5ID4KKyAgICBNdXRlZCB2aWRlbyBzaG91bGQgbm90IHBhdXNlIHdoZW4gZW50ZXJpbmcg ZnVsbHNjcmVlbi48YnI+CisgICAgPGRpdiBpZD0icGFyZW50Ij4KKyAgICAgICAgPHZpZGVvIGNv bnRyb2xzIG11dGVkPjwvdmlkZW8+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CisK 455937 2022-03-28 12:05:01 -0700 2022-03-28 15:54:34 -0700 Patch bug-238462-20220328120500.patch text/plain 16080 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVjMDM1YTdmZDdiZmEx NDRkNGM5MGY4ZGI1N2NjYzE1NjczNGI0ZS4uM2U2NmUwNzgwZWU1ZTUwMDdmY2UzYjRhNDg2ZWNh ZWE3MjU3ZDQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIyLTAzLTI4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0 ZWQgdmlkZW8gaXMgc29tZXRpbWVzIHBhdXNlZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAg ICAgICByZGFyOi8vODkxMDQyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0OiBtZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0ZWQuaHRtbAorCisg ICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OmRpZE1vdmVUb05ld0RvY3VtZW50KTogQWRkIGxvZ2dpbmcuCisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjplbGVtZW50SXNIaWRkZW4gY29uc3QpOiBD b25zaWRlciBib3RoIGVsZW1lbnQgZnVsbHNjcmVlbgorICAgICAgICBhbmQgdmlkZW8gZnVsbHNj cmVlbi4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnZpc2liaWxpdHlTdGF0 ZUNoYW5nZWQpOiBVc2UgZWxlbWVudElzSGlkZGVuLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6c2hvdWxkT3ZlcnJpZGVCYWNrZ3JvdW5kUGxheWJhY2tSZXN0cmljdGlvbiBj b25zdCk6IEFkZAorICAgICAgICBsb2dnaW5nIGZvciB0aGUgb25lIGNhc2UgdGhhdCBkaWRuJ3Qg aGF2ZSBpdC4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmlzVmlzaWJsZUlu Vmlld3BvcnRDaGFuZ2VkKTogRml4IGluZGVudGF0aW9uLgorICAgICAgICAoV2ViQ29yZTo6SFRN TE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQbGF5ZXIpOiBOZXcsIHdyYXAgTWVkaWFQbGF5ZXIg ZnVuY3Rpb25zCisgICAgICAgIHRoYXQgYXJlIGNhbGxlZCBmcmVxdWVudGx5IGJ5IFJlbmRlclZp ZGVvIHNvIHdlIGNhbiBvbmx5IGNhbGwgdGhlbSB3aGVuIG5lY2Vzc2FyeS4KKyAgICAgICAgKiBo dG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6OmVsZW1lbnRJc0hpZGRlbiBjb25zdCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBodG1sL01l ZGlhRWxlbWVudFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vz c2lvbjo6dmlzaWJpbGl0eUNoYW5nZWQpOiBKdXN0IHVzZSBlbGVtZW50SXNIaWRkZW4sIGl0IAor ICAgICAgICBhbHJlYWR5IGFjY291bnRzIGZvciBmdWxsc2NyZWVuLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXI6OnNldFZpc2libGVJblZpZXdwb3J0KTogRG8gbm90aGluZyB3aGVuIHZpc2liaWxpdHkg aXMgbm90IGNoYW5naW5nLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDOjpzZXRQYWdl SXNWaXNpYmxlKTogQWRkIGxvZ2dpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlkZW86OnVwZGF0ZVBsYXllcik6IENh bGwgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQbGF5ZXIgaW5zdGVhZAorICAgICAgICBv ZiBjYWxsaW5nIE1lZGlhUGxheWVyIGRpcmVjdGx5LgorCiAyMDIyLTAzLTE4ICBDaHJpcyBEdW1l eiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQXZvaWQgZXh0cmEgcG9pbnRlciBkZXJl ZmVyZW5jZSBpbiBFdmVudExpc3RlbmVyTWFwOjptX2VudHJpZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNzEzNzg5 NDViMTllMDNmZGM4MjMzNzY1NWRlOTAwYjg4ZDc1N2VkYy4uMGY4OTBlZTNlM2I2N2U5OWI5NTMw ODU3YzlhZDcyMWRmZTAxMWEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAyMi0wMy0y OCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFj T1NdIE11dGVkIHZpZGVvIGlzIHNvbWV0aW1lcyBwYXVzZWQgd2hlbiBlbnRlcmluZyBmdWxsc2Ny ZWVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg0 NjIKKyAgICAgICAgcmRhcjovLzg5MTA0MjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclBy aXZhdGVSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYVBsYXllclByaXZhdGVSZW1v dGU6OnNldFBhZ2VJc1Zpc2libGUpOiBUcmFjayB2aXNpYmlsaXR5IGFuZCBkbworICAgICAgICBu b3RoaW5nIHdoZW4gaXQgZG9lc24ndCBjaGFuZ2UuCisgICAgICAgIChXZWJLaXQ6Ok1lZGlhUGxh eWVyUHJpdmF0ZVJlbW90ZTo6c2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyk6IERpdHRvIGZv ciBhc3BlY3QKKyAgICAgICAgcmF0aW8uCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvbWVkaWEv TWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmg6CisKIDIwMjItMDMtMTggIEJlbiBOaGFtICA8bmhh bUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHB1c2ggc3Vic2NyaXB0aW9ucyB3aGVuIGFz c29jaWF0ZWQgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9ucyBhcmUgcmVtb3ZlZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggODFhNWIyODdmOTg1MjE4NjNh MTQ1M2U5NTJjN2Q3YmFiMzhlMTM1Ny4uMzBiM2ExZDY1ODcyYTU4ODU0MTAwNmUzNWZjMjk1NGRl NDAzZDhmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC02 ODUsNiArNjg1LDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1bnJlZ2lzdGVyV2l0aERvY3Vt ZW50KERvY3VtZW50JiBkb2N1bWVudCkKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRNb3Zl VG9OZXdEb2N1bWVudChEb2N1bWVudCYgb2xkRG9jdW1lbnQsIERvY3VtZW50JiBuZXdEb2N1bWVu dCkKIHsKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOworCiAgICAgQVNTRVJUX1dJVEhf U0VDVVJJVFlfSU1QTElDQVRJT04oJmRvY3VtZW50KCkgPT0gJm5ld0RvY3VtZW50KTsKICAgICBp ZiAobV9zaG91bGREZWxheUxvYWRFdmVudCkgewogICAgICAgICBvbGREb2N1bWVudC5kZWNyZW1l bnRMb2FkRXZlbnREZWxheUNvdW50KCk7CkBAIC02MDQyLDkgKzYwNDQsMjMgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50OjptZWRpYVZvbHVtZURpZENoYW5nZSgpCiAjZW5kaWYKIH0KIAorYm9vbCBI VE1MTWVkaWFFbGVtZW50OjplbGVtZW50SXNIaWRkZW4oKSBjb25zdAoreworI2lmIEVOQUJMRShG VUxMU0NSRUVOX0FQSSkKKyAgICBhdXRvJiBmdWxsc2NyZWVuTWFuYWdlciA9IGRvY3VtZW50KCku ZnVsbHNjcmVlbk1hbmFnZXIoKTsKKyAgICBpZiAoaXNWaWRlbygpICYmIGZ1bGxzY3JlZW5NYW5h Z2VyLmlzRnVsbHNjcmVlbigpICYmIGZ1bGxzY3JlZW5NYW5hZ2VyLmN1cnJlbnRGdWxsc2NyZWVu RWxlbWVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKworICAgIGlmIChtX3Zp ZGVvRnVsbHNjcmVlbk1vZGUgIT0gVmlkZW9GdWxsc2NyZWVuTW9kZU5vbmUpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIHJldHVybiBkb2N1bWVudCgpLmhpZGRlbigpOworfQorCiB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnZpc2liaWxpdHlTdGF0ZUNoYW5nZWQoKQogewotICAgIGJvb2wg ZWxlbWVudElzSGlkZGVuID0gZG9jdW1lbnQoKS5oaWRkZW4oKSAmJiBtX3ZpZGVvRnVsbHNjcmVl bk1vZGUgPT0gVmlkZW9GdWxsc2NyZWVuTW9kZU5vbmU7CisgICAgYm9vbCBlbGVtZW50SXNIaWRk ZW4gPSB0aGlzLT5lbGVtZW50SXNIaWRkZW4oKTsKICAgICBpZiAoZWxlbWVudElzSGlkZGVuID09 IG1fZWxlbWVudElzSGlkZGVuKQogICAgICAgICByZXR1cm47CiAKQEAgLTgwNTAsOCArODA2Niwx MCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OnNob3VsZE92ZXJyaWRlQmFja2dyb3VuZFBsYXli YWNrUmVzdHJpY3Rpb24oUGxhdGZvcm1NZWRpYQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgICAgIH0KICNpZiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpCi0gICAgICAgIGlm IChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0gVmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBp Y3R1cmUpCisgICAgICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0gVmlkZW9GdWxsc2Ny ZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpIHsKKyAgICAgICAgICAgIElORk9fTE9HKExPR0lERU5U SUZJRVIsICJyZXR1cm5pbmcgdHJ1ZSwgaW4gUGlQIik7CiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgfQogI2VuZGlmCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICAgICAg aWYgKGhhc01lZGlhU3RyZWFtU3JjT2JqZWN0KCkgJiYgbWVkaWFTdGF0ZSgpLmNvbnRhaW5zQW55 KE1lZGlhUHJvZHVjZXJNZWRpYVN0YXRlOjpJc1BsYXlpbmdBdWRpbykgJiYgZG9jdW1lbnQoKS5t ZWRpYVN0YXRlKCkuY29udGFpbnNBbnkoTWVkaWFQcm9kdWNlck1lZGlhU3RhdGU6Okhhc0FjdGl2 ZUF1ZGlvQ2FwdHVyZURldmljZSkpIHsKQEAgLTgzMTcsMTMgKzgzMzUsMTMgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50Ojppc1Zpc2libGVJblZpZXdwb3J0Q2hhbmdlZCgpCiB7CiAgICAgaWYgKG1f cGxheWVyKQogICAgICAgICBtX3BsYXllci0+c2V0VmlzaWJsZUluVmlld3BvcnQoaXNWaXNpYmxl SW5WaWV3cG9ydCgpKTsKLSAgICBxdWV1ZVRhc2tLZWVwaW5nT2JqZWN0QWxpdmUoKnRoaXMsIFRh c2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgW3RoaXNdIHsKLSAgICAgICAgaWYgKGlzQ29udGV4dFN0 b3BwZWQoKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbWVkaWFTZXNzaW9uKCkuaXNW aXNpYmxlSW5WaWV3cG9ydENoYW5nZWQoKTsKLSAgICAgICAgdXBkYXRlU2hvdWxkQXV0b3BsYXko KTsKLSAgICAgICAgc2NoZWR1bGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlclVwZGF0ZSgpOwotICAg IH0pOworICAgICAgICBxdWV1ZVRhc2tLZWVwaW5nT2JqZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3Vy Y2U6Ok1lZGlhRWxlbWVudCwgW3RoaXNdIHsKKyAgICAgICAgICAgIGlmIChpc0NvbnRleHRTdG9w cGVkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgbWVkaWFTZXNzaW9u KCkuaXNWaXNpYmxlSW5WaWV3cG9ydENoYW5nZWQoKTsKKyAgICAgICAgICAgIHVwZGF0ZVNob3Vs ZEF1dG9wbGF5KCk7CisgICAgICAgICAgICBzY2hlZHVsZVBsYXliYWNrQ29udHJvbHNNYW5hZ2Vy VXBkYXRlKCk7CisgICAgICAgIH0pOwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVwZGF0 ZVNob3VsZEF1dG9wbGF5KCkKQEAgLTg1MDcsNiArODUyNSwxNSBAQCBNZWRpYUVsZW1lbnRTZXNz aW9uJiBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVNlc3Npb24oKSBjb25zdAogICAgIHJldHVybiAq bV9tZWRpYVNlc3Npb247CiB9CiAKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQ bGF5ZXIoSW50U2l6ZSBlbGVtZW50U2l6ZSwgYm9vbCBzaG91bGRNYWludGFpbkFzcGVjdFJhdGlv KQoreworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CisgICAgbV9wbGF5ZXItPnNldFNp emUoZWxlbWVudFNpemUpOworICAgIHZpc2liaWxpdHlTdGF0ZUNoYW5nZWQoKTsKKyAgICBtX3Bs YXllci0+c2V0VmlzaWJsZUluVmlld3BvcnQoaXNWaXNpYmxlSW5WaWV3cG9ydCgpKTsKKyAgICBt X3BsYXllci0+c2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhzaG91bGRNYWludGFpbkFzcGVj dFJhdGlvKTsKK30KKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclF1ZXVlVGFz a09uRXZlbnRMb29wKEZ1bmN0aW9uPHZvaWQoKT4mJiB0YXNrKQogewogICAgIGRvY3VtZW50KCku ZXZlbnRMb29wKCkucXVldWVUYXNrKFRhc2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgV1RGTW92ZSh0 YXNrKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDg1MzVmZWQz Yzk0YWZiMTQxZWVmYTVlMTE2MmMzNDE3YjUzMjIxZGQuLmRiNzJkMWViN2NmMWYyZTY1ZWYwMjE2 MDkyNTIxMDI2ZTMzOGNlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o CkBAIC0yOTUsOCArMjk1LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgd2Vi a2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxlKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzZXRXZWJraXRDbG9zZWRDYXB0aW9uc1Zpc2libGUoYm9vbCk7CiAKLSAgICBib29sIGVsZW1l bnRJc0hpZGRlbigpIGNvbnN0IHsgcmV0dXJuIG1fZWxlbWVudElzSGlkZGVuOyB9Ci0KICNpZiBF TkFCTEUoTUVESUFfU1RBVElTVElDUykKIC8vIFN0YXRpc3RpY3MKICAgICB1bnNpZ25lZCB3ZWJr aXRBdWRpb0RlY29kZWRCeXRlQ291bnQoKSBjb25zdDsKQEAgLTYwNSw2ICs2MDMsOSBAQCBwdWJs aWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIG1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVB Y2NlbGVyYXRlZCgpIGZpbmFsOwogCisgICAgdm9pZCB1cGRhdGVNZWRpYVBsYXllcihJbnRTaXpl LCBib29sKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBib29sIGVsZW1lbnRJc0hpZGRlbigpIGNvbnN0 OworCiBwcm90ZWN0ZWQ6CiAgICAgSFRNTE1lZGlhRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1l JiwgRG9jdW1lbnQmLCBib29sIGNyZWF0ZWRCeVBhcnNlcik7CiAgICAgdmlydHVhbCB+SFRNTE1l ZGlhRWxlbWVudCgpOwpAQCAtNjQxLDcgKzY0Miw2IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHNl dENoYW5naW5nVmlkZW9GdWxsc2NyZWVuTW9kZShib29sIHZhbHVlKSB7IG1fY2hhbmdpbmdWaWRl b0Z1bGxzY3JlZW5Nb2RlID0gdmFsdWU7IH0KICAgICBib29sIGlzQ2hhbmdpbmdWaWRlb0Z1bGxz Y3JlZW5Nb2RlKCkgY29uc3QgeyByZXR1cm4gbV9jaGFuZ2luZ1ZpZGVvRnVsbHNjcmVlbk1vZGU7 IH0KIAotcHJvdGVjdGVkOgogICAgIHZvaWQgbWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKCkgb3Zl cnJpZGU7CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlh RWxlbWVudFNlc3Npb24uY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNz aW9uLmNwcAppbmRleCBjNTlhNDE4MjU2M2U2YzAzZjc0MWZlNGNjNzZiY2NkZjRiOWFmNWMyLi4y ZDgxZjE0NWFiMDVlOWI2YzBjNTgxY2M5OGNkOGI0N2RlOTkyNWZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKQEAgLTI1Miw3ICsyNTIsNyBAQCB2b2lk IE1lZGlhRWxlbWVudFNlc3Npb246OnZpc2liaWxpdHlDaGFuZ2VkKCkKIAogICAgIGJvb2wgZWxl bWVudElzSGlkZGVuID0gbV9lbGVtZW50LmVsZW1lbnRJc0hpZGRlbigpOwogCi0gICAgaWYgKGVs ZW1lbnRJc0hpZGRlbiAmJiAhbV9lbGVtZW50LmlzRnVsbHNjcmVlbigpKQorICAgIGlmIChlbGVt ZW50SXNIaWRkZW4pCiAgICAgICAgIG1fZWxlbWVudElzSGlkZGVuVW50aWxWaXNpYmxlSW5WaWV3 cG9ydCA9IHRydWU7CiAgICAgZWxzZSBpZiAobV9lbGVtZW50LmlzVmlzaWJsZUluVmlld3BvcnQo KSkKICAgICAgICAgbV9lbGVtZW50SXNIaWRkZW5VbnRpbFZpc2libGVJblZpZXdwb3J0ID0gZmFs c2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBs YXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5j cHAKaW5kZXggNmY0OWFmMDQ2ZDEyNDYzYTRkZWZhOWYxNDg5YTcxNTMyYThkYWY4YS4uMjhhY2Nk MTM2OTIzODYzNjdhOWM4MTZlNDNiNjZjMzQ0YzdjYzI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcApAQCAtMTA1OSw2ICsxMDU5LDkg QEAgdm9pZCBNZWRpYVBsYXllcjo6c2V0VmlzaWJsZUZvckNhbnZhcyhib29sIHZpc2libGUpCiAK IHZvaWQgTWVkaWFQbGF5ZXI6OnNldFZpc2libGVJblZpZXdwb3J0KGJvb2wgdmlzaWJsZSkKIHsK KyAgICBpZiAodmlzaWJsZSA9PSBtX3Zpc2libGVJblZpZXdwb3J0KQorICAgICAgICByZXR1cm47 CisKICAgICBtX3Zpc2libGVJblZpZXdwb3J0ID0gdmlzaWJsZTsKICAgICBtX3ByaXZhdGUtPnNl dFZpc2libGVJblZpZXdwb3J0KHZpc2libGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRl TWVkaWFTdHJlYW1BVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1t CmluZGV4IDRkZDgxYmFhZjk1ODkwNWU2YWI5NjkyMWZiZmRjZDU3ZGQwZDIwNDMuLmNhYzM1NmZm MTExODM0MGRkNTBkZGE5NjM0NTA3ZjJmODkzOGY2OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9i akMubW0KQEAgLTYzOSw2ICs2MzksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3Ry ZWFtQVZGT2JqQzo6c2V0UGFnZUlzVmlzaWJsZShib29sIGlzVmlzaWJsZSkKICAgICBpZiAobV9p c1BhZ2VWaXNpYmxlID09IGlzVmlzaWJsZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgQUxXQVlT X0xPRyhMT0dJREVOVElGSUVSLCBpc1Zpc2libGUpOwogICAgIG1faXNQYWdlVmlzaWJsZSA9IGlz VmlzaWJsZTsKICAgICBmbHVzaFJlbmRlcmVycygpOwogICAgIHJlZW5xdWV1ZUN1cnJlbnRWaWRl b1NhbXBsZUlmTmVlZGVkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVmlkZW8uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNw cAppbmRleCBmMGI2MzQwMDhhNTU2YzVkOTZiOGI4NGQ2NTFmODU4ZWJmYzc2MzFiLi5iYjE1OWU4 ZTYyOWQzODNjZjhlY2ZiMmM5ZGNhZWQyNjM0MmE5YzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWRlby5jcHAKQEAgLTI3MiwxOCArMjcyLDEwIEBAIHZvaWQgUmVuZGVyVmlk ZW86OnVwZGF0ZVBsYXllcigpCiAgICAgaWYgKCFtZWRpYVBsYXllcikKICAgICAgICAgcmV0dXJu OwogCi0gICAgaWYgKCF2aWRlb0VsZW1lbnQoKS5pbkFjdGl2ZURvY3VtZW50KCkpIHsKLSAgICAg ICAgbWVkaWFQbGF5ZXItPnNldFBhZ2VJc1Zpc2libGUoZmFsc2UpOwotICAgICAgICByZXR1cm47 Ci0gICAgfQorICAgIGlmICh2aWRlb0VsZW1lbnQoKS5pbkFjdGl2ZURvY3VtZW50KCkpCisgICAg ICAgIGNvbnRlbnRDaGFuZ2VkKFZpZGVvQ2hhbmdlZCk7CiAKLSAgICBjb250ZW50Q2hhbmdlZChW aWRlb0NoYW5nZWQpOwotICAgIAotICAgIEludFJlY3QgdmlkZW9Cb3VuZHMgPSB2aWRlb0JveCgp OyAKLSAgICBtZWRpYVBsYXllci0+c2V0U2l6ZShJbnRTaXplKHZpZGVvQm91bmRzLndpZHRoKCks IHZpZGVvQm91bmRzLmhlaWdodCgpKSk7Ci0gICAgbWVkaWFQbGF5ZXItPnNldFBhZ2VJc1Zpc2li bGUoIXZpZGVvRWxlbWVudCgpLmVsZW1lbnRJc0hpZGRlbigpKTsKLSAgICBtZWRpYVBsYXllci0+ c2V0VmlzaWJsZUluVmlld3BvcnQodmlkZW9FbGVtZW50KCkuaXNWaXNpYmxlSW5WaWV3cG9ydCgp KTsKLSAgICBtZWRpYVBsYXllci0+c2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhzdHlsZSgp Lm9iamVjdEZpdCgpICE9IE9iamVjdEZpdDo6RmlsbCk7CisgICAgdmlkZW9FbGVtZW50KCkudXBk YXRlTWVkaWFQbGF5ZXIodmlkZW9Cb3goKS5zaXplKCksIHN0eWxlKCkub2JqZWN0Rml0KCkgIT0g T2JqZWN0Rml0OjpGaWxsKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJWaWRlbzo6Y29tcHV0ZVJl cGxhY2VkTG9naWNhbFdpZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVBy ZWZlcnJlZCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUv bWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmNwcAppbmRleCA0MjY0YTBl ZWQxY2JkYjdiMGVkMzc5ZDVmMzRlMTMwMTgzMzY0MDY3Li40NWI1MGQ3MDc4ODQ0YTMyMTJhOTc3 NWYwZjBjZGRiZGUzODFiYTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv R1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwCkBAIC01 NjUsMTEgKzU2NSwyMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6cHJlcGFyZUZv clJlbmRlcmluZygpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpzZXRQYWdlSXNW aXNpYmxlKGJvb2wgdmlzaWJsZSkKIHsKKyAgICBpZiAobV9wYWdlSXNWaXNpYmxlID09IHZpc2li bGUpCisgICAgICAgIHJldHVybjsKKworICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgdmlz aWJsZSk7CisKKyAgICBtX3BhZ2VJc1Zpc2libGUgPSB2aXNpYmxlOwogICAgIGNvbm5lY3Rpb24o KS5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVNZWRpYVBsYXllclByb3h5OjpTZXRQYWdlSXNWaXNpYmxl KHZpc2libGUpLCBtX2lkKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNl dFNob3VsZE1haW50YWluQXNwZWN0UmF0aW8oYm9vbCBtYWludGFpblJhdGlvKQogeworICAgIGlm IChtYWludGFpblJhdGlvID09IG1fc2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbykKKyAgICAgICAg cmV0dXJuOworCisgICAgbV9zaG91bGRNYWludGFpbkFzcGVjdFJhdGlvID0gbWFpbnRhaW5SYXRp bzsKICAgICBjb25uZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94 eTo6U2V0U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhtYWludGFpblJhdGlvKSwgbV9pZCk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQ bGF5ZXJQcml2YXRlUmVtb3RlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlh L01lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZS5oCmluZGV4IDc3NTI3YjBlZTE5Yjc4MTFkMmQ1ZjQz NjM5YmY2OWEwMzdlMDg0YmMuLjdjOGI0OGRlODE2MzNkYWFiNTU4YzQ4YzJlMWJkODA5MzBiYmM1 MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQ bGF5ZXJQcml2YXRlUmVtb3RlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9t ZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuaApAQCAtNDY2LDYgKzQ2Niw4IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX3dhaXRpbmdGb3JLZXkgeyBmYWxzZSB9OwogICAgIGJvb2wgbV90aW1l SXNQcm9ncmVzc2luZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3JlbmRlcmluZ0NhbkJlQWNjZWxl cmF0ZWQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9zaG91bGRNYWludGFpbkFzcGVjdFJhdGlvIHsg ZmFsc2UgfTsKKyAgICBib29sIG1fcGFnZUlzVmlzaWJsZSB7IGZhbHNlIH07CiAgICAgUmVmUHRy PFJlbW90ZVZpZGVvRnJhbWVQcm94eT4gbV92aWRlb0ZyYW1lRm9yQ3VycmVudFRpbWU7CiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgUmV0YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+IG1fcGl4ZWxC dWZmZXJHYXRoZXJlZFdpdGhWaWRlb0ZyYW1lTWV0YWRhdGE7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDg1YjMxYjJkMDhk MDUzMzNhOTlkNDM4NzZkZDdhZGY3Mjc5MDU0ZS4uZDE1MDczNjJhOGE2NjBlOTQ3NzNlNzhlNDRi MWEwMDQyYWY5Y2RlNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAzLTI4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0ZWQg dmlkZW8gaXMgc29tZXRpbWVzIHBhdXNlZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAgICAg ICByZGFyOi8vODkxMDQyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIG1lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIG1lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC5odG1sOiBBZGRlZC4K KwogMjAyMi0wMy0xOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OIChyMjkwNjI4KTogU2NydWJiZXIgbWFrZXMgYSB2aXN1YWwgdHJh aWwgd2hlbiBzY3J1YmJpbmcgb24gdHYueW91dHViZS5jb20KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL21lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9tZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0ZWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ5 MDUwNWE3OTQ3MmM4YmY3NzIzN2MxNjQwOGFiNjcyNmM3YWQ2ZGQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9tZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0ZWQtZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTMgQEAKK011dGVkIHZpZGVvIHNob3VsZCBub3QgcGF1c2Ugd2hlbiBlbnRlcmlu ZyBmdWxsc2NyZWVuLgorCitFVkVOVChjYW5wbGF5dGhyb3VnaCkKK0VWRU5UKHBsYXlpbmcpCitF WFBFQ1RFRCAodmlkZW8ubXV0ZWQgPT0gJ3RydWUnKSBPSworRVhQRUNURUQgKHZpZGVvLnBhdXNl ZCA9PSAnZmFsc2UnKSBPSworRVZFTlQod2Via2l0ZnVsbHNjcmVlbmNoYW5nZSkKK0VYUEVDVEVE IChkb2N1bWVudC53ZWJraXRGdWxsc2NyZWVuRWxlbWVudCA9PSAnW29iamVjdCBIVE1MSHRtbEVs ZW1lbnRdJykgT0sKK0VYUEVDVEVEICh2aWRlby5tdXRlZCA9PSAndHJ1ZScpIE9LCitFWFBFQ1RF RCAodmlkZW8ucGF1c2VkID09ICdmYWxzZScpIE9LCitFVkVOVCh3ZWJraXRmdWxsc2NyZWVuY2hh bmdlKQorRU5EIE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvZnVsbHNj cmVlbi13aGVuLW11dGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9mdWxsc2NyZWVuLXdoZW4t bXV0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jNjQxZTFlODg3NWI3YTZkMjVhZjEyZDk1ZmE4N2FiNjI0 OTA5ODNkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvZnVsbHNjcmVlbi13 aGVuLW11dGVkLmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0 bGU+VGVzdCB0aGF0IG11dGVkIHZpZGVvIGlzIG5vdCBwYXVzZWQgd2hlbiBlbnRlcmluZyBmdWxs c2NyZWVuPC90aXRsZT4KKyAgICA8c2NyaXB0IHNyYz0ibWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+ CisgICAgPHNjcmlwdCBzcmM9InZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+ CisKKyAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGFzeW5jIGV2ZW50ID0+IHsK KyAgICAgICAgZmluZE1lZGlhRWxlbWVudCgpOworCisgICAgICAgIHZpZGVvLnNyYyA9IGZpbmRN ZWRpYUZpbGUoJ3ZpZGVvJywgJ2NvbnRlbnQvdGVzdCcpOworICAgICAgICBhd2FpdCB3YWl0Rm9y KHZpZGVvLCAnY2FucGxheXRocm91Z2gnKTsKKyAgICAgICAgZmFpbFRlc3RJbigxMjAwMCk7CisK KyAgICAgICAgcnVuV2l0aEtleURvd24oKCkgPT4gdmlkZW8ucGxheSgpKTsKKyAgICAgICAgYXdh aXQgd2FpdEZvcih2aWRlbywgJ3BsYXlpbmcnKTsKKworICAgICAgICB0ZXN0RXhwZWN0ZWQoJ3Zp ZGVvLm11dGVkJywgdHJ1ZSk7CisgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywg ZmFsc2UpOworCisgICAgICAgIHJ1bldpdGhLZXlEb3duKCgpID0+IGRvY3VtZW50LmRvY3VtZW50 RWxlbWVudC53ZWJraXRSZXF1ZXN0RnVsbHNjcmVlbigpICk7CisKKyAgICAgICAgYXdhaXQgd2Fp dEZvcihkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQsICd3ZWJraXRmdWxsc2NyZWVuY2hhbmdlJyk7 CisgICAgICAgIGF3YWl0IHNsZWVwRm9yKDI1MCk7CisKKyAgICAgICAgdGVzdEV4cGVjdGVkKCdk b2N1bWVudC53ZWJraXRGdWxsc2NyZWVuRWxlbWVudCcsIGRvY3VtZW50LmRvY3VtZW50RWxlbWVu dCk7CisgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ubXV0ZWQnLCB0cnVlKTsKKyAgICAgICAg dGVzdEV4cGVjdGVkKCd2aWRlby5wYXVzZWQnLCBmYWxzZSk7CisKKyAgICAgICAgcnVuV2l0aEtl eURvd24oKCkgPT4gZG9jdW1lbnQud2Via2l0RXhpdEZ1bGxzY3JlZW4oKSApOworICAgICAgICBh d2FpdCB3YWl0Rm9yKGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCwgJ3dlYmtpdGZ1bGxzY3JlZW5j aGFuZ2UnKTsKKworICAgICAgICBlbmRUZXN0KCk7CisgICAgfSk7CisKKyAgICA8L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5ID4KKyAgICBNdXRlZCB2aWRlbyBzaG91bGQgbm90IHBhdXNlIHdoZW4g ZW50ZXJpbmcgZnVsbHNjcmVlbi48YnI+CisgICAgPGRpdiBpZD0icGFyZW50Ij4KKyAgICAgICAg PHZpZGVvIGNvbnRyb2xzIG11dGVkPjwvdmlkZW8+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0 bWw+CisK 455964 2022-03-28 15:54:37 -0700 2022-03-29 11:32:07 -0700 Patch for landing bug-238462-20220328155436.patch text/plain 15481 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVjMDM1YTdmZDdiZmEx NDRkNGM5MGY4ZGI1N2NjYzE1NjczNGI0ZS4uNjZkOTEwNzU2ZTM4ODA1ZDNkZDMwMTdjOGNlOTUz ODZiZjUzZmMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIyLTAzLTI4ICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0 ZWQgdmlkZW8gaXMgc29tZXRpbWVzIHBhdXNlZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAg ICAgICByZGFyOi8vODkxMDQyMTYKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisK KyAgICAgICAgVGVzdDogbWVkaWEvZnVsbHNjcmVlbi13aGVuLW11dGVkLmh0bWwKKworICAgICAg ICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50OjpkaWRNb3ZlVG9OZXdEb2N1bWVudCk6IEFkZCBsb2dnaW5nLgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZWxlbWVudElzSGlkZGVuIGNvbnN0KTogQ29uc2lk ZXIgYm90aCBlbGVtZW50IGZ1bGxzY3JlZW4KKyAgICAgICAgYW5kIHZpZGVvIGZ1bGxzY3JlZW4u CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp2aXNpYmlsaXR5U3RhdGVDaGFu Z2VkKTogVXNlIGVsZW1lbnRJc0hpZGRlbi4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OnNob3VsZE92ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24gY29uc3Qp OiBBZGQKKyAgICAgICAgbG9nZ2luZyBmb3IgdGhlIG9uZSBjYXNlIHRoYXQgZGlkbid0IGhhdmUg aXQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVNZWRpYVBsYXll cik6IE5ldywgd3JhcCBNZWRpYVBsYXllciBmdW5jdGlvbnMKKyAgICAgICAgdGhhdCBhcmUgY2Fs bGVkIGZyZXF1ZW50bHkgYnkgUmVuZGVyVmlkZW8gc28gd2UgY2FuIG9ubHkgY2FsbCB0aGVtIHdo ZW4gbmVjZXNzYXJ5LgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorICAgICAg ICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZWxlbWVudElzSGlkZGVuIGNvbnN0KTogRGVs ZXRlZC4KKworICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjp2aXNpYmlsaXR5Q2hhbmdlZCk6IEp1c3Qg dXNlIGVsZW1lbnRJc0hpZGRlbiwgaXQgCisgICAgICAgIGFscmVhZHkgYWNjb3VudHMgZm9yIGZ1 bGxzY3JlZW4uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllcjo6c2V0VmlzaWJsZUluVmlld3BvcnQpOiBE byBub3RoaW5nIHdoZW4gdmlzaWJpbGl0eSBpcyBub3QgY2hhbmdpbmcuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVN0cmVhbUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVN ZWRpYVN0cmVhbUFWRk9iakM6OnNldFBhZ2VJc1Zpc2libGUpOiBBZGQgbG9nZ2luZy4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWRlby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJWaWRlbzo6dXBkYXRlUGxheWVyKTogQ2FsbCBIVE1MTWVkaWFFbGVtZW50Ojp1cGRhdGVNZWRp YVBsYXllciBpbnN0ZWFkCisgICAgICAgIG9mIGNhbGxpbmcgTWVkaWFQbGF5ZXIgZGlyZWN0bHku CisKIDIwMjItMDMtMTggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBBdm9pZCBleHRyYSBwb2ludGVyIGRlcmVmZXJlbmNlIGluIEV2ZW50TGlzdGVuZXJNYXA6Om1f ZW50cmllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwppbmRleCA3MTM3ODk0NWIxOWUwM2ZkYzgyMzM3NjU1ZGU5MDBiODhkNzU3 ZWRjLi42ZmVmM2FhOWRiNDVhNGY5MzA1N2E1MWY5NThiY2UwYzU4MGZlYTI0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDIyLTAzLTI4ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25A YXBwbGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0ZWQgdmlkZW8gaXMgc29tZXRpbWVzIHBh dXNlZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAgICAgICByZGFyOi8vODkxMDQyMTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQ VS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpN ZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFBhZ2VJc1Zpc2libGUpOiBUcmFjayB2aXNpYmls aXR5IGFuZCBkbworICAgICAgICBub3RoaW5nIHdoZW4gaXQgZG9lc24ndCBjaGFuZ2UuCisgICAg ICAgIChXZWJLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6c2V0U2hvdWxkTWFpbnRhaW5B c3BlY3RSYXRpbyk6IERpdHRvIGZvciBhc3BlY3QKKyAgICAgICAgcmF0aW8uCisgICAgICAgICog V2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmg6CisKIDIwMjIt MDMtMTggIEJlbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHB1c2gg c3Vic2NyaXB0aW9ucyB3aGVuIGFzc29jaWF0ZWQgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9u cyBhcmUgcmVtb3ZlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5k ZXggODFhNWIyODdmOTg1MjE4NjNhMTQ1M2U5NTJjN2Q3YmFiMzhlMTM1Ny4uYzIxY2U0YjhmNmNi YmM1ZDcxMDlmZDY1YjRkNDA5NzM0M2IwMzAyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwCkBAIC02ODUsNiArNjg1LDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50 Ojp1bnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBkb2N1bWVudCkKIAogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpkaWRNb3ZlVG9OZXdEb2N1bWVudChEb2N1bWVudCYgb2xkRG9jdW1lbnQs IERvY3VtZW50JiBuZXdEb2N1bWVudCkKIHsKKyAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIp OworCiAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oJmRvY3VtZW50KCkgPT0g Jm5ld0RvY3VtZW50KTsKICAgICBpZiAobV9zaG91bGREZWxheUxvYWRFdmVudCkgewogICAgICAg ICBvbGREb2N1bWVudC5kZWNyZW1lbnRMb2FkRXZlbnREZWxheUNvdW50KCk7CkBAIC02MDQyLDkg KzYwNDQsMjMgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVZvbHVtZURpZENoYW5nZSgp CiAjZW5kaWYKIH0KIAorYm9vbCBIVE1MTWVkaWFFbGVtZW50OjplbGVtZW50SXNIaWRkZW4oKSBj b25zdAoreworI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKKyAgICBhdXRvJiBmdWxsc2NyZWVu TWFuYWdlciA9IGRvY3VtZW50KCkuZnVsbHNjcmVlbk1hbmFnZXIoKTsKKyAgICBpZiAoaXNWaWRl bygpICYmIGZ1bGxzY3JlZW5NYW5hZ2VyLmlzRnVsbHNjcmVlbigpICYmIGZ1bGxzY3JlZW5NYW5h Z2VyLmN1cnJlbnRGdWxsc2NyZWVuRWxlbWVudCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisj ZW5kaWYKKworICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgIT0gVmlkZW9GdWxsc2NyZWVu TW9kZU5vbmUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBkb2N1bWVudCgp LmhpZGRlbigpOworfQorCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnZpc2liaWxpdHlTdGF0ZUNo YW5nZWQoKQogewotICAgIGJvb2wgZWxlbWVudElzSGlkZGVuID0gZG9jdW1lbnQoKS5oaWRkZW4o KSAmJiBtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0gVmlkZW9GdWxsc2NyZWVuTW9kZU5vbmU7Cisg ICAgYm9vbCBlbGVtZW50SXNIaWRkZW4gPSB0aGlzLT5lbGVtZW50SXNIaWRkZW4oKTsKICAgICBp ZiAoZWxlbWVudElzSGlkZGVuID09IG1fZWxlbWVudElzSGlkZGVuKQogICAgICAgICByZXR1cm47 CiAKQEAgLTgwNTAsOCArODA2NiwxMCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OnNob3VsZE92 ZXJyaWRlQmFja2dyb3VuZFBsYXliYWNrUmVzdHJpY3Rpb24oUGxhdGZvcm1NZWRpYQogICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICNpZiBFTkFCTEUoVklERU9fUFJFU0VOVEFU SU9OX01PREUpCi0gICAgICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVlbk1vZGUgPT0gVmlkZW9GdWxs c2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpCisgICAgICAgIGlmIChtX3ZpZGVvRnVsbHNjcmVl bk1vZGUgPT0gVmlkZW9GdWxsc2NyZWVuTW9kZVBpY3R1cmVJblBpY3R1cmUpIHsKKyAgICAgICAg ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJyZXR1cm5pbmcgdHJ1ZSwgaW4gUGlQIik7CiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQogI2VuZGlmCiAjaWYgRU5BQkxFKE1F RElBX1NUUkVBTSkKICAgICAgICAgaWYgKGhhc01lZGlhU3RyZWFtU3JjT2JqZWN0KCkgJiYgbWVk aWFTdGF0ZSgpLmNvbnRhaW5zQW55KE1lZGlhUHJvZHVjZXJNZWRpYVN0YXRlOjpJc1BsYXlpbmdB dWRpbykgJiYgZG9jdW1lbnQoKS5tZWRpYVN0YXRlKCkuY29udGFpbnNBbnkoTWVkaWFQcm9kdWNl ck1lZGlhU3RhdGU6Okhhc0FjdGl2ZUF1ZGlvQ2FwdHVyZURldmljZSkpIHsKQEAgLTgzMTcsNiAr ODMzNSw3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6aXNWaXNpYmxlSW5WaWV3cG9ydENoYW5n ZWQoKQogewogICAgIGlmIChtX3BsYXllcikKICAgICAgICAgbV9wbGF5ZXItPnNldFZpc2libGVJ blZpZXdwb3J0KGlzVmlzaWJsZUluVmlld3BvcnQoKSk7CisKICAgICBxdWV1ZVRhc2tLZWVwaW5n T2JqZWN0QWxpdmUoKnRoaXMsIFRhc2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgW3RoaXNdIHsKICAg ICAgICAgaWYgKGlzQ29udGV4dFN0b3BwZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTg1 MDcsNiArODUyNiwxNSBAQCBNZWRpYUVsZW1lbnRTZXNzaW9uJiBIVE1MTWVkaWFFbGVtZW50Ojpt ZWRpYVNlc3Npb24oKSBjb25zdAogICAgIHJldHVybiAqbV9tZWRpYVNlc3Npb247CiB9CiAKK3Zv aWQgSFRNTE1lZGlhRWxlbWVudDo6dXBkYXRlTWVkaWFQbGF5ZXIoSW50U2l6ZSBlbGVtZW50U2l6 ZSwgYm9vbCBzaG91bGRNYWludGFpbkFzcGVjdFJhdGlvKQoreworICAgIEFMV0FZU19MT0coTE9H SURFTlRJRklFUik7CisgICAgbV9wbGF5ZXItPnNldFNpemUoZWxlbWVudFNpemUpOworICAgIHZp c2liaWxpdHlTdGF0ZUNoYW5nZWQoKTsKKyAgICBtX3BsYXllci0+c2V0VmlzaWJsZUluVmlld3Bv cnQoaXNWaXNpYmxlSW5WaWV3cG9ydCgpKTsKKyAgICBtX3BsYXllci0+c2V0U2hvdWxkTWFpbnRh aW5Bc3BlY3RSYXRpbyhzaG91bGRNYWludGFpbkFzcGVjdFJhdGlvKTsKK30KKwogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjptZWRpYVBsYXllclF1ZXVlVGFza09uRXZlbnRMb29wKEZ1bmN0aW9uPHZv aWQoKT4mJiB0YXNrKQogewogICAgIGRvY3VtZW50KCkuZXZlbnRMb29wKCkucXVldWVUYXNrKFRh c2tTb3VyY2U6Ok1lZGlhRWxlbWVudCwgV1RGTW92ZSh0YXNrKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDg1MzVmZWQzYzk0YWZiMTQxZWVmYTVlMTE2MmMzNDE3 YjUzMjIxZGQuLmRiNzJkMWViN2NmMWYyZTY1ZWYwMjE2MDkyNTIxMDI2ZTMzOGNlNjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCkBAIC0yOTUsOCArMjk1LDYgQEAgcHVi bGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgd2Via2l0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxl KCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRXZWJraXRDbG9zZWRDYXB0aW9u c1Zpc2libGUoYm9vbCk7CiAKLSAgICBib29sIGVsZW1lbnRJc0hpZGRlbigpIGNvbnN0IHsgcmV0 dXJuIG1fZWxlbWVudElzSGlkZGVuOyB9Ci0KICNpZiBFTkFCTEUoTUVESUFfU1RBVElTVElDUykK IC8vIFN0YXRpc3RpY3MKICAgICB1bnNpZ25lZCB3ZWJraXRBdWRpb0RlY29kZWRCeXRlQ291bnQo KSBjb25zdDsKQEAgLTYwNSw2ICs2MDMsOSBAQCBwdWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9S VCBib29sIG1lZGlhUGxheWVyUmVuZGVyaW5nQ2FuQmVBY2NlbGVyYXRlZCgpIGZpbmFsOwogCisg ICAgdm9pZCB1cGRhdGVNZWRpYVBsYXllcihJbnRTaXplLCBib29sKTsKKyAgICBXRUJDT1JFX0VY UE9SVCBib29sIGVsZW1lbnRJc0hpZGRlbigpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAgICAgSFRN TE1lZGlhRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQmLCBib29sIGNyZWF0 ZWRCeVBhcnNlcik7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhRWxlbWVudCgpOwpAQCAtNjQxLDcg KzY0Miw2IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHNldENoYW5naW5nVmlkZW9GdWxsc2NyZWVu TW9kZShib29sIHZhbHVlKSB7IG1fY2hhbmdpbmdWaWRlb0Z1bGxzY3JlZW5Nb2RlID0gdmFsdWU7 IH0KICAgICBib29sIGlzQ2hhbmdpbmdWaWRlb0Z1bGxzY3JlZW5Nb2RlKCkgY29uc3QgeyByZXR1 cm4gbV9jaGFuZ2luZ1ZpZGVvRnVsbHNjcmVlbk1vZGU7IH0KIAotcHJvdGVjdGVkOgogICAgIHZv aWQgbWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKCkgb3ZlcnJpZGU7CiAKIHByaXZhdGU6CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAppbmRleCBjNTlhNDE4MjU2 M2U2YzAzZjc0MWZlNGNjNzZiY2NkZjRiOWFmNWMyLi4yZDgxZjE0NWFiMDVlOWI2YzBjNTgxY2M5 OGNkOGI0N2RlOTkyNWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxl bWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vz c2lvbi5jcHAKQEAgLTI1Miw3ICsyNTIsNyBAQCB2b2lkIE1lZGlhRWxlbWVudFNlc3Npb246OnZp c2liaWxpdHlDaGFuZ2VkKCkKIAogICAgIGJvb2wgZWxlbWVudElzSGlkZGVuID0gbV9lbGVtZW50 LmVsZW1lbnRJc0hpZGRlbigpOwogCi0gICAgaWYgKGVsZW1lbnRJc0hpZGRlbiAmJiAhbV9lbGVt ZW50LmlzRnVsbHNjcmVlbigpKQorICAgIGlmIChlbGVtZW50SXNIaWRkZW4pCiAgICAgICAgIG1f ZWxlbWVudElzSGlkZGVuVW50aWxWaXNpYmxlSW5WaWV3cG9ydCA9IHRydWU7CiAgICAgZWxzZSBp ZiAobV9lbGVtZW50LmlzVmlzaWJsZUluVmlld3BvcnQoKSkKICAgICAgICAgbV9lbGVtZW50SXNI aWRkZW5VbnRpbFZpc2libGVJblZpZXdwb3J0ID0gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKaW5kZXggNmY0OWFmMDQ2ZDEyNDYz YTRkZWZhOWYxNDg5YTcxNTMyYThkYWY4YS4uMjhhY2NkMTM2OTIzODYzNjdhOWM4MTZlNDNiNjZj MzQ0YzdjYzI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv TWVkaWFQbGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01l ZGlhUGxheWVyLmNwcApAQCAtMTA1OSw2ICsxMDU5LDkgQEAgdm9pZCBNZWRpYVBsYXllcjo6c2V0 VmlzaWJsZUZvckNhbnZhcyhib29sIHZpc2libGUpCiAKIHZvaWQgTWVkaWFQbGF5ZXI6OnNldFZp c2libGVJblZpZXdwb3J0KGJvb2wgdmlzaWJsZSkKIHsKKyAgICBpZiAodmlzaWJsZSA9PSBtX3Zp c2libGVJblZpZXdwb3J0KQorICAgICAgICByZXR1cm47CisKICAgICBtX3Zpc2libGVJblZpZXdw b3J0ID0gdmlzaWJsZTsKICAgICBtX3ByaXZhdGUtPnNldFZpc2libGVJblZpZXdwb3J0KHZpc2li bGUpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTdHJlYW1BVkZPYmpDLm1tCmluZGV4IDRkZDgxYmFhZjk1ODkwNWU2 YWI5NjkyMWZiZmRjZDU3ZGQwZDIwNDMuLmNhYzM1NmZmMTExODM0MGRkNTBkZGE5NjM0NTA3ZjJm ODkzOGY2OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVNZWRpYVN0cmVhbUFWRk9iakMubW0KQEAgLTYzOSw2ICs2MzksNyBA QCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU3RyZWFtQVZGT2JqQzo6c2V0UGFnZUlzVmlz aWJsZShib29sIGlzVmlzaWJsZSkKICAgICBpZiAobV9pc1BhZ2VWaXNpYmxlID09IGlzVmlzaWJs ZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCBpc1Zp c2libGUpOwogICAgIG1faXNQYWdlVmlzaWJsZSA9IGlzVmlzaWJsZTsKICAgICBmbHVzaFJlbmRl cmVycygpOwogICAgIHJlZW5xdWV1ZUN1cnJlbnRWaWRlb1NhbXBsZUlmTmVlZGVkKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAppbmRleCBmMGI2MzQwMDhhNTU2YzVk OTZiOGI4NGQ2NTFmODU4ZWJmYzc2MzFiLi5iYjE1OWU4ZTYyOWQzODNjZjhlY2ZiMmM5ZGNhZWQy NjM0MmE5YzUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlk ZW8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRlby5jcHAKQEAg LTI3MiwxOCArMjcyLDEwIEBAIHZvaWQgUmVuZGVyVmlkZW86OnVwZGF0ZVBsYXllcigpCiAgICAg aWYgKCFtZWRpYVBsYXllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCF2aWRlb0VsZW1l bnQoKS5pbkFjdGl2ZURvY3VtZW50KCkpIHsKLSAgICAgICAgbWVkaWFQbGF5ZXItPnNldFBhZ2VJ c1Zpc2libGUoZmFsc2UpOwotICAgICAgICByZXR1cm47Ci0gICAgfQorICAgIGlmICh2aWRlb0Vs ZW1lbnQoKS5pbkFjdGl2ZURvY3VtZW50KCkpCisgICAgICAgIGNvbnRlbnRDaGFuZ2VkKFZpZGVv Q2hhbmdlZCk7CiAKLSAgICBjb250ZW50Q2hhbmdlZChWaWRlb0NoYW5nZWQpOwotICAgIAotICAg IEludFJlY3QgdmlkZW9Cb3VuZHMgPSB2aWRlb0JveCgpOyAKLSAgICBtZWRpYVBsYXllci0+c2V0 U2l6ZShJbnRTaXplKHZpZGVvQm91bmRzLndpZHRoKCksIHZpZGVvQm91bmRzLmhlaWdodCgpKSk7 Ci0gICAgbWVkaWFQbGF5ZXItPnNldFBhZ2VJc1Zpc2libGUoIXZpZGVvRWxlbWVudCgpLmVsZW1l bnRJc0hpZGRlbigpKTsKLSAgICBtZWRpYVBsYXllci0+c2V0VmlzaWJsZUluVmlld3BvcnQodmlk ZW9FbGVtZW50KCkuaXNWaXNpYmxlSW5WaWV3cG9ydCgpKTsKLSAgICBtZWRpYVBsYXllci0+c2V0 U2hvdWxkTWFpbnRhaW5Bc3BlY3RSYXRpbyhzdHlsZSgpLm9iamVjdEZpdCgpICE9IE9iamVjdEZp dDo6RmlsbCk7CisgICAgdmlkZW9FbGVtZW50KCkudXBkYXRlTWVkaWFQbGF5ZXIodmlkZW9Cb3go KS5zaXplKCksIHN0eWxlKCkub2JqZWN0Rml0KCkgIT0gT2JqZWN0Rml0OjpGaWxsKTsKIH0KIAog TGF5b3V0VW5pdCBSZW5kZXJWaWRlbzo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdpZHRoKFNob3Vs ZENvbXB1dGVQcmVmZXJyZWQgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRl UmVtb3RlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5 ZXJQcml2YXRlUmVtb3RlLmNwcAppbmRleCA0MjY0YTBlZWQxY2JkYjdiMGVkMzc5ZDVmMzRlMTMw MTgzMzY0MDY3Li40NWI1MGQ3MDc4ODQ0YTMyMTJhOTc3NWYwZjBjZGRiZGUzODFiYTFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJp dmF0ZVJlbW90ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9N ZWRpYVBsYXllclByaXZhdGVSZW1vdGUuY3BwCkBAIC01NjUsMTEgKzU2NSwyMSBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZVJlbW90ZTo6cHJlcGFyZUZvclJlbmRlcmluZygpCiAKIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlUmVtb3RlOjpzZXRQYWdlSXNWaXNpYmxlKGJvb2wgdmlzaWJsZSkKIHsK KyAgICBpZiAobV9wYWdlSXNWaXNpYmxlID09IHZpc2libGUpCisgICAgICAgIHJldHVybjsKKwor ICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgdmlzaWJsZSk7CisKKyAgICBtX3BhZ2VJc1Zp c2libGUgPSB2aXNpYmxlOwogICAgIGNvbm5lY3Rpb24oKS5zZW5kKE1lc3NhZ2VzOjpSZW1vdGVN ZWRpYVBsYXllclByb3h5OjpTZXRQYWdlSXNWaXNpYmxlKHZpc2libGUpLCBtX2lkKTsKIH0KIAog dm9pZCBNZWRpYVBsYXllclByaXZhdGVSZW1vdGU6OnNldFNob3VsZE1haW50YWluQXNwZWN0UmF0 aW8oYm9vbCBtYWludGFpblJhdGlvKQogeworICAgIGlmIChtYWludGFpblJhdGlvID09IG1fc2hv dWxkTWFpbnRhaW5Bc3BlY3RSYXRpbykKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9zaG91bGRN YWludGFpbkFzcGVjdFJhdGlvID0gbWFpbnRhaW5SYXRpbzsKICAgICBjb25uZWN0aW9uKCkuc2Vu ZChNZXNzYWdlczo6UmVtb3RlTWVkaWFQbGF5ZXJQcm94eTo6U2V0U2hvdWxkTWFpbnRhaW5Bc3Bl Y3RSYXRpbyhtYWludGFpblJhdGlvKSwgbV9pZCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmggYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL21lZGlhL01lZGlhUGxheWVyUHJpdmF0ZVJlbW90 ZS5oCmluZGV4IDc3NTI3YjBlZTE5Yjc4MTFkMmQ1ZjQzNjM5YmY2OWEwMzdlMDg0YmMuLjdjOGI0 OGRlODE2MzNkYWFiNTU4YzQ4YzJlMWJkODA5MzBiYmM1MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvbWVkaWEvTWVkaWFQbGF5ZXJQcml2YXRlUmVtb3RlLmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9tZWRpYS9NZWRpYVBsYXllclByaXZhdGVS ZW1vdGUuaApAQCAtNDY2LDYgKzQ2Niw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3dhaXRpbmdG b3JLZXkgeyBmYWxzZSB9OwogICAgIGJvb2wgbV90aW1lSXNQcm9ncmVzc2luZyB7IGZhbHNlIH07 CiAgICAgYm9vbCBtX3JlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQgeyBmYWxzZSB9OworICAgIGJv b2wgbV9zaG91bGRNYWludGFpbkFzcGVjdFJhdGlvIHsgZmFsc2UgfTsKKyAgICBib29sIG1fcGFn ZUlzVmlzaWJsZSB7IGZhbHNlIH07CiAgICAgUmVmUHRyPFJlbW90ZVZpZGVvRnJhbWVQcm94eT4g bV92aWRlb0ZyYW1lRm9yQ3VycmVudFRpbWU7CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgUmV0 YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+IG1fcGl4ZWxCdWZmZXJHYXRoZXJlZFdpdGhWaWRlb0Zy YW1lTWV0YWRhdGE7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDg1YjMxYjJkMDhkMDUzMzNhOTlkNDM4NzZkZDdhZGY3Mjc5 MDU0ZS4uMDgyNDgwOTJjZjZlNmYzYWE0M2E2MWU1NzA5ZmUyY2I5YWFiMTVjMSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIyLTAzLTI4ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBw bGUuY29tPgorCisgICAgICAgIFttYWNPU10gTXV0ZWQgdmlkZW8gaXMgc29tZXRpbWVzIHBhdXNl ZCB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzODQ2MgorICAgICAgICByZGFyOi8vODkxMDQyMTYKKworICAg ICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUuCisKKyAgICAgICAgKiBtZWRpYS9mdWxsc2NyZWVu LXdoZW4tbXV0ZWQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9mdWxsc2Ny ZWVuLXdoZW4tbXV0ZWQuaHRtbDogQWRkZWQuCisKIDIwMjItMDMtMTggIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI5MDYyOCk6 IFNjcnViYmVyIG1ha2VzIGEgdmlzdWFsIHRyYWlsIHdoZW4gc2NydWJiaW5nIG9uIHR2LnlvdXR1 YmUuY29tCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9mdWxsc2NyZWVuLXdoZW4tbXV0 ZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvZnVsbHNjcmVlbi13aGVuLW11dGVk LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OTA1MDVhNzk0NzJjOGJmNzcyMzdjMTY0MDhhYjY3 MjZjN2FkNmRkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvZnVsbHNjcmVl bi13aGVuLW11dGVkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEzIEBACitNdXRlZCB2aWRlbyBz aG91bGQgbm90IHBhdXNlIHdoZW4gZW50ZXJpbmcgZnVsbHNjcmVlbi4KKworRVZFTlQoY2FucGxh eXRocm91Z2gpCitFVkVOVChwbGF5aW5nKQorRVhQRUNURUQgKHZpZGVvLm11dGVkID09ICd0cnVl JykgT0sKK0VYUEVDVEVEICh2aWRlby5wYXVzZWQgPT0gJ2ZhbHNlJykgT0sKK0VWRU5UKHdlYmtp dGZ1bGxzY3JlZW5jaGFuZ2UpCitFWFBFQ1RFRCAoZG9jdW1lbnQud2Via2l0RnVsbHNjcmVlbkVs ZW1lbnQgPT0gJ1tvYmplY3QgSFRNTEh0bWxFbGVtZW50XScpIE9LCitFWFBFQ1RFRCAodmlkZW8u bXV0ZWQgPT0gJ3RydWUnKSBPSworRVhQRUNURUQgKHZpZGVvLnBhdXNlZCA9PSAnZmFsc2UnKSBP SworRVZFTlQod2Via2l0ZnVsbHNjcmVlbmNoYW5nZSkKK0VORCBPRiBURVNUCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL21lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC5odG1sIGIvTGF5b3V0 VGVzdHMvbWVkaWEvZnVsbHNjcmVlbi13aGVuLW11dGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzY0MWUx ZTg4NzViN2E2ZDI1YWYxMmQ5NWZhODdhYjYyNDkwOTgzZAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL21lZGlhL2Z1bGxzY3JlZW4td2hlbi1tdXRlZC5odG1sCkBAIC0wLDAgKzEsNDUg QEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPlRlc3QgdGhhdCBtdXRlZCB2aWRlbyBpcyBu b3QgcGF1c2VkIHdoZW4gZW50ZXJpbmcgZnVsbHNjcmVlbjwvdGl0bGU+CisgICAgPHNjcmlwdCBz cmM9Im1lZGlhLWZpbGUuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJ2aWRlby10ZXN0 LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0PgorCisgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoJ2xvYWQnLCBhc3luYyBldmVudCA9PiB7CisgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsK KworICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCd2aWRlbycsICdjb250ZW50L3Rl c3QnKTsKKyAgICAgICAgYXdhaXQgd2FpdEZvcih2aWRlbywgJ2NhbnBsYXl0aHJvdWdoJyk7Cisg ICAgICAgIGZhaWxUZXN0SW4oMTIwMDApOworCisgICAgICAgIHJ1bldpdGhLZXlEb3duKCgpID0+ IHZpZGVvLnBsYXkoKSk7CisgICAgICAgIGF3YWl0IHdhaXRGb3IodmlkZW8sICdwbGF5aW5nJyk7 CisKKyAgICAgICAgdGVzdEV4cGVjdGVkKCd2aWRlby5tdXRlZCcsIHRydWUpOworICAgICAgICB0 ZXN0RXhwZWN0ZWQoJ3ZpZGVvLnBhdXNlZCcsIGZhbHNlKTsKKworICAgICAgICBydW5XaXRoS2V5 RG93bigoKSA9PiBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQud2Via2l0UmVxdWVzdEZ1bGxzY3Jl ZW4oKSApOworCisgICAgICAgIGF3YWl0IHdhaXRGb3IoZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50 LCAnd2Via2l0ZnVsbHNjcmVlbmNoYW5nZScpOworICAgICAgICBhd2FpdCBzbGVlcEZvcigyNTAp OworCisgICAgICAgIHRlc3RFeHBlY3RlZCgnZG9jdW1lbnQud2Via2l0RnVsbHNjcmVlbkVsZW1l bnQnLCBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQpOworICAgICAgICB0ZXN0RXhwZWN0ZWQoJ3Zp ZGVvLm11dGVkJywgdHJ1ZSk7CisgICAgICAgIHRlc3RFeHBlY3RlZCgndmlkZW8ucGF1c2VkJywg ZmFsc2UpOworCisgICAgICAgIHJ1bldpdGhLZXlEb3duKCgpID0+IGRvY3VtZW50LndlYmtpdEV4 aXRGdWxsc2NyZWVuKCkgKTsKKyAgICAgICAgYXdhaXQgd2FpdEZvcihkb2N1bWVudC5kb2N1bWVu dEVsZW1lbnQsICd3ZWJraXRmdWxsc2NyZWVuY2hhbmdlJyk7CisKKyAgICAgICAgZW5kVGVzdCgp OworICAgIH0pOworCisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSA+CisgICAgTXV0ZWQg dmlkZW8gc2hvdWxkIG5vdCBwYXVzZSB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4uPGJyPgorICAg IDxkaXYgaWQ9InBhcmVudCI+CisgICAgICAgIDx2aWRlbyBjb250cm9scyBtdXRlZD48L3ZpZGVv PgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgorCg==