223195 2021-03-15 10:56:31 -0700 [GStreamer] Videos start playing muted in epiphany with no unmute icon visible in tab, webkit_web_view_get_is_muted() returns incorrect results 2021-06-28 10:31:19 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225857 InRadar P2 Normal --- 1 hoboprimate pnormand bugs-noreply calvaris cdumez cgarcia changseok eric.carlson esprehn+autocc ews-watchlist glenn gustavo gyuyoung.kim jer.noble mcatanzaro menard philipj pnormand sergio vjaquez webkit-bug-importer oldest_to_newest 1739527 0 hoboprimate 2021-03-15 10:56:31 -0700 Fedora 34 (alpha) Epiphany 40.beta gstreamer1-1.18.2-2 pipewire-0.3.23-2 Videos played on epiphany start with sound muted and no icon indication in the tab. One has to go to settings > sound and unmute the specific WebKitWebProcess . Can be seen on youtube.com and in other places. Also, a related issue seems to be that (sometimes) the unmute sound icon is not shown in the tab. As in, when playing a video with sound and after clicking the sound icon on the tab to mute, no unmute icon replaces it. 1740663 1 pnormand 2021-03-17 04:46:42 -0700 Works as expected in Ephy TP 40.rc-8-g7ff912064+ 1741127 2 hoboprimate 2021-03-18 03:22:35 -0700 Can't reproduce it anymore since updating to epiphany 40.rc . Should I close this? 1741198 3 mcatanzaro 2021-03-18 07:39:37 -0700 Yeah if you can't reproduce, let's close it. That said, there's little chance that an Epiphany change is related.... 1741692 4 mcatanzaro 2021-03-19 07:32:03 -0700 Reopening because I hit this today myself on youtube.com. Either the WebKitWebProcess set its own volume to zero, or pipewire decided to for some reason. Sadly I'm not sure how to reproduce. 1741697 5 mcatanzaro 2021-03-19 07:42:42 -0700 Ah sorry, it only happens when I mute a YouTube video and then quit Epiphany when the video is playing, such that the YouTube tab is focused when I close the window. If any other tab is focused when closing the browser, then it is not muted when I reopen the browser. That's weird, but the bigger problem is there's no way to unmute. That's because webkit_web_view_is_playing_audio() is broken, which we just discovered recently. I was planning to report a separate bug for that, but maybe I'll repurpose this one, since I think that's what we're really dealing with here.... 1741705 6 mcatanzaro 2021-03-19 07:50:12 -0700 (In reply to hoboprimate from comment #0) > Fedora 34 (alpha) It could be related to pulseaudio -> pipewire? Alex cannot reproduce on F33, but Jan-Michael and I can both reproduce on F34. The bug doesn't seem to be due to any change in WebKit. 1741714 7 mcatanzaro 2021-03-19 08:38:55 -0700 Problem is that after muting the web view, webkit_web_view_is_playing_audio() returns FALSE. That seems kinda reasonable, but it's not what Epiphany and MiniBrowser expect. Both expect use webkit_web_view_is_playing_audio() to decide whether to show the audio indicator, so it needs to return TRUE if audio is playing but muted. Specifically, MiniBrowser does this: g_object_bind_property(tab->webView, "is-playing-audio", tab->titleAudioButton, "visible", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); so once the video is muted, the indicator disappears and there's no way to unmute. 1741738 8 mcatanzaro 2021-03-19 09:27:14 -0700 I found further confirmation in https://bugs.webkit.org/show_bug.cgi?id=176119#c46, where Carlos says setting WebKitWebView:is-muted does not change the state of WebKitWebView:is-playing-audio. So that does appear to be the intended and past behavior. Also, our API docs for WebKitWebView:is-muted say: "Whether the WebKitWebView audio is muted. When TRUE, audio is silenced. It may still be playing, i.e. “is-playing-audio” may be TRUE." So webkit_web_view_get_is_muted() and WebKitWebView:is-muted are returning incorrect results. 1741856 9 mcatanzaro 2021-03-19 13:18:20 -0700 (In reply to Michael Catanzaro from comment #8) > So webkit_web_view_get_is_muted() and WebKitWebView:is-muted are returning > incorrect results. Sorry, Jan-Michael noticed this is a typo. There's nothing wrong with is-muted. The problem is WebKitWebView:is-playing-audio and webkit_web_view_is_playing_audio() return FALSE when the video is muted, but it needs to return TRUE. 1742000 10 pnormand 2021-03-20 03:00:42 -0700 *** Bug 223433 has been marked as a duplicate of this bug. *** 1742012 11 pnormand 2021-03-20 04:26:07 -0700 (In reply to Michael Catanzaro from comment #6) > (In reply to hoboprimate from comment #0) > > Fedora 34 (alpha) > > It could be related to pulseaudio -> pipewire? Alex cannot reproduce on F33, > but Jan-Michael and I can both reproduce on F34. The bug doesn't seem to be > due to any change in WebKit. Can't reproduce on F33 either. I think this could be related with pipewire indded. Please provide logs, as usual. 1742017 12 pnormand 2021-03-20 05:40:14 -0700 OK I've rebased to F34. Can reproduce the issue now: 0:02:25.077821336 69 0x652550 INFO webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1235:isMuted:<media-player-1> Player is muted: false 0:02:25.077855310 69 0x652550 INFO webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1706:setMuted:<media-player-1> Setting muted state to true 0:02:25.078523841 69 0x652550 DEBUG webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1717:notifyPlayerOfMute:<media-player-1> Notifying player of new mute value: false 0:02:25.078564079 69 0x652550 DEBUG webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1653:setVolume:<media-player-1> Setting volume: 0.530206 0:02:25.079093901 69 0x652550 DEBUG webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1684:volumeChangedCallback:<media-player-1> Volume changed to: 0.530206 0:02:25.082536880 69 0x67c2a0 DEBUG webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1684:volumeChangedCallback:<media-player-1> Volume changed to: 0.530206 0:02:25.083244316 69 0x652550 DEBUG webkitmediaplayer MediaPlayerPrivateGStreamer.cpp:1717:notifyPlayerOfMute:<media-player-1> Notifying player of new mute value: true So we call setMuted(true) and get a GObject notification from playbin but the value is false instead of true, and a while later another notification which is correct this time... 1742018 13 pnormand 2021-03-20 06:38:06 -0700 (In reply to Michael Catanzaro from comment #9) > (In reply to Michael Catanzaro from comment #8) > > So webkit_web_view_get_is_muted() and WebKitWebView:is-muted are returning > > incorrect results. > > Sorry, Jan-Michael noticed this is a typo. There's nothing wrong with > is-muted. The problem is WebKitWebView:is-playing-audio and > webkit_web_view_is_playing_audio() return FALSE when the video is muted, but > it needs to return TRUE. MediaProducer::MediaStateFlags HTMLMediaElement::mediaState() const { ... if (hasAudio && !muted() && volume()) state |= IsPlayingAudio; } So that's why webkit_web_view_is_playing_audio() returns FALSE when the video is muted. 1742019 14 mcatanzaro 2021-03-20 07:53:51 -0700 (In reply to Philippe Normand from comment #13) > MediaProducer::MediaStateFlags HTMLMediaElement::mediaState() const > { > ... > if (hasAudio && !muted() && volume()) > state |= IsPlayingAudio; > } > > So that's why webkit_web_view_is_playing_audio() returns FALSE when the > video is muted. I found that yesterday and thought it looked concerning, given the API requires different behavior, but it clearly didn't work before now. Any ideas what the path forward is? Do we dare try changing that...? 1742021 15 pnormand 2021-03-20 08:17:14 -0700 (In reply to Michael Catanzaro from comment #14) > (In reply to Philippe Normand from comment #13) > > MediaProducer::MediaStateFlags HTMLMediaElement::mediaState() const > > { > > ... > > if (hasAudio && !muted() && volume()) > > state |= IsPlayingAudio; > > } > > > > So that's why webkit_web_view_is_playing_audio() returns FALSE when the > > video is muted. > > I found that yesterday and thought it looked concerning, given the API > requires different behavior, but it clearly didn't work before now. > > Any ideas what the path forward is? Do we dare try changing that...? I'm not sure what to do yet. I think there are 3 issues: - muting the WebProcess from the GNOME settings makes the speaker icon disappear from the MB tab that is playing media - there's a racy behavior where muting audio through the MB speaker icon sometimes makes it disappear - if a WebProcess was muted from GNOME settings and the browser is closed, reopening it and playing media leads to muted audio and invisible speaker icon in the tab 1742901 16 pnormand 2021-03-23 10:33:30 -0700 I've updated to Pipewire 0.3.24 and am now unable to reproduce this issue here. Can you check as well please? 1742902 17 pnormand 2021-03-23 10:34:33 -0700 Dang it, scratch this, it's a racy speaker icon disappearance. 1744606 18 424491 pnormand 2021-03-28 03:52:54 -0700 Created attachment 424491 Patch 1744610 19 424494 pnormand 2021-03-28 05:32:48 -0700 Created attachment 424494 Patch 1744638 20 424494 eric.carlson 2021-03-28 13:04:17 -0700 Comment on attachment 424494 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424494&action=review > Source/WebCore/html/HTMLMediaElement.cpp:7690 > + bool isPlayingAudio = hasAudio && volume(); Shouldn't this be `bool isPlayingAudio = hasAudio && !muted() && volume()` to avoid changing behavior on non-GStreamer ports? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1678 > + auto volume = this->volume(); > + auto oldVolume = volume; > + > // get_volume() can return values superior to 1.0 if the user > // applies software user gain via third party application (GNOME > // volume control for instance). > volume = CLAMP(volume, 0.0, 1.0); Nit: this would be sightly more efficient as: auto oldVolume = this->volume(); auto volume = CLAMP(oldVolume, 0.0, 1.0); 1744653 21 424494 mcatanzaro 2021-03-28 15:15:02 -0700 Comment on attachment 424494 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424494&action=review >> Source/WebCore/html/HTMLMediaElement.cpp:7690 >> + bool isPlayingAudio = hasAudio && volume(); > > Shouldn't this be `bool isPlayingAudio = hasAudio && !muted() && volume()` to avoid changing behavior on non-GStreamer ports? On non-GStreamer ports, && !muted is tested on the next line. It's an #if !USE(GSTREAMER) condition. 1744694 22 424494 cgarcia 2021-03-28 23:22:45 -0700 Comment on attachment 424494 Patch Would it be possible to add a unit test to check the fixed behavior? 1745096 23 pnormand 2021-03-30 06:25:36 -0700 (In reply to Carlos Garcia Campos from comment #22) > Comment on attachment 424494 [details] > Patch > > Would it be possible to add a unit test to check the fixed behavior? Yes I think so, at least update existing API tests. The current ones don't test mixed usage of the is_playing_audio and is_muted APIs, which is not great because in practice we do use both in interesting ways. 1746431 24 424998 pnormand 2021-04-02 02:26:14 -0700 Created attachment 424998 Patch 1746487 25 424998 mcatanzaro 2021-04-02 07:20:30 -0700 Comment on attachment 424998 Patch New API test is r=me, though 50ms * 20 = 1 second, which is a little long for a test. (I would be more concerned if this were a layout test. We don't have so many API tests that one extra second would be a big deal.) (You already have Eric's r+ for the media changes.) 1747817 26 425368 pnormand 2021-04-07 01:54:21 -0700 Created attachment 425368 Patch 1747818 27 pnormand 2021-04-07 01:54:55 -0700 (In reply to Michael Catanzaro from comment #25) > Comment on attachment 424998 [details] > Patch > > New API test is r=me, though 50ms * 20 = 1 second, which is a little long > for a test. (I would be more concerned if this were a layout test. We don't > have so many API tests that one extra second would be a big deal.) > > (You already have Eric's r+ for the media changes.) I´ve changed it to 500ms. 1747819 28 425369 pnormand 2021-04-07 01:59:01 -0700 Created attachment 425369 Patch 1747835 29 ews-feeder 2021-04-07 02:58:58 -0700 Committed r275600: <https://commits.webkit.org/r275600> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425369. 1747836 30 webkit-bug-importer 2021-04-07 02:59:25 -0700 <rdar://problem/76330028> 1760286 31 mcatanzaro 2021-05-14 16:18:22 -0700 Hm, this is not completely fixed. We are still sometimes starting youtube videos without any sound. However, since 2.32.1, it's now always possible to fix it by pausing and restarting the video without having to modify system sound settings, so that is an improvement at least. Do you want a fresh bug report? Unfortunately I can't reproduce it on demand, so no logs yet. 1760606 32 pnormand 2021-05-16 08:35:23 -0700 New bug yes please. 1760640 33 mcatanzaro 2021-05-16 11:35:32 -0700 Bug #225857. 1761807 34 mcatanzaro 2021-05-19 18:19:10 -0700 Unfortunately I am still seeing this with 2.32.1... it's happened twice now in the past couple days. This seems to be a separate issue from bug #225857. 1762341 35 pnormand 2021-05-21 02:50:08 -0700 I'm lost in the backlog... what are the steps to reproduce this? 1762403 36 mcatanzaro 2021-05-21 07:25:25 -0700 (In reply to Philippe Normand from comment #35) > I'm lost in the backlog... what are the steps to reproduce this? We don't know, that's the problem. I think it's a race condition, so it's down to luck.... 1762404 37 mcatanzaro 2021-05-21 07:28:10 -0700 (In reply to Michael Catanzaro from comment #31) > Hm, this is not completely fixed. We are still sometimes starting youtube > videos without any sound. However, since 2.32.1, it's now always possible to > fix it by pausing and restarting the video without having to modify system > sound settings, so that is an improvement at least. To be clear: this is wrong, you still sometimes have to modify system sound settings to get the sound back, that's why I reopened this bug. When it happens, it happens to many tabs all at once. I'm not sure, but I think maybe the affected tabs are somehow inheriting volume level from one another? 1773121 38 mcatanzaro 2021-06-28 10:31:19 -0700 (In reply to Michael Catanzaro from comment #37) > To be clear: this is wrong, you still sometimes have to modify system sound > settings to get the sound back, that's why I reopened this bug. I'm not seeing this anymore, so closing again. We still have bug #225857 that occurs regularly, though. 424491 2021-03-28 03:52:54 -0700 2021-03-28 05:32:42 -0700 Patch bug-223195-20210328035253.patch text/plain 5455 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjkxODQ3MDkyZmVmMzFm ZWYxZmZjNDY1ZmVjNmMzMTQyMmVhOGY1MS4uMjE4MTA5NjNhMThjOWI4ODNkNzFmYjYzZTg1OGQ2 ZGQzYmMwMWRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAzLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBWaWRlb3Mgc3RhcnQgcGxheWluZyBtdXRlZCBpbiBlcGlwaGFueSB3aXRoIG5vIHVubXV0ZSBp Y29uIHZpc2libGUgaW4gdGFiLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKCkgcmV0dXJu cyBpbmNvcnJlY3QgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV0lQCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdGF0ZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5n ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmlzTXV0ZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjp2b2x1bWUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZlZvbHVtZUNoYW5nZSk6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldE11dGVkKToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVy T2ZNdXRlKToKKwogMjAyMS0wMy0yNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KIAogICAgICAgICBBbGxvdyBEaXNwbGF5UmVmcmVzaE1vbml0b3IgdG8gYmUgbW9yZSBs b25nLWxpdmVkIG9iamVjdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CmluZGV4IGNiYzU5OTAwN2Y4N2JmYjk4ZGNjNDUxNzRlZDQ4NDQ1YmYzOTMzZWIuLjVlZGFhZWU4 NjM5MGQ3ZWY0MjQ0YjU0YjRhYmE1NTc3YWM0MmFkMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNzY4NCw3ICs3Njg0LDE0IEBAIE1lZGlhUHJvZHVjZXI6 Ok1lZGlhU3RhdGVGbGFncyBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKCkgY29uc3QKICAg ICBpZiAoIWlzUGxheWluZygpKQogICAgICAgICByZXR1cm4gc3RhdGU7CiAKLSAgICBpZiAoaGFz QXVkaW8gJiYgIW11dGVkKCkgJiYgdm9sdW1lKCkpCisgICAgLy8gRm9yIEdTdHJlYW1lciBwb3J0 cyB0aGUgc2VtYW50aWNzIG9mIElzUGxheWluZ0F1ZGlvIHNsaWdodGx5IGRpZmZlciBmcm9tIEFw cGxlIHBvcnRzLiBUaGUKKyAgICAvLyB3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbygp IEFQSSBpcyBleHBlY3RlZCB0byByZXR1cm4gdHJ1ZSBpZiBhIHBhZ2UgaXMgcHJvZHVjaW5nCisg ICAgLy8gYXVkaW8gZXZlbiB0aG91Z2ggaXQgbWlnaHQgYmUgbXV0ZWQuCisgICAgYm9vbCBpc1Bs YXlpbmdBdWRpbyA9IGhhc0F1ZGlvICYmIHZvbHVtZSgpOworI2lmICFVU0UoR1NUUkVBTUVSKQor ICAgIGlzUGxheWluZ0F1ZGlvID0gaXNQbGF5aW5nQXVkaW8gJiYgIW11dGVkKCk7CisjZW5kaWYK KyAgICBpZiAoaXNQbGF5aW5nQXVkaW8pCiAgICAgICAgIHN0YXRlIHw9IElzUGxheWluZ0F1ZGlv OwogCiAgICAgaWYgKGhhc0FjdGl2ZVZpZGVvKQpAQCAtNzc0MSw5ICs3NzQ4LDEwIEBAIHZvaWQg SFRNTE1lZGlhRWxlbWVudDo6c2V0QXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUoQXV0b3BsYXlF dmVudFBsYXliYWNrU3RhdGUKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwYWdlTXV0ZWRTdGF0 ZURpZENoYW5nZSgpCiB7Ci0gICAgdXBkYXRlVm9sdW1lKCk7Ci0KICAgICBpZiAoUGFnZSogcGFn ZSA9IGRvY3VtZW50KCkucGFnZSgpKSB7CisgICAgICAgIC8vIFByb3BhZ2F0ZSB0aGUgbmV3IHN0 YXRlIHRvIHRoZSBwbGF0Zm9ybSBwbGF5ZXIuCisgICAgICAgIGlmIChtX3BsYXllcikKKyAgICAg ICAgICAgIG1fcGxheWVyLT5zZXRNdXRlZChwYWdlLT5pc0F1ZGlvTXV0ZWQoKSk7CiAgICAgICAg IGlmIChoYXNBdWRpbygpICYmICFtdXRlZCgpICYmIHBhZ2UtPmlzQXVkaW9NdXRlZCgpKQogICAg ICAgICAgICAgdXNlckRpZEludGVyZmVyZVdpdGhBdXRvcGxheSgpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggMmNkYzk0NmRj YTgyZGY1NjI5NGRhMzU5NGJkOTY5NjJkMWQyOWY5Ni4uNmJhZGEzMGIzMjU2MzZlMmVjMDM2ZDA1 ODE4YTVmN2JkYTJiNWY4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAKQEAgLTEyMzIsNyArMTIzMiw3IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjppc011dGVkKCkgY29uc3QKIAogICAgIGdib29sZWFuIGlzTXV0ZWQ7CiAg ICAgZ19vYmplY3RfZ2V0KG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgIm11dGUiLCAmaXNNdXRlZCwg bnVsbHB0cik7Ci0gICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJQbGF5ZXIgaXMgbXV0 ZWQ6ICVzIiwgYm9vbEZvclByaW50aW5nKCEhaXNNdXRlZCkpOworICAgIEdTVF9JTkZPX09CSkVD VChwaXBlbGluZSgpLCAiUGxheWVyIGlzIG11dGVkOiAlcyIsIGJvb2xGb3JQcmludGluZyhpc011 dGVkKSk7CiAgICAgcmV0dXJuIGlzTXV0ZWQ7CiB9CiAKQEAgLTE2NTksMjAgKzE2NTksMjYgQEAg ZmxvYXQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2b2x1bWUoKSBjb25zdAogICAgIGlm ICghbV92b2x1bWVFbGVtZW50KQogICAgICAgICByZXR1cm4gMDsKIAotICAgIHJldHVybiBnc3Rf c3RyZWFtX3ZvbHVtZV9nZXRfdm9sdW1lKG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgR1NUX1NUUkVB TV9WT0xVTUVfRk9STUFUX0xJTkVBUik7CisgICAgYXV0byB2b2x1bWUgPSBnc3Rfc3RyZWFtX3Zv bHVtZV9nZXRfdm9sdW1lKG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVf Rk9STUFUX0xJTkVBUik7CisgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVm9sdW1l OiAlZiIsIHZvbHVtZSk7CisgICAgcmV0dXJuIHZvbHVtZTsKIH0KIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mVm9sdW1lQ2hhbmdlKCkKIHsKICAgICBp ZiAoIW1fcGxheWVyIHx8ICFtX3ZvbHVtZUVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKLSAgICBk b3VibGUgdm9sdW1lOwotICAgIHZvbHVtZSA9IGdzdF9zdHJlYW1fdm9sdW1lX2dldF92b2x1bWUo bV92b2x1bWVFbGVtZW50LmdldCgpLCBHU1RfU1RSRUFNX1ZPTFVNRV9GT1JNQVRfTElORUFSKTsK KworICAgIGF1dG8gdm9sdW1lID0gdGhpcy0+dm9sdW1lKCk7CisgICAgYXV0byBvbGRWb2x1bWUg PSB2b2x1bWU7CisKICAgICAvLyBnZXRfdm9sdW1lKCkgY2FuIHJldHVybiB2YWx1ZXMgc3VwZXJp b3IgdG8gMS4wIGlmIHRoZSB1c2VyCiAgICAgLy8gYXBwbGllcyBzb2Z0d2FyZSB1c2VyIGdhaW4g dmlhIHRoaXJkIHBhcnR5IGFwcGxpY2F0aW9uIChHTk9NRQogICAgIC8vIHZvbHVtZSBjb250cm9s IGZvciBpbnN0YW5jZSkuCiAgICAgdm9sdW1lID0gQ0xBTVAodm9sdW1lLCAwLjAsIDEuMCk7Ci0g ICAgbV9wbGF5ZXItPnZvbHVtZUNoYW5nZWQoc3RhdGljX2Nhc3Q8ZmxvYXQ+KHZvbHVtZSkpOwor ICAgIGlmICh2b2x1bWUgIT0gb2xkVm9sdW1lKQorICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHBp cGVsaW5lKCksICJWb2x1bWUgdmFsdWUgKCVmKSB3YXMgbm90IGluIFswLDFdIHJhbmdlLiBDbGFt cGVkIHRvICVmIiwgb2xkVm9sdW1lLCB2b2x1bWUpOworICAgIG1fcGxheWVyLT52b2x1bWVDaGFu Z2VkKHZvbHVtZSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2b2x1 bWVDaGFuZ2VkQ2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKiBwbGF5ZXIpCkBA IC0xNzAzLDcgKzE3MDksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0 TXV0ZWQoYm9vbCBzaG91bGRNdXRlKQogICAgIGlmICghbV92b2x1bWVFbGVtZW50IHx8IHNob3Vs ZE11dGUgPT0gaXNNdXRlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBHU1RfSU5GT19PQkpF Q1QocGlwZWxpbmUoKSwgIk11dGVkPyAlcyIsIGJvb2xGb3JQcmludGluZyhzaG91bGRNdXRlKSk7 CisgICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJTZXR0aW5nIG11dGVkIHN0YXRlIHRv ICVzIiwgYm9vbEZvclByaW50aW5nKHNob3VsZE11dGUpKTsKICAgICBnX29iamVjdF9zZXQobV92 b2x1bWVFbGVtZW50LmdldCgpLCAibXV0ZSIsIHNob3VsZE11dGUsIG51bGxwdHIpOwogfQogCkBA IC0xNzE0LDYgKzE3MjAsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90 aWZ5UGxheWVyT2ZNdXRlKCkKIAogICAgIGdib29sZWFuIG11dGVkOwogICAgIGdfb2JqZWN0X2dl dChtX3ZvbHVtZUVsZW1lbnQuZ2V0KCksICJtdXRlIiwgJm11dGVkLCBudWxscHRyKTsKKyAgICBH U1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lKCksICJOb3RpZnlpbmcgcGxheWVyIG9mIG5ldyBtdXRl IHZhbHVlOiAlcyIsIGJvb2xGb3JQcmludGluZyhtdXRlZCkpOwogICAgIG1fcGxheWVyLT5tdXRl Q2hhbmdlZChzdGF0aWNfY2FzdDxib29sPihtdXRlZCkpOwogfQogCg== 424494 2021-03-28 05:32:48 -0700 2021-04-02 02:26:07 -0700 Patch bug-223195-20210328053247.patch text/plain 5826 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjkxODQ3MDkyZmVmMzFm ZWYxZmZjNDY1ZmVjNmMzMTQyMmVhOGY1MS4uOTk1YzhiNzVlMmRiNjFlNjA3OTgwOWQwZTRhN2E4 NDdmMjBkNGMyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAzLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBWaWRlb3Mgc3RhcnQgcGxheWluZyBtdXRlZCBpbiBlcGlwaGFueSB3aXRoIG5vIHVubXV0ZSBp Y29uIHZpc2libGUgaW4gdGFiLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKCkgcmV0dXJu cyBpbmNvcnJlY3QgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRm9yIEdTdHJlYW1lciBwb3J0cyB0aGUgc2VtYW50aWNzIG9mIElzUGxheWlu Z0F1ZGlvIHNsaWdodGx5IGRpZmZlciBmcm9tIEFwcGxlIHBvcnRzLiBUaGUKKyAgICAgICAgd2Vi a2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8oKSBBUEkgaXMgZXhwZWN0ZWQgdG8gcmV0dXJu IHRydWUgaWYgYSBwYWdlIGlzIHByb2R1Y2luZworICAgICAgICBhdWRpbyBldmVuIHRob3VnaCBp dCBtaWdodCBiZSBtdXRlZC4KKworICAgICAgICBUaGUgc2Vjb25kIGNoYW5nZSBhZmZlY3RzIHRo ZSBwcml2YXRlIHBsYXllciBtdXRlIHN0YXRlIHdoZW4gdGhlIHBhZ2UgbXV0ZSBzdGF0ZSBoYXMg YmVlbgorICAgICAgICB1cGRhdGVkLgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhU3RhdGUgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFnZU11dGVkU3RhdGVE aWRDaGFuZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwOiBMb2dnaW5nIGltcHJvdmVtZW50cy4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aXNNdXRlZCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZvbHVtZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlm eVBsYXllck9mVm9sdW1lQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6c2V0TXV0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZk11dGUpOgorCiAyMDIxLTAzLTI3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IERpc3Bs YXlSZWZyZXNoTW9uaXRvciB0byBiZSBtb3JlIGxvbmctbGl2ZWQgb2JqZWN0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggY2JjNTk5MDA3Zjg3YmZiOThkY2M0 NTE3NGVkNDg0NDViZjM5MzNlYi4uNWVkYWFlZTg2MzkwZDdlZjQyNDRiNTRiNGFiYTU1NzdhYzQy YWQyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC03Njg0 LDcgKzc2ODQsMTQgQEAgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIEhUTUxNZWRpYUVs ZW1lbnQ6Om1lZGlhU3RhdGUoKSBjb25zdAogICAgIGlmICghaXNQbGF5aW5nKCkpCiAgICAgICAg IHJldHVybiBzdGF0ZTsKIAotICAgIGlmIChoYXNBdWRpbyAmJiAhbXV0ZWQoKSAmJiB2b2x1bWUo KSkKKyAgICAvLyBGb3IgR1N0cmVhbWVyIHBvcnRzIHRoZSBzZW1hbnRpY3Mgb2YgSXNQbGF5aW5n QXVkaW8gc2xpZ2h0bHkgZGlmZmVyIGZyb20gQXBwbGUgcG9ydHMuIFRoZQorICAgIC8vIHdlYmtp dF93ZWJfdmlld19pc19wbGF5aW5nX2F1ZGlvKCkgQVBJIGlzIGV4cGVjdGVkIHRvIHJldHVybiB0 cnVlIGlmIGEgcGFnZSBpcyBwcm9kdWNpbmcKKyAgICAvLyBhdWRpbyBldmVuIHRob3VnaCBpdCBt aWdodCBiZSBtdXRlZC4KKyAgICBib29sIGlzUGxheWluZ0F1ZGlvID0gaGFzQXVkaW8gJiYgdm9s dW1lKCk7CisjaWYgIVVTRShHU1RSRUFNRVIpCisgICAgaXNQbGF5aW5nQXVkaW8gPSBpc1BsYXlp bmdBdWRpbyAmJiAhbXV0ZWQoKTsKKyNlbmRpZgorICAgIGlmIChpc1BsYXlpbmdBdWRpbykKICAg ICAgICAgc3RhdGUgfD0gSXNQbGF5aW5nQXVkaW87CiAKICAgICBpZiAoaGFzQWN0aXZlVmlkZW8p CkBAIC03NzQxLDkgKzc3NDgsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRBdXRvcGxh eUV2ZW50UGxheWJhY2tTdGF0ZShBdXRvcGxheUV2ZW50UGxheWJhY2tTdGF0ZQogCiB2b2lkIEhU TUxNZWRpYUVsZW1lbnQ6OnBhZ2VNdXRlZFN0YXRlRGlkQ2hhbmdlKCkKIHsKLSAgICB1cGRhdGVW b2x1bWUoKTsKLQogICAgIGlmIChQYWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCkpIHsKKyAg ICAgICAgLy8gUHJvcGFnYXRlIHRoZSBuZXcgc3RhdGUgdG8gdGhlIHBsYXRmb3JtIHBsYXllci4K KyAgICAgICAgaWYgKG1fcGxheWVyKQorICAgICAgICAgICAgbV9wbGF5ZXItPnNldE11dGVkKHBh Z2UtPmlzQXVkaW9NdXRlZCgpKTsKICAgICAgICAgaWYgKGhhc0F1ZGlvKCkgJiYgIW11dGVkKCkg JiYgcGFnZS0+aXNBdWRpb011dGVkKCkpCiAgICAgICAgICAgICB1c2VyRGlkSW50ZXJmZXJlV2l0 aEF1dG9wbGF5KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcAppbmRleCAyY2RjOTQ2ZGNhODJkZjU2Mjk0ZGEzNTk0YmQ5Njk2MmQxZDI5 Zjk2Li42YmFkYTMwYjMyNTYzNmUyZWMwMzZkMDU4MThhNWY3YmRhMmI1Zjg5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTIzMiw3ICsx MjMyLDcgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmlzTXV0ZWQoKSBjb25z dAogCiAgICAgZ2Jvb2xlYW4gaXNNdXRlZDsKICAgICBnX29iamVjdF9nZXQobV92b2x1bWVFbGVt ZW50LmdldCgpLCAibXV0ZSIsICZpc011dGVkLCBudWxscHRyKTsKLSAgICBHU1RfSU5GT19PQkpF Q1QocGlwZWxpbmUoKSwgIlBsYXllciBpcyBtdXRlZDogJXMiLCBib29sRm9yUHJpbnRpbmcoISFp c011dGVkKSk7CisgICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJQbGF5ZXIgaXMgbXV0 ZWQ6ICVzIiwgYm9vbEZvclByaW50aW5nKGlzTXV0ZWQpKTsKICAgICByZXR1cm4gaXNNdXRlZDsK IH0KIApAQCAtMTY1OSwyMCArMTY1OSwyNiBAQCBmbG9hdCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OnZvbHVtZSgpIGNvbnN0CiAgICAgaWYgKCFtX3ZvbHVtZUVsZW1lbnQpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgcmV0dXJuIGdzdF9zdHJlYW1fdm9sdW1lX2dldF92b2x1bWUobV92 b2x1bWVFbGVtZW50LmdldCgpLCBHU1RfU1RSRUFNX1ZPTFVNRV9GT1JNQVRfTElORUFSKTsKKyAg ICBhdXRvIHZvbHVtZSA9IGdzdF9zdHJlYW1fdm9sdW1lX2dldF92b2x1bWUobV92b2x1bWVFbGVt ZW50LmdldCgpLCBHU1RfU1RSRUFNX1ZPTFVNRV9GT1JNQVRfTElORUFSKTsKKyAgICBHU1RfREVC VUdfT0JKRUNUKHBpcGVsaW5lKCksICJWb2x1bWU6ICVmIiwgdm9sdW1lKTsKKyAgICByZXR1cm4g dm9sdW1lOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxh eWVyT2ZWb2x1bWVDaGFuZ2UoKQogewogICAgIGlmICghbV9wbGF5ZXIgfHwgIW1fdm9sdW1lRWxl bWVudCkKICAgICAgICAgcmV0dXJuOwotICAgIGRvdWJsZSB2b2x1bWU7Ci0gICAgdm9sdW1lID0g Z3N0X3N0cmVhbV92b2x1bWVfZ2V0X3ZvbHVtZShtX3ZvbHVtZUVsZW1lbnQuZ2V0KCksIEdTVF9T VFJFQU1fVk9MVU1FX0ZPUk1BVF9MSU5FQVIpOworCisgICAgYXV0byB2b2x1bWUgPSB0aGlzLT52 b2x1bWUoKTsKKyAgICBhdXRvIG9sZFZvbHVtZSA9IHZvbHVtZTsKKwogICAgIC8vIGdldF92b2x1 bWUoKSBjYW4gcmV0dXJuIHZhbHVlcyBzdXBlcmlvciB0byAxLjAgaWYgdGhlIHVzZXIKICAgICAv LyBhcHBsaWVzIHNvZnR3YXJlIHVzZXIgZ2FpbiB2aWEgdGhpcmQgcGFydHkgYXBwbGljYXRpb24g KEdOT01FCiAgICAgLy8gdm9sdW1lIGNvbnRyb2wgZm9yIGluc3RhbmNlKS4KICAgICB2b2x1bWUg PSBDTEFNUCh2b2x1bWUsIDAuMCwgMS4wKTsKLSAgICBtX3BsYXllci0+dm9sdW1lQ2hhbmdlZChz dGF0aWNfY2FzdDxmbG9hdD4odm9sdW1lKSk7CisgICAgaWYgKHZvbHVtZSAhPSBvbGRWb2x1bWUp CisgICAgICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIlZvbHVtZSB2YWx1ZSAoJWYp IHdhcyBub3QgaW4gWzAsMV0gcmFuZ2UuIENsYW1wZWQgdG8gJWYiLCBvbGRWb2x1bWUsIHZvbHVt ZSk7CisgICAgbV9wbGF5ZXItPnZvbHVtZUNoYW5nZWQodm9sdW1lKTsKIH0KIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnZvbHVtZUNoYW5nZWRDYWxsYmFjayhNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIqIHBsYXllcikKQEAgLTE3MDMsNyArMTcwOSw3IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRNdXRlZChib29sIHNob3VsZE11dGUpCiAgICAg aWYgKCFtX3ZvbHVtZUVsZW1lbnQgfHwgc2hvdWxkTXV0ZSA9PSBpc011dGVkKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiTXV0ZWQ/ICVzIiwg Ym9vbEZvclByaW50aW5nKHNob3VsZE11dGUpKTsKKyAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxp bmUoKSwgIlNldHRpbmcgbXV0ZWQgc3RhdGUgdG8gJXMiLCBib29sRm9yUHJpbnRpbmcoc2hvdWxk TXV0ZSkpOwogICAgIGdfb2JqZWN0X3NldChtX3ZvbHVtZUVsZW1lbnQuZ2V0KCksICJtdXRlIiwg c2hvdWxkTXV0ZSwgbnVsbHB0cik7CiB9CiAKQEAgLTE3MTQsNiArMTcyMCw3IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQbGF5ZXJPZk11dGUoKQogCiAgICAgZ2Jv b2xlYW4gbXV0ZWQ7CiAgICAgZ19vYmplY3RfZ2V0KG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgIm11 dGUiLCAmbXV0ZWQsIG51bGxwdHIpOworICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwg Ik5vdGlmeWluZyBwbGF5ZXIgb2YgbmV3IG11dGUgdmFsdWU6ICVzIiwgYm9vbEZvclByaW50aW5n KG11dGVkKSk7CiAgICAgbV9wbGF5ZXItPm11dGVDaGFuZ2VkKHN0YXRpY19jYXN0PGJvb2w+KG11 dGVkKSk7CiB9CiAK 424998 2021-04-02 02:26:14 -0700 2021-04-07 01:54:14 -0700 Patch bug-223195-20210402022612.patch text/plain 9690 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjMyMDQ1YTI3ZTFjYTZi ZDk3MjdhNzQxMTFhOTk0ZjBkNGVmYjQ2Zi4uZTBkYTYyYTJmOGUzOTIwMDU0MGNjMmRkZjBkM2Q0 NDA4NWQ3YjEzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTAzLTI5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBWaWRlb3Mgc3RhcnQgcGxheWluZyBtdXRlZCBpbiBlcGlwaGFueSB3aXRoIG5vIHVubXV0ZSBp Y29uIHZpc2libGUgaW4gdGFiLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKCkgcmV0dXJu cyBpbmNvcnJlY3QgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgor CisgICAgICAgIEZvciBHU3RyZWFtZXIgcG9ydHMgdGhlIHNlbWFudGljcyBvZiBJc1BsYXlpbmdB dWRpbyBzbGlnaHRseSBkaWZmZXIgZnJvbSBBcHBsZSBwb3J0cy4gVGhlCisgICAgICAgIHdlYmtp dF93ZWJfdmlld19pc19wbGF5aW5nX2F1ZGlvKCkgQVBJIGlzIGV4cGVjdGVkIHRvIHJldHVybiB0 cnVlIGlmIGEgcGFnZSBpcyBwcm9kdWNpbmcKKyAgICAgICAgYXVkaW8gZXZlbiB0aG91Z2ggaXQg bWlnaHQgYmUgbXV0ZWQuCisKKyAgICAgICAgVGhlIHNlY29uZCBjaGFuZ2UgYWZmZWN0cyB0aGUg cHJpdmF0ZSBwbGF5ZXIgbXV0ZSBzdGF0ZSB3aGVuIHRoZSBwYWdlIG11dGUgc3RhdGUgaGFzIGJl ZW4KKyAgICAgICAgdXBkYXRlZC4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VNdXRlZFN0YXRlRGlk Q2hhbmdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDogTG9nZ2luZyBpbXByb3ZlbWVudHMuCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmlzTXV0ZWQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2b2x1bWUgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQ bGF5ZXJPZlZvbHVtZUNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnNldE11dGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZNdXRlKToKKwogMjAyMS0wNC0wMiAgUGhpbGlw cGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihy MjY4MTc2KTogW0dTdHJlYW1lcl0gbWVkaWEvdmlkZW8tb3JpZW50YXRpb24tY2FudmFzLmh0bWwg ZmFpbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDM4MzRm MTZmNTE5ZGVhMjc2ZWNlYWIyYjRjYTI0ZWFjZDQ2NGYzYzYuLjkwN2ZhNzI2ZDBhMDJjYzA5ZTVh NTBiYmUzNDY0MThhNWJiM2E1Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcApAQCAtNzcyMSw3ICs3NzIxLDE0IEBAIE1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RhdGVG bGFncyBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKCkgY29uc3QKICAgICBpZiAoIWlzUGxh eWluZygpKQogICAgICAgICByZXR1cm4gc3RhdGU7CiAKLSAgICBpZiAoaGFzQXVkaW8gJiYgIW11 dGVkKCkgJiYgdm9sdW1lKCkpCisgICAgLy8gRm9yIEdTdHJlYW1lciBwb3J0cyB0aGUgc2VtYW50 aWNzIG9mIElzUGxheWluZ0F1ZGlvIHNsaWdodGx5IGRpZmZlciBmcm9tIEFwcGxlIHBvcnRzLiBU aGUKKyAgICAvLyB3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbygpIEFQSSBpcyBleHBl Y3RlZCB0byByZXR1cm4gdHJ1ZSBpZiBhIHBhZ2UgaXMgcHJvZHVjaW5nCisgICAgLy8gYXVkaW8g ZXZlbiB0aG91Z2ggaXQgbWlnaHQgYmUgbXV0ZWQuCisgICAgYm9vbCBpc1BsYXlpbmdBdWRpbyA9 IGhhc0F1ZGlvICYmIHZvbHVtZSgpOworI2lmICFVU0UoR1NUUkVBTUVSKQorICAgIGlzUGxheWlu Z0F1ZGlvID0gaXNQbGF5aW5nQXVkaW8gJiYgIW11dGVkKCk7CisjZW5kaWYKKyAgICBpZiAoaXNQ bGF5aW5nQXVkaW8pCiAgICAgICAgIHN0YXRlIHw9IElzUGxheWluZ0F1ZGlvOwogCiAgICAgaWYg KGhhc0FjdGl2ZVZpZGVvKQpAQCAtNzc3OCw5ICs3Nzg1LDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6c2V0QXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUoQXV0b3BsYXlFdmVudFBsYXliYWNr U3RhdGUKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgp CiB7Ci0gICAgdXBkYXRlVm9sdW1lKCk7Ci0KICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50 KCkucGFnZSgpKSB7CisgICAgICAgIC8vIFByb3BhZ2F0ZSB0aGUgbmV3IHN0YXRlIHRvIHRoZSBw bGF0Zm9ybSBwbGF5ZXIuCisgICAgICAgIGlmIChtX3BsYXllcikKKyAgICAgICAgICAgIG1fcGxh eWVyLT5zZXRNdXRlZChwYWdlLT5pc0F1ZGlvTXV0ZWQoKSk7CiAgICAgICAgIGlmIChoYXNBdWRp bygpICYmICFtdXRlZCgpICYmIHBhZ2UtPmlzQXVkaW9NdXRlZCgpKQogICAgICAgICAgICAgdXNl ckRpZEludGVyZmVyZVdpdGhBdXRvcGxheSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggYzY5MTI4NDY1ZThmZGUzMDYxY2Rh NWQ0NDk4NDU4ODUzOTVkYzNlYS4uM2VlZDRmZjMwMGZkZmUyZDIzOTk5ZDU1OGExOTA4ZjgxZWE3 NTc2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHAKQEAgLTEyMzIsNyArMTIzMiw3IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojppc011dGVkKCkgY29uc3QKIAogICAgIGdib29sZWFuIGlzTXV0ZWQ7CiAgICAgZ19vYmplY3Rf Z2V0KG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgIm11dGUiLCAmaXNNdXRlZCwgbnVsbHB0cik7Ci0g ICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJQbGF5ZXIgaXMgbXV0ZWQ6ICVzIiwgYm9v bEZvclByaW50aW5nKCEhaXNNdXRlZCkpOworICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgp LCAiUGxheWVyIGlzIG11dGVkOiAlcyIsIGJvb2xGb3JQcmludGluZyhpc011dGVkKSk7CiAgICAg cmV0dXJuIGlzTXV0ZWQ7CiB9CiAKQEAgLTE2NTksMjAgKzE2NTksMjQgQEAgZmxvYXQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2b2x1bWUoKSBjb25zdAogICAgIGlmICghbV92b2x1bWVF bGVtZW50KQogICAgICAgICByZXR1cm4gMDsKIAotICAgIHJldHVybiBnc3Rfc3RyZWFtX3ZvbHVt ZV9nZXRfdm9sdW1lKG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVfRk9S TUFUX0xJTkVBUik7CisgICAgYXV0byB2b2x1bWUgPSBnc3Rfc3RyZWFtX3ZvbHVtZV9nZXRfdm9s dW1lKG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVfRk9STUFUX0xJTkVB Uik7CisgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVm9sdW1lOiAlZiIsIHZvbHVt ZSk7CisgICAgcmV0dXJuIHZvbHVtZTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6Om5vdGlmeVBsYXllck9mVm9sdW1lQ2hhbmdlKCkKIHsKICAgICBpZiAoIW1fcGxheWVy IHx8ICFtX3ZvbHVtZUVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKLSAgICBkb3VibGUgdm9sdW1l OwotICAgIHZvbHVtZSA9IGdzdF9zdHJlYW1fdm9sdW1lX2dldF92b2x1bWUobV92b2x1bWVFbGVt ZW50LmdldCgpLCBHU1RfU1RSRUFNX1ZPTFVNRV9GT1JNQVRfTElORUFSKTsKLSAgICAvLyBnZXRf dm9sdW1lKCkgY2FuIHJldHVybiB2YWx1ZXMgc3VwZXJpb3IgdG8gMS4wIGlmIHRoZSB1c2VyCi0g ICAgLy8gYXBwbGllcyBzb2Z0d2FyZSB1c2VyIGdhaW4gdmlhIHRoaXJkIHBhcnR5IGFwcGxpY2F0 aW9uIChHTk9NRQotICAgIC8vIHZvbHVtZSBjb250cm9sIGZvciBpbnN0YW5jZSkuCi0gICAgdm9s dW1lID0gQ0xBTVAodm9sdW1lLCAwLjAsIDEuMCk7Ci0gICAgbV9wbGF5ZXItPnZvbHVtZUNoYW5n ZWQoc3RhdGljX2Nhc3Q8ZmxvYXQ+KHZvbHVtZSkpOworCisgICAgLy8gZ2V0X3ZvbHVtZSgpIGNh biByZXR1cm4gdmFsdWVzIHN1cGVyaW9yIHRvIDEuMCBpZiB0aGUgdXNlciBhcHBsaWVzIHNvZnR3 YXJlIHVzZXIgZ2FpbiB2aWEKKyAgICAvLyB0aGlyZCBwYXJ0eSBhcHBsaWNhdGlvbiAoR05PTUUg dm9sdW1lIGNvbnRyb2wgZm9yIGluc3RhbmNlKS4KKyAgICBhdXRvIG9sZFZvbHVtZSA9IHRoaXMt PnZvbHVtZSgpOworICAgIGF1dG8gdm9sdW1lID0gQ0xBTVAob2xkVm9sdW1lLCAwLjAsIDEuMCk7 CisKKyAgICBpZiAodm9sdW1lICE9IG9sZFZvbHVtZSkKKyAgICAgICAgR1NUX0RFQlVHX09CSkVD VChwaXBlbGluZSgpLCAiVm9sdW1lIHZhbHVlICglZikgd2FzIG5vdCBpbiBbMCwxXSByYW5nZS4g Q2xhbXBlZCB0byAlZiIsIG9sZFZvbHVtZSwgdm9sdW1lKTsKKyAgICBtX3BsYXllci0+dm9sdW1l Q2hhbmdlZCh2b2x1bWUpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 dm9sdW1lQ2hhbmdlZENhbGxiYWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVy KQpAQCAtMTcwMyw3ICsxNzA3LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OnNldE11dGVkKGJvb2wgc2hvdWxkTXV0ZSkKICAgICBpZiAoIW1fdm9sdW1lRWxlbWVudCB8fCBz aG91bGRNdXRlID09IGlzTXV0ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgR1NUX0lORk9f T0JKRUNUKHBpcGVsaW5lKCksICJNdXRlZD8gJXMiLCBib29sRm9yUHJpbnRpbmcoc2hvdWxkTXV0 ZSkpOworICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiU2V0dGluZyBtdXRlZCBzdGF0 ZSB0byAlcyIsIGJvb2xGb3JQcmludGluZyhzaG91bGRNdXRlKSk7CiAgICAgZ19vYmplY3Rfc2V0 KG1fdm9sdW1lRWxlbWVudC5nZXQoKSwgIm11dGUiLCBzaG91bGRNdXRlLCBudWxscHRyKTsKIH0K IApAQCAtMTcxNCw2ICsxNzE4LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 Om5vdGlmeVBsYXllck9mTXV0ZSgpCiAKICAgICBnYm9vbGVhbiBtdXRlZDsKICAgICBnX29iamVj dF9nZXQobV92b2x1bWVFbGVtZW50LmdldCgpLCAibXV0ZSIsICZtdXRlZCwgbnVsbHB0cik7Cisg ICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiTm90aWZ5aW5nIHBsYXllciBvZiBuZXcg bXV0ZSB2YWx1ZTogJXMiLCBib29sRm9yUHJpbnRpbmcobXV0ZWQpKTsKICAgICBtX3BsYXllci0+ bXV0ZUNoYW5nZWQoc3RhdGljX2Nhc3Q8Ym9vbD4obXV0ZWQpKTsKIH0KIApkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGE2ZjQxYjQzNzgyZDcxZDky M2FjNjRjY2E2OGU0ODNiODI1NjcwZTMuLjAxN2FiYjI2N2NjOWI3MzVlZjE0Y2NhZTU3MDIzMGFi MmVkN2QyMjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMS0wNC0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gVmlkZW9zIHN0YXJ0IHBsYXlp bmcgbXV0ZWQgaW4gZXBpcGhhbnkgd2l0aCBubyB1bm11dGUgaWNvbiB2aXNpYmxlIGluIHRhYiwg d2Via2l0X3dlYl92aWV3X2dldF9pc19tdXRlZCgpIHJldHVybnMgaW5jb3JyZWN0IHJlc3VsdHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkYXB0IGlz LXBsYXlpbmcgdGVzdCwgYWZ0ZXIgbXV0aW5nIHRoZSBwYWdlLCB3ZWJraXRfd2ViX3ZpZXdfaXNf cGxheWluZ19hdWRpbygpIHNob3VsZAorICAgICAgICBzdGlsbCByZXR1cm4gVFJVRS4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5j cHA6CisgICAgICAgIChJc1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0OjpwZXJpb2RpY2FsbHlDaGVj a0lzUGxheWluZ0ZvckFXaGlsZSk6CisgICAgICAgICh0ZXN0V2ViVmlld0lzUGxheWluZ0F1ZGlv KToKKwogMjAyMS0wNC0wMSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dTdHJlYW1lcl0gVGVzdCBoYXJuZXNzIHNob3VsZCB1c2UgYSBtb2NrIGF1 ZGlvIG91dHB1dCBkZXZpY2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdEdMaWIvVGVzdFdlYktpdFdlYlZpZXcuY3BwCmluZGV4IGYzOTA0YzU1ODEzOWUw NjNkYjQzODlmMTlmZTQ2ZDYwMmRkOGM3ZDIuLjk4NmVjMDU5MTE3NmQ1NGE0NGY5ZTI2OGFlYjQy ZjNkODg1NDY3ZDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRHTGliL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcApAQCAtNDQsNiArNDQsMjUgQEAgcHVi bGljOgogICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmlldywgIm5vdGlmeTo6aXMtcGxh eWluZy1hdWRpbyIsIEdfQ0FMTEJBQ0soaXNQbGF5aW5nQXVkaW9DaGFuZ2VkKSwgdGhpcyk7CiAg ICAgICAgIGdfbWFpbl9sb29wX3J1bihtX21haW5Mb29wKTsKICAgICB9CisKKyAgICB2b2lkIHBl cmlvZGljYWxseUNoZWNrSXNQbGF5aW5nRm9yQVdoaWxlKCkKKyAgICB7CisgICAgICAgIG1fdGlj a0NvdW50ID0gMDsKKyAgICAgICAgZ190aW1lb3V0X2FkZCg1MCwgW10oZ3BvaW50ZXIgdXNlckRh dGEpIC0+IGdib29sZWFuIHsKKyAgICAgICAgICAgIGF1dG8qIHRlc3QgPSBzdGF0aWNfY2FzdDxJ c1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0Kj4odXNlckRhdGEpOworICAgICAgICAgICAgZ19hc3Nl cnRfdHJ1ZSh3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbyh0ZXN0LT5tX3dlYlZpZXcp KTsKKyAgICAgICAgICAgIHRlc3QtPm1fdGlja0NvdW50Kys7CisgICAgICAgICAgICBpZiAodGVz dC0+bV90aWNrQ291bnQgPj0gMjApIHsKKyAgICAgICAgICAgICAgICB0ZXN0LT5xdWl0TWFpbkxv b3AoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuIEdfU09VUkNFX0NPTlRJTlVFOworICAgICAgICB9LCB0 aGlzKTsKKyAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgIH0KKworcHJp dmF0ZToKKyAgICB1aW50MzJfdCBtX3RpY2tDb3VudCB7IDAgfTsKIH07CiAKIHN0YXRpYyBXZWJL aXRUZXN0U2VydmVyKiBnU2VydmVyOwpAQCAtMTExNCw2ICsxMTMzLDcgQEAgc3RhdGljIHZvaWQg dGVzdFdlYlZpZXdJc1BsYXlpbmdBdWRpbyhJc1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0KiB0ZXN0 LCBnY29uc3Rwb2kKIAogICAgIC8vIEluaXRpYWxseSwgd2ViIHZpZXdzIHNob3VsZCBhbHdheXMg cmVwb3J0IG5vIGF1ZGlvIGJlaW5nIHBsYXllZC4KICAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRf d2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbyh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICBnX2Fzc2Vy dF9mYWxzZSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKHRlc3QtPm1fd2ViVmlldykpOwog CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiByZXNvdXJjZVBhdGgoZ19idWlsZF9maWxlbmFtZShUZXN0 OjpnZXRSZXNvdXJjZXNEaXIoVGVzdDo6V2ViS2l0MlJlc291cmNlcykuZGF0YSgpLCAiZmlsZS13 aXRoLXZpZGVvLmh0bWwiLCBudWxscHRyKSk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiByZXNvdXJj ZVVSTChnX2ZpbGVuYW1lX3RvX3VyaShyZXNvdXJjZVBhdGguZ2V0KCksIG51bGxwdHIsIG51bGxw dHIpKTsKQEAgLTExMjYsNiArMTE0NiwxNSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0lzUGxh eWluZ0F1ZGlvKElzUGxheWluZ0F1ZGlvV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaQogICAg ICAgICB0ZXN0LT53YWl0VW50aWxJc1BsYXlpbmdBdWRpb0NoYW5nZWQoKTsKICAgICBnX2Fzc2Vy dF90cnVlKHdlYmtpdF93ZWJfdmlld19pc19wbGF5aW5nX2F1ZGlvKHRlc3QtPm1fd2ViVmlldykp OwogCisgICAgLy8gTXV0ZSB0aGUgcGFnZSwgd2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVk aW8oKSBzaG91bGQgc3RpbGwgcmV0dXJuIFRSVUUuCisgICAgd2Via2l0X3dlYl92aWV3X3NldF9p c19tdXRlZCh0ZXN0LT5tX3dlYlZpZXcsIFRSVUUpOworICAgIGdfYXNzZXJ0X3RydWUod2Via2l0 X3dlYl92aWV3X2dldF9pc19tdXRlZCh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICB0ZXN0LT5wZXJp b2RpY2FsbHlDaGVja0lzUGxheWluZ0ZvckFXaGlsZSgpOworICAgIGdfYXNzZXJ0X3RydWUod2Vi a2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSk7CisgICAgd2Vi a2l0X3dlYl92aWV3X3NldF9pc19tdXRlZCh0ZXN0LT5tX3dlYlZpZXcsIEZBTFNFKTsKKyAgICBn X2Fzc2VydF9mYWxzZSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKHRlc3QtPm1fd2ViVmll dykpOworICAgIGdfYXNzZXJ0X3RydWUod2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8o dGVzdC0+bV93ZWJWaWV3KSk7CisKICAgICAvLyBQYXVzZSB0aGUgdmlkZW8sIGFuZCBjaGVjayBh Z2Fpbi4KICAgICB0ZXN0LT5ydW5KYXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoImRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0LXZpZGVvJykucGF1c2UoKTsiLCBudWxscHRyKTsKICAg ICBpZiAod2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSkK 425368 2021-04-07 01:54:21 -0700 2021-04-07 01:58:54 -0700 Patch bug-223195-20210407015419.patch text/plain 9783 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTJlYjA5ZDlmMDg4MTIy YTQ5NzhhYWY1MGIyNjU3OTNjZGYxMTAwYS4uYjZkNWU2ZTBlNGViMGUyNjA0MTJmNzc1YTBlM2E2 MGNhNjhlNjI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA0LTA3ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBWaWRlb3Mgc3RhcnQgcGxheWluZyBtdXRlZCBpbiBlcGlwaGFueSB3aXRoIG5vIHVubXV0ZSBp Y29uIHZpc2libGUgaW4gdGFiLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKCkgcmV0dXJu cyBpbmNvcnJlY3QgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgor CisgICAgICAgIEZvciBHU3RyZWFtZXIgcG9ydHMgdGhlIHNlbWFudGljcyBvZiBJc1BsYXlpbmdB dWRpbyBzbGlnaHRseSBkaWZmZXIgZnJvbSBBcHBsZSBwb3J0cy4gVGhlCisgICAgICAgIHdlYmtp dF93ZWJfdmlld19pc19wbGF5aW5nX2F1ZGlvKCkgQVBJIGlzIGV4cGVjdGVkIHRvIHJldHVybiB0 cnVlIGlmIGEgcGFnZSBpcyBwcm9kdWNpbmcKKyAgICAgICAgYXVkaW8gZXZlbiB0aG91Z2ggaXQg bWlnaHQgYmUgbXV0ZWQuCisKKyAgICAgICAgVGhlIHNlY29uZCBjaGFuZ2UgYWZmZWN0cyB0aGUg cHJpdmF0ZSBwbGF5ZXIgbXV0ZSBzdGF0ZSB3aGVuIHRoZSBwYWdlIG11dGUgc3RhdGUgaGFzIGJl ZW4KKyAgICAgICAgdXBkYXRlZC4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VNdXRlZFN0YXRlRGlk Q2hhbmdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDogTG9nZ2luZyBpbXByb3ZlbWVudHMuCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmlzTXV0ZWQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2b2x1bWUgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQ bGF5ZXJPZlZvbHVtZUNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnNldE11dGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZNdXRlKToKKwogMjAyMS0wNC0wNyAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzQ4MTIp OiBSZWxlYXNlIGFzc2VydCBpbiBEb2N1bWVudDo6dXBkYXRlTGF5b3V0KCkgYWZ0ZXIgY2FsbGlu ZyBmb2N1cyh7cHJldmVudFNjcm9sbDogdHJ1ZX0pIG9uIGEgdGV4dGFyZWEKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDJiNGEzMjYzYTg5ZjI1YjI3YTJjZDA4 MTk4NDdkMWE0MjlhNGNmYWUuLmU0NGJmOWFmMGFkYTc5ZDcxM2E3MDRkM2RjZThhYjc1NmY1NzAy MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNzczMCw3 ICs3NzMwLDE0IEBAIE1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RhdGVGbGFncyBIVE1MTWVkaWFFbGVt ZW50OjptZWRpYVN0YXRlKCkgY29uc3QKICAgICBpZiAoIWlzUGxheWluZygpKQogICAgICAgICBy ZXR1cm4gc3RhdGU7CiAKLSAgICBpZiAoaGFzQXVkaW8gJiYgIW11dGVkKCkgJiYgdm9sdW1lKCkp CisgICAgLy8gRm9yIEdTdHJlYW1lciBwb3J0cyB0aGUgc2VtYW50aWNzIG9mIElzUGxheWluZ0F1 ZGlvIHNsaWdodGx5IGRpZmZlciBmcm9tIEFwcGxlIHBvcnRzLiBUaGUKKyAgICAvLyB3ZWJraXRf d2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbygpIEFQSSBpcyBleHBlY3RlZCB0byByZXR1cm4gdHJ1 ZSBpZiBhIHBhZ2UgaXMgcHJvZHVjaW5nCisgICAgLy8gYXVkaW8gZXZlbiB0aG91Z2ggaXQgbWln aHQgYmUgbXV0ZWQuCisgICAgYm9vbCBpc1BsYXlpbmdBdWRpbyA9IGhhc0F1ZGlvICYmIHZvbHVt ZSgpOworI2lmICFVU0UoR1NUUkVBTUVSKQorICAgIGlzUGxheWluZ0F1ZGlvID0gaXNQbGF5aW5n QXVkaW8gJiYgIW11dGVkKCk7CisjZW5kaWYKKyAgICBpZiAoaXNQbGF5aW5nQXVkaW8pCiAgICAg ICAgIHN0YXRlIHw9IElzUGxheWluZ0F1ZGlvOwogCiAgICAgaWYgKGhhc0FjdGl2ZVZpZGVvKQpA QCAtNzc4Nyw5ICs3Nzk0LDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0QXV0b3BsYXlF dmVudFBsYXliYWNrU3RhdGUoQXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUKIAogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgpCiB7Ci0gICAgdXBkYXRlVm9s dW1lKCk7Ci0KICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKSB7CisgICAg ICAgIC8vIFByb3BhZ2F0ZSB0aGUgbmV3IHN0YXRlIHRvIHRoZSBwbGF0Zm9ybSBwbGF5ZXIuCisg ICAgICAgIGlmIChtX3BsYXllcikKKyAgICAgICAgICAgIG1fcGxheWVyLT5zZXRNdXRlZChwYWdl LT5pc0F1ZGlvTXV0ZWQoKSk7CiAgICAgICAgIGlmIChoYXNBdWRpbygpICYmICFtdXRlZCgpICYm IHBhZ2UtPmlzQXVkaW9NdXRlZCgpKQogICAgICAgICAgICAgdXNlckRpZEludGVyZmVyZVdpdGhB dXRvcGxheSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKaW5kZXggNmE2NGUzMmMyZGFjMjliM2FlYmY4Y2YyNzk4NGFkMTA2ODk5Y2Qw OC4uM2QzZDU4MWY1NWFiY2FiY2RiMzMxMGMzNTQ0YjI5ZjdkOGM0NjQyMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTEyMzAsNyArMTIz MCw3IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc011dGVkKCkgY29uc3QK IAogICAgIGdib29sZWFuIGlzTXV0ZWQ7CiAgICAgZ19vYmplY3RfZ2V0KG1fdm9sdW1lRWxlbWVu dC5nZXQoKSwgIm11dGUiLCAmaXNNdXRlZCwgbnVsbHB0cik7Ci0gICAgR1NUX0lORk9fT0JKRUNU KHBpcGVsaW5lKCksICJQbGF5ZXIgaXMgbXV0ZWQ6ICVzIiwgYm9vbEZvclByaW50aW5nKCEhaXNN dXRlZCkpOworICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiUGxheWVyIGlzIG11dGVk OiAlcyIsIGJvb2xGb3JQcmludGluZyhpc011dGVkKSk7CiAgICAgcmV0dXJuIGlzTXV0ZWQ7CiB9 CiAKQEAgLTE2NjUsMjAgKzE2NjUsMjQgQEAgZmxvYXQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjp2b2x1bWUoKSBjb25zdAogICAgIGlmICghbV92b2x1bWVFbGVtZW50KQogICAgICAgICBy ZXR1cm4gMDsKIAotICAgIHJldHVybiBnc3Rfc3RyZWFtX3ZvbHVtZV9nZXRfdm9sdW1lKG1fdm9s dW1lRWxlbWVudC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVfRk9STUFUX0xJTkVBUik7CisgICAg YXV0byB2b2x1bWUgPSBnc3Rfc3RyZWFtX3ZvbHVtZV9nZXRfdm9sdW1lKG1fdm9sdW1lRWxlbWVu dC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVfRk9STUFUX0xJTkVBUik7CisgICAgR1NUX0RFQlVH X09CSkVDVChwaXBlbGluZSgpLCAiVm9sdW1lOiAlZiIsIHZvbHVtZSk7CisgICAgcmV0dXJuIHZv bHVtZTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXll ck9mVm9sdW1lQ2hhbmdlKCkKIHsKICAgICBpZiAoIW1fcGxheWVyIHx8ICFtX3ZvbHVtZUVsZW1l bnQpCiAgICAgICAgIHJldHVybjsKLSAgICBkb3VibGUgdm9sdW1lOwotICAgIHZvbHVtZSA9IGdz dF9zdHJlYW1fdm9sdW1lX2dldF92b2x1bWUobV92b2x1bWVFbGVtZW50LmdldCgpLCBHU1RfU1RS RUFNX1ZPTFVNRV9GT1JNQVRfTElORUFSKTsKLSAgICAvLyBnZXRfdm9sdW1lKCkgY2FuIHJldHVy biB2YWx1ZXMgc3VwZXJpb3IgdG8gMS4wIGlmIHRoZSB1c2VyCi0gICAgLy8gYXBwbGllcyBzb2Z0 d2FyZSB1c2VyIGdhaW4gdmlhIHRoaXJkIHBhcnR5IGFwcGxpY2F0aW9uIChHTk9NRQotICAgIC8v IHZvbHVtZSBjb250cm9sIGZvciBpbnN0YW5jZSkuCi0gICAgdm9sdW1lID0gQ0xBTVAodm9sdW1l LCAwLjAsIDEuMCk7Ci0gICAgbV9wbGF5ZXItPnZvbHVtZUNoYW5nZWQoc3RhdGljX2Nhc3Q8Zmxv YXQ+KHZvbHVtZSkpOworCisgICAgLy8gZ2V0X3ZvbHVtZSgpIGNhbiByZXR1cm4gdmFsdWVzIHN1 cGVyaW9yIHRvIDEuMCBpZiB0aGUgdXNlciBhcHBsaWVzIHNvZnR3YXJlIHVzZXIgZ2FpbiB2aWEK KyAgICAvLyB0aGlyZCBwYXJ0eSBhcHBsaWNhdGlvbiAoR05PTUUgdm9sdW1lIGNvbnRyb2wgZm9y IGluc3RhbmNlKS4KKyAgICBhdXRvIG9sZFZvbHVtZSA9IHRoaXMtPnZvbHVtZSgpOworICAgIGF1 dG8gdm9sdW1lID0gQ0xBTVAob2xkVm9sdW1lLCAwLjAsIDEuMCk7CisKKyAgICBpZiAodm9sdW1l ICE9IG9sZFZvbHVtZSkKKyAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVm9s dW1lIHZhbHVlICglZikgd2FzIG5vdCBpbiBbMCwxXSByYW5nZS4gQ2xhbXBlZCB0byAlZiIsIG9s ZFZvbHVtZSwgdm9sdW1lKTsKKyAgICBtX3BsYXllci0+dm9sdW1lQ2hhbmdlZCh2b2x1bWUpOwog fQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dm9sdW1lQ2hhbmdlZENhbGxi YWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVyKQpAQCAtMTcwOSw3ICsxNzEz LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldE11dGVkKGJvb2wgc2hv dWxkTXV0ZSkKICAgICBpZiAoIW1fdm9sdW1lRWxlbWVudCB8fCBzaG91bGRNdXRlID09IGlzTXV0 ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCks ICJNdXRlZD8gJXMiLCBib29sRm9yUHJpbnRpbmcoc2hvdWxkTXV0ZSkpOworICAgIEdTVF9JTkZP X09CSkVDVChwaXBlbGluZSgpLCAiU2V0dGluZyBtdXRlZCBzdGF0ZSB0byAlcyIsIGJvb2xGb3JQ cmludGluZyhzaG91bGRNdXRlKSk7CiAgICAgZ19vYmplY3Rfc2V0KG1fdm9sdW1lRWxlbWVudC5n ZXQoKSwgIm11dGUiLCBzaG91bGRNdXRlLCBudWxscHRyKTsKIH0KIApAQCAtMTcyMCw2ICsxNzI0 LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mTXV0 ZSgpCiAKICAgICBnYm9vbGVhbiBtdXRlZDsKICAgICBnX29iamVjdF9nZXQobV92b2x1bWVFbGVt ZW50LmdldCgpLCAibXV0ZSIsICZtdXRlZCwgbnVsbHB0cik7CisgICAgR1NUX0RFQlVHX09CSkVD VChwaXBlbGluZSgpLCAiTm90aWZ5aW5nIHBsYXllciBvZiBuZXcgbXV0ZSB2YWx1ZTogJXMiLCBi b29sRm9yUHJpbnRpbmcobXV0ZWQpKTsKICAgICBtX3BsYXllci0+bXV0ZUNoYW5nZWQoc3RhdGlj X2Nhc3Q8Ym9vbD4obXV0ZWQpKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIv VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFjMmUxZDE4YjMzZjdlNWMzOTNkOTQwYTcxODY0ZWE0MjRl YzU3MjMuLjI5NDRkMjFkZmIwYWRkMTg3ZTIzYThjY2MwY2IzMGI1NDdhZjYzZTEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBA QAorMjAyMS0wNC0wNyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisK KyAgICAgICAgW0dTdHJlYW1lcl0gVmlkZW9zIHN0YXJ0IHBsYXlpbmcgbXV0ZWQgaW4gZXBpcGhh bnkgd2l0aCBubyB1bm11dGUgaWNvbiB2aXNpYmxlIGluIHRhYiwgd2Via2l0X3dlYl92aWV3X2dl dF9pc19tdXRlZCgpIHJldHVybnMgaW5jb3JyZWN0IHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE1pY2hhZWwgQ2F0YW56YXJvLgorCisgICAgICAgIEFkYXB0IGlzLXBsYXlpbmcgdGVzdCwg YWZ0ZXIgbXV0aW5nIHRoZSBwYWdlLCB3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbygp IHNob3VsZAorICAgICAgICBzdGlsbCByZXR1cm4gVFJVRS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgIChJ c1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0OjpwZXJpb2RpY2FsbHlDaGVja0lzUGxheWluZ0ZvckFX aGlsZSk6CisgICAgICAgICh0ZXN0V2ViVmlld0lzUGxheWluZ0F1ZGlvKToKKwogMjAyMS0wNC0w NiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtH UFUgUHJvY2Vzc10gU2ltcGxpZnkgRGlzcGxheUxpc3Q6Okl0ZXJhdG9yIHBhcnQgNTogVHdlYWsg dGhlIHJldHVybiB0eXBlIG9mIERpc3BsYXlMaXN0OjpJdGVyYXRvcjo6b3BlcmF0b3IqKCkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0 V2ViVmlldy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdl YktpdFdlYlZpZXcuY3BwCmluZGV4IGYzOTA0YzU1ODEzOWUwNjNkYjQzODlmMTlmZTQ2ZDYwMmRk OGM3ZDIuLjk4NmVjMDU5MTE3NmQ1NGE0NGY5ZTI2OGFlYjQyZjNkODg1NDY3ZDMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmll dy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJL aXRXZWJWaWV3LmNwcApAQCAtNDQsNiArNDQsMjUgQEAgcHVibGljOgogICAgICAgICBnX3NpZ25h bF9jb25uZWN0KG1fd2ViVmlldywgIm5vdGlmeTo6aXMtcGxheWluZy1hdWRpbyIsIEdfQ0FMTEJB Q0soaXNQbGF5aW5nQXVkaW9DaGFuZ2VkKSwgdGhpcyk7CiAgICAgICAgIGdfbWFpbl9sb29wX3J1 bihtX21haW5Mb29wKTsKICAgICB9CisKKyAgICB2b2lkIHBlcmlvZGljYWxseUNoZWNrSXNQbGF5 aW5nRm9yQVdoaWxlKCkKKyAgICB7CisgICAgICAgIG1fdGlja0NvdW50ID0gMDsKKyAgICAgICAg Z190aW1lb3V0X2FkZCg1MCwgW10oZ3BvaW50ZXIgdXNlckRhdGEpIC0+IGdib29sZWFuIHsKKyAg ICAgICAgICAgIGF1dG8qIHRlc3QgPSBzdGF0aWNfY2FzdDxJc1BsYXlpbmdBdWRpb1dlYlZpZXdU ZXN0Kj4odXNlckRhdGEpOworICAgICAgICAgICAgZ19hc3NlcnRfdHJ1ZSh3ZWJraXRfd2ViX3Zp ZXdfaXNfcGxheWluZ19hdWRpbyh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICAgICAgICAgIHRlc3Qt Pm1fdGlja0NvdW50Kys7CisgICAgICAgICAgICBpZiAodGVzdC0+bV90aWNrQ291bnQgPj0gMjAp IHsKKyAgICAgICAgICAgICAgICB0ZXN0LT5xdWl0TWFpbkxvb3AoKTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0 dXJuIEdfU09VUkNFX0NPTlRJTlVFOworICAgICAgICB9LCB0aGlzKTsKKyAgICAgICAgZ19tYWlu X2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgIH0KKworcHJpdmF0ZToKKyAgICB1aW50MzJfdCBt X3RpY2tDb3VudCB7IDAgfTsKIH07CiAKIHN0YXRpYyBXZWJLaXRUZXN0U2VydmVyKiBnU2VydmVy OwpAQCAtMTExNCw2ICsxMTMzLDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdJc1BsYXlpbmdB dWRpbyhJc1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2kKIAogICAgIC8v IEluaXRpYWxseSwgd2ViIHZpZXdzIHNob3VsZCBhbHdheXMgcmVwb3J0IG5vIGF1ZGlvIGJlaW5n IHBsYXllZC4KICAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19h dWRpbyh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2ViX3Zp ZXdfZ2V0X2lzX211dGVkKHRlc3QtPm1fd2ViVmlldykpOwogCiAgICAgR1VuaXF1ZVB0cjxjaGFy PiByZXNvdXJjZVBhdGgoZ19idWlsZF9maWxlbmFtZShUZXN0OjpnZXRSZXNvdXJjZXNEaXIoVGVz dDo6V2ViS2l0MlJlc291cmNlcykuZGF0YSgpLCAiZmlsZS13aXRoLXZpZGVvLmh0bWwiLCBudWxs cHRyKSk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiByZXNvdXJjZVVSTChnX2ZpbGVuYW1lX3RvX3Vy aShyZXNvdXJjZVBhdGguZ2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsKQEAgLTExMjYsNiArMTE0 NiwxNSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0lzUGxheWluZ0F1ZGlvKElzUGxheWluZ0F1 ZGlvV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaQogICAgICAgICB0ZXN0LT53YWl0VW50aWxJ c1BsYXlpbmdBdWRpb0NoYW5nZWQoKTsKICAgICBnX2Fzc2VydF90cnVlKHdlYmtpdF93ZWJfdmll d19pc19wbGF5aW5nX2F1ZGlvKHRlc3QtPm1fd2ViVmlldykpOwogCisgICAgLy8gTXV0ZSB0aGUg cGFnZSwgd2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8oKSBzaG91bGQgc3RpbGwgcmV0 dXJuIFRSVUUuCisgICAgd2Via2l0X3dlYl92aWV3X3NldF9pc19tdXRlZCh0ZXN0LT5tX3dlYlZp ZXcsIFRSVUUpOworICAgIGdfYXNzZXJ0X3RydWUod2Via2l0X3dlYl92aWV3X2dldF9pc19tdXRl ZCh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICB0ZXN0LT5wZXJpb2RpY2FsbHlDaGVja0lzUGxheWlu Z0ZvckFXaGlsZSgpOworICAgIGdfYXNzZXJ0X3RydWUod2Via2l0X3dlYl92aWV3X2lzX3BsYXlp bmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSk7CisgICAgd2Via2l0X3dlYl92aWV3X3NldF9pc19t dXRlZCh0ZXN0LT5tX3dlYlZpZXcsIEZBTFNFKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRf d2ViX3ZpZXdfZ2V0X2lzX211dGVkKHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0X3Ry dWUod2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSk7CisK ICAgICAvLyBQYXVzZSB0aGUgdmlkZW8sIGFuZCBjaGVjayBhZ2Fpbi4KICAgICB0ZXN0LT5ydW5K YXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0 ZXN0LXZpZGVvJykucGF1c2UoKTsiLCBudWxscHRyKTsKICAgICBpZiAod2Via2l0X3dlYl92aWV3 X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSkK 425369 2021-04-07 01:59:01 -0700 2021-04-07 02:59:00 -0700 Patch bug-223195-20210407015859.patch text/plain 9783 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTJlYjA5ZDlmMDg4MTIy YTQ5NzhhYWY1MGIyNjU3OTNjZGYxMTAwYS4uYjZkNWU2ZTBlNGViMGUyNjA0MTJmNzc1YTBlM2E2 MGNhNjhlNjI3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA0LTA3ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBWaWRlb3Mgc3RhcnQgcGxheWluZyBtdXRlZCBpbiBlcGlwaGFueSB3aXRoIG5vIHVubXV0ZSBp Y29uIHZpc2libGUgaW4gdGFiLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2lzX211dGVkKCkgcmV0dXJu cyBpbmNvcnJlY3QgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjIzMTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgor CisgICAgICAgIEZvciBHU3RyZWFtZXIgcG9ydHMgdGhlIHNlbWFudGljcyBvZiBJc1BsYXlpbmdB dWRpbyBzbGlnaHRseSBkaWZmZXIgZnJvbSBBcHBsZSBwb3J0cy4gVGhlCisgICAgICAgIHdlYmtp dF93ZWJfdmlld19pc19wbGF5aW5nX2F1ZGlvKCkgQVBJIGlzIGV4cGVjdGVkIHRvIHJldHVybiB0 cnVlIGlmIGEgcGFnZSBpcyBwcm9kdWNpbmcKKyAgICAgICAgYXVkaW8gZXZlbiB0aG91Z2ggaXQg bWlnaHQgYmUgbXV0ZWQuCisKKyAgICAgICAgVGhlIHNlY29uZCBjaGFuZ2UgYWZmZWN0cyB0aGUg cHJpdmF0ZSBwbGF5ZXIgbXV0ZSBzdGF0ZSB3aGVuIHRoZSBwYWdlIG11dGUgc3RhdGUgaGFzIGJl ZW4KKyAgICAgICAgdXBkYXRlZC4KKworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0YXRlIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VNdXRlZFN0YXRlRGlk Q2hhbmdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDogTG9nZ2luZyBpbXByb3ZlbWVudHMuCisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmlzTXV0ZWQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp2b2x1bWUgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpub3RpZnlQ bGF5ZXJPZlZvbHVtZUNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnNldE11dGVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6bm90aWZ5UGxheWVyT2ZNdXRlKToKKwogMjAyMS0wNC0wNyAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzQ4MTIp OiBSZWxlYXNlIGFzc2VydCBpbiBEb2N1bWVudDo6dXBkYXRlTGF5b3V0KCkgYWZ0ZXIgY2FsbGlu ZyBmb2N1cyh7cHJldmVudFNjcm9sbDogdHJ1ZX0pIG9uIGEgdGV4dGFyZWEKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDJiNGEzMjYzYTg5ZjI1YjI3YTJjZDA4 MTk4NDdkMWE0MjlhNGNmYWUuLmU0NGJmOWFmMGFkYTc5ZDcxM2E3MDRkM2RjZThhYjc1NmY1NzAy MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNzczMCw3 ICs3NzMwLDE0IEBAIE1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RhdGVGbGFncyBIVE1MTWVkaWFFbGVt ZW50OjptZWRpYVN0YXRlKCkgY29uc3QKICAgICBpZiAoIWlzUGxheWluZygpKQogICAgICAgICBy ZXR1cm4gc3RhdGU7CiAKLSAgICBpZiAoaGFzQXVkaW8gJiYgIW11dGVkKCkgJiYgdm9sdW1lKCkp CisgICAgLy8gRm9yIEdTdHJlYW1lciBwb3J0cyB0aGUgc2VtYW50aWNzIG9mIElzUGxheWluZ0F1 ZGlvIHNsaWdodGx5IGRpZmZlciBmcm9tIEFwcGxlIHBvcnRzLiBUaGUKKyAgICAvLyB3ZWJraXRf d2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbygpIEFQSSBpcyBleHBlY3RlZCB0byByZXR1cm4gdHJ1 ZSBpZiBhIHBhZ2UgaXMgcHJvZHVjaW5nCisgICAgLy8gYXVkaW8gZXZlbiB0aG91Z2ggaXQgbWln aHQgYmUgbXV0ZWQuCisgICAgYm9vbCBpc1BsYXlpbmdBdWRpbyA9IGhhc0F1ZGlvICYmIHZvbHVt ZSgpOworI2lmICFVU0UoR1NUUkVBTUVSKQorICAgIGlzUGxheWluZ0F1ZGlvID0gaXNQbGF5aW5n QXVkaW8gJiYgIW11dGVkKCk7CisjZW5kaWYKKyAgICBpZiAoaXNQbGF5aW5nQXVkaW8pCiAgICAg ICAgIHN0YXRlIHw9IElzUGxheWluZ0F1ZGlvOwogCiAgICAgaWYgKGhhc0FjdGl2ZVZpZGVvKQpA QCAtNzc4Nyw5ICs3Nzk0LDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0QXV0b3BsYXlF dmVudFBsYXliYWNrU3RhdGUoQXV0b3BsYXlFdmVudFBsYXliYWNrU3RhdGUKIAogdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgpCiB7Ci0gICAgdXBkYXRlVm9s dW1lKCk7Ci0KICAgICBpZiAoUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpKSB7CisgICAg ICAgIC8vIFByb3BhZ2F0ZSB0aGUgbmV3IHN0YXRlIHRvIHRoZSBwbGF0Zm9ybSBwbGF5ZXIuCisg ICAgICAgIGlmIChtX3BsYXllcikKKyAgICAgICAgICAgIG1fcGxheWVyLT5zZXRNdXRlZChwYWdl LT5pc0F1ZGlvTXV0ZWQoKSk7CiAgICAgICAgIGlmIChoYXNBdWRpbygpICYmICFtdXRlZCgpICYm IHBhZ2UtPmlzQXVkaW9NdXRlZCgpKQogICAgICAgICAgICAgdXNlckRpZEludGVyZmVyZVdpdGhB dXRvcGxheSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKaW5kZXggNmE2NGUzMmMyZGFjMjliM2FlYmY4Y2YyNzk4NGFkMTA2ODk5Y2Qw OC4uM2QzZDU4MWY1NWFiY2FiY2RiMzMxMGMzNTQ0YjI5ZjdkOGM0NjQyMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTEyMzAsNyArMTIz MCw3IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc011dGVkKCkgY29uc3QK IAogICAgIGdib29sZWFuIGlzTXV0ZWQ7CiAgICAgZ19vYmplY3RfZ2V0KG1fdm9sdW1lRWxlbWVu dC5nZXQoKSwgIm11dGUiLCAmaXNNdXRlZCwgbnVsbHB0cik7Ci0gICAgR1NUX0lORk9fT0JKRUNU KHBpcGVsaW5lKCksICJQbGF5ZXIgaXMgbXV0ZWQ6ICVzIiwgYm9vbEZvclByaW50aW5nKCEhaXNN dXRlZCkpOworICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiUGxheWVyIGlzIG11dGVk OiAlcyIsIGJvb2xGb3JQcmludGluZyhpc011dGVkKSk7CiAgICAgcmV0dXJuIGlzTXV0ZWQ7CiB9 CiAKQEAgLTE2NjUsMjAgKzE2NjUsMjQgQEAgZmxvYXQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjp2b2x1bWUoKSBjb25zdAogICAgIGlmICghbV92b2x1bWVFbGVtZW50KQogICAgICAgICBy ZXR1cm4gMDsKIAotICAgIHJldHVybiBnc3Rfc3RyZWFtX3ZvbHVtZV9nZXRfdm9sdW1lKG1fdm9s dW1lRWxlbWVudC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVfRk9STUFUX0xJTkVBUik7CisgICAg YXV0byB2b2x1bWUgPSBnc3Rfc3RyZWFtX3ZvbHVtZV9nZXRfdm9sdW1lKG1fdm9sdW1lRWxlbWVu dC5nZXQoKSwgR1NUX1NUUkVBTV9WT0xVTUVfRk9STUFUX0xJTkVBUik7CisgICAgR1NUX0RFQlVH X09CSkVDVChwaXBlbGluZSgpLCAiVm9sdW1lOiAlZiIsIHZvbHVtZSk7CisgICAgcmV0dXJuIHZv bHVtZTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXll ck9mVm9sdW1lQ2hhbmdlKCkKIHsKICAgICBpZiAoIW1fcGxheWVyIHx8ICFtX3ZvbHVtZUVsZW1l bnQpCiAgICAgICAgIHJldHVybjsKLSAgICBkb3VibGUgdm9sdW1lOwotICAgIHZvbHVtZSA9IGdz dF9zdHJlYW1fdm9sdW1lX2dldF92b2x1bWUobV92b2x1bWVFbGVtZW50LmdldCgpLCBHU1RfU1RS RUFNX1ZPTFVNRV9GT1JNQVRfTElORUFSKTsKLSAgICAvLyBnZXRfdm9sdW1lKCkgY2FuIHJldHVy biB2YWx1ZXMgc3VwZXJpb3IgdG8gMS4wIGlmIHRoZSB1c2VyCi0gICAgLy8gYXBwbGllcyBzb2Z0 d2FyZSB1c2VyIGdhaW4gdmlhIHRoaXJkIHBhcnR5IGFwcGxpY2F0aW9uIChHTk9NRQotICAgIC8v IHZvbHVtZSBjb250cm9sIGZvciBpbnN0YW5jZSkuCi0gICAgdm9sdW1lID0gQ0xBTVAodm9sdW1l LCAwLjAsIDEuMCk7Ci0gICAgbV9wbGF5ZXItPnZvbHVtZUNoYW5nZWQoc3RhdGljX2Nhc3Q8Zmxv YXQ+KHZvbHVtZSkpOworCisgICAgLy8gZ2V0X3ZvbHVtZSgpIGNhbiByZXR1cm4gdmFsdWVzIHN1 cGVyaW9yIHRvIDEuMCBpZiB0aGUgdXNlciBhcHBsaWVzIHNvZnR3YXJlIHVzZXIgZ2FpbiB2aWEK KyAgICAvLyB0aGlyZCBwYXJ0eSBhcHBsaWNhdGlvbiAoR05PTUUgdm9sdW1lIGNvbnRyb2wgZm9y IGluc3RhbmNlKS4KKyAgICBhdXRvIG9sZFZvbHVtZSA9IHRoaXMtPnZvbHVtZSgpOworICAgIGF1 dG8gdm9sdW1lID0gQ0xBTVAob2xkVm9sdW1lLCAwLjAsIDEuMCk7CisKKyAgICBpZiAodm9sdW1l ICE9IG9sZFZvbHVtZSkKKyAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVm9s dW1lIHZhbHVlICglZikgd2FzIG5vdCBpbiBbMCwxXSByYW5nZS4gQ2xhbXBlZCB0byAlZiIsIG9s ZFZvbHVtZSwgdm9sdW1lKTsKKyAgICBtX3BsYXllci0+dm9sdW1lQ2hhbmdlZCh2b2x1bWUpOwog fQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dm9sdW1lQ2hhbmdlZENhbGxi YWNrKE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lciogcGxheWVyKQpAQCAtMTcwOSw3ICsxNzEz LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldE11dGVkKGJvb2wgc2hv dWxkTXV0ZSkKICAgICBpZiAoIW1fdm9sdW1lRWxlbWVudCB8fCBzaG91bGRNdXRlID09IGlzTXV0 ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCks ICJNdXRlZD8gJXMiLCBib29sRm9yUHJpbnRpbmcoc2hvdWxkTXV0ZSkpOworICAgIEdTVF9JTkZP X09CSkVDVChwaXBlbGluZSgpLCAiU2V0dGluZyBtdXRlZCBzdGF0ZSB0byAlcyIsIGJvb2xGb3JQ cmludGluZyhzaG91bGRNdXRlKSk7CiAgICAgZ19vYmplY3Rfc2V0KG1fdm9sdW1lRWxlbWVudC5n ZXQoKSwgIm11dGUiLCBzaG91bGRNdXRlLCBudWxscHRyKTsKIH0KIApAQCAtMTcyMCw2ICsxNzI0 LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om5vdGlmeVBsYXllck9mTXV0 ZSgpCiAKICAgICBnYm9vbGVhbiBtdXRlZDsKICAgICBnX29iamVjdF9nZXQobV92b2x1bWVFbGVt ZW50LmdldCgpLCAibXV0ZSIsICZtdXRlZCwgbnVsbHB0cik7CisgICAgR1NUX0RFQlVHX09CSkVD VChwaXBlbGluZSgpLCAiTm90aWZ5aW5nIHBsYXllciBvZiBuZXcgbXV0ZSB2YWx1ZTogJXMiLCBi b29sRm9yUHJpbnRpbmcobXV0ZWQpKTsKICAgICBtX3BsYXllci0+bXV0ZUNoYW5nZWQoc3RhdGlj X2Nhc3Q8Ym9vbD4obXV0ZWQpKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIv VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFjMmUxZDE4YjMzZjdlNWMzOTNkOTQwYTcxODY0ZWE0MjRl YzU3MjMuLjI5NDRkMjFkZmIwYWRkMTg3ZTIzYThjY2MwY2IzMGI1NDdhZjYzZTEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBA QAorMjAyMS0wNC0wNyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisK KyAgICAgICAgW0dTdHJlYW1lcl0gVmlkZW9zIHN0YXJ0IHBsYXlpbmcgbXV0ZWQgaW4gZXBpcGhh bnkgd2l0aCBubyB1bm11dGUgaWNvbiB2aXNpYmxlIGluIHRhYiwgd2Via2l0X3dlYl92aWV3X2dl dF9pc19tdXRlZCgpIHJldHVybnMgaW5jb3JyZWN0IHJlc3VsdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzE5NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE1pY2hhZWwgQ2F0YW56YXJvLgorCisgICAgICAgIEFkYXB0IGlzLXBsYXlpbmcgdGVzdCwg YWZ0ZXIgbXV0aW5nIHRoZSBwYWdlLCB3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19hdWRpbygp IHNob3VsZAorICAgICAgICBzdGlsbCByZXR1cm4gVFJVRS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgIChJ c1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0OjpwZXJpb2RpY2FsbHlDaGVja0lzUGxheWluZ0ZvckFX aGlsZSk6CisgICAgICAgICh0ZXN0V2ViVmlld0lzUGxheWluZ0F1ZGlvKToKKwogMjAyMS0wNC0w NiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtH UFUgUHJvY2Vzc10gU2ltcGxpZnkgRGlzcGxheUxpc3Q6Okl0ZXJhdG9yIHBhcnQgNTogVHdlYWsg dGhlIHJldHVybiB0eXBlIG9mIERpc3BsYXlMaXN0OjpJdGVyYXRvcjo6b3BlcmF0b3IqKCkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0 V2ViVmlldy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEdMaWIvVGVzdFdl YktpdFdlYlZpZXcuY3BwCmluZGV4IGYzOTA0YzU1ODEzOWUwNjNkYjQzODlmMTlmZTQ2ZDYwMmRk OGM3ZDIuLjU5YmUxZmRlODQ5YWVmMjU2MGE5ZTFjNDg1ZmEwYjBjNDM0YTU2ZWEgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R0xpYi9UZXN0V2ViS2l0V2ViVmll dy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRHTGliL1Rlc3RXZWJL aXRXZWJWaWV3LmNwcApAQCAtNDQsNiArNDQsMjUgQEAgcHVibGljOgogICAgICAgICBnX3NpZ25h bF9jb25uZWN0KG1fd2ViVmlldywgIm5vdGlmeTo6aXMtcGxheWluZy1hdWRpbyIsIEdfQ0FMTEJB Q0soaXNQbGF5aW5nQXVkaW9DaGFuZ2VkKSwgdGhpcyk7CiAgICAgICAgIGdfbWFpbl9sb29wX3J1 bihtX21haW5Mb29wKTsKICAgICB9CisKKyAgICB2b2lkIHBlcmlvZGljYWxseUNoZWNrSXNQbGF5 aW5nRm9yQVdoaWxlKCkKKyAgICB7CisgICAgICAgIG1fdGlja0NvdW50ID0gMDsKKyAgICAgICAg Z190aW1lb3V0X2FkZCg1MCwgW10oZ3BvaW50ZXIgdXNlckRhdGEpIC0+IGdib29sZWFuIHsKKyAg ICAgICAgICAgIGF1dG8qIHRlc3QgPSBzdGF0aWNfY2FzdDxJc1BsYXlpbmdBdWRpb1dlYlZpZXdU ZXN0Kj4odXNlckRhdGEpOworICAgICAgICAgICAgZ19hc3NlcnRfdHJ1ZSh3ZWJraXRfd2ViX3Zp ZXdfaXNfcGxheWluZ19hdWRpbyh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICAgICAgICAgIHRlc3Qt Pm1fdGlja0NvdW50Kys7CisgICAgICAgICAgICBpZiAodGVzdC0+bV90aWNrQ291bnQgPj0gMTAp IHsKKyAgICAgICAgICAgICAgICB0ZXN0LT5xdWl0TWFpbkxvb3AoKTsKKyAgICAgICAgICAgICAg ICByZXR1cm4gR19TT1VSQ0VfUkVNT1ZFOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0 dXJuIEdfU09VUkNFX0NPTlRJTlVFOworICAgICAgICB9LCB0aGlzKTsKKyAgICAgICAgZ19tYWlu X2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgIH0KKworcHJpdmF0ZToKKyAgICB1aW50MzJfdCBt X3RpY2tDb3VudCB7IDAgfTsKIH07CiAKIHN0YXRpYyBXZWJLaXRUZXN0U2VydmVyKiBnU2VydmVy OwpAQCAtMTExNCw2ICsxMTMzLDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdJc1BsYXlpbmdB dWRpbyhJc1BsYXlpbmdBdWRpb1dlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rwb2kKIAogICAgIC8v IEluaXRpYWxseSwgd2ViIHZpZXdzIHNob3VsZCBhbHdheXMgcmVwb3J0IG5vIGF1ZGlvIGJlaW5n IHBsYXllZC4KICAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2ViX3ZpZXdfaXNfcGxheWluZ19h dWRpbyh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRfd2ViX3Zp ZXdfZ2V0X2lzX211dGVkKHRlc3QtPm1fd2ViVmlldykpOwogCiAgICAgR1VuaXF1ZVB0cjxjaGFy PiByZXNvdXJjZVBhdGgoZ19idWlsZF9maWxlbmFtZShUZXN0OjpnZXRSZXNvdXJjZXNEaXIoVGVz dDo6V2ViS2l0MlJlc291cmNlcykuZGF0YSgpLCAiZmlsZS13aXRoLXZpZGVvLmh0bWwiLCBudWxs cHRyKSk7CiAgICAgR1VuaXF1ZVB0cjxjaGFyPiByZXNvdXJjZVVSTChnX2ZpbGVuYW1lX3RvX3Vy aShyZXNvdXJjZVBhdGguZ2V0KCksIG51bGxwdHIsIG51bGxwdHIpKTsKQEAgLTExMjYsNiArMTE0 NiwxNSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld0lzUGxheWluZ0F1ZGlvKElzUGxheWluZ0F1 ZGlvV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaQogICAgICAgICB0ZXN0LT53YWl0VW50aWxJ c1BsYXlpbmdBdWRpb0NoYW5nZWQoKTsKICAgICBnX2Fzc2VydF90cnVlKHdlYmtpdF93ZWJfdmll d19pc19wbGF5aW5nX2F1ZGlvKHRlc3QtPm1fd2ViVmlldykpOwogCisgICAgLy8gTXV0ZSB0aGUg cGFnZSwgd2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8oKSBzaG91bGQgc3RpbGwgcmV0 dXJuIFRSVUUuCisgICAgd2Via2l0X3dlYl92aWV3X3NldF9pc19tdXRlZCh0ZXN0LT5tX3dlYlZp ZXcsIFRSVUUpOworICAgIGdfYXNzZXJ0X3RydWUod2Via2l0X3dlYl92aWV3X2dldF9pc19tdXRl ZCh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICB0ZXN0LT5wZXJpb2RpY2FsbHlDaGVja0lzUGxheWlu Z0ZvckFXaGlsZSgpOworICAgIGdfYXNzZXJ0X3RydWUod2Via2l0X3dlYl92aWV3X2lzX3BsYXlp bmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSk7CisgICAgd2Via2l0X3dlYl92aWV3X3NldF9pc19t dXRlZCh0ZXN0LT5tX3dlYlZpZXcsIEZBTFNFKTsKKyAgICBnX2Fzc2VydF9mYWxzZSh3ZWJraXRf d2ViX3ZpZXdfZ2V0X2lzX211dGVkKHRlc3QtPm1fd2ViVmlldykpOworICAgIGdfYXNzZXJ0X3Ry dWUod2Via2l0X3dlYl92aWV3X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSk7CisK ICAgICAvLyBQYXVzZSB0aGUgdmlkZW8sIGFuZCBjaGVjayBhZ2Fpbi4KICAgICB0ZXN0LT5ydW5K YXZhU2NyaXB0QW5kV2FpdFVudGlsRmluaXNoZWQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0 ZXN0LXZpZGVvJykucGF1c2UoKTsiLCBudWxscHRyKTsKICAgICBpZiAod2Via2l0X3dlYl92aWV3 X2lzX3BsYXlpbmdfYXVkaW8odGVzdC0+bV93ZWJWaWV3KSkK