200856 2019-08-17 01:10:51 -0700 [GTK] Crash closing web view while hardware acceleration is enabled 2022-06-11 07:30:07 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Linux RESOLVED FIXED https://bugzilla.redhat.com/show_bug.cgi?id=1749709 https://bugs.webkit.org/show_bug.cgi?id=239429 P2 Normal --- 192523 1 guillaume.webkit webkit-unassigned alexandr.miloslavskiy berto bugs-noreply cgarcia cmarcelo ews-watchlist gustavo gyuyoung.kim luiz mcatanzaro noam ryuan.choi sergio zeno oldest_to_newest 1562449 0 guillaume.webkit 2019-08-17 01:10:51 -0700 Closing a tab in Epiphany makes WebKitGTK crash: [340549.969001] epiphany[497780]: segfault at 0 ip 00007fe241add5cb sp 00007fff599bc3e8 error 4 in libwebkit2gtk-4.0.so.37.38.2[7fe241196000+2c31000] [340549.969008] Code: c3 66 0f 1f 44 00 00 48 89 ee 4c 89 e7 ff d3 eb df 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48 8b 47 28 48 8b b8 90 01 00 00 <48> 8b 07 48 8b 40 20 48 3b 05 cf 42 4d 02 75 05 31 c0 c3 66 90 ff It happens at least with 2.25.3 and 2.25.4, only with the Wayland GTK backend (works on X11), only when using hardware acceleration. My GPU: Intel HD Graphics 520 (Skylake GT2). 1562453 1 guillaume.webkit 2019-08-17 01:16:32 -0700 It also happens when closing the web inspector. 1562479 2 mcatanzaro 2019-08-17 08:54:23 -0700 You need to attach a backtrace for developers to be able to look at this. 1562511 3 guillaume.webkit 2019-08-17 15:27:15 -0700 Here it is: #0 0x00007ffff45f2cbb in webkitWebViewBaseMakeGLContextCurrent(_WebKitWebViewBase*) (webkitWebViewBase=<optimized out>) at /usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include/g++-v9/bits/unique_ptr.h:357 #1 0x00007ffff46608e4 in WebKit::WebPageProxy::makeGLContextCurrent() (this=<optimized out>) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp:161 #2 0x00007ffff46595fc in WebKit::WaylandCompositor::Surface::setWebPage(WebKit::WebPageProxy*) (this=0x7fff94016a80, webPage=webPage@entry=0x0) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp:176 #3 0x00007ffff465a599 in WebKit::WaylandCompositor::unregisterWebPage(WebKit::WebPageProxy&) (this=<optimized out>, webPage=...) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp:574 #4 0x00007ffff4650988 in WebKit::AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland() (this=0x7fff940320c0, __in_chrg=<optimized out>) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:144 #5 0x00007ffff46509e9 in WebKit::AcceleratedBackingStoreWayland::~AcceleratedBackingStoreWayland() (this=0x7fff940320c0, __in_chrg=<optimized out>) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:131 #6 0x00007ffff45f1abe in std::default_delete<WebKit::AcceleratedBackingStore>::operator()(WebKit::AcceleratedBackingStore*) const (this=<optimized out>, __ptr=<optimized out>) at /usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include/g++-v9/bits/unique_ptr.h:75 #7 0x00007ffff45f1abe in std::unique_ptr<WebKit::AcceleratedBackingStore, std::default_delete<WebKit::AcceleratedBackingStore> >::reset(WebKit::AcceleratedBackingStore*) (__p=<optimized out>, this=<optimized out>) at /usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include/g++-v9/bits/unique_ptr.h:399 #8 0x00007ffff45f1abe in std::unique_ptr<WebKit::AcceleratedBackingStore, std::default_delete<WebKit::AcceleratedBackingStore> >::operator=(decltype(nullptr)) (this=<optimized out>) at /usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include/g++-v9/bits/unique_ptr.h:333 #9 0x00007ffff45f1abe in webkitWebViewBaseDispose(GObject*) (gobject=0x555556e63c20) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:553 #10 0x00007ffff72ee169 in g_object_run_dispose () at /usr/lib64/libgobject-2.0.so.0 #11 0x00007ffff7a053a0 in () at /usr/lib64/libgtk-3.so.0 #12 0x00007ffff7912366 in () at /usr/lib64/libgtk-3.so.0 #13 0x00007ffff72e7b49 in g_closure_invoke () at /usr/lib64/libgobject-2.0.so.0 #14 0x00007ffff72fa4e6 in () at /usr/lib64/libgobject-2.0.so.0 #15 0x00007ffff7302c85 in g_signal_emit_valist () at /usr/lib64/libgobject-2.0.so.0 #16 0x00007ffff73032aa in g_signal_emit () at /usr/lib64/libgobject-2.0.so.0 #17 0x00007ffff7b16b00 in () at /usr/lib64/libgtk-3.so.0 #18 0x00007ffff72ee169 in g_object_run_dispose () at /usr/lib64/libgobject-2.0.so.0 #19 0x00007ffff7a0b272 in () at /usr/lib64/libgtk-3.so.0 #20 0x00007ffff7912366 in () at /usr/lib64/libgtk-3.so.0 #21 0x00007ffff72e7b49 in g_closure_invoke () at /usr/lib64/libgobject-2.0.so.0 #22 0x00007ffff72fa4e6 in () at /usr/lib64/libgobject-2.0.so.0 #23 0x00007ffff7302c85 in g_signal_emit_valist () at /usr/lib64/libgobject-2.0.so.0 #24 0x00007ffff73032aa in g_signal_emit () at /usr/lib64/libgobject-2.0.so.0 #25 0x00007ffff7b16b00 in () at /usr/lib64/libgtk-3.so.0 #26 0x00007ffff72ee169 in g_object_run_dispose () at /usr/lib64/libgobject-2.0.so.0 #27 0x00007ffff78c95ef in () at /usr/lib64/libgtk-3.so.0 #28 0x00007ffff7912366 in () at /usr/lib64/libgtk-3.so.0 #29 0x00007ffff72e7c2b in g_closure_invoke () at /usr/lib64/libgobject-2.0.so.0 #30 0x00007ffff72fa4e6 in () at /usr/lib64/libgobject-2.0.so.0 #31 0x00007ffff7302c85 in g_signal_emit_valist () at /usr/lib64/libgobject-2.0.so.0 #32 0x00007ffff73032aa in g_signal_emit () at /usr/lib64/libgobject-2.0.so.0 #33 0x00007ffff7b16b00 in () at /usr/lib64/libgtk-3.so.0 #34 0x00007ffff72ee169 in g_object_run_dispose () at /usr/lib64/libgobject-2.0.so.0 #35 0x00007ffff7f59ed3 in () at /usr/lib64/epiphany/libephymain.so #36 0x00007ffff7f5a02e in () at /usr/lib64/epiphany/libephymain.so #37 0x00007ffff73d1bc3 in () at /usr/lib64/libgio-2.0.so.0 #38 0x00007ffff73d256d in () at /usr/lib64/libgio-2.0.so.0 #39 0x00007ffff7f7d6b0 in () at /usr/lib64/epiphany/libephymain.so #40 0x00007ffff73d1bc3 in () at /usr/lib64/libgio-2.0.so.0 #41 0x00007ffff73d256d in () at /usr/lib64/libgio-2.0.so.0 #42 0x00007ffff45d2e6f in webkitWebViewRunJavaScriptCallback(API::SerializedScriptValue*, WebCore::ExceptionDetails const&, GTask*) (wkSerializedScriptValue=0x7fff74474990, exceptionDetails=..., task=0x555555dc6490) at DerivedSources/ForwardingHeaders/wtf/DumbPtrTraits.h:43 #43 0x00007ffff4512808 in WTF::Function<void (API::SerializedScriptValue*, bool, WebCore::ExceptionDetails const&, WebKit::CallbackBase::Error)>::operator()(API::SerializedScriptValue*, bool, WebCore::ExceptionDetails const&, WebKit::CallbackBase::Error) const (in#3=WebKit::CallbackBase::Error::None, in#2=..., in#1=false, in#0=0x7fff74474990, this=0x7fffffffe1b8) at /usr/lib/gcc/x86_64-pc-linux-gnu/9.1.0/include/g++-v9/bits/unique_ptr.h:357 #44 0x00007ffff4512808 in WebKit::GenericCallback<API::SerializedScriptValue*, bool, WebCore::ExceptionDetails const&>::performCallbackWithReturnValue(API::SerializedScriptValue*, bool, WebCore::ExceptionDetails const&) (returnValue#2=..., returnValue#1=false, returnValue#0=0x7fff74474990, this=0x7fff744a1038) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/GenericCallback.h:109 #45 0x00007ffff4512808 in WebKit::GenericCallback<API::SerializedScriptValue*, bool, WebCore::ExceptionDetails const&>::performCallbackWithReturnValue(API::SerializedScriptValue*, bool, WebCore::ExceptionDetails const&) (returnValue#2=..., returnValue#1=false, returnValue#0=0x7fff74474990, this=0x7fff744a1038) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/GenericCallback.h:101 #46 0x00007ffff4512808 in WebKit::WebPageProxy::scriptValueCallback(IPC::DataReference const&, bool, WebCore::ExceptionDetails const&, WebKit::CallbackID) (this=<optimized out>, dataReference=..., hadException=<optimized out>, details=..., callbackID=...) at /var/tmp/portage/net-libs/webkit-gtk-2.25.4/work/webkitgtk-2.25.4/Source/WebKit/UIProcess/WebPageProxy.cpp:6554 1570559 4 mcatanzaro 2019-09-13 05:38:01 -0700 We have 78 reports of this in Fedora 31 and Fedora 32 so far; that might not seem like much, but before Fedora 31 beta has been released it's pretty bad. 1570560 5 mcatanzaro 2019-09-13 05:40:12 -0700 Oh you won't be able to reproduce in Epiphany anymore because I disabled AC mode again due to bug #200575. Current reports are coming from gnome-control-center/gnome-online-accounts. 1570568 6 cgarcia 2019-09-13 06:20:03 -0700 This is in my TODO already, I know how to fix it, it's not trivial fix, though. 1570728 7 mcatanzaro 2019-09-13 15:59:24 -0700 Can you describe what you know? It's probably going to be a F31 release blocker since it happens in gnome-initial-setup, so it will be getting a lot of attention.... 1571057 8 378850 cgarcia 2019-09-16 03:12:39 -0700 Created attachment 378850 Patch 1571058 9 ews-watchlist 2019-09-16 03:13:31 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1571060 10 378851 cgarcia 2019-09-16 03:24:13 -0700 Created attachment 378851 Patch 1571064 11 guillaume.webkit 2019-09-16 04:34:36 -0700 I've tried attachment 378851 with Epiphany (hardware acceleration enabled) and I get no rendering at all, the pages are white. Closing a tab works. 1571071 12 cgarcia 2019-09-16 05:44:23 -0700 (In reply to Guilaume Ayoub from comment #11) > I've tried attachment 378851 [details] with Epiphany (hardware acceleration > enabled) and I get no rendering at all, the pages are white. > > Closing a tab works. Weird, I've used ephy for testing it, because this also fixes detaching the a tab from a window (it makes an unrealize -> realize) which was also broken on accelerated compositing mode. Does it work if you resize the window? or if you reload the page? 1571072 13 cgarcia 2019-09-16 05:47:21 -0700 Are you building with USE_WPE_RENDERER=OFF? 1571074 14 guillaume.webkit 2019-09-16 06:12:43 -0700 (In reply to Carlos Garcia Campos from comment #12) > Does it work if you resize the window? or if you reload the page? It doesn't. When I activate hardware acceleration with DConf, the content is blank as soon as Epiphany gets the focus. Resizing the window or reloading the page doesn't change anything. I get this error: Cannot create EGL window surface: EGL_BAD_ALLOC When I deactivate hardware acceleration, I have to reload the page to make it appear. Resizing or giving focus doesn't change anything. > Are you building with USE_WPE_RENDERER=OFF? It's OFF. 1571078 15 cgarcia 2019-09-16 06:37:19 -0700 (In reply to Guilaume Ayoub from comment #14) > (In reply to Carlos Garcia Campos from comment #12) > > Does it work if you resize the window? or if you reload the page? > > It doesn't. > > When I activate hardware acceleration with DConf, the content is blank as > soon as Epiphany gets the focus. Resizing the window or reloading the page > doesn't change anything. Does it happen if you start ephy with AC mode already ondemand or always? > I get this error: > Cannot create EGL window surface: EGL_BAD_ALLOC hmm, and this doesn't happen without the patch? > When I deactivate hardware acceleration, I have to reload the page to make > it appear. Resizing or giving focus doesn't change anything. > > > Are you building with USE_WPE_RENDERER=OFF? > > It's OFF. why? 1571095 16 guillaume.webkit 2019-09-16 08:09:33 -0700 (In reply to Carlos Garcia Campos from comment #15) > (In reply to Guilaume Ayoub from comment #14) > > (In reply to Carlos Garcia Campos from comment #12) > > > Does it work if you resize the window? or if you reload the page? > > > > It doesn't. > > > > When I activate hardware acceleration with DConf, the content is blank as > > soon as Epiphany gets the focus. Resizing the window or reloading the page > > doesn't change anything. > > Does it happen if you start ephy with AC mode already ondemand or always? It does. > > I get this error: > > Cannot create EGL window surface: EGL_BAD_ALLOC > > hmm, and this doesn't happen without the patch? Actually, I have the same problem without the patch (error and blank page). Something probably happened between 2.25.4 and 2.26.0. I'll try with versions between 2.25.4 and 2.26.0. > > When I deactivate hardware acceleration, I have to reload the page to make > > it appear. Resizing or giving focus doesn't change anything. > > > > > Are you building with USE_WPE_RENDERER=OFF? > > > > It's OFF. > > why? libwpe is not packaged on my system. 1571148 17 guillaume.webkit 2019-09-16 09:58:55 -0700 OK, the blank page is a different issue, see: https://bugs.webkit.org/show_bug.cgi?id=201505 https://bugzilla.redhat.com/show_bug.cgi?id=1748817 I'll try to reopen this issue, as it also happens on Gentoo. Good news: without your patch, closing a tab makes Epiphany crash, even with blank pages. It's fixed with your patch. So it works for me, even if I now get blank pages because of another bug. 1571233 18 guillaume.webkit 2019-09-16 13:21:03 -0700 The blank-page bug was caused by a recent version of Mesa. With the older version of Mesa and with your patch, everything seems to work well. I'll try to use Epiphany for hours tomorrow and confirm that everything works fine. Thanks a lot for the hard work! 1571468 19 cgarcia 2019-09-17 01:05:37 -0700 Committed r249947: <https://trac.webkit.org/changeset/249947> 1862136 20 mcatanzaro 2022-04-17 07:34:57 -0700 Looks like we are crashing here again, see bug #200856 1875388 21 alexandr.miloslavskiy 2022-06-11 07:30:07 -0700 Comment 20 should have mentioned Bug 239429 instead of Bug 200856 378850 2019-09-16 03:12:39 -0700 2019-09-16 03:24:13 -0700 Patch wk2-wl-unrealize.diff text/plain 10854 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggODg2ZmQ0MWI3MDMuLjRlMzVhMDllMjgxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDM5IEBACisyMDE5LTA5LTE2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBDcmFzaCBjbG9zaW5nIHdlYiB2aWV3IHdoaWxlIGhhcmR3 YXJlIGFjY2VsZXJhdGlvbiBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgY3Jhc2ggaGFwcGVucyB3aGVuIGRlc3Ryb3lpbmcgdGhl IFdheWxhbmRDb21wb3NpdG9yOjpTdXJmYWNlIGJlY2F1c2UgdGhlIHdlYiB2aWV3IEdMIGNvbnRl eHQgaXMgdXNlZCB0bworICAgICAgICByZWxlYXNlIHRoZSB0ZXh0dXJlLCBidXQgdGhlIEdMIGNv bnRleHQgaXMgbm8gbG9uZ2VyIHZhbGlkIGFmdGVyIHdlYiB2aWV3CisgICAgICAgIHVucmVhbGl6 ZS4gQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kIHNob3VsZCBoYW5kbGUgdGhlIHdlYiB2 aWV3IHVucmVhbGl6ZSB0byBkZXN0cm95IHRoZSBHTCBjb250ZXh0LiBJdAorICAgICAgICB3aWxs IGJlIGNyZWF0ZWQgb24gZGVtYW5kIGFnYWluIGFmdGVyIHRoZSB3ZWIgdmlldyBpcyByZWFsaXpl ZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoK KyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6ZSk6IE5vdGlmeSBBY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZS4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVW5yZWFsaXplKTogRGl0dG8u CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZS5oOgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZTo6cmVhbGl6ZSk6IEFkZGVkLgor ICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZTo6dW5yZWFsaXplKTogQWRk ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxh bmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6 OnJlYWxpemUpOiBJbiBjYXNlIG9mIHVzaW5nIFdheWxhbmRDb21wb3NpdG9yLCBjYWxsCisgICAg ICAgIFdheWxhbmRDb21wb3NpdG9yOjpiaW5kV2ViUGFnZSgpIHRvIGJpbmQgdGhlIFdlYlBhZ2VQ cm94eSB0byB0aGUgV2F5bGFuZCBzdXJmYWNlLgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRl ZEJhY2tpbmdTdG9yZVdheWxhbmQ6OnVucmVhbGl6ZSk6IERlc3Ryb3kgR0wgcmVzb3VyY2VzIGFu ZCB0aGUgR0wgY29udGV4dC4KKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRCYWNraW5nU3Rv cmVXYXlsYW5kOjp0cnlFbnN1cmVHTENvbnRleHQpOiBEbyBub3QgdHJ5IHRvIGNyZWF0ZSB0aGUg R0wgY29udGV4dCBpZiB0aGUgd2ViCisgICAgICAgIHZpZXcgaXMgbm90IHJlYWxpemVkLgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmRpc3BsYXlCdWZm ZXIpOiBSZW1vdmUgdGhlIGNvZGUgdG8gaW5pdGlhbGl6ZSB0aGUgdGV4dHVyZS4KKyAgICAgICAg KFdlYktpdDo6QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpwYWludCk6IEFuZCBhZGQg aXQgaGVyZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3Jl V2F5bGFuZC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9zaXRvcjo6U3VyZmFjZTo6c2V0V2ViUGFn ZSk6IFJldHVybiBlYXJseSBpZiBnaXZlbiBwYWdlIGlzIHRoZSBjdXJyZW50IG9uZSBhbHJlYWR5 LgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9zaXRvcjo6YmluZFdlYlBhZ2UpOiBTZXQg dGhlIHN1cmZhY2UgV2ViUGFnZVByb3h5LgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9z aXRvcjo6dW5iaW5kV2ViUGFnZSk6IFVuc2V0IHRoZSBzdXJmYWNlIFdlYlBhZ2VQcm94eS4KKyAg ICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRl ZEdyYXBoaWNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFDb29yZGluYXRlZEdy YXBoaWNzOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKTogV2hlbiByZXN0b3Jpbmcg YSBwcmV2aW91cyBsYXllciB0cmVlCisgICAgICAgIGhvc3QsIGFsd2F5cyBjYWxsIHJlc3VtZVJl bmRlcmluZygpIHRvIGJhbGFuY2UgdGhlIHN1c3BlbmRSZW5kZXJpbmcoKSBjYWxsZWQgaW4gZXhp dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkuCisKIDIwMTktMDktMTYgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI0 OTE0Mik6IFtHVEtdIEVwaXBoYW55IGRlbGF5ZWQgcGFnZSBsb2FkcyBjb250aW51ZSBpbmRlZmlu aXRlbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAKaW5kZXggODhiM2NmNDNiZmUuLjY4Y2EzYWQ1YjViIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNw cApAQCAtNDIyLDYgKzQyMiw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6 ZShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBnZGtfd2luZG93X3NldF91c2VyX2RhdGEod2luZG93 LCB3aWRnZXQpOwogCiAgICAgZ3RrX2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cocHJpdi0+ aW5wdXRNZXRob2RGaWx0ZXIuY29udGV4dCgpLCB3aW5kb3cpOworCisgICAgaWYgKHByaXYtPmFj Y2VsZXJhdGVkQmFja2luZ1N0b3JlKQorICAgICAgICBwcml2LT5hY2NlbGVyYXRlZEJhY2tpbmdT dG9yZS0+cmVhbGl6ZSgpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVVucmVh bGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKQEAgLTQyOSw2ICs0MzIsOSBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRXZWJWaWV3QmFzZVVucmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBXZWJLaXRX ZWJWaWV3QmFzZSogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAgICAg Z3RrX2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cod2ViVmlldy0+cHJpdi0+aW5wdXRNZXRo b2RGaWx0ZXIuY29udGV4dCgpLCBudWxscHRyKTsKIAorICAgIGlmICh3ZWJWaWV3LT5wcml2LT5h Y2NlbGVyYXRlZEJhY2tpbmdTdG9yZSkKKyAgICAgICAgd2ViVmlldy0+cHJpdi0+YWNjZWxlcmF0 ZWRCYWNraW5nU3RvcmUtPnVucmVhbGl6ZSgpOworCiAgICAgR1RLX1dJREdFVF9DTEFTUyh3ZWJr aXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT51bnJlYWxpemUod2lkZ2V0KTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2lu Z1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5n U3RvcmUuaAppbmRleCAxODIyNjRjNjk1Mi4uYzZhZmIyMGIwNDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZS5oCkBAIC00 Nyw2ICs0Nyw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoY29uc3QgTGF5 ZXJUcmVlQ29udGV4dCYpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBwYWludChjYWlyb190KiwgY29u c3QgV2ViQ29yZTo6SW50UmVjdCYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgcmVhbGl6ZSgpIHsg fTsKKyAgICB2aXJ0dWFsIHZvaWQgdW5yZWFsaXplKCkgeyB9OwogICAgIHZpcnR1YWwgYm9vbCBt YWtlQ29udGV4dEN1cnJlbnQoKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgaW50IHJl bmRlckhvc3RGaWxlRGVzY3JpcHRvcigpIHsgcmV0dXJuIC0xOyB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3Jl V2F5bGFuZC5jcHAKaW5kZXggODkzMjc5ZmJjZjUuLjU1YjA5MGZlYTIzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5k LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5n U3RvcmVXYXlsYW5kLmNwcApAQCAtMTQ4LDkgKzE0OCwzNyBAQCBBY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQ6On5BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQoKQogICAgICAgICBn ZGtfZ2xfY29udGV4dF9jbGVhcl9jdXJyZW50KCk7CiB9CiAKK3ZvaWQgQWNjZWxlcmF0ZWRCYWNr aW5nU3RvcmVXYXlsYW5kOjpyZWFsaXplKCkKK3sKKyNpZiAhVVNFKFdQRV9SRU5ERVJFUikKKyAg ICBXYXlsYW5kQ29tcG9zaXRvcjo6c2luZ2xldG9uKCkuYmluZFdlYlBhZ2UobV93ZWJQYWdlKTsK KyNlbmRpZgorfQorCit2b2lkIEFjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZDo6dW5yZWFs aXplKCkKK3sKKyAgICBpZiAoIW1fZ2xDb250ZXh0SW5pdGlhbGl6ZWQpCisgICAgICAgIHJldHVy bjsKKworI2lmIFVTRShXUEVfUkVOREVSRVIpCisgICAgaWYgKG1fdmlld1RleHR1cmUpIHsKKwlp ZiAobWFrZUNvbnRleHRDdXJyZW50KCkpCisgICAgICAgICAgICBnbERlbGV0ZVRleHR1cmVzKDEs ICZtX3ZpZXdUZXh0dXJlKTsKKyAgICAgICAgbV92aWV3VGV4dHVyZSA9IDA7CisgICAgfQorI2Vs c2UKKyAgICBXYXlsYW5kQ29tcG9zaXRvcjo6c2luZ2xldG9uKCkudW5iaW5kV2ViUGFnZShtX3dl YlBhZ2UpOworI2VuZGlmCisKKyAgICBpZiAobV9nZGtHTENvbnRleHQgJiYgbV9nZGtHTENvbnRl eHQuZ2V0KCkgPT0gZ2RrX2dsX2NvbnRleHRfZ2V0X2N1cnJlbnQoKSkKKyAgICAgICAgZ2RrX2ds X2NvbnRleHRfY2xlYXJfY3VycmVudCgpOworCisgICAgbV9nbENvbnRleHRJbml0aWFsaXplZCA9 IGZhbHNlOworfQorCiB2b2lkIEFjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZDo6dHJ5RW5z dXJlR0xDb250ZXh0KCkKIHsKLSAgICBpZiAobV9nbENvbnRleHRJbml0aWFsaXplZCkKKyAgICBp ZiAobV9nbENvbnRleHRJbml0aWFsaXplZCB8fCAhZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQobV93 ZWJQYWdlLnZpZXdXaWRnZXQoKSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZ2xDb250ZXh0 SW5pdGlhbGl6ZWQgPSB0cnVlOwpAQCAtMjA4LDE4ICsyMzYsNiBAQCB2b2lkIEFjY2VsZXJhdGVk QmFja2luZ1N0b3JlV2F5bGFuZDo6ZGlzcGxheUJ1ZmZlcihzdHJ1Y3Qgd3BlX2Zkb19lZ2xfZXhw b3J0ZWRfaQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgaWYgKCFtX3ZpZXdUZXh0dXJl KSB7Ci0gICAgICAgIGlmICghbWFrZUNvbnRleHRDdXJyZW50KCkpCi0gICAgICAgICAgICByZXR1 cm47Ci0KLSAgICAgICAgZ2xHZW5UZXh0dXJlcygxLCAmbV92aWV3VGV4dHVyZSk7Ci0gICAgICAg IGdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgbV92aWV3VGV4dHVyZSk7Ci0gICAgICAgIGds VGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX1dSQVBfUywgR0xfQ0xBTVBf VE9fRURHRSk7Ci0gICAgICAgIGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhU VVJFX1dSQVBfVCwgR0xfQ0xBTVBfVE9fRURHRSk7Ci0gICAgICAgIGdsVGV4UGFyYW1ldGVyaShH TF9URVhUVVJFXzJELCBHTF9URVhUVVJFX01JTl9GSUxURVIsIEdMX05FQVJFU1QpOwotICAgICAg ICBnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9NQUdfRklMVEVSLCBH TF9ORUFSRVNUKTsKLSAgICB9Ci0KICAgICBpZiAobV9wZW5kaW5nSW1hZ2UpCiAgICAgICAgIHdw ZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZWdsX2Rpc3BhdGNoX3JlbGVhc2VfZXhwb3J0 ZWRfaW1hZ2UobV9leHBvcnRhYmxlLCBtX3BlbmRpbmdJbWFnZSk7CiAgICAgbV9wZW5kaW5nSW1h Z2UgPSBpbWFnZTsKQEAgLTIzNSw3ICsyNTEsNyBAQCBib29sIEFjY2VsZXJhdGVkQmFja2luZ1N0 b3JlV2F5bGFuZDo6cGFpbnQoY2Fpcm9fdCogY3IsIGNvbnN0IEludFJlY3QmIGNsaXBSZWN0KQog CiAjaWYgVVNFKFdQRV9SRU5ERVJFUikKICAgICBpZiAoIW1ha2VDb250ZXh0Q3VycmVudCgpKQot ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYgKG1f cGVuZGluZ0ltYWdlKSB7CiAgICAgICAgIHdwZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9f ZGlzcGF0Y2hfZnJhbWVfY29tcGxldGUobV9leHBvcnRhYmxlKTsKQEAgLTI0OSw2ICsyNjUsMTQg QEAgYm9vbCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OnBhaW50KGNhaXJvX3QqIGNy LCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKICAgICBpZiAoIW1fY29tbWl0dGVkSW1hZ2UpCiAg ICAgICAgIHJldHVybiB0cnVlOwogCisgICAgaWYgKCFtX3ZpZXdUZXh0dXJlKSB7CisgICAgICAg IGdsR2VuVGV4dHVyZXMoMSwgJm1fdmlld1RleHR1cmUpOworICAgICAgICBnbEJpbmRUZXh0dXJl KEdMX1RFWFRVUkVfMkQsIG1fdmlld1RleHR1cmUpOworICAgICAgICBnbFRleFBhcmFtZXRlcmko R0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1MsIEdMX0NMQU1QX1RPX0VER0UpOworICAg ICAgICBnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1QsIEdM X0NMQU1QX1RPX0VER0UpOworICAgICAgICBnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwg R0xfVEVYVFVSRV9NSU5fRklMVEVSLCBHTF9ORUFSRVNUKTsKKyAgICAgICAgZ2xUZXhQYXJhbWV0 ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUFHX0ZJTFRFUiwgR0xfTkVBUkVTVCk7Cisg ICAgfQogICAgIGdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgbV92aWV3VGV4dHVyZSk7CiAg ICAgZ2xJbWFnZVRhcmdldFRleHR1cmUyRChHTF9URVhUVVJFXzJELCB3cGVfZmRvX2VnbF9leHBv cnRlZF9pbWFnZV9nZXRfZWdsX2ltYWdlKG1fY29tbWl0dGVkSW1hZ2UpKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5 bGFuZC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0 b3JlV2F5bGFuZC5oCmluZGV4IDU4MjZiY2NlOWJkLi5kZmZlMjNkOGYzYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFu ZC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQuaApAQCAtNjUsNiArNjUsOCBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBi b29sIHBhaW50KGNhaXJvX3QqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7Cisg ICAgdm9pZCByZWFsaXplKCkgb3ZlcnJpZGU7CisgICAgdm9pZCB1bnJlYWxpemUoKSBvdmVycmlk ZTsKICAgICBib29sIG1ha2VDb250ZXh0Q3VycmVudCgpIG92ZXJyaWRlOwogI2lmIFVTRShXUEVf UkVOREVSRVIpCiAgICAgdm9pZCB1cGRhdGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpIG92ZXJy aWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21w b3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5kQ29tcG9zaXRv ci5jcHAKaW5kZXggY2U4OTUyOTNmZWUuLjhhMTRjNTUyYzg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5kQ29tcG9zaXRvci5jcHAKQEAgLTE2Nyw2ICsxNjcs OSBAQCBXYXlsYW5kQ29tcG9zaXRvcjo6U3VyZmFjZTo6flN1cmZhY2UoKQogCiB2b2lkIFdheWxh bmRDb21wb3NpdG9yOjpTdXJmYWNlOjpzZXRXZWJQYWdlKFdlYlBhZ2VQcm94eSogd2ViUGFnZSkK IHsKKyAgICBpZiAobV93ZWJQYWdlID09IHdlYlBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAg IGlmIChtX3dlYlBhZ2UpIHsKICAgICAgICAgZmx1c2hQZW5kaW5nRnJhbWVDYWxsYmFja3MoKTsK ICAgICAgICAgZmx1c2hGcmFtZUNhbGxiYWNrcygpOwpAQCAtNTYzLDYgKzU2NiwxOCBAQCB2b2lk IFdheWxhbmRDb21wb3NpdG9yOjpiaW5kU3VyZmFjZVRvV2ViUGFnZShXYXlsYW5kQ29tcG9zaXRv cjo6U3VyZmFjZSogc3VyZmFjZQogICAgIG1fcGFnZU1hcC5zZXQod2ViUGFnZSwgbWFrZVdlYWtQ dHIoKnN1cmZhY2UpKTsKIH0KIAordm9pZCBXYXlsYW5kQ29tcG9zaXRvcjo6YmluZFdlYlBhZ2Uo V2ViUGFnZVByb3h5JiB3ZWJQYWdlKQoreworICAgIGlmIChXZWFrUHRyPFN1cmZhY2U+IHN1cmZh Y2UgPSBtX3BhZ2VNYXAuZ2V0KCZ3ZWJQYWdlKSkKKyAgICAgICAgc3VyZmFjZS0+c2V0V2ViUGFn ZSgmd2ViUGFnZSk7Cit9CisKK3ZvaWQgV2F5bGFuZENvbXBvc2l0b3I6OnVuYmluZFdlYlBhZ2Uo V2ViUGFnZVByb3h5JiB3ZWJQYWdlKQoreworICAgIGlmIChXZWFrUHRyPFN1cmZhY2U+IHN1cmZh Y2UgPSBtX3BhZ2VNYXAuZ2V0KCZ3ZWJQYWdlKSkKKyAgICAgICAgc3VyZmFjZS0+c2V0V2ViUGFn ZShudWxscHRyKTsKK30KKwogdm9pZCBXYXlsYW5kQ29tcG9zaXRvcjo6cmVnaXN0ZXJXZWJQYWdl KFdlYlBhZ2VQcm94eSYgd2ViUGFnZSkKIHsKICAgICBtX3BhZ2VNYXAuYWRkKCZ3ZWJQYWdlLCBu dWxscHRyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5k Q29tcG9zaXRvci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3Np dG9yLmgKaW5kZXggZDQwYzIzMDMyNTcuLmU5YTQyMTg5YjczIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuaApAQCAtMTA0LDYgKzEwNCw4IEBA IHB1YmxpYzoKICAgICBTdHJpbmcgZGlzcGxheU5hbWUoKSBjb25zdCB7IHJldHVybiBtX2Rpc3Bs YXlOYW1lOyB9CiAKICAgICB2b2lkIGJpbmRTdXJmYWNlVG9XZWJQYWdlKFN1cmZhY2UqLCBXZWJD b3JlOjpQYWdlSWRlbnRpZmllcik7CisgICAgdm9pZCBiaW5kV2ViUGFnZShXZWJQYWdlUHJveHkm KTsKKyAgICB2b2lkIHVuYmluZFdlYlBhZ2UoV2ViUGFnZVByb3h5Jik7CiAgICAgdm9pZCByZWdp c3RlcldlYlBhZ2UoV2ViUGFnZVByb3h5Jik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyV2ViUGFnZShX ZWJQYWdlUHJveHkmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3Mu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3MuY3BwCmluZGV4IDAxMGFjZTYyMTNiLi5m YTk3NGMyMTY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv Q29vcmRpbmF0ZWRHcmFwaGljcy9EcmF3aW5nQXJlYUNvb3JkaW5hdGVkR3JhcGhpY3MuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv RHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzLmNwcApAQCAtNTUxLDggKzU1MSw3IEBAIHZv aWQgRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzOjplbnRlckFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKEdyYXBoaWNzTGF5CiAgICAgaWYgKG1fcHJldmlvdXNMYXllclRyZWVIb3N0KSB7 CiAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdCA9IFdURk1vdmUobV9wcmV2aW91c0xheWVyVHJlZUhv c3QpOwogICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldElzRGlzY2FyZGFibGUoZmFsc2UpOwot ICAgICAgICBpZiAoIW1faXNQYWludGluZ1N1c3BlbmRlZCkKLSAgICAgICAgICAgIG1fbGF5ZXJU cmVlSG9zdC0+cmVzdW1lUmVuZGVyaW5nKCk7CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+cmVz dW1lUmVuZGVyaW5nKCk7CiAgICAgICAgIGlmICghbV9sYXllclRyZWVTdGF0ZUlzRnJvemVuKQog ICAgICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRMYXllckZsdXNoU2NoZWR1bGluZ0VuYWJs ZWQodHJ1ZSk7CiAgICAgfSBlbHNlIHsK 378851 2019-09-16 03:24:13 -0700 2019-09-16 15:59:38 -0700 Patch wk2-wl-unrealize.diff text/plain 10861 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggODg2ZmQ0MWI3MDMuLjRlMzVhMDllMjgxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDM5IEBACisyMDE5LTA5LTE2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KKworICAgICAgICBbR1RLXSBDcmFzaCBjbG9zaW5nIHdlYiB2aWV3IHdoaWxlIGhhcmR3 YXJlIGFjY2VsZXJhdGlvbiBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGUgY3Jhc2ggaGFwcGVucyB3aGVuIGRlc3Ryb3lpbmcgdGhl IFdheWxhbmRDb21wb3NpdG9yOjpTdXJmYWNlIGJlY2F1c2UgdGhlIHdlYiB2aWV3IEdMIGNvbnRl eHQgaXMgdXNlZCB0bworICAgICAgICByZWxlYXNlIHRoZSB0ZXh0dXJlLCBidXQgdGhlIEdMIGNv bnRleHQgaXMgbm8gbG9uZ2VyIHZhbGlkIGFmdGVyIHdlYiB2aWV3CisgICAgICAgIHVucmVhbGl6 ZS4gQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kIHNob3VsZCBoYW5kbGUgdGhlIHdlYiB2 aWV3IHVucmVhbGl6ZSB0byBkZXN0cm95IHRoZSBHTCBjb250ZXh0LiBJdAorICAgICAgICB3aWxs IGJlIGNyZWF0ZWQgb24gZGVtYW5kIGFnYWluIGFmdGVyIHRoZSB3ZWIgdmlldyBpcyByZWFsaXpl ZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoK KyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6ZSk6IE5vdGlmeSBBY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZS4KKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVW5yZWFsaXplKTogRGl0dG8u CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZS5oOgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZTo6cmVhbGl6ZSk6IEFkZGVkLgor ICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZTo6dW5yZWFsaXplKTogQWRk ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxh bmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6 OnJlYWxpemUpOiBJbiBjYXNlIG9mIHVzaW5nIFdheWxhbmRDb21wb3NpdG9yLCBjYWxsCisgICAg ICAgIFdheWxhbmRDb21wb3NpdG9yOjpiaW5kV2ViUGFnZSgpIHRvIGJpbmQgdGhlIFdlYlBhZ2VQ cm94eSB0byB0aGUgV2F5bGFuZCBzdXJmYWNlLgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRl ZEJhY2tpbmdTdG9yZVdheWxhbmQ6OnVucmVhbGl6ZSk6IERlc3Ryb3kgR0wgcmVzb3VyY2VzIGFu ZCB0aGUgR0wgY29udGV4dC4KKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRCYWNraW5nU3Rv cmVXYXlsYW5kOjp0cnlFbnN1cmVHTENvbnRleHQpOiBEbyBub3QgdHJ5IHRvIGNyZWF0ZSB0aGUg R0wgY29udGV4dCBpZiB0aGUgd2ViCisgICAgICAgIHZpZXcgaXMgbm90IHJlYWxpemVkLgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmRpc3BsYXlCdWZm ZXIpOiBSZW1vdmUgdGhlIGNvZGUgdG8gaW5pdGlhbGl6ZSB0aGUgdGV4dHVyZS4KKyAgICAgICAg KFdlYktpdDo6QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpwYWludCk6IEFuZCBhZGQg aXQgaGVyZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3Jl V2F5bGFuZC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9zaXRvcjo6U3VyZmFjZTo6c2V0V2ViUGFn ZSk6IFJldHVybiBlYXJseSBpZiBnaXZlbiBwYWdlIGlzIHRoZSBjdXJyZW50IG9uZSBhbHJlYWR5 LgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9zaXRvcjo6YmluZFdlYlBhZ2UpOiBTZXQg dGhlIHN1cmZhY2UgV2ViUGFnZVByb3h5LgorICAgICAgICAoV2ViS2l0OjpXYXlsYW5kQ29tcG9z aXRvcjo6dW5iaW5kV2ViUGFnZSk6IFVuc2V0IHRoZSBzdXJmYWNlIFdlYlBhZ2VQcm94eS4KKyAg ICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRl ZEdyYXBoaWNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWFDb29yZGluYXRlZEdy YXBoaWNzOjplbnRlckFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKTogV2hlbiByZXN0b3Jpbmcg YSBwcmV2aW91cyBsYXllciB0cmVlCisgICAgICAgIGhvc3QsIGFsd2F5cyBjYWxsIHJlc3VtZVJl bmRlcmluZygpIHRvIGJhbGFuY2UgdGhlIHN1c3BlbmRSZW5kZXJpbmcoKSBjYWxsZWQgaW4gZXhp dEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCkuCisKIDIwMTktMDktMTYgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI0 OTE0Mik6IFtHVEtdIEVwaXBoYW55IGRlbGF5ZWQgcGFnZSBsb2FkcyBjb250aW51ZSBpbmRlZmlu aXRlbHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAKaW5kZXggODhiM2NmNDNiZmUuLjY4Y2EzYWQ1YjViIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNw cApAQCAtNDIyLDYgKzQyMiw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlUmVhbGl6 ZShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBnZGtfd2luZG93X3NldF91c2VyX2RhdGEod2luZG93 LCB3aWRnZXQpOwogCiAgICAgZ3RrX2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cocHJpdi0+ aW5wdXRNZXRob2RGaWx0ZXIuY29udGV4dCgpLCB3aW5kb3cpOworCisgICAgaWYgKHByaXYtPmFj Y2VsZXJhdGVkQmFja2luZ1N0b3JlKQorICAgICAgICBwcml2LT5hY2NlbGVyYXRlZEJhY2tpbmdT dG9yZS0+cmVhbGl6ZSgpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVVucmVh bGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKQEAgLTQyOSw2ICs0MzIsOSBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRXZWJWaWV3QmFzZVVucmVhbGl6ZShHdGtXaWRnZXQqIHdpZGdldCkKICAgICBXZWJLaXRX ZWJWaWV3QmFzZSogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFV19CQVNFKHdpZGdldCk7CiAgICAg Z3RrX2ltX2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cod2ViVmlldy0+cHJpdi0+aW5wdXRNZXRo b2RGaWx0ZXIuY29udGV4dCgpLCBudWxscHRyKTsKIAorICAgIGlmICh3ZWJWaWV3LT5wcml2LT5h Y2NlbGVyYXRlZEJhY2tpbmdTdG9yZSkKKyAgICAgICAgd2ViVmlldy0+cHJpdi0+YWNjZWxlcmF0 ZWRCYWNraW5nU3RvcmUtPnVucmVhbGl6ZSgpOworCiAgICAgR1RLX1dJREdFVF9DTEFTUyh3ZWJr aXRfd2ViX3ZpZXdfYmFzZV9wYXJlbnRfY2xhc3MpLT51bnJlYWxpemUod2lkZ2V0KTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2lu Z1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5n U3RvcmUuaAppbmRleCAxODIyNjRjNjk1Mi4uYzZhZmIyMGIwNDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZS5oCkBAIC00 Nyw2ICs0Nyw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoY29uc3QgTGF5 ZXJUcmVlQ29udGV4dCYpIHsgfQogICAgIHZpcnR1YWwgYm9vbCBwYWludChjYWlyb190KiwgY29u c3QgV2ViQ29yZTo6SW50UmVjdCYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgcmVhbGl6ZSgpIHsg fTsKKyAgICB2aXJ0dWFsIHZvaWQgdW5yZWFsaXplKCkgeyB9OwogICAgIHZpcnR1YWwgYm9vbCBt YWtlQ29udGV4dEN1cnJlbnQoKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgaW50IHJl bmRlckhvc3RGaWxlRGVzY3JpcHRvcigpIHsgcmV0dXJuIC0xOyB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQu Y3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3Jl V2F5bGFuZC5jcHAKaW5kZXggODkzMjc5ZmJjZjUuLjk3M2IzMTY4MWZiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5k LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5n U3RvcmVXYXlsYW5kLmNwcApAQCAtMTQ4LDkgKzE0OCwzNyBAQCBBY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQ6On5BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQoKQogICAgICAgICBn ZGtfZ2xfY29udGV4dF9jbGVhcl9jdXJyZW50KCk7CiB9CiAKK3ZvaWQgQWNjZWxlcmF0ZWRCYWNr aW5nU3RvcmVXYXlsYW5kOjpyZWFsaXplKCkKK3sKKyNpZiAhVVNFKFdQRV9SRU5ERVJFUikKKyAg ICBXYXlsYW5kQ29tcG9zaXRvcjo6c2luZ2xldG9uKCkuYmluZFdlYlBhZ2UobV93ZWJQYWdlKTsK KyNlbmRpZgorfQorCit2b2lkIEFjY2VsZXJhdGVkQmFja2luZ1N0b3JlV2F5bGFuZDo6dW5yZWFs aXplKCkKK3sKKyAgICBpZiAoIW1fZ2xDb250ZXh0SW5pdGlhbGl6ZWQpCisgICAgICAgIHJldHVy bjsKKworI2lmIFVTRShXUEVfUkVOREVSRVIpCisgICAgaWYgKG1fdmlld1RleHR1cmUpIHsKKyAg ICAgICAgaWYgKG1ha2VDb250ZXh0Q3VycmVudCgpKQorICAgICAgICAgICAgZ2xEZWxldGVUZXh0 dXJlcygxLCAmbV92aWV3VGV4dHVyZSk7CisgICAgICAgIG1fdmlld1RleHR1cmUgPSAwOworICAg IH0KKyNlbHNlCisgICAgV2F5bGFuZENvbXBvc2l0b3I6OnNpbmdsZXRvbigpLnVuYmluZFdlYlBh Z2UobV93ZWJQYWdlKTsKKyNlbmRpZgorCisgICAgaWYgKG1fZ2RrR0xDb250ZXh0ICYmIG1fZ2Rr R0xDb250ZXh0LmdldCgpID09IGdka19nbF9jb250ZXh0X2dldF9jdXJyZW50KCkpCisgICAgICAg IGdka19nbF9jb250ZXh0X2NsZWFyX2N1cnJlbnQoKTsKKworICAgIG1fZ2xDb250ZXh0SW5pdGlh bGl6ZWQgPSBmYWxzZTsKK30KKwogdm9pZCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6 OnRyeUVuc3VyZUdMQ29udGV4dCgpCiB7Ci0gICAgaWYgKG1fZ2xDb250ZXh0SW5pdGlhbGl6ZWQp CisgICAgaWYgKG1fZ2xDb250ZXh0SW5pdGlhbGl6ZWQgfHwgIWd0a193aWRnZXRfZ2V0X3JlYWxp emVkKG1fd2ViUGFnZS52aWV3V2lkZ2V0KCkpKQogICAgICAgICByZXR1cm47CiAKICAgICBtX2ds Q29udGV4dEluaXRpYWxpemVkID0gdHJ1ZTsKQEAgLTIwOCwxOCArMjM2LDYgQEAgdm9pZCBBY2Nl bGVyYXRlZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmRpc3BsYXlCdWZmZXIoc3RydWN0IHdwZV9mZG9f ZWdsX2V4cG9ydGVkX2kKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmICghbV92aWV3 VGV4dHVyZSkgewotICAgICAgICBpZiAoIW1ha2VDb250ZXh0Q3VycmVudCgpKQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIGdsR2VuVGV4dHVyZXMoMSwgJm1fdmlld1RleHR1cmUpOwot ICAgICAgICBnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIG1fdmlld1RleHR1cmUpOwotICAg ICAgICBnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1MsIEdM X0NMQU1QX1RPX0VER0UpOwotICAgICAgICBnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwg R0xfVEVYVFVSRV9XUkFQX1QsIEdMX0NMQU1QX1RPX0VER0UpOwotICAgICAgICBnbFRleFBhcmFt ZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9NSU5fRklMVEVSLCBHTF9ORUFSRVNUKTsK LSAgICAgICAgZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfTUFHX0ZJ TFRFUiwgR0xfTkVBUkVTVCk7Ci0gICAgfQotCiAgICAgaWYgKG1fcGVuZGluZ0ltYWdlKQogICAg ICAgICB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVfZmRvX2VnbF9kaXNwYXRjaF9yZWxlYXNl X2V4cG9ydGVkX2ltYWdlKG1fZXhwb3J0YWJsZSwgbV9wZW5kaW5nSW1hZ2UpOwogICAgIG1fcGVu ZGluZ0ltYWdlID0gaW1hZ2U7CkBAIC0yMzUsNyArMjUxLDcgQEAgYm9vbCBBY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZVdheWxhbmQ6OnBhaW50KGNhaXJvX3QqIGNyLCBjb25zdCBJbnRSZWN0JiBjbGlw UmVjdCkKIAogI2lmIFVTRShXUEVfUkVOREVSRVIpCiAgICAgaWYgKCFtYWtlQ29udGV4dEN1cnJl bnQoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAg IGlmIChtX3BlbmRpbmdJbWFnZSkgewogICAgICAgICB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFi bGVfZmRvX2Rpc3BhdGNoX2ZyYW1lX2NvbXBsZXRlKG1fZXhwb3J0YWJsZSk7CkBAIC0yNDksNiAr MjY1LDE0IEBAIGJvb2wgQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpwYWludChjYWly b190KiBjciwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpCiAgICAgaWYgKCFtX2NvbW1pdHRlZElt YWdlKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAorICAgIGlmICghbV92aWV3VGV4dHVyZSkgewor ICAgICAgICBnbEdlblRleHR1cmVzKDEsICZtX3ZpZXdUZXh0dXJlKTsKKyAgICAgICAgZ2xCaW5k VGV4dHVyZShHTF9URVhUVVJFXzJELCBtX3ZpZXdUZXh0dXJlKTsKKyAgICAgICAgZ2xUZXhQYXJh bWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JBUF9TLCBHTF9DTEFNUF9UT19FREdF KTsKKyAgICAgICAgZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JB UF9ULCBHTF9DTEFNUF9UT19FREdFKTsKKyAgICAgICAgZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRV UkVfMkQsIEdMX1RFWFRVUkVfTUlOX0ZJTFRFUiwgR0xfTkVBUkVTVCk7CisgICAgICAgIGdsVGV4 UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX01BR19GSUxURVIsIEdMX05FQVJF U1QpOworICAgIH0KICAgICBnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIG1fdmlld1RleHR1 cmUpOwogICAgIGdsSW1hZ2VUYXJnZXRUZXh0dXJlMkQoR0xfVEVYVFVSRV8yRCwgd3BlX2Zkb19l Z2xfZXhwb3J0ZWRfaW1hZ2VfZ2V0X2VnbF9pbWFnZShtX2NvbW1pdHRlZEltYWdlKSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZVdheWxhbmQuaAppbmRleCA1ODI2YmNjZTliZC4uZGZmZTIzZDhmM2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9y ZVdheWxhbmQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRC YWNraW5nU3RvcmVXYXlsYW5kLmgKQEAgLTY1LDYgKzY1LDggQEAgcHJpdmF0ZToKICNlbmRpZgog CiAgICAgYm9vbCBwYWludChjYWlyb190KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpIG92ZXJy aWRlOworICAgIHZvaWQgcmVhbGl6ZSgpIG92ZXJyaWRlOworICAgIHZvaWQgdW5yZWFsaXplKCkg b3ZlcnJpZGU7CiAgICAgYm9vbCBtYWtlQ29udGV4dEN1cnJlbnQoKSBvdmVycmlkZTsKICNpZiBV U0UoV1BFX1JFTkRFUkVSKQogICAgIHZvaWQgdXBkYXRlKGNvbnN0IExheWVyVHJlZUNvbnRleHQm KSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXls YW5kQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2F5bGFuZENv bXBvc2l0b3IuY3BwCmluZGV4IGNlODk1MjkzZmVlLi44YTE0YzU1MmM4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvV2F5bGFuZENvbXBvc2l0b3IuY3BwCkBAIC0xNjcs NiArMTY3LDkgQEAgV2F5bGFuZENvbXBvc2l0b3I6OlN1cmZhY2U6On5TdXJmYWNlKCkKIAogdm9p ZCBXYXlsYW5kQ29tcG9zaXRvcjo6U3VyZmFjZTo6c2V0V2ViUGFnZShXZWJQYWdlUHJveHkqIHdl YlBhZ2UpCiB7CisgICAgaWYgKG1fd2ViUGFnZSA9PSB3ZWJQYWdlKQorICAgICAgICByZXR1cm47 CisKICAgICBpZiAobV93ZWJQYWdlKSB7CiAgICAgICAgIGZsdXNoUGVuZGluZ0ZyYW1lQ2FsbGJh Y2tzKCk7CiAgICAgICAgIGZsdXNoRnJhbWVDYWxsYmFja3MoKTsKQEAgLTU2Myw2ICs1NjYsMTgg QEAgdm9pZCBXYXlsYW5kQ29tcG9zaXRvcjo6YmluZFN1cmZhY2VUb1dlYlBhZ2UoV2F5bGFuZENv bXBvc2l0b3I6OlN1cmZhY2UqIHN1cmZhY2UKICAgICBtX3BhZ2VNYXAuc2V0KHdlYlBhZ2UsIG1h a2VXZWFrUHRyKCpzdXJmYWNlKSk7CiB9CiAKK3ZvaWQgV2F5bGFuZENvbXBvc2l0b3I6OmJpbmRX ZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSkKK3sKKyAgICBpZiAoV2Vha1B0cjxTdXJmYWNl PiBzdXJmYWNlID0gbV9wYWdlTWFwLmdldCgmd2ViUGFnZSkpCisgICAgICAgIHN1cmZhY2UtPnNl dFdlYlBhZ2UoJndlYlBhZ2UpOworfQorCit2b2lkIFdheWxhbmRDb21wb3NpdG9yOjp1bmJpbmRX ZWJQYWdlKFdlYlBhZ2VQcm94eSYgd2ViUGFnZSkKK3sKKyAgICBpZiAoV2Vha1B0cjxTdXJmYWNl PiBzdXJmYWNlID0gbV9wYWdlTWFwLmdldCgmd2ViUGFnZSkpCisgICAgICAgIHN1cmZhY2UtPnNl dFdlYlBhZ2UobnVsbHB0cik7Cit9CisKIHZvaWQgV2F5bGFuZENvbXBvc2l0b3I6OnJlZ2lzdGVy V2ViUGFnZShXZWJQYWdlUHJveHkmIHdlYlBhZ2UpCiB7CiAgICAgbV9wYWdlTWFwLmFkZCgmd2Vi UGFnZSwgbnVsbHB0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsv V2F5bGFuZENvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9XYXlsYW5k Q29tcG9zaXRvci5oCmluZGV4IGQ0MGMyMzAzMjU3Li5lOWE0MjE4OWI3MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1dheWxhbmRDb21wb3NpdG9yLmgKQEAgLTEwNCw2ICsx MDQsOCBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIGRpc3BsYXlOYW1lKCkgY29uc3QgeyByZXR1cm4g bV9kaXNwbGF5TmFtZTsgfQogCiAgICAgdm9pZCBiaW5kU3VyZmFjZVRvV2ViUGFnZShTdXJmYWNl KiwgV2ViQ29yZTo6UGFnZUlkZW50aWZpZXIpOworICAgIHZvaWQgYmluZFdlYlBhZ2UoV2ViUGFn ZVByb3h5Jik7CisgICAgdm9pZCB1bmJpbmRXZWJQYWdlKFdlYlBhZ2VQcm94eSYpOwogICAgIHZv aWQgcmVnaXN0ZXJXZWJQYWdlKFdlYlBhZ2VQcm94eSYpOwogICAgIHZvaWQgdW5yZWdpc3Rlcldl YlBhZ2UoV2ViUGFnZVByb3h5Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdy YXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVk R3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNzLmNwcAppbmRleCAwMTBhY2U2 MjEzYi4uZmE5NzRjMjE2NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvRHJhd2luZ0FyZWFDb29yZGluYXRlZEdyYXBoaWNz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdy YXBoaWNzL0RyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljcy5jcHAKQEAgLTU1MSw4ICs1NTEs NyBAQCB2b2lkIERyYXdpbmdBcmVhQ29vcmRpbmF0ZWRHcmFwaGljczo6ZW50ZXJBY2NlbGVyYXRl ZENvbXBvc2l0aW5nTW9kZShHcmFwaGljc0xheQogICAgIGlmIChtX3ByZXZpb3VzTGF5ZXJUcmVl SG9zdCkgewogICAgICAgICBtX2xheWVyVHJlZUhvc3QgPSBXVEZNb3ZlKG1fcHJldmlvdXNMYXll clRyZWVIb3N0KTsKICAgICAgICAgbV9sYXllclRyZWVIb3N0LT5zZXRJc0Rpc2NhcmRhYmxlKGZh bHNlKTsKLSAgICAgICAgaWYgKCFtX2lzUGFpbnRpbmdTdXNwZW5kZWQpCi0gICAgICAgICAgICBt X2xheWVyVHJlZUhvc3QtPnJlc3VtZVJlbmRlcmluZygpOworICAgICAgICBtX2xheWVyVHJlZUhv c3QtPnJlc3VtZVJlbmRlcmluZygpOwogICAgICAgICBpZiAoIW1fbGF5ZXJUcmVlU3RhdGVJc0Zy b3plbikKICAgICAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0TGF5ZXJGbHVzaFNjaGVkdWxp bmdFbmFibGVkKHRydWUpOwogICAgIH0gZWxzZSB7Cg==