206234 2020-01-14 07:51:43 -0800 [GStreamer] Several buffering fixes 2020-01-16 08:14:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 206331 1 tsaunier tsaunier calvaris cgarcia clopez commit-queue cturner dpino eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez webkit-bug-importer oldest_to_newest 1606388 0 tsaunier 2020-01-14 07:51:43 -0800 [GStreamer] Several buffering fixes 1606390 1 387656 tsaunier 2020-01-14 07:53:21 -0800 Created attachment 387656 Patch 1606392 2 387656 calvaris 2020-01-14 08:01:59 -0800 Comment on attachment 387656 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387656&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2308 > + GST_TRACE_OBJECT(pipeline(), "did download finish %s", boolForPrinting(m_didDownloadFinish)); did download finish? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2593 > + gst_query_parse_buffering_percent(query.get(), (gboolean*) &m_isBuffering, NULL); Casting a bool to gboolean is a bad idea, please proxy it thru a gboolean isBuffering. NULL -> nullptr 1606847 3 387656 cturner 2020-01-15 02:12:52 -0800 Comment on attachment 387656 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387656&action=review Looking forward to apply this locally and fixing lots of buffering bugs :-) > Source/WebCore/ChangeLog:25 > + * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: Download as fast as possible when My review window is not showing me any changes in WKWS, is this up-to-date? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2303 > + auto wasBuffering = m_isBuffering; auto is not needed here, please use bool 1606890 4 387782 tsaunier 2020-01-15 05:51:10 -0800 Created attachment 387782 Patch for landing 1606891 5 387782 commit-queue 2020-01-15 05:52:55 -0800 Comment on attachment 387782 Patch for landing Rejecting attachment 387782 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 387782, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: https://webkit-queues.webkit.org/results/13304751 1606894 6 387785 tsaunier 2020-01-15 05:56:00 -0800 Created attachment 387785 Patch for landing 1606905 7 387785 commit-queue 2020-01-15 06:40:05 -0800 Comment on attachment 387785 Patch for landing Clearing flags on attachment: 387785 Committed r254565: <https://trac.webkit.org/changeset/254565> 1606906 8 commit-queue 2020-01-15 06:40:07 -0800 All reviewed patches have been landed. Closing bug. 1606908 9 webkit-bug-importer 2020-01-15 06:41:13 -0800 <rdar://problem/58604046> 1607278 10 clopez 2020-01-15 17:50:36 -0800 (In reply to WebKit Commit Bot from comment #7) > Comment on attachment 387785 [details] > Patch for landing > > Clearing flags on attachment: 387785 > > Committed r254565: <https://trac.webkit.org/changeset/254565> This has caused lot of timeouts on the GTK port. The bot its aborting early. I double-checked it locally, reverting this patch makes the timeout go away. At least 39 new timeouts, and likely more. I didn't ran the whole layout test suite. Regressions: Unexpected timeouts (39) compositing/geometry/clipped-video-controller.html [ Timeout ] compositing/geometry/video-fixed-scrolling.html [ Timeout ] compositing/geometry/video-opacity-overlay.html [ Timeout ] compositing/layers-inside-overflow-scroll.html [ Timeout ] compositing/overflow/overflow-compositing-descendant.html [ Timeout ] compositing/overflow/scroll-ancestor-update.html [ Timeout ] compositing/reflections/load-video-in-reflection.html [ Timeout ] compositing/self-painting-layers.html [ Timeout ] compositing/shared-backing/clipping-and-shared-backing.html [ Timeout ] compositing/video-page-visibility.html [ Timeout ] compositing/video/poster.html [ Timeout ] compositing/video/video-background-color.html [ Timeout ] compositing/video/video-border-radius-clipping.html [ Timeout ] compositing/video/video-border-radius.html [ Timeout ] compositing/video/video-clip-change-src.html [ Timeout ] compositing/video/video-object-fit.html [ Timeout ] compositing/video/video-object-position.html [ Timeout ] compositing/video/video-poster.html [ Timeout ] compositing/video/video-reflection.html [ Timeout ] fullscreen/full-screen-iframe-legacy.html [ Timeout ] fullscreen/video-controls-timeline.html [ Timeout ] legacy-animation-engine/compositing/reflections/load-video-in-reflection.html [ Timeout ] media/W3C/audio/events/event_canplaythrough.html [ Timeout ] media/W3C/audio/events/event_canplaythrough_manual.html [ Timeout ] media/W3C/audio/events/event_order_canplay_canplaythrough.html [ Timeout ] media/W3C/audio/paused/paused_false_during_play.html [ Timeout ] media/W3C/audio/readyState/readyState_during_canplaythrough.html [ Timeout ] media/W3C/audio/readyState/readyState_during_playing.html [ Timeout ] media/W3C/video/events/event_canplaythrough.html [ Timeout ] media/W3C/video/events/event_order_canplay_canplaythrough.html [ Timeout ] media/W3C/video/networkState/networkState_during_progress.html [ Timeout ] media/W3C/video/paused/paused_false_during_play.html [ Timeout ] media/W3C/video/readyState/readyState_during_canplaythrough.html [ Timeout ] media/W3C/video/readyState/readyState_during_playing.html [ Timeout ] media/accessiblity-describes-video.html [ Timeout ] media/audio-background-playback-playlist.html [ Timeout ] media/media-fragments/TC0001.html [ Timeout ] media/media-fragments/TC0002.html [ Timeout ] media/track/audio/audio-track-mkv-vorbis-addtrack.html [ Timeout ] See: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Tests%29/builds/12379 Unless you have a quick fix I think we should revert this patch, because the GTK test bot it is in really bad state. 1607288 11 commit-queue 2020-01-15 18:06:18 -0800 Re-opened since this is blocked by bug 206331 1607429 12 387912 tsaunier 2020-01-16 05:34:34 -0800 Created attachment 387912 Patch 1607430 13 tsaunier 2020-01-16 05:35:13 -0800 (In reply to Carlos Alberto Lopez Perez from comment #10) > (In reply to WebKit Commit Bot from comment #7) > > Comment on attachment 387785 [details] > > Patch for landing > > > > Clearing flags on attachment: 387785 > > > > Committed r254565: <https://trac.webkit.org/changeset/254565> > > This has caused lot of timeouts on the GTK port. The bot its aborting early. > I double-checked it locally, reverting this patch makes the timeout go away. > At least 39 new timeouts, and likely more. I didn't ran the whole layout > test suite. > > Regressions: Unexpected timeouts (39) > compositing/geometry/clipped-video-controller.html [ Timeout ] > compositing/geometry/video-fixed-scrolling.html [ Timeout ] > compositing/geometry/video-opacity-overlay.html [ Timeout ] > compositing/layers-inside-overflow-scroll.html [ Timeout ] > compositing/overflow/overflow-compositing-descendant.html [ Timeout ] > compositing/overflow/scroll-ancestor-update.html [ Timeout ] > compositing/reflections/load-video-in-reflection.html [ Timeout ] > compositing/self-painting-layers.html [ Timeout ] > compositing/shared-backing/clipping-and-shared-backing.html [ Timeout ] > compositing/video-page-visibility.html [ Timeout ] > compositing/video/poster.html [ Timeout ] > compositing/video/video-background-color.html [ Timeout ] > compositing/video/video-border-radius-clipping.html [ Timeout ] > compositing/video/video-border-radius.html [ Timeout ] > compositing/video/video-clip-change-src.html [ Timeout ] > compositing/video/video-object-fit.html [ Timeout ] > compositing/video/video-object-position.html [ Timeout ] > compositing/video/video-poster.html [ Timeout ] > compositing/video/video-reflection.html [ Timeout ] > fullscreen/full-screen-iframe-legacy.html [ Timeout ] > fullscreen/video-controls-timeline.html [ Timeout ] > > legacy-animation-engine/compositing/reflections/load-video-in-reflection. > html [ Timeout ] > media/W3C/audio/events/event_canplaythrough.html [ Timeout ] > media/W3C/audio/events/event_canplaythrough_manual.html [ Timeout ] > media/W3C/audio/events/event_order_canplay_canplaythrough.html [ Timeout ] > media/W3C/audio/paused/paused_false_during_play.html [ Timeout ] > media/W3C/audio/readyState/readyState_during_canplaythrough.html [ Timeout > ] > media/W3C/audio/readyState/readyState_during_playing.html [ Timeout ] > media/W3C/video/events/event_canplaythrough.html [ Timeout ] > media/W3C/video/events/event_order_canplay_canplaythrough.html [ Timeout ] > media/W3C/video/networkState/networkState_during_progress.html [ Timeout ] > media/W3C/video/paused/paused_false_during_play.html [ Timeout ] > media/W3C/video/readyState/readyState_during_canplaythrough.html [ Timeout > ] > media/W3C/video/readyState/readyState_during_playing.html [ Timeout ] > media/accessiblity-describes-video.html [ Timeout ] > media/audio-background-playback-playlist.html [ Timeout ] > media/media-fragments/TC0001.html [ Timeout ] > media/media-fragments/TC0002.html [ Timeout ] > media/track/audio/audio-track-mkv-vorbis-addtrack.html [ Timeout ] > > > > See: > https://build.webkit.org/builders/GTK%20Linux%2064- > bit%20Release%20%28Tests%29/builds/12379 > > > Unless you have a quick fix I think we should revert this patch, because the > GTK test bot it is in really bad state. The problem was stupid simple! I was basically saying that fillTimerFired should not fire an Buffering update if the pipeline didn't answer in DOWNLOAD mode, but this leaded to the pipeline never considering downloadDone for local files. I think further refactoring to avoid that codepath all together could be done, but I added that check mainly because we where querying bufferring on the source instead of the pipelines where we could get result from random elements in the pipeline and where getting results sometimes in DOWNLOAD and sometime in STREAM modes, now that we query the pipeline we can keep updating buffering from the fillTimer callback I think. No regression timeout with the new version of the patch. 1607437 14 dpino 2020-01-16 06:05:46 -0800 *** Bug 206338 has been marked as a duplicate of this bug. *** 1607485 15 387912 commit-queue 2020-01-16 08:14:19 -0800 Comment on attachment 387912 Patch Clearing flags on attachment: 387912 Committed r254684: <https://trac.webkit.org/changeset/254684> 1607486 16 commit-queue 2020-01-16 08:14:21 -0800 All reviewed patches have been landed. Closing bug. 387656 2020-01-14 07:53:21 -0800 2020-01-15 05:51:04 -0800 Patch bug-206234-20200114125320.patch text/plain 8013 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNkNDNiOTcyODc3MjMy YjIxNWE3YjQ3MDgwZmE0ZmQzMTM4MGY2OC4uNDlkMzM4NDE5NDQ1YmEwOThlYjIwNzM1ODdjMzA2 OGJjNjdjMWVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTEyLTMwICBUaGli YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTZXZlcmFsIGJ1ZmZlcmluZyBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMgYWxyZWFkeSB0ZXN0ZWQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6ZHVyYXRpb25DaGFuZ2VkKTogTWlub3IgdHlwbyBmaXgKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQpOiBRdWVyeSBi dWZmZXJpbmcgb24gdGhlIHBpcGVsaW5lIG5vdCB0aGUgc291cmNlCisgICAgICAgICAgICBvdGhl cndpc2UgR3N0QmFzZVNyYyByZXR1cm5zIHNvbWUgdXNlbGVzcyB2YWx1ZXMgYmVmb3JlIGBkb3du bG9hZGJ1ZmZlcmAgYWN0dWFsbHkgZ2l2ZXMgdXMgdGhlCisgICAgICAgICAgICBpbmZvIGFib3V0 IERPV05MT0FEIGJ1ZmZlcmluZyBzdGF0dXMuIEFsc28gaWdub3JlcyByZXNwb25zZSBpZiB0aGV5 IGFyZSBub3QgaW4gRE9XTkxPQUQgbW9kZSBhcyB0aG9zZQorICAgICAgICAgICAgd2lsbCBlbmQg dXAgc2NyZXdpbmcgb3VyIGJ1ZmZlcmluZyBtYW5hZ2VtZW50IGFsZ29yaXRobS4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFuZGxlTWVzc2FnZSk6Cisg ICAgICAgICAgICAtIERldGVjdCB3aGVuIERPV05MT0FEIGlzIGRvbmUgYnkgdXNpbmcgdGhlIGBk b3dubG9hZGJ1ZmZlcmAgYEdzdENhY2hlRG93bmxvYWRDb21wbGV0ZWAKKyAgICAgICAgICAgICAg ZWxlbWVudCBtZXNzYWdlIHdoaWNoIGlzIHdoYXQgaXMgc3VwcG9zZWQgdG8gYmUgdXNlZCBmb3Ig dGhhdCBwdXJwb3NlLgorICAgICAgICAgICAgLSBGaXggdGhlIHdheSB3ZSBkZXRlY3QgdGhhdCBi dWZmZXJpbmcgaXMgZG9uZSAobW9zdGx5IHdoZW4gdXNpbmcgYSBgZG93bmxvYWRidWZmZXJgKSBi eSByZWx5aW5nIG9uIGEKKyAgICAgICAgICAgICAgYnVmZmVyaW5nIHF1ZXJ5IHRvIGNoZWNrIGlm IGl0IGlzIHN0aWxsIGJ1ZmZlcmluZy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6dXBkYXRlQnVmZmVyaW5nU3RhdHVzKTogRW5zdXJlIHRoYXQgd2UgcHJv cGVybHkgcGF1c2UgdGhlIHBpcGVsaW5lIHdoZW4KKyAgICAgICAgICAgIHJlc3RhcnRpbmcgYnVm ZmVyaW5nLiBUaGVyZSB3ZXJlIGNhc2VzIHdoZW4gbm90IHVzaW5nIGBkb3dubG9hZGJ1ZmZlcmAg d2hlcmUgd2UgZGlkbid0IHBhdXNlIHRoZSBwaXBlbGluZQorICAgICAgICAgICAgbGVhZGluZyB0 byBwcmV0dHkgYmFkIHVzZXIgZXhwZXJpZW5jZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVzKTogQnVmZmVyaW5nIHNob3VsZCBoYXBw ZW4gb25seSBvbiAqKm5vbiBsaXZlKiogcGlwZWxpbmVzLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwOiBEb3dubG9hZCBh cyBmYXN0IGFzIHBvc3NpYmxlIHdoZW4KKyAgICAgICAgICB3ZSBhcmUgdXNpbmcgYSBgZG93bmxv YWRidWZmZXJgIGFuZCBub3QgbGltaXQgdGhlIHNvdXJjZSBpbiB0aGF0IGNhc2UgYXMgdGhlIHN0 cmVhbSBpcyBnb25uYSBiZSB3cml0dGVuIG9uCisgICAgICAgICAgZGlzayBhcyBmYXN0IGFzIHBv c3NpYmxlIGFueXdheS4KKwogMjAyMC0wMS0xNCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxj YWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIFJld29yayBXZWJLaXRX ZWJTcmMgdG8gaW1wcm92ZSByb2J1c3RuZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGRhMzE2YzhjODc1OGI4YzA1NmYzODY3ZWM2OWJh NTUzMWUyOTMzNGYuLjUwYjg0NmMyNTNiNzA5MjIwOTVkYTVmODI4YzhhNDdhNWQ2ZmI4OWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0x MDUzLDcgKzEwNTMsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZHVyYXRp b25DaGFuZ2VkKCkKICAgICBNZWRpYVRpbWUgcHJldmlvdXNEdXJhdGlvbiA9IGR1cmF0aW9uTWVk aWFUaW1lKCk7CiAgICAgbV9jYWNoZWREdXJhdGlvbiA9IE1lZGlhVGltZTo6aW52YWxpZFRpbWUo KTsKIAotICAgIC8vIEF2b2lkIGVtaXRpbmcgZHVyYXRpb25jaGFuZ2VkIGluIHRoZSBjYXNlIHdo ZXJlIHRoZSBwcmV2aW91cworICAgIC8vIEF2b2lkIGVtaXR0aW5nIGR1cmF0aW9uQ2hhbmdlZCBp biB0aGUgY2FzZSB3aGVyZSB0aGUgcHJldmlvdXMKICAgICAvLyBkdXJhdGlvbiB3YXMgMCBiZWNh dXNlIHRoYXQgY2FzZSBpcyBhbHJlYWR5IGhhbmRsZWQgYnkgdGhlCiAgICAgLy8gSFRNTE1lZGlh RWxlbWVudC4KICAgICBpZiAocHJldmlvdXNEdXJhdGlvbiAmJiBkdXJhdGlvbk1lZGlhVGltZSgp ICE9IHByZXZpb3VzRHVyYXRpb24pCkBAIC0xNDU2LDcgKzE0NTYsNyBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQoKQogICAgIGRvdWJsZSBmaWxsU3Rh dHVzID0gMTAwLjA7CiAgICAgR3N0QnVmZmVyaW5nTW9kZSBtb2RlID0gR1NUX0JVRkZFUklOR19E T1dOTE9BRDsKIAotICAgIGlmIChnc3RfZWxlbWVudF9xdWVyeShtX3NvdXJjZS5nZXQoKSwgcXVl cnkuZ2V0KCkpKSB7CisgICAgaWYgKGdzdF9lbGVtZW50X3F1ZXJ5KHBpcGVsaW5lKCksIHF1ZXJ5 LmdldCgpKSkgewogICAgICAgICBnc3RfcXVlcnlfcGFyc2VfYnVmZmVyaW5nX3N0YXRzKHF1ZXJ5 LmdldCgpLCAmbW9kZSwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cik7CiAKICAgICAgICAgaW50 IHBlcmNlbnRhZ2U7CkBAIC0xNDcwLDcgKzE0NzAsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmZpbGxUaW1lckZpcmVkKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIHVwZGF0ZUJ1ZmZlcmluZ1N0YXR1cyhtb2RlLCBmaWxsU3RhdHVzKTsKKyAgICBpZiAobW9k ZSAhPSBHU1RfQlVGRkVSSU5HX0RPV05MT0FEKQorICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlw ZWxpbmUoKSwgIklnbm9yaW5nIGJ1ZmZlcmluZyBpbiAlcyIsIGVudW1Ub1N0cmluZyhHU1RfVFlQ RV9CVUZGRVJJTkdfTU9ERSwgbW9kZSkuZGF0YSgpKTsKKyAgICBlbHNlCisgICAgICAgIHVwZGF0 ZUJ1ZmZlcmluZ1N0YXR1cyhtb2RlLCBmaWxsU3RhdHVzKTsKIH0KIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmxvYWRTdGF0ZUNoYW5nZWQoKQpAQCAtMjE5OCw2ICsyMjAxLDEx IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYW5kbGVNZXNzYWdlKEdzdE1l c3NhZ2UqIG1lc3NhZ2UpCiAgICAgICAgICAgICAgICAgaWYgKGNvbnN0IGNoYXIqIHVyaSA9IGdz dF9zdHJ1Y3R1cmVfZ2V0X3N0cmluZyhzdHJ1Y3R1cmUsICJ1cmkiKSkKICAgICAgICAgICAgICAg ICAgICAgbV9oYXNUYWludGVkT3JpZ2luID0gd2ViS2l0U3JjV291bGRUYWludE9yaWdpbihXRUJL SVRfV0VCX1NSQ19DQVNUKG1fc291cmNlLmdldCgpKSwgU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShV UkwoVVJMKCksIHVyaSkpKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChnc3Rf c3RydWN0dXJlX2hhc19uYW1lKHN0cnVjdHVyZSwgIkdzdENhY2hlRG93bmxvYWRDb21wbGV0ZSIp KSB7CisgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIlN0cmVhbSBpcyBm dWxseSBkb3dubG9hZGVkLCBzdG9wcGluZyBtb25pdG9yaW5nIGRvd25sb2FkaW5nIHByb2dyZXNz LiIpOworICAgICAgICAgICAgbV9maWxsVGltZXIuc3RvcCgpOworICAgICAgICAgICAgbV9idWZm ZXJpbmdQZXJjZW50YWdlID0gMTAwOworICAgICAgICAgICAgdXBkYXRlU3RhdGVzKCk7CiAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVW5o YW5kbGVkIGVsZW1lbnQgbWVzc2FnZTogJSIgR1NUX1BUUl9GT1JNQVQsIHN0cnVjdHVyZSk7CiAg ICAgICAgIGJyZWFrOwpAQCAtMjI5MiwyOSArMjMwMCwzMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6dXBkYXRlTWF4VGltZUxvYWRlZChkb3VibGUgcGVyY2VudGFnZSkKIAog dm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZUJ1ZmZlcmluZ1N0YXR1cyhH c3RCdWZmZXJpbmdNb2RlIG1vZGUsIGRvdWJsZSBwZXJjZW50YWdlKQogeworICAgIGF1dG8gd2Fz QnVmZmVyaW5nID0gbV9pc0J1ZmZlcmluZzsKKwogICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxp bmUoKSwgIltCdWZmZXJpbmddIG1vZGU6ICVzLCBzdGF0dXM6ICVmJSUiLCBlbnVtVG9TdHJpbmco R1NUX1RZUEVfQlVGRkVSSU5HX01PREUsIG1vZGUpLmRhdGEoKSwgcGVyY2VudGFnZSk7CiAKICAg ICBtX2RpZERvd25sb2FkRmluaXNoID0gcGVyY2VudGFnZSA9PSAxMDA7CisgICAgR1NUX1RSQUNF X09CSkVDVChwaXBlbGluZSgpLCAiZGlkIGRvd25sb2FkIGZpbmlzaCAlcyIsIGJvb2xGb3JQcmlu dGluZyhtX2RpZERvd25sb2FkRmluaXNoKSk7CiAgICAgbV9pc0J1ZmZlcmluZyA9ICFtX2RpZERv d25sb2FkRmluaXNoOwogCisgICAgaWYgKCFtX2RpZERvd25sb2FkRmluaXNoKQorICAgICAgICBt X2lzQnVmZmVyaW5nID0gdHJ1ZTsKKworICAgIG1fYnVmZmVyaW5nUGVyY2VudGFnZSA9IHBlcmNl bnRhZ2U7CiAgICAgc3dpdGNoIChtb2RlKSB7CiAgICAgY2FzZSBHU1RfQlVGRkVSSU5HX1NUUkVB TTogewogICAgICAgICB1cGRhdGVNYXhUaW1lTG9hZGVkKHBlcmNlbnRhZ2UpOwogCiAgICAgICAg IG1fYnVmZmVyaW5nUGVyY2VudGFnZSA9IHBlcmNlbnRhZ2U7Ci0gICAgICAgIGlmIChtX2RpZERv d25sb2FkRmluaXNoKQorICAgICAgICBpZiAobV9kaWREb3dubG9hZEZpbmlzaCB8fCAoIXdhc0J1 ZmZlcmluZyAmJiBtX2lzQnVmZmVyaW5nKSkKICAgICAgICAgICAgIHVwZGF0ZVN0YXRlcygpOwog CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIEdTVF9CVUZGRVJJTkdfRE9XTkxPQUQ6 IHsKICAgICAgICAgdXBkYXRlTWF4VGltZUxvYWRlZChwZXJjZW50YWdlKTsKLQotICAgICAgICAv LyBNZWRpYSBpcyBub3cgZnVsbHkgbG9hZGVkLiBJdCB3aWxsIHBsYXkgZXZlbiBpZiBuZXR3b3Jr IGNvbm5lY3Rpb24gaXMKLSAgICAgICAgLy8gY3V0LiBCdWZmZXJpbmcgaXMgZG9uZSwgcmVtb3Zl IHRoZSBmaWxsIHNvdXJjZSBmcm9tIHRoZSBtYWluIGxvb3AuCi0gICAgICAgIGlmIChtX2RpZERv d25sb2FkRmluaXNoKQotICAgICAgICAgICAgbV9maWxsVGltZXIuc3RvcCgpOwotCiAgICAgICAg IHVwZGF0ZVN0YXRlcygpOwogICAgICAgICBicmVhazsKICAgICB9CkBAIC0yNTc3LDkgKzI1ODYs MTQgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAg ICAgICAgICAgICBGQUxMVEhST1VHSDsKICAgICAgICAgY2FzZSBHU1RfU1RBVEVfUExBWUlORzoK ICAgICAgICAgICAgIGlmIChtX2lzQnVmZmVyaW5nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG1f YnVmZmVyaW5nUGVyY2VudGFnZSA9PSAxMDApIHsKLSAgICAgICAgICAgICAgICAgICAgR1NUX0RF QlVHX09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gQ29tcGxldGUuIik7Ci0gICAgICAg ICAgICAgICAgICAgIG1faXNCdWZmZXJpbmcgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBHUmVm UHRyPEdzdFF1ZXJ5PiBxdWVyeSA9IGFkb3B0R1JlZihnc3RfcXVlcnlfbmV3X2J1ZmZlcmluZyhH U1RfRk9STUFUX1BFUkNFTlQpKTsKKworICAgICAgICAgICAgICAgIG1faXNCdWZmZXJpbmcgPSBt X2J1ZmZlcmluZ1BlcmNlbnRhZ2UgPT0gMTAwOworICAgICAgICAgICAgICAgIGlmIChnc3RfZWxl bWVudF9xdWVyeShtX3BpcGVsaW5lLmdldCgpLCBxdWVyeS5nZXQoKSkpCisgICAgICAgICAgICAg ICAgICAgIGdzdF9xdWVyeV9wYXJzZV9idWZmZXJpbmdfcGVyY2VudChxdWVyeS5nZXQoKSwgKGdi b29sZWFuKikgJm1faXNCdWZmZXJpbmcsIE5VTEwpOworCisgICAgICAgICAgICAgICAgaWYgKCFt X2lzQnVmZmVyaW5nKSB7CisgICAgICAgICAgICAgICAgICAgIEdTVF9JTkZPX09CSkVDVChwaXBl bGluZSgpLCAiW0J1ZmZlcmluZ10gQ29tcGxldGUuIik7CiAgICAgICAgICAgICAgICAgICAgIG1f cmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlOjpIYXZlRW5vdWdoRGF0YTsKICAg ICAgICAgICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBtX2RpZERvd25sb2FkRmluaXNoID8g TWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZTo6SWRsZSA6IE1lZGlhUGxheWVyOjpOZXR3b3JrU3Rh dGU6OkxvYWRpbmc7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTI2MDksMTQgKzI2MjMs MTQgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChkaWRCdWZmZXJpbmcgJiYgIW1faXNCdWZm ZXJpbmcgJiYgIW1faXNQYXVzZWQgJiYgbV9wbGF5YmFja1JhdGUpIHsKLSAgICAgICAgICAgICAg ICBHU1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lKCksICJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBs YXliYWNrLiIpOworICAgICAgICAgICAgICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAi W0J1ZmZlcmluZ10gUmVzdGFydGluZyBwbGF5YmFjay4iKTsKICAgICAgICAgICAgICAgICBjaGFu Z2VQaXBlbGluZVN0YXRlKEdTVF9TVEFURV9QTEFZSU5HKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfSBlbHNlIGlmIChtX2N1cnJlbnRTdGF0ZSA9PSBHU1RfU1RBVEVfUExBWUlORykgewogICAg ICAgICAgICAgbV9pc1BhdXNlZCA9IGZhbHNlOwogCiAgICAgICAgICAgICBpZiAoKG1faXNCdWZm ZXJpbmcgJiYgIW1faXNMaXZlU3RyZWFtKSB8fCAhbV9wbGF5YmFja1JhdGUpIHsKLSAgICAgICAg ICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lKCksICJbQnVmZmVyaW5nXSBQYXVzaW5n IHN0cmVhbSBmb3IgYnVmZmVyaW5nLiIpOworICAgICAgICAgICAgICAgIEdTVF9JTkZPX09CSkVD VChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gUGF1c2luZyBzdHJlYW0gZm9yIGJ1ZmZlcmluZy4i KTsKICAgICAgICAgICAgICAgICBjaGFuZ2VQaXBlbGluZVN0YXRlKEdTVF9TVEFURV9QQVVTRUQp OwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UK 387782 2020-01-15 05:51:10 -0800 2020-01-15 05:55:37 -0800 Patch for landing bug-206234-20200115105109.patch text/plain 7768 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNkNDNiOTcyODc3MjMy YjIxNWE3YjQ3MDgwZmE0ZmQzMTM4MGY2OC4uZjFjNmVlNjliYjk5ODBiZjJjMjZkMjc3MGY4Mjc1 NmY0NTIwNzIyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEyLTMwICBUaGli YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTZXZlcmFsIGJ1ZmZlcmluZyBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMgYWxyZWFkeSB0ZXN0ZWQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6ZHVyYXRpb25DaGFuZ2VkKTogTWlub3IgdHlwbyBmaXgKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQpOiBRdWVyeSBi dWZmZXJpbmcgb24gdGhlIHBpcGVsaW5lIG5vdCB0aGUgc291cmNlCisgICAgICAgICAgICBvdGhl cndpc2UgR3N0QmFzZVNyYyByZXR1cm5zIHNvbWUgdXNlbGVzcyB2YWx1ZXMgYmVmb3JlIGBkb3du bG9hZGJ1ZmZlcmAgYWN0dWFsbHkgZ2l2ZXMgdXMgdGhlCisgICAgICAgICAgICBpbmZvIGFib3V0 IERPV05MT0FEIGJ1ZmZlcmluZyBzdGF0dXMuIEFsc28gaWdub3JlcyByZXNwb25zZSBpZiB0aGV5 IGFyZSBub3QgaW4gRE9XTkxPQUQgbW9kZSBhcyB0aG9zZQorICAgICAgICAgICAgd2lsbCBlbmQg dXAgc2NyZXdpbmcgb3VyIGJ1ZmZlcmluZyBtYW5hZ2VtZW50IGFsZ29yaXRobS4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFuZGxlTWVzc2FnZSk6Cisg ICAgICAgICAgICAtIERldGVjdCB3aGVuIERPV05MT0FEIGlzIGRvbmUgYnkgdXNpbmcgdGhlIGBk b3dubG9hZGJ1ZmZlcmAgYEdzdENhY2hlRG93bmxvYWRDb21wbGV0ZWAKKyAgICAgICAgICAgICAg ZWxlbWVudCBtZXNzYWdlIHdoaWNoIGlzIHdoYXQgaXMgc3VwcG9zZWQgdG8gYmUgdXNlZCBmb3Ig dGhhdCBwdXJwb3NlLgorICAgICAgICAgICAgLSBGaXggdGhlIHdheSB3ZSBkZXRlY3QgdGhhdCBi dWZmZXJpbmcgaXMgZG9uZSAobW9zdGx5IHdoZW4gdXNpbmcgYSBgZG93bmxvYWRidWZmZXJgKSBi eSByZWx5aW5nIG9uIGEKKyAgICAgICAgICAgICAgYnVmZmVyaW5nIHF1ZXJ5IHRvIGNoZWNrIGlm IGl0IGlzIHN0aWxsIGJ1ZmZlcmluZy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6dXBkYXRlQnVmZmVyaW5nU3RhdHVzKTogRW5zdXJlIHRoYXQgd2UgcHJv cGVybHkgcGF1c2UgdGhlIHBpcGVsaW5lIHdoZW4KKyAgICAgICAgICAgIHJlc3RhcnRpbmcgYnVm ZmVyaW5nLiBUaGVyZSB3ZXJlIGNhc2VzIHdoZW4gbm90IHVzaW5nIGBkb3dubG9hZGJ1ZmZlcmAg d2hlcmUgd2UgZGlkbid0IHBhdXNlIHRoZSBwaXBlbGluZQorICAgICAgICAgICAgbGVhZGluZyB0 byBwcmV0dHkgYmFkIHVzZXIgZXhwZXJpZW5jZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVzKTogQnVmZmVyaW5nIHNob3VsZCBoYXBw ZW4gb25seSBvbiAqKm5vbiBsaXZlKiogcGlwZWxpbmVzLgorCiAyMDIwLTAxLTE0ICBYYWJpZXIg Um9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJl YW1lcl0gUmV3b3JrIFdlYktpdFdlYlNyYyB0byBpbXByb3ZlIHJvYnVzdG5lc3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggZGEzMTZjOGM4 NzU4YjhjMDU2ZjM4NjdlYzY5YmE1NTMxZTI5MzM0Zi4uNWIyZjBjZGM4MTVjNmNhYWZjZjQyMzQ0 NTBlNzc5OTdjZGUyMmQzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAKQEAgLTEwNTMsNyArMTA1Myw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjpkdXJhdGlvbkNoYW5nZWQoKQogICAgIE1lZGlhVGltZSBwcmV2aW91c0R1 cmF0aW9uID0gZHVyYXRpb25NZWRpYVRpbWUoKTsKICAgICBtX2NhY2hlZER1cmF0aW9uID0gTWVk aWFUaW1lOjppbnZhbGlkVGltZSgpOwogCi0gICAgLy8gQXZvaWQgZW1pdGluZyBkdXJhdGlvbmNo YW5nZWQgaW4gdGhlIGNhc2Ugd2hlcmUgdGhlIHByZXZpb3VzCisgICAgLy8gQXZvaWQgZW1pdHRp bmcgZHVyYXRpb25DaGFuZ2VkIGluIHRoZSBjYXNlIHdoZXJlIHRoZSBwcmV2aW91cwogICAgIC8v IGR1cmF0aW9uIHdhcyAwIGJlY2F1c2UgdGhhdCBjYXNlIGlzIGFscmVhZHkgaGFuZGxlZCBieSB0 aGUKICAgICAvLyBIVE1MTWVkaWFFbGVtZW50LgogICAgIGlmIChwcmV2aW91c0R1cmF0aW9uICYm IGR1cmF0aW9uTWVkaWFUaW1lKCkgIT0gcHJldmlvdXNEdXJhdGlvbikKQEAgLTE0NTYsNyArMTQ1 Niw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpmaWxsVGltZXJGaXJlZCgp CiAgICAgZG91YmxlIGZpbGxTdGF0dXMgPSAxMDAuMDsKICAgICBHc3RCdWZmZXJpbmdNb2RlIG1v ZGUgPSBHU1RfQlVGRkVSSU5HX0RPV05MT0FEOwogCi0gICAgaWYgKGdzdF9lbGVtZW50X3F1ZXJ5 KG1fc291cmNlLmdldCgpLCBxdWVyeS5nZXQoKSkpIHsKKyAgICBpZiAoZ3N0X2VsZW1lbnRfcXVl cnkocGlwZWxpbmUoKSwgcXVlcnkuZ2V0KCkpKSB7CiAgICAgICAgIGdzdF9xdWVyeV9wYXJzZV9i dWZmZXJpbmdfc3RhdHMocXVlcnkuZ2V0KCksICZtb2RlLCBudWxscHRyLCBudWxscHRyLCBudWxs cHRyKTsKIAogICAgICAgICBpbnQgcGVyY2VudGFnZTsKQEAgLTE0NzAsNyArMTQ3MCwxMCBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQoKQogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgdXBkYXRlQnVmZmVyaW5nU3RhdHVzKG1vZGUsIGZpbGxT dGF0dXMpOworICAgIGlmIChtb2RlICE9IEdTVF9CVUZGRVJJTkdfRE9XTkxPQUQpCisgICAgICAg IEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiSWdub3JpbmcgYnVmZmVyaW5nIGluICVzIiwg ZW51bVRvU3RyaW5nKEdTVF9UWVBFX0JVRkZFUklOR19NT0RFLCBtb2RlKS5kYXRhKCkpOworICAg IGVsc2UKKyAgICAgICAgdXBkYXRlQnVmZmVyaW5nU3RhdHVzKG1vZGUsIGZpbGxTdGF0dXMpOwog fQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZFN0YXRlQ2hhbmdlZCgp CkBAIC0yMTk4LDYgKzIyMDEsMTEgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OmhhbmRsZU1lc3NhZ2UoR3N0TWVzc2FnZSogbWVzc2FnZSkKICAgICAgICAgICAgICAgICBpZiAo Y29uc3QgY2hhciogdXJpID0gZ3N0X3N0cnVjdHVyZV9nZXRfc3RyaW5nKHN0cnVjdHVyZSwgInVy aSIpKQogICAgICAgICAgICAgICAgICAgICBtX2hhc1RhaW50ZWRPcmlnaW4gPSB3ZWJLaXRTcmNX b3VsZFRhaW50T3JpZ2luKFdFQktJVF9XRUJfU1JDX0NBU1QobV9zb3VyY2UuZ2V0KCkpLCBTZWN1 cml0eU9yaWdpbjo6Y3JlYXRlKFVSTChVUkwoKSwgdXJpKSkpOwogICAgICAgICAgICAgfQorICAg ICAgICB9IGVsc2UgaWYgKGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUoc3RydWN0dXJlLCAiR3N0Q2Fj aGVEb3dubG9hZENvbXBsZXRlIikpIHsKKyAgICAgICAgICAgIEdTVF9JTkZPX09CSkVDVChwaXBl bGluZSgpLCAiU3RyZWFtIGlzIGZ1bGx5IGRvd25sb2FkZWQsIHN0b3BwaW5nIG1vbml0b3Jpbmcg ZG93bmxvYWRpbmcgcHJvZ3Jlc3MuIik7CisgICAgICAgICAgICBtX2ZpbGxUaW1lci5zdG9wKCk7 CisgICAgICAgICAgICBtX2J1ZmZlcmluZ1BlcmNlbnRhZ2UgPSAxMDA7CisgICAgICAgICAgICB1 cGRhdGVTdGF0ZXMoKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBHU1RfREVCVUdfT0JK RUNUKHBpcGVsaW5lKCksICJVbmhhbmRsZWQgZWxlbWVudCBtZXNzYWdlOiAlIiBHU1RfUFRSX0ZP Uk1BVCwgc3RydWN0dXJlKTsKICAgICAgICAgYnJlYWs7CkBAIC0yMjkyLDI5ICsyMzAwLDI5IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVNYXhUaW1lTG9hZGVkKGRv dWJsZSBwZXJjZW50YWdlKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBk YXRlQnVmZmVyaW5nU3RhdHVzKEdzdEJ1ZmZlcmluZ01vZGUgbW9kZSwgZG91YmxlIHBlcmNlbnRh Z2UpCiB7CisgICAgYm9vbCB3YXNCdWZmZXJpbmcgPSBtX2lzQnVmZmVyaW5nOworCiAgICAgR1NU X0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gbW9kZTogJXMsIHN0YXR1czog JWYlJSIsIGVudW1Ub1N0cmluZyhHU1RfVFlQRV9CVUZGRVJJTkdfTU9ERSwgbW9kZSkuZGF0YSgp LCBwZXJjZW50YWdlKTsKIAogICAgIG1fZGlkRG93bmxvYWRGaW5pc2ggPSBwZXJjZW50YWdlID09 IDEwMDsKICAgICBtX2lzQnVmZmVyaW5nID0gIW1fZGlkRG93bmxvYWRGaW5pc2g7CiAKKyAgICBp ZiAoIW1fZGlkRG93bmxvYWRGaW5pc2gpCisgICAgICAgIG1faXNCdWZmZXJpbmcgPSB0cnVlOwor CisgICAgbV9idWZmZXJpbmdQZXJjZW50YWdlID0gcGVyY2VudGFnZTsKICAgICBzd2l0Y2ggKG1v ZGUpIHsKICAgICBjYXNlIEdTVF9CVUZGRVJJTkdfU1RSRUFNOiB7CiAgICAgICAgIHVwZGF0ZU1h eFRpbWVMb2FkZWQocGVyY2VudGFnZSk7CiAKICAgICAgICAgbV9idWZmZXJpbmdQZXJjZW50YWdl ID0gcGVyY2VudGFnZTsKLSAgICAgICAgaWYgKG1fZGlkRG93bmxvYWRGaW5pc2gpCisgICAgICAg IGlmIChtX2RpZERvd25sb2FkRmluaXNoIHx8ICghd2FzQnVmZmVyaW5nICYmIG1faXNCdWZmZXJp bmcpKQogICAgICAgICAgICAgdXBkYXRlU3RhdGVzKCk7CiAKICAgICAgICAgYnJlYWs7CiAgICAg fQogICAgIGNhc2UgR1NUX0JVRkZFUklOR19ET1dOTE9BRDogewogICAgICAgICB1cGRhdGVNYXhU aW1lTG9hZGVkKHBlcmNlbnRhZ2UpOwotCi0gICAgICAgIC8vIE1lZGlhIGlzIG5vdyBmdWxseSBs b2FkZWQuIEl0IHdpbGwgcGxheSBldmVuIGlmIG5ldHdvcmsgY29ubmVjdGlvbiBpcwotICAgICAg ICAvLyBjdXQuIEJ1ZmZlcmluZyBpcyBkb25lLCByZW1vdmUgdGhlIGZpbGwgc291cmNlIGZyb20g dGhlIG1haW4gbG9vcC4KLSAgICAgICAgaWYgKG1fZGlkRG93bmxvYWRGaW5pc2gpCi0gICAgICAg ICAgICBtX2ZpbGxUaW1lci5zdG9wKCk7Ci0KICAgICAgICAgdXBkYXRlU3RhdGVzKCk7CiAgICAg ICAgIGJyZWFrOwogICAgIH0KQEAgLTI1NzcsOSArMjU4NSwxNyBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVzKCkKICAgICAgICAgICAgIEZBTExUSFJPVUdI OwogICAgICAgICBjYXNlIEdTVF9TVEFURV9QTEFZSU5HOgogICAgICAgICAgICAgaWYgKG1faXNC dWZmZXJpbmcpIHsKLSAgICAgICAgICAgICAgICBpZiAobV9idWZmZXJpbmdQZXJjZW50YWdlID09 IDEwMCkgewotICAgICAgICAgICAgICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHBpcGVsaW5lKCks ICJbQnVmZmVyaW5nXSBDb21wbGV0ZS4iKTsKLSAgICAgICAgICAgICAgICAgICAgbV9pc0J1ZmZl cmluZyA9IGZhbHNlOworICAgICAgICAgICAgICAgIEdSZWZQdHI8R3N0UXVlcnk+IHF1ZXJ5ID0g YWRvcHRHUmVmKGdzdF9xdWVyeV9uZXdfYnVmZmVyaW5nKEdTVF9GT1JNQVRfUEVSQ0VOVCkpOwor CisgICAgICAgICAgICAgICAgbV9pc0J1ZmZlcmluZyA9IG1fYnVmZmVyaW5nUGVyY2VudGFnZSA9 PSAxMDA7CisgICAgICAgICAgICAgICAgaWYgKGdzdF9lbGVtZW50X3F1ZXJ5KG1fcGlwZWxpbmUu Z2V0KCksIHF1ZXJ5LmdldCgpKSkgeworICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiBpc0J1 ZmZlcmluZyA9IG1faXNCdWZmZXJpbmc7CisgICAgICAgICAgICAgICAgICAgIGdzdF9xdWVyeV9w YXJzZV9idWZmZXJpbmdfcGVyY2VudChxdWVyeS5nZXQoKSwgJmlzQnVmZmVyaW5nLCBudWxscHRy KTsKKyAgICAgICAgICAgICAgICAgICAgbV9pc0J1ZmZlcmluZyA9IGlzQnVmZmVyaW5nOworICAg ICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGlmICghbV9pc0J1ZmZlcmluZykgewor ICAgICAgICAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIltCdWZmZXJp bmddIENvbXBsZXRlLiIpOwogICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRp YVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZUVub3VnaERhdGE7CiAgICAgICAgICAgICAgICAgICAg IG1fbmV0d29ya1N0YXRlID0gbV9kaWREb3dubG9hZEZpbmlzaCA/IE1lZGlhUGxheWVyOjpOZXR3 b3JrU3RhdGU6OklkbGUgOiBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpMb2FkaW5nOwogICAg ICAgICAgICAgICAgIH0gZWxzZSB7CkBAIC0yNjA5LDE0ICsyNjI1LDE0IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICBpZiAoZGlkQnVmZmVyaW5nICYmICFtX2lzQnVmZmVyaW5nICYmICFtX2lzUGF1 c2VkICYmIG1fcGxheWJhY2tSYXRlKSB7Ci0gICAgICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVD VChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gUmVzdGFydGluZyBwbGF5YmFjay4iKTsKKyAgICAg ICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIltCdWZmZXJpbmddIFJlc3Rh cnRpbmcgcGxheWJhY2suIik7CiAgICAgICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShH U1RfU1RBVEVfUExBWUlORyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAobV9j dXJyZW50U3RhdGUgPT0gR1NUX1NUQVRFX1BMQVlJTkcpIHsKICAgICAgICAgICAgIG1faXNQYXVz ZWQgPSBmYWxzZTsKIAogICAgICAgICAgICAgaWYgKChtX2lzQnVmZmVyaW5nICYmICFtX2lzTGl2 ZVN0cmVhbSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7Ci0gICAgICAgICAgICAgICAgR1NUX0RFQlVH X09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gUGF1c2luZyBzdHJlYW0gZm9yIGJ1ZmZl cmluZy4iKTsKKyAgICAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIltC dWZmZXJpbmddIFBhdXNpbmcgc3RyZWFtIGZvciBidWZmZXJpbmcuIik7CiAgICAgICAgICAgICAg ICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUEFVU0VEKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfSBlbHNlCg== 387785 2020-01-15 05:56:00 -0800 2020-01-16 05:34:29 -0800 Patch for landing bug-206234-20200115105554.patch text/plain 7777 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGNkNDNiOTcyODc3MjMy YjIxNWE3YjQ3MDgwZmE0ZmQzMTM4MGY2OC4uZmE4YzhhM2MwYTgyYTcyMjc5NzAxNjVhNTA0YjI4 NTcyNjRlMzVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEyLTMwICBUaGli YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTZXZlcmFsIGJ1ZmZlcmluZyBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWGFiaWVyIFJv ZHJpZ3Vlei1DYWx2YXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMgYWxyZWFk eSB0ZXN0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6ZHVyYXRpb25DaGFuZ2VkKTogTWlub3IgdHlwbyBmaXgKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQp OiBRdWVyeSBidWZmZXJpbmcgb24gdGhlIHBpcGVsaW5lIG5vdCB0aGUgc291cmNlCisgICAgICAg ICAgICBvdGhlcndpc2UgR3N0QmFzZVNyYyByZXR1cm5zIHNvbWUgdXNlbGVzcyB2YWx1ZXMgYmVm b3JlIGBkb3dubG9hZGJ1ZmZlcmAgYWN0dWFsbHkgZ2l2ZXMgdXMgdGhlCisgICAgICAgICAgICBp bmZvIGFib3V0IERPV05MT0FEIGJ1ZmZlcmluZyBzdGF0dXMuIEFsc28gaWdub3JlcyByZXNwb25z ZSBpZiB0aGV5IGFyZSBub3QgaW4gRE9XTkxPQUQgbW9kZSBhcyB0aG9zZQorICAgICAgICAgICAg d2lsbCBlbmQgdXAgc2NyZXdpbmcgb3VyIGJ1ZmZlcmluZyBtYW5hZ2VtZW50IGFsZ29yaXRobS4K KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6aGFuZGxlTWVz c2FnZSk6CisgICAgICAgICAgICAtIERldGVjdCB3aGVuIERPV05MT0FEIGlzIGRvbmUgYnkgdXNp bmcgdGhlIGBkb3dubG9hZGJ1ZmZlcmAgYEdzdENhY2hlRG93bmxvYWRDb21wbGV0ZWAKKyAgICAg ICAgICAgICAgZWxlbWVudCBtZXNzYWdlIHdoaWNoIGlzIHdoYXQgaXMgc3VwcG9zZWQgdG8gYmUg dXNlZCBmb3IgdGhhdCBwdXJwb3NlLgorICAgICAgICAgICAgLSBGaXggdGhlIHdheSB3ZSBkZXRl Y3QgdGhhdCBidWZmZXJpbmcgaXMgZG9uZSAobW9zdGx5IHdoZW4gdXNpbmcgYSBgZG93bmxvYWRi dWZmZXJgKSBieSByZWx5aW5nIG9uIGEKKyAgICAgICAgICAgICAgYnVmZmVyaW5nIHF1ZXJ5IHRv IGNoZWNrIGlmIGl0IGlzIHN0aWxsIGJ1ZmZlcmluZy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlQnVmZmVyaW5nU3RhdHVzKTogRW5zdXJlIHRo YXQgd2UgcHJvcGVybHkgcGF1c2UgdGhlIHBpcGVsaW5lIHdoZW4KKyAgICAgICAgICAgIHJlc3Rh cnRpbmcgYnVmZmVyaW5nLiBUaGVyZSB3ZXJlIGNhc2VzIHdoZW4gbm90IHVzaW5nIGBkb3dubG9h ZGJ1ZmZlcmAgd2hlcmUgd2UgZGlkbid0IHBhdXNlIHRoZSBwaXBlbGluZQorICAgICAgICAgICAg bGVhZGluZyB0byBwcmV0dHkgYmFkIHVzZXIgZXhwZXJpZW5jZS4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVzKTogQnVmZmVyaW5nIHNo b3VsZCBoYXBwZW4gb25seSBvbiAqKm5vbiBsaXZlKiogcGlwZWxpbmVzLgorCiAyMDIwLTAxLTE0 ICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dTdHJlYW1lcl0gUmV3b3JrIFdlYktpdFdlYlNyYyB0byBpbXByb3ZlIHJvYnVzdG5lc3MK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXgg ZGEzMTZjOGM4NzU4YjhjMDU2ZjM4NjdlYzY5YmE1NTMxZTI5MzM0Zi4uNWIyZjBjZGM4MTVjNmNh YWZjZjQyMzQ0NTBlNzc5OTdjZGUyMmQzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTEwNTMsNyArMTA1Myw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkdXJhdGlvbkNoYW5nZWQoKQogICAgIE1lZGlhVGltZSBw cmV2aW91c0R1cmF0aW9uID0gZHVyYXRpb25NZWRpYVRpbWUoKTsKICAgICBtX2NhY2hlZER1cmF0 aW9uID0gTWVkaWFUaW1lOjppbnZhbGlkVGltZSgpOwogCi0gICAgLy8gQXZvaWQgZW1pdGluZyBk dXJhdGlvbmNoYW5nZWQgaW4gdGhlIGNhc2Ugd2hlcmUgdGhlIHByZXZpb3VzCisgICAgLy8gQXZv aWQgZW1pdHRpbmcgZHVyYXRpb25DaGFuZ2VkIGluIHRoZSBjYXNlIHdoZXJlIHRoZSBwcmV2aW91 cwogICAgIC8vIGR1cmF0aW9uIHdhcyAwIGJlY2F1c2UgdGhhdCBjYXNlIGlzIGFscmVhZHkgaGFu ZGxlZCBieSB0aGUKICAgICAvLyBIVE1MTWVkaWFFbGVtZW50LgogICAgIGlmIChwcmV2aW91c0R1 cmF0aW9uICYmIGR1cmF0aW9uTWVkaWFUaW1lKCkgIT0gcHJldmlvdXNEdXJhdGlvbikKQEAgLTE0 NTYsNyArMTQ1Niw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpmaWxsVGlt ZXJGaXJlZCgpCiAgICAgZG91YmxlIGZpbGxTdGF0dXMgPSAxMDAuMDsKICAgICBHc3RCdWZmZXJp bmdNb2RlIG1vZGUgPSBHU1RfQlVGRkVSSU5HX0RPV05MT0FEOwogCi0gICAgaWYgKGdzdF9lbGVt ZW50X3F1ZXJ5KG1fc291cmNlLmdldCgpLCBxdWVyeS5nZXQoKSkpIHsKKyAgICBpZiAoZ3N0X2Vs ZW1lbnRfcXVlcnkocGlwZWxpbmUoKSwgcXVlcnkuZ2V0KCkpKSB7CiAgICAgICAgIGdzdF9xdWVy eV9wYXJzZV9idWZmZXJpbmdfc3RhdHMocXVlcnkuZ2V0KCksICZtb2RlLCBudWxscHRyLCBudWxs cHRyLCBudWxscHRyKTsKIAogICAgICAgICBpbnQgcGVyY2VudGFnZTsKQEAgLTE0NzAsNyArMTQ3 MCwxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQo KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgdXBkYXRlQnVmZmVyaW5nU3RhdHVzKG1v ZGUsIGZpbGxTdGF0dXMpOworICAgIGlmIChtb2RlICE9IEdTVF9CVUZGRVJJTkdfRE9XTkxPQUQp CisgICAgICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiSWdub3JpbmcgYnVmZmVyaW5n IGluICVzIiwgZW51bVRvU3RyaW5nKEdTVF9UWVBFX0JVRkZFUklOR19NT0RFLCBtb2RlKS5kYXRh KCkpOworICAgIGVsc2UKKyAgICAgICAgdXBkYXRlQnVmZmVyaW5nU3RhdHVzKG1vZGUsIGZpbGxT dGF0dXMpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZFN0YXRl Q2hhbmdlZCgpCkBAIC0yMTk4LDYgKzIyMDEsMTEgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmhhbmRsZU1lc3NhZ2UoR3N0TWVzc2FnZSogbWVzc2FnZSkKICAgICAgICAgICAg ICAgICBpZiAoY29uc3QgY2hhciogdXJpID0gZ3N0X3N0cnVjdHVyZV9nZXRfc3RyaW5nKHN0cnVj dHVyZSwgInVyaSIpKQogICAgICAgICAgICAgICAgICAgICBtX2hhc1RhaW50ZWRPcmlnaW4gPSB3 ZWJLaXRTcmNXb3VsZFRhaW50T3JpZ2luKFdFQktJVF9XRUJfU1JDX0NBU1QobV9zb3VyY2UuZ2V0 KCkpLCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFVSTChVUkwoKSwgdXJpKSkpOwogICAgICAgICAg ICAgfQorICAgICAgICB9IGVsc2UgaWYgKGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUoc3RydWN0dXJl LCAiR3N0Q2FjaGVEb3dubG9hZENvbXBsZXRlIikpIHsKKyAgICAgICAgICAgIEdTVF9JTkZPX09C SkVDVChwaXBlbGluZSgpLCAiU3RyZWFtIGlzIGZ1bGx5IGRvd25sb2FkZWQsIHN0b3BwaW5nIG1v bml0b3JpbmcgZG93bmxvYWRpbmcgcHJvZ3Jlc3MuIik7CisgICAgICAgICAgICBtX2ZpbGxUaW1l ci5zdG9wKCk7CisgICAgICAgICAgICBtX2J1ZmZlcmluZ1BlcmNlbnRhZ2UgPSAxMDA7CisgICAg ICAgICAgICB1cGRhdGVTdGF0ZXMoKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBHU1Rf REVCVUdfT0JKRUNUKHBpcGVsaW5lKCksICJVbmhhbmRsZWQgZWxlbWVudCBtZXNzYWdlOiAlIiBH U1RfUFRSX0ZPUk1BVCwgc3RydWN0dXJlKTsKICAgICAgICAgYnJlYWs7CkBAIC0yMjkyLDI5ICsy MzAwLDI5IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVNYXhUaW1l TG9hZGVkKGRvdWJsZSBwZXJjZW50YWdlKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6dXBkYXRlQnVmZmVyaW5nU3RhdHVzKEdzdEJ1ZmZlcmluZ01vZGUgbW9kZSwgZG91Ymxl IHBlcmNlbnRhZ2UpCiB7CisgICAgYm9vbCB3YXNCdWZmZXJpbmcgPSBtX2lzQnVmZmVyaW5nOwor CiAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gbW9kZTogJXMs IHN0YXR1czogJWYlJSIsIGVudW1Ub1N0cmluZyhHU1RfVFlQRV9CVUZGRVJJTkdfTU9ERSwgbW9k ZSkuZGF0YSgpLCBwZXJjZW50YWdlKTsKIAogICAgIG1fZGlkRG93bmxvYWRGaW5pc2ggPSBwZXJj ZW50YWdlID09IDEwMDsKICAgICBtX2lzQnVmZmVyaW5nID0gIW1fZGlkRG93bmxvYWRGaW5pc2g7 CiAKKyAgICBpZiAoIW1fZGlkRG93bmxvYWRGaW5pc2gpCisgICAgICAgIG1faXNCdWZmZXJpbmcg PSB0cnVlOworCisgICAgbV9idWZmZXJpbmdQZXJjZW50YWdlID0gcGVyY2VudGFnZTsKICAgICBz d2l0Y2ggKG1vZGUpIHsKICAgICBjYXNlIEdTVF9CVUZGRVJJTkdfU1RSRUFNOiB7CiAgICAgICAg IHVwZGF0ZU1heFRpbWVMb2FkZWQocGVyY2VudGFnZSk7CiAKICAgICAgICAgbV9idWZmZXJpbmdQ ZXJjZW50YWdlID0gcGVyY2VudGFnZTsKLSAgICAgICAgaWYgKG1fZGlkRG93bmxvYWRGaW5pc2gp CisgICAgICAgIGlmIChtX2RpZERvd25sb2FkRmluaXNoIHx8ICghd2FzQnVmZmVyaW5nICYmIG1f aXNCdWZmZXJpbmcpKQogICAgICAgICAgICAgdXBkYXRlU3RhdGVzKCk7CiAKICAgICAgICAgYnJl YWs7CiAgICAgfQogICAgIGNhc2UgR1NUX0JVRkZFUklOR19ET1dOTE9BRDogewogICAgICAgICB1 cGRhdGVNYXhUaW1lTG9hZGVkKHBlcmNlbnRhZ2UpOwotCi0gICAgICAgIC8vIE1lZGlhIGlzIG5v dyBmdWxseSBsb2FkZWQuIEl0IHdpbGwgcGxheSBldmVuIGlmIG5ldHdvcmsgY29ubmVjdGlvbiBp cwotICAgICAgICAvLyBjdXQuIEJ1ZmZlcmluZyBpcyBkb25lLCByZW1vdmUgdGhlIGZpbGwgc291 cmNlIGZyb20gdGhlIG1haW4gbG9vcC4KLSAgICAgICAgaWYgKG1fZGlkRG93bmxvYWRGaW5pc2gp Ci0gICAgICAgICAgICBtX2ZpbGxUaW1lci5zdG9wKCk7Ci0KICAgICAgICAgdXBkYXRlU3RhdGVz KCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTI1NzcsOSArMjU4NSwxNyBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVzKCkKICAgICAgICAgICAgIEZB TExUSFJPVUdIOwogICAgICAgICBjYXNlIEdTVF9TVEFURV9QTEFZSU5HOgogICAgICAgICAgICAg aWYgKG1faXNCdWZmZXJpbmcpIHsKLSAgICAgICAgICAgICAgICBpZiAobV9idWZmZXJpbmdQZXJj ZW50YWdlID09IDEwMCkgewotICAgICAgICAgICAgICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHBp cGVsaW5lKCksICJbQnVmZmVyaW5nXSBDb21wbGV0ZS4iKTsKLSAgICAgICAgICAgICAgICAgICAg bV9pc0J1ZmZlcmluZyA9IGZhbHNlOworICAgICAgICAgICAgICAgIEdSZWZQdHI8R3N0UXVlcnk+ IHF1ZXJ5ID0gYWRvcHRHUmVmKGdzdF9xdWVyeV9uZXdfYnVmZmVyaW5nKEdTVF9GT1JNQVRfUEVS Q0VOVCkpOworCisgICAgICAgICAgICAgICAgbV9pc0J1ZmZlcmluZyA9IG1fYnVmZmVyaW5nUGVy Y2VudGFnZSA9PSAxMDA7CisgICAgICAgICAgICAgICAgaWYgKGdzdF9lbGVtZW50X3F1ZXJ5KG1f cGlwZWxpbmUuZ2V0KCksIHF1ZXJ5LmdldCgpKSkgeworICAgICAgICAgICAgICAgICAgICBnYm9v bGVhbiBpc0J1ZmZlcmluZyA9IG1faXNCdWZmZXJpbmc7CisgICAgICAgICAgICAgICAgICAgIGdz dF9xdWVyeV9wYXJzZV9idWZmZXJpbmdfcGVyY2VudChxdWVyeS5nZXQoKSwgJmlzQnVmZmVyaW5n LCBudWxscHRyKTsKKyAgICAgICAgICAgICAgICAgICAgbV9pc0J1ZmZlcmluZyA9IGlzQnVmZmVy aW5nOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGlmICghbV9pc0J1ZmZl cmluZykgeworICAgICAgICAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwg IltCdWZmZXJpbmddIENvbXBsZXRlLiIpOwogICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3Rh dGUgPSBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZTo6SGF2ZUVub3VnaERhdGE7CiAgICAgICAgICAg ICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gbV9kaWREb3dubG9hZEZpbmlzaCA/IE1lZGlhUGxh eWVyOjpOZXR3b3JrU3RhdGU6OklkbGUgOiBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpMb2Fk aW5nOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7CkBAIC0yNjA5LDE0ICsyNjI1LDE0IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICBpZiAoZGlkQnVmZmVyaW5nICYmICFtX2lzQnVmZmVyaW5nICYm ICFtX2lzUGF1c2VkICYmIG1fcGxheWJhY2tSYXRlKSB7Ci0gICAgICAgICAgICAgICAgR1NUX0RF QlVHX09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gUmVzdGFydGluZyBwbGF5YmFjay4i KTsKKyAgICAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIltCdWZmZXJp bmddIFJlc3RhcnRpbmcgcGxheWJhY2suIik7CiAgICAgICAgICAgICAgICAgY2hhbmdlUGlwZWxp bmVTdGF0ZShHU1RfU1RBVEVfUExBWUlORyk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxz ZSBpZiAobV9jdXJyZW50U3RhdGUgPT0gR1NUX1NUQVRFX1BMQVlJTkcpIHsKICAgICAgICAgICAg IG1faXNQYXVzZWQgPSBmYWxzZTsKIAogICAgICAgICAgICAgaWYgKChtX2lzQnVmZmVyaW5nICYm ICFtX2lzTGl2ZVN0cmVhbSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7Ci0gICAgICAgICAgICAgICAg R1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gUGF1c2luZyBzdHJlYW0g Zm9yIGJ1ZmZlcmluZy4iKTsKKyAgICAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxp bmUoKSwgIltCdWZmZXJpbmddIFBhdXNpbmcgc3RyZWFtIGZvciBidWZmZXJpbmcuIik7CiAgICAg ICAgICAgICAgICAgY2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfUEFVU0VEKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfSBlbHNlCg== 387912 2020-01-16 05:34:34 -0800 2020-01-16 08:14:19 -0800 Patch bug-206234-20200116103432.patch text/plain 7220 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc3MTc1MWE3OWYyZDA3 NTIwMmJkYjczNjVkZmUxYTA4ZjY0NDk4NC4uN2JhNzg0ZDA5OThjZGIzZDI4OTc1MjY2NDY2MjQ5 Mjc3OTAxNTEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAxLTE1ICBUaGli YXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBTZXZlcmFsIGJ1ZmZlcmluZyBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWGFiaWVyIFJv ZHJpZ3Vlei1DYWx2YXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoaXMgaXMgYWxyZWFk eSB0ZXN0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6ZHVyYXRpb25DaGFuZ2VkKTogTWlub3IgdHlwbyBmaXgKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6ZmlsbFRpbWVyRmlyZWQp OiBRdWVyeSBidWZmZXJpbmcgb24gdGhlIHBpcGVsaW5lIG5vdCB0aGUgc291cmNlCisgICAgICAg ICAgICBvdGhlcndpc2UgR3N0QmFzZVNyYyByZXR1cm5zIHNvbWUgdXNlbGVzcyB2YWx1ZXMgYmVm b3JlIGBkb3dubG9hZGJ1ZmZlcmAgYWN0dWFsbHkgZ2l2ZXMgdXMgdGhlCisgICAgICAgICAgICBp bmZvIGFib3V0IERPV05MT0FEIGJ1ZmZlcmluZyBzdGF0dXMuCisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZU1lc3NhZ2UpOgorICAgICAgICAgICAg LSBEZXRlY3Qgd2hlbiBET1dOTE9BRCBpcyBkb25lIGJ5IHVzaW5nIHRoZSBgZG93bmxvYWRidWZm ZXJgIGBHc3RDYWNoZURvd25sb2FkQ29tcGxldGVgCisgICAgICAgICAgICAgIGVsZW1lbnQgbWVz c2FnZSB3aGljaCBpcyB3aGF0IGlzIHN1cHBvc2VkIHRvIGJlIHVzZWQgZm9yIHRoYXQgcHVycG9z ZS4KKyAgICAgICAgICAgIC0gRml4IHRoZSB3YXkgd2UgZGV0ZWN0IHRoYXQgYnVmZmVyaW5nIGlz IGRvbmUgKG1vc3RseSB3aGVuIHVzaW5nIGEgYGRvd25sb2FkYnVmZmVyYCkgYnkgcmVseWluZyBv biBhCisgICAgICAgICAgICAgIGJ1ZmZlcmluZyBxdWVyeSB0byBjaGVjayBpZiBpdCBpcyBzdGls bCBidWZmZXJpbmcuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OnVwZGF0ZUJ1ZmZlcmluZ1N0YXR1cyk6IEVuc3VyZSB0aGF0IHdlIHByb3Blcmx5IHBhdXNl IHRoZSBwaXBlbGluZSB3aGVuCisgICAgICAgICAgICByZXN0YXJ0aW5nIGJ1ZmZlcmluZy4gVGhl cmUgd2VyZSBjYXNlcyB3aGVuIG5vdCB1c2luZyBgZG93bmxvYWRidWZmZXJgIHdoZXJlIHdlIGRp ZG4ndCBwYXVzZSB0aGUgcGlwZWxpbmUKKyAgICAgICAgICAgIGxlYWRpbmcgdG8gcHJldHR5IGJh ZCB1c2VyIGV4cGVyaWVuY2UuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnVwZGF0ZVN0YXRlcyk6IEJ1ZmZlcmluZyBzaG91bGQgaGFwcGVuIG9ubHkgb24g Kipub24gbGl2ZSoqIHBpcGVsaW5lcy4KKwogMjAyMC0wMS0xNiAgQWxpY2lhIEJveWEgR2FyY8Ot YSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW01TRV0gRG9uJ3QgZW5xdWV1ZSBzYW1w bGVzIHRoYXQgc3RhcnQgYXQgYSBiaWcgZGlzY29udGludWl0eQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA4NWFhZjA0ZTdhMjNkNzAyMzkw NDFkMDUyMDVlMGEwMTQzNWM2YTEwLi5jNTg5NTQ5MjIyNWIzMGM0YmE2YjZhOWNkMWUxN2Y1NjRi MmFiYTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcApAQCAtMTA1Myw3ICsxMDUzLDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OmR1cmF0aW9uQ2hhbmdlZCgpCiAgICAgTWVkaWFUaW1lIHByZXZpb3VzRHVyYXRpb24gPSBk dXJhdGlvbk1lZGlhVGltZSgpOwogICAgIG1fY2FjaGVkRHVyYXRpb24gPSBNZWRpYVRpbWU6Omlu dmFsaWRUaW1lKCk7CiAKLSAgICAvLyBBdm9pZCBlbWl0aW5nIGR1cmF0aW9uY2hhbmdlZCBpbiB0 aGUgY2FzZSB3aGVyZSB0aGUgcHJldmlvdXMKKyAgICAvLyBBdm9pZCBlbWl0dGluZyBkdXJhdGlv bkNoYW5nZWQgaW4gdGhlIGNhc2Ugd2hlcmUgdGhlIHByZXZpb3VzCiAgICAgLy8gZHVyYXRpb24g d2FzIDAgYmVjYXVzZSB0aGF0IGNhc2UgaXMgYWxyZWFkeSBoYW5kbGVkIGJ5IHRoZQogICAgIC8v IEhUTUxNZWRpYUVsZW1lbnQuCiAgICAgaWYgKHByZXZpb3VzRHVyYXRpb24gJiYgZHVyYXRpb25N ZWRpYVRpbWUoKSAhPSBwcmV2aW91c0R1cmF0aW9uKQpAQCAtMTQ1Niw3ICsxNDU2LDcgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmZpbGxUaW1lckZpcmVkKCkKICAgICBkb3Vi bGUgZmlsbFN0YXR1cyA9IDEwMC4wOwogICAgIEdzdEJ1ZmZlcmluZ01vZGUgbW9kZSA9IEdTVF9C VUZGRVJJTkdfRE9XTkxPQUQ7CiAKLSAgICBpZiAoZ3N0X2VsZW1lbnRfcXVlcnkobV9zb3VyY2Uu Z2V0KCksIHF1ZXJ5LmdldCgpKSkgeworICAgIGlmIChnc3RfZWxlbWVudF9xdWVyeShwaXBlbGlu ZSgpLCBxdWVyeS5nZXQoKSkpIHsKICAgICAgICAgZ3N0X3F1ZXJ5X3BhcnNlX2J1ZmZlcmluZ19z dGF0cyhxdWVyeS5nZXQoKSwgJm1vZGUsIG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIpOwogCiAg ICAgICAgIGludCBwZXJjZW50YWdlOwpAQCAtMjE5OCw2ICsyMTk4LDExIEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpoYW5kbGVNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2Up CiAgICAgICAgICAgICAgICAgaWYgKGNvbnN0IGNoYXIqIHVyaSA9IGdzdF9zdHJ1Y3R1cmVfZ2V0 X3N0cmluZyhzdHJ1Y3R1cmUsICJ1cmkiKSkKICAgICAgICAgICAgICAgICAgICAgbV9oYXNUYWlu dGVkT3JpZ2luID0gd2ViS2l0U3JjV291bGRUYWludE9yaWdpbihXRUJLSVRfV0VCX1NSQ19DQVNU KG1fc291cmNlLmdldCgpKSwgU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShVUkwoVVJMKCksIHVyaSkp KTsKICAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChnc3Rfc3RydWN0dXJlX2hhc19u YW1lKHN0cnVjdHVyZSwgIkdzdENhY2hlRG93bmxvYWRDb21wbGV0ZSIpKSB7CisgICAgICAgICAg ICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIlN0cmVhbSBpcyBmdWxseSBkb3dubG9hZGVk LCBzdG9wcGluZyBtb25pdG9yaW5nIGRvd25sb2FkaW5nIHByb2dyZXNzLiIpOworICAgICAgICAg ICAgbV9maWxsVGltZXIuc3RvcCgpOworICAgICAgICAgICAgbV9idWZmZXJpbmdQZXJjZW50YWdl ID0gMTAwOworICAgICAgICAgICAgdXBkYXRlU3RhdGVzKCk7CiAgICAgICAgIH0gZWxzZQogICAg ICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVW5oYW5kbGVkIGVsZW1lbnQg bWVzc2FnZTogJSIgR1NUX1BUUl9GT1JNQVQsIHN0cnVjdHVyZSk7CiAgICAgICAgIGJyZWFrOwpA QCAtMjI5MiwyOSArMjI5NywyOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 dXBkYXRlTWF4VGltZUxvYWRlZChkb3VibGUgcGVyY2VudGFnZSkKIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZUJ1ZmZlcmluZ1N0YXR1cyhHc3RCdWZmZXJpbmdNb2Rl IG1vZGUsIGRvdWJsZSBwZXJjZW50YWdlKQogeworICAgIGJvb2wgd2FzQnVmZmVyaW5nID0gbV9p c0J1ZmZlcmluZzsKKwogICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIltCdWZmZXJp bmddIG1vZGU6ICVzLCBzdGF0dXM6ICVmJSUiLCBlbnVtVG9TdHJpbmcoR1NUX1RZUEVfQlVGRkVS SU5HX01PREUsIG1vZGUpLmRhdGEoKSwgcGVyY2VudGFnZSk7CiAKICAgICBtX2RpZERvd25sb2Fk RmluaXNoID0gcGVyY2VudGFnZSA9PSAxMDA7CiAgICAgbV9pc0J1ZmZlcmluZyA9ICFtX2RpZERv d25sb2FkRmluaXNoOwogCisgICAgaWYgKCFtX2RpZERvd25sb2FkRmluaXNoKQorICAgICAgICBt X2lzQnVmZmVyaW5nID0gdHJ1ZTsKKworICAgIG1fYnVmZmVyaW5nUGVyY2VudGFnZSA9IHBlcmNl bnRhZ2U7CiAgICAgc3dpdGNoIChtb2RlKSB7CiAgICAgY2FzZSBHU1RfQlVGRkVSSU5HX1NUUkVB TTogewogICAgICAgICB1cGRhdGVNYXhUaW1lTG9hZGVkKHBlcmNlbnRhZ2UpOwogCiAgICAgICAg IG1fYnVmZmVyaW5nUGVyY2VudGFnZSA9IHBlcmNlbnRhZ2U7Ci0gICAgICAgIGlmIChtX2RpZERv d25sb2FkRmluaXNoKQorICAgICAgICBpZiAobV9kaWREb3dubG9hZEZpbmlzaCB8fCAoIXdhc0J1 ZmZlcmluZyAmJiBtX2lzQnVmZmVyaW5nKSkKICAgICAgICAgICAgIHVwZGF0ZVN0YXRlcygpOwog CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIEdTVF9CVUZGRVJJTkdfRE9XTkxPQUQ6 IHsKICAgICAgICAgdXBkYXRlTWF4VGltZUxvYWRlZChwZXJjZW50YWdlKTsKLQotICAgICAgICAv LyBNZWRpYSBpcyBub3cgZnVsbHkgbG9hZGVkLiBJdCB3aWxsIHBsYXkgZXZlbiBpZiBuZXR3b3Jr IGNvbm5lY3Rpb24gaXMKLSAgICAgICAgLy8gY3V0LiBCdWZmZXJpbmcgaXMgZG9uZSwgcmVtb3Zl IHRoZSBmaWxsIHNvdXJjZSBmcm9tIHRoZSBtYWluIGxvb3AuCi0gICAgICAgIGlmIChtX2RpZERv d25sb2FkRmluaXNoKQotICAgICAgICAgICAgbV9maWxsVGltZXIuc3RvcCgpOwotCiAgICAgICAg IHVwZGF0ZVN0YXRlcygpOwogICAgICAgICBicmVhazsKICAgICB9CkBAIC0yNTc3LDkgKzI1ODIs MTcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVN0YXRlcygpCiAg ICAgICAgICAgICBGQUxMVEhST1VHSDsKICAgICAgICAgY2FzZSBHU1RfU1RBVEVfUExBWUlORzoK ICAgICAgICAgICAgIGlmIChtX2lzQnVmZmVyaW5nKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG1f YnVmZmVyaW5nUGVyY2VudGFnZSA9PSAxMDApIHsKLSAgICAgICAgICAgICAgICAgICAgR1NUX0RF QlVHX09CSkVDVChwaXBlbGluZSgpLCAiW0J1ZmZlcmluZ10gQ29tcGxldGUuIik7Ci0gICAgICAg ICAgICAgICAgICAgIG1faXNCdWZmZXJpbmcgPSBmYWxzZTsKKyAgICAgICAgICAgICAgICBHUmVm UHRyPEdzdFF1ZXJ5PiBxdWVyeSA9IGFkb3B0R1JlZihnc3RfcXVlcnlfbmV3X2J1ZmZlcmluZyhH U1RfRk9STUFUX1BFUkNFTlQpKTsKKworICAgICAgICAgICAgICAgIG1faXNCdWZmZXJpbmcgPSBt X2J1ZmZlcmluZ1BlcmNlbnRhZ2UgPT0gMTAwOworICAgICAgICAgICAgICAgIGlmIChnc3RfZWxl bWVudF9xdWVyeShtX3BpcGVsaW5lLmdldCgpLCBxdWVyeS5nZXQoKSkpIHsKKyAgICAgICAgICAg ICAgICAgICAgZ2Jvb2xlYW4gaXNCdWZmZXJpbmcgPSBtX2lzQnVmZmVyaW5nOworICAgICAgICAg ICAgICAgICAgICBnc3RfcXVlcnlfcGFyc2VfYnVmZmVyaW5nX3BlcmNlbnQocXVlcnkuZ2V0KCks ICZpc0J1ZmZlcmluZywgbnVsbHB0cik7CisgICAgICAgICAgICAgICAgICAgIG1faXNCdWZmZXJp bmcgPSBpc0J1ZmZlcmluZzsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBp ZiAoIW1faXNCdWZmZXJpbmcpIHsKKyAgICAgICAgICAgICAgICAgICAgR1NUX0lORk9fT0JKRUNU KHBpcGVsaW5lKCksICJbQnVmZmVyaW5nXSBDb21wbGV0ZS4iKTsKICAgICAgICAgICAgICAgICAg ICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OlJlYWR5U3RhdGU6OkhhdmVFbm91Z2hEYXRh OwogICAgICAgICAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IG1fZGlkRG93bmxvYWRGaW5p c2ggPyBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpJZGxlIDogTWVkaWFQbGF5ZXI6Ok5ldHdv cmtTdGF0ZTo6TG9hZGluZzsKICAgICAgICAgICAgICAgICB9IGVsc2UgewpAQCAtMjYwOSwxNCAr MjYyMiwxNCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6dXBkYXRlU3RhdGVz KCkKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKGRpZEJ1ZmZlcmluZyAmJiAhbV9p c0J1ZmZlcmluZyAmJiAhbV9pc1BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkgewotICAgICAgICAg ICAgICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIltCdWZmZXJpbmddIFJlc3RhcnRp bmcgcGxheWJhY2suIik7CisgICAgICAgICAgICAgICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5l KCksICJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBsYXliYWNrLiIpOwogICAgICAgICAgICAgICAg IGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogICAgICAgICAgICAgfQog ICAgICAgICB9IGVsc2UgaWYgKG1fY3VycmVudFN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7 CiAgICAgICAgICAgICBtX2lzUGF1c2VkID0gZmFsc2U7CiAKICAgICAgICAgICAgIGlmICgobV9p c0J1ZmZlcmluZyAmJiAhbV9pc0xpdmVTdHJlYW0pIHx8ICFtX3BsYXliYWNrUmF0ZSkgewotICAg ICAgICAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIltCdWZmZXJpbmddIFBh dXNpbmcgc3RyZWFtIGZvciBidWZmZXJpbmcuIik7CisgICAgICAgICAgICAgICAgR1NUX0lORk9f T0JKRUNUKHBpcGVsaW5lKCksICJbQnVmZmVyaW5nXSBQYXVzaW5nIHN0cmVhbSBmb3IgYnVmZmVy aW5nLiIpOwogICAgICAgICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BB VVNFRCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQo=