142079 2015-02-27 01:07:32 -0800 REGRESSION(r177075): WebProcess crashes when entering accelerating compositing mode before the WebView is realized 2015-03-03 00:10:30 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, Regression P2 Normal --- 1 cgarcia webkit-unassigned gustavo j.isorce mrobinson zan oldest_to_newest 1072673 0 cgarcia 2015-02-27 01:07:32 -0800 Yet another regression of r177075, where the creation of the redirected composited window was moved to realize method. Program received signal SIGSEGV, Segmentation fault. 0x00007fc4570b8790 in WebKit::LayerTreeHostGtk::compositeLayersToContext(WebKit::LayerTreeHostGtk::CompositePurpose) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 (gdb) bt #0 0x00007fc4570b8790 in WebKit::LayerTreeHostGtk::compositeLayersToContext(WebKit::LayerTreeHostGtk::CompositePurpose) () from WebKit/WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #1 0x00007fc4570b88bb in WebKit::LayerTreeHostGtk::sizeDidChange(WebCore::IntSize const&) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #2 0x00007fc4570b253b in WebKit::DrawingAreaImpl::updateBackingStoreState(unsigned long, bool, float, WebCore::IntSize const&, WebCore::IntSize const&) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #3 0x00007fc4570de606 in void IPC::handleMessage<Messages::DrawingArea::UpdateBackingStoreState, WebKit::DrawingArea, void (WebKit::DrawingArea::*)(unsigned long, bool, float, WebCore::IntSize const&, WebCore::IntSize const&)>(IPC::MessageDecoder&, WebKit::DrawingArea*, void (WebKit::DrawingArea::*)(unsigned long, bool, float, WebCore::IntSize const&, WebCore::IntSize const&)) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #4 0x00007fc4570de4df in WebKit::DrawingArea::didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #5 0x00007fc456eb5280 in IPC::MessageReceiverMap::dispatchMessage(IPC::Connection&, IPC::MessageDecoder&) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #6 0x00007fc456fa60f9 in WebKit::WebProcess::didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #7 0x00007fc456eb194b in IPC::Connection::dispatchMessage(std::unique_ptr<IPC::MessageDecoder, std::default_delete<IPC::MessageDecoder> >) () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #8 0x00007fc456eb2364 in IPC::Connection::dispatchOneMessage() () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #9 0x00007fc458442734 in WTF::RunLoop::performWork() () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #10 0x00007fc4558a0525 in WTF::GMainLoopSource::voidCallback() () from WebKitBuild/Release/lib/libjavascriptcoregtk-4.0.so.18 #11 0x00007fc45589e5ba in WTF::GMainLoopSource::voidSourceCallback(WTF::GMainLoopSource*) () from WebKitBuild/Release/lib/libjavascriptcoregtk-4.0.so.18 #12 0x00007fc4527f4aed in g_main_dispatch (context=0x24f7e50) at gmain.c:3122 #13 g_main_context_dispatch (context=context@entry=0x24f7e50) at gmain.c:3737 #14 0x00007fc4527f4e88 in g_main_context_iterate (context=0x24f7e50, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at gmain.c:3808 #15 0x00007fc4527f51a2 in g_main_loop_run (loop=0x2b35c90) at gmain.c:4002 #16 0x00007fc4570b73b2 in WebProcessMainUnix () from WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #17 0x00007fc44cebdb45 in __libc_start_main (main=0x400aa0 <main>, argc=2, argv=0x7fff5d409608, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fff5d4095f8) at libc-start.c:287 #18 0x0000000000400af5 in _start () 1072674 1 cgarcia 2015-02-27 01:11:08 -0800 This can be reproduced with epiphany. 1- Disable the delayed load option of ephy 2- search for poster circle in google 3- Middle click on tyhe result to open it in a new tab (let the tab load) 4- Move to the new tab CRASH! The problem is that the texture mapper and native window handler are initialized when the LayerTreeHost is initialized, assuming the UI process has already sent the native window handler to the web process, but that doesn't always happen since we moved the redirected window creation to realize. 1072675 2 247504 cgarcia 2015-02-27 02:01:03 -0800 Created attachment 247504 Patch 1073262 3 247504 zan 2015-03-01 23:24:45 -0800 Comment on attachment 247504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247504&action=review > Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:86 > + m_context = GLContext::createContextForWindow(m_layerTreeContext.contextID, GLContext::sharingContext()); GLContext::createContextForWindow() can still return null. But you don't want to call that every time you call LayerTreeHostGtk::makeContextCurrent(). > Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:90 > + m_context->makeContextCurrent(); > + return true; Here you should return the return value of GLContext::makeContextCurrent(). 1073270 4 247504 cgarcia 2015-03-02 00:59:47 -0800 Comment on attachment 247504 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247504&action=review Thanks for the review, I'll submit a new patch. >> Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:86 >> + m_context = GLContext::createContextForWindow(m_layerTreeContext.contextID, GLContext::sharingContext()); > > GLContext::createContextForWindow() can still return null. But you don't want to call that every time you call LayerTreeHostGtk::makeContextCurrent(). I'm not sure I get what you mean, I need to check if m_context is nullptr or not, that's right. But why not calling this everytime LayerTreeHostGtk::makeContextCurrent() is called? It's only called when the context is nullptr. I noticed that glContext() was always used to make the context current, that's why I tried to simplify the caller with this method, that it should do the same than previous code (it doesn't because I made some mistakes, though) >> Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:90 >> + return true; > > Here you should return the return value of GLContext::makeContextCurrent(). Right. > Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:-123 > - context->makeContextCurrent(); So, here for example we are not checking the return value of makeContextCurrent(), I guess we should, there's a comment saying that the creation fo the texture mapper needs an active context, and we are creating the texture mapper after this. 1073271 5 247655 cgarcia 2015-03-02 01:06:22 -0800 Created attachment 247655 Updated patch 1073365 6 247655 zan 2015-03-02 10:19:18 -0800 Comment on attachment 247655 Updated patch Looks OK. 1073634 7 cgarcia 2015-03-03 00:10:30 -0800 Committed r180924: <http://trac.webkit.org/changeset/180924> 247504 2015-02-27 02:01:03 -0800 2015-03-02 01:06:22 -0800 Patch wk2-ac-crash.diff text/plain 9643 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0MDFlYzZlLi5mOWQ5ZDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYg QEAKKzIwMTUtMDItMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04ocjE3NzA3NSk6IFdlYlByb2Nlc3MgY3Jhc2hlcyB3aGVu IGVudGVyaW5nIGFjY2VsZXJhdGluZyBjb21wb3NpdGluZyBtb2RlIGJlZm9yZSB0aGUgV2ViVmll dyBpcyByZWFsaXplZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQyMDc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIHByb2JsZW0gaXMgdGhhdCB0aGUgdGV4dHVyZSBtYXBwZXIgYW5kIG5hdGl2ZSB3 aW5kb3cgaGFuZGxlcgorICAgICAgICBhcmUgaW5pdGlhbGl6ZWQgd2hlbiB0aGUgTGF5ZXJUcmVl SG9zdCBpcyBpbml0aWFsaXplZCwgYXNzdW1pbmcKKyAgICAgICAgdGhlIFVJIHByb2Nlc3MgaGFz IGFscmVhZHkgc2VudCB0aGUgbmF0aXZlIHdpbmRvdyBoYW5kbGVyIHRvIHRoZQorICAgICAgICB3 ZWIgcHJvY2VzcywgYnV0IHRoYXQgZG9lc24ndCBhbHdheXMgaGFwcGVuIHNpbmNlIHdlIG1vdmVk IHRoZQorICAgICAgICByZWRpcmVjdGVkIHdpbmRvdyBjcmVhdGlvbiB0byByZWFsaXplIGluIHIx NzcwNzUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAg ICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6Om5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3Np dGluZyk6IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6ZW50ZXJBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSk6IENhbGwKKyAgICAgICAgTGF5ZXJUcmVlSG9zdDo6c2V0TmF0 aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nIGlmIHdlCisgICAgICAgIGFscmVhZHkgaGF2 ZSBhIG5hdGl2ZSB3aW5kb3cgaGFuZGxlIGF0IHRoaXMgcG9pbnQuCisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhSW1wbDo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToK KyAgICAgICAgQ2FsbCBMYXllclRyZWVIb3N0OjpzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29t cG9zaXRpbmcgYWxzbyB3aGVuCisgICAgICAgIG5vdCB1c2luZyB0aHJlYWRlZCBjb21wb3NpdGlu Zy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHA6CisgICAgICAg IChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6Om1ha2VDb250ZXh0Q3VycmVudCk6IEhlbHBlciBm dW5jdGlvbiB0bworICAgICAgICBlbnN1cmUgYSBjb250ZXh0IGFuZCBtYWtpbmcgaXQgY3VycmVu dC4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6ZW5zdXJlVGV4dHVyZU1hcHBl cik6IEVuc3VyZSBhIHRleHR1cmUKKyAgICAgICAgaXMgY3JlYXRlZCBmb3IgdGhlIGN1cnJlbnQg Y29udGV4dC4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6aW5pdGlhbGl6ZSk6 IFVzZSBtYWtlQ29udGV4dEN1cnJlbnQoKQorICAgICAgICBhbmQgZW5zdXJlVGV4dHVyZU1hcHBl cigpLCBhbmQgcmVtb3ZlIHRoZSBMYXllclRyZWVDb250ZXh0CisgICAgICAgIGluaXRpYWxpemF0 aW9uIHNpbmNlIHRoYXQncyBpcyBub3cgYWx3YXlzIGluaXRpYWxpemVkIGluCisgICAgICAgIHNl dE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpLgorICAgICAgICAoV2ViS2l0OjpM YXllclRyZWVIb3N0R3RrOjpjb21wb3NpdGVMYXllcnNUb0NvbnRleHQpOiBVc2UKKyAgICAgICAg bWFrZUNvbnRleHRDdXJyZW50KCkgaGVscGVyIGZ1bmN0aW9uIGFuZCBhbHNvIGNhbGwKKyAgICAg ICAgZW5zdXJlVGV4dHVyZU1hcHBlcigpIGp1c3QgaW4gY2FzZSB0aGUgdGV4dHVyZSBjb3VsZCBu b3QgYmUKKyAgICAgICAgY3JlYXRlZCBkdXJpbmcgaW5pdGlhbGl6YXRpb24gYmVjYXVzZSB0aGUg bmF0aXZlIHdpbmRvdyBoYW5kbGUgd2FzCisgICAgICAgIG5vdCB5ZXQgYXZhaWxhYmxlLgorICAg ICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0R3RrOjpmbHVzaEFuZFJlbmRlckxheWVycyk6IFVz ZSBtYWtlQ29udGV4dEN1cnJlbnQoKS4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0 azo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToKKyAgICAgICAgSW5pdGlh bGl6ZSB0aGUgTGF5ZXJUcmVlQ29udGV4dC4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9z dEd0azo6Z2xDb250ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv Z3RrL0xheWVyVHJlZUhvc3RHdGsuaDoKKwogMjAxNS0wMi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dLMl1bR1RLXSBGaXggdGhlIGJ1 aWxkIGFmdGVyIHIxODAzNjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0RyYXdpbmdBcmVhLmgKaW5kZXggZTQ1Mzg2OS4uOWZkNjBhNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTEyNCwxMCArMTI0LDYg QEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaFZpZXdPdmVybGF5R3JhcGhpY3NM YXllcihXZWJDb3JlOjpGcmFtZSosIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKSB7IH0KIAotI2lm IFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oR1RLKQotICAgIHVpbnQ2NF90IG5h dGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpIHsgcmV0dXJuIG1fbmF0aXZlU3VyZmFj ZUhhbmRsZUZvckNvbXBvc2l0aW5nOyB9Ci0jZW5kaWYKLQogcHJvdGVjdGVkOgogICAgIERyYXdp bmdBcmVhKERyYXdpbmdBcmVhVHlwZSwgV2ViUGFnZSYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCmluZGV4IDEwM2Vk MzcuLmVkN2ViMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9EcmF3aW5nQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCkBAIC00NTYsNiArNDU2LDggQEAgdm9pZCBEcmF3aW5n QXJlYUltcGw6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoR3JhcGhpY3NMYXllciog Z3JhcGhpY3NMYXkKICAgICBBU1NFUlQoIW1fbGF5ZXJUcmVlSG9zdCk7CiAKICAgICBtX2xheWVy VHJlZUhvc3QgPSBMYXllclRyZWVIb3N0OjpjcmVhdGUoJm1fd2ViUGFnZSk7CisgICAgaWYgKG1f bmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKQorICAgICAgICBtX2xheWVyVHJlZUhv c3QtPnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyhtX25hdGl2ZVN1cmZhY2VI YW5kbGVGb3JDb21wb3NpdGluZyk7CiAgICAgaWYgKCFtX2luVXBkYXRlQmFja2luZ1N0b3JlU3Rh dGUpCiAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0U2hvdWxkTm90aWZ5QWZ0ZXJOZXh0U2No ZWR1bGVkTGF5ZXJGbHVzaCh0cnVlKTsKIApAQCAtNjc3LDEwICs2NzksOCBAQCB2b2lkIERyYXdp bmdBcmVhSW1wbDo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2NF90 IGhhbmRsZSkKICAgICBtX25hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyA9IGhhbmRs ZTsKICAgICBtX3dlYlBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5zZXRBY2NlbGVyYXRlZENv bXBvc2l0aW5nRW5hYmxlZCh0cnVlKTsKIAotI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElDU19U SFJFQURFRCkKICAgICBpZiAobV9sYXllclRyZWVIb3N0KQogICAgICAgICBtX2xheWVyVHJlZUhv c3QtPnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyhoYW5kbGUpOwotI2VuZGlm CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0xheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9M YXllclRyZWVIb3N0LmgKaW5kZXggNjUwNzk5YS4uZDcyMTI3NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCkBAIC05Myw2ICs5Mywx MCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQW5pbWF0aW9uKCkgPSAwOwog I2VuZGlmCiAKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKEdUSykKKyAg ICB2aXJ0dWFsIHZvaWQgc2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2 NF90KSA9IDA7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgdm9pZCBzZXRWaWV3T3ZlcmxheVJvb3RM YXllcihXZWJDb3JlOjpHcmFwaGljc0xheWVyKikgPSAwOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RH dGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRyZWVI b3N0R3RrLmNwcAppbmRleCAzZWY3NTE0Li5mMWE4M2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAK QEAgLTc4LDE3ICs3OCwyNyBAQCBMYXllclRyZWVIb3N0R3RrOjpMYXllclRyZWVIb3N0R3RrKFdl YlBhZ2UqIHdlYlBhZ2UpCiB7CiB9CiAKLUdMQ29udGV4dCogTGF5ZXJUcmVlSG9zdEd0azo6Z2xD b250ZXh0KCkKK2Jvb2wgTGF5ZXJUcmVlSG9zdEd0azo6bWFrZUNvbnRleHRDdXJyZW50KCkKIHsK LSAgICBpZiAobV9jb250ZXh0KQotICAgICAgICByZXR1cm4gbV9jb250ZXh0LmdldCgpOworICAg IGlmICghbV9jb250ZXh0KSB7CisgICAgICAgIGlmICghbV9sYXllclRyZWVDb250ZXh0LmNvbnRl eHRJRCkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgbV9jb250ZXh0ID0gR0xD b250ZXh0OjpjcmVhdGVDb250ZXh0Rm9yV2luZG93KG1fbGF5ZXJUcmVlQ29udGV4dC5jb250ZXh0 SUQsIEdMQ29udGV4dDo6c2hhcmluZ0NvbnRleHQoKSk7CisgICAgfQorCisgICAgbV9jb250ZXh0 LT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KIAotICAgIHVpbnQ2 NF90IHdpbmRvd0hhbmRsZSA9IG1fd2ViUGFnZS0+ZHJhd2luZ0FyZWEoKS0+bmF0aXZlU3VyZmFj ZUhhbmRsZUZvckNvbXBvc2l0aW5nKCk7Ci0gICAgaWYgKCF3aW5kb3dIYW5kbGUpCi0gICAgICAg IHJldHVybiAwOwordm9pZCBMYXllclRyZWVIb3N0R3RrOjplbnN1cmVUZXh0dXJlTWFwcGVyKCkK K3sKKyAgICBpZiAobV90ZXh0dXJlTWFwcGVyKQorICAgICAgICByZXR1cm47CiAKLSAgICBtX2Nv bnRleHQgPSBHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3cod2luZG93SGFuZGxlLCBH TENvbnRleHQ6OnNoYXJpbmdDb250ZXh0KCkpOwotICAgIHJldHVybiBtX2NvbnRleHQuZ2V0KCk7 CisgICAgQVNTRVJUKG1faXNWYWxpZCk7CisgICAgbV90ZXh0dXJlTWFwcGVyID0gVGV4dHVyZU1h cHBlcjo6Y3JlYXRlKFRleHR1cmVNYXBwZXI6Ok9wZW5HTE1vZGUpOworICAgIHN0YXRpY19jYXN0 PFRleHR1cmVNYXBwZXJHTCo+KG1fdGV4dHVyZU1hcHBlci5nZXQoKSktPnNldEVuYWJsZUVkZ2VE aXN0YW5jZUFudGlhbGlhc2luZyh0cnVlKTsKKyAgICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlcj4oKm1fcm9vdExheWVyKS5sYXllcigpLnNldFRleHR1cmVNYXBwZXIobV90ZXh0 dXJlTWFwcGVyLmdldCgpKTsKIH0KIAogdm9pZCBMYXllclRyZWVIb3N0R3RrOjppbml0aWFsaXpl KCkKQEAgLTExMywxOSArMTIzLDExIEBAIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6aW5pdGlhbGl6 ZSgpCiAgICAgbV9yb290TGF5ZXItPmFkZENoaWxkKG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXll ci5nZXQoKSk7CiAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudExheWVyLT5zZXROZWVkc0Rpc3Bs YXkoKTsKIAotICAgIG1fbGF5ZXJUcmVlQ29udGV4dC5jb250ZXh0SUQgPSBtX3dlYlBhZ2UtPmRy YXdpbmdBcmVhKCktPm5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpOwotCi0gICAg R0xDb250ZXh0KiBjb250ZXh0ID0gZ2xDb250ZXh0KCk7Ci0gICAgaWYgKCFjb250ZXh0KQotICAg ICAgICByZXR1cm47Ci0KICAgICAvLyBUaGUgY3JlYXRpb24gb2YgdGhlIFRleHR1cmVNYXBwZXIg bmVlZHMgYW4gYWN0aXZlIE9wZW5HTCBjb250ZXh0LgotICAgIGNvbnRleHQtPm1ha2VDb250ZXh0 Q3VycmVudCgpOwotCi0gICAgbV90ZXh0dXJlTWFwcGVyID0gVGV4dHVyZU1hcHBlcjo6Y3JlYXRl KFRleHR1cmVNYXBwZXI6Ok9wZW5HTE1vZGUpOwotICAgIHN0YXRpY19jYXN0PFRleHR1cmVNYXBw ZXJHTCo+KG1fdGV4dHVyZU1hcHBlci5nZXQoKSktPnNldEVuYWJsZUVkZ2VEaXN0YW5jZUFudGlh bGlhc2luZyh0cnVlKTsKLSAgICBkb3duY2FzdDxHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcj4o Km1fcm9vdExheWVyKS5sYXllcigpLnNldFRleHR1cmVNYXBwZXIobV90ZXh0dXJlTWFwcGVyLmdl dCgpKTsKKyAgICBpZiAoIW1ha2VDb250ZXh0Q3VycmVudCgpKQorICAgICAgICByZXR1cm47CiAK KyAgICBlbnN1cmVUZXh0dXJlTWFwcGVyKCk7CiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9 CiAKQEAgLTI4OSwxMCArMjkxLDExIEBAIGJvb2wgTGF5ZXJUcmVlSG9zdEd0azo6Zmx1c2hQZW5k aW5nTGF5ZXJDaGFuZ2VzKCkKIAogdm9pZCBMYXllclRyZWVIb3N0R3RrOjpjb21wb3NpdGVMYXll cnNUb0NvbnRleHQoQ29tcG9zaXRlUHVycG9zZSBwdXJwb3NlKQogewotICAgIEdMQ29udGV4dCog Y29udGV4dCA9IGdsQ29udGV4dCgpOwotICAgIGlmICghY29udGV4dCB8fCAhY29udGV4dC0+bWFr ZUNvbnRleHRDdXJyZW50KCkpCisgICAgaWYgKCFtYWtlQ29udGV4dEN1cnJlbnQoKSkKICAgICAg ICAgcmV0dXJuOwogCisgICAgZW5zdXJlVGV4dHVyZU1hcHBlcigpOworCiAgICAgLy8gVGhlIHdp bmRvdyBzaXplIG1heSBiZSBvdXQgb2Ygc3luYyB3aXRoIHRoZSBwYWdlIHNpemUgYXQgdGhpcyBw b2ludCwgYW5kIGdldHRpbmcKICAgICAvLyB0aGUgdmlld3BvcnQgcGFyYW1ldGVycyBpbmNvcnJl Y3QsIG1lYW5zIHRoYXQgdGhlIGNvbnRlbnQgd2lsbCBiZSBtaXNwbGFjZWQuIFRodXMKICAgICAv LyB3ZSBzZXQgdGhlIHZpZXdwb3J0IHBhcmFtZXRlcnMgZGlyZWN0bHkgZnJvbSB0aGUgd2luZG93 IHNpemUuCkBAIC0zMDgsNyArMzExLDcgQEAgdm9pZCBMYXllclRyZWVIb3N0R3RrOjpjb21wb3Np dGVMYXllcnNUb0NvbnRleHQoQ29tcG9zaXRlUHVycG9zZSBwdXJwb3NlKQogICAgIGRvd25jYXN0 PEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyPigqbV9yb290TGF5ZXIpLmxheWVyKCkucGFpbnQo KTsKICAgICBtX3RleHR1cmVNYXBwZXItPmVuZFBhaW50aW5nKCk7CiAKLSAgICBjb250ZXh0LT5z d2FwQnVmZmVycygpOworICAgIG1fY29udGV4dC0+c3dhcEJ1ZmZlcnMoKTsKIH0KIAogdm9pZCBM YXllclRyZWVIb3N0R3RrOjpmbHVzaEFuZFJlbmRlckxheWVycygpCkBAIC0zMjEsOCArMzI0LDcg QEAgdm9pZCBMYXllclRyZWVIb3N0R3RrOjpmbHVzaEFuZFJlbmRlckxheWVycygpCiAgICAgICAg ICAgICByZXR1cm47CiAgICAgfQogCi0gICAgR0xDb250ZXh0KiBjb250ZXh0ID0gZ2xDb250ZXh0 KCk7Ci0gICAgaWYgKCFjb250ZXh0IHx8ICFjb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKSkK KyAgICBpZiAoIW1ha2VDb250ZXh0Q3VycmVudCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBp ZiAoIWZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpKQpAQCAtMzgwLDYgKzM4MiwxMSBAQCB2b2lk IExheWVyVHJlZUhvc3RHdGs6OnNldFZpZXdPdmVybGF5Um9vdExheWVyKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXIqIHZpZXdPdmVybAogICAgICAgICBtX3Jvb3RMYXllci0+YWRkQ2hpbGQobV92aWV3 T3ZlcmxheVJvb3RMYXllcik7CiB9CiAKK3ZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6c2V0TmF0aXZl U3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2NF90IGhhbmRsZSkKK3sKKyAgICBtX2xh eWVyVHJlZUNvbnRleHQuY29udGV4dElEID0gaGFuZGxlOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5oCmluZGV4IGM4MDliMDUuLjEwZWFjOGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVl SG9zdEd0ay5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5 ZXJUcmVlSG9zdEd0ay5oCkBAIC02MSw2ICs2MSw4IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFs IHZvaWQgZGV2aWNlT3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCkgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCB2b2lkIHBhZ2VCYWNrZ3JvdW5kVHJhbnNwYXJlbmN5Q2hhbmdlZCgpIG92ZXJyaWRlOwog CisgICAgdmlydHVhbCB2b2lkIHNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyh1 aW50NjRfdCkgb3ZlcnJpZGU7CisKIHByaXZhdGU6CiAgICAgLy8gTGF5ZXJUcmVlSG9zdAogICAg IHZpcnR1YWwgY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXJUcmVlQ29udGV4dCgpIG92ZXJy aWRlOwpAQCAtODQsNyArODYsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBsYXllckZsdXNoVGlt ZXJGaXJlZCgpOwogCi0gICAgV2ViQ29yZTo6R0xDb250ZXh0KiBnbENvbnRleHQoKTsKKyAgICBi b29sIG1ha2VDb250ZXh0Q3VycmVudCgpOworICAgIHZvaWQgZW5zdXJlVGV4dHVyZU1hcHBlcigp OwogCiAgICAgTGF5ZXJUcmVlQ29udGV4dCBtX2xheWVyVHJlZUNvbnRleHQ7CiAgICAgYm9vbCBt X2lzVmFsaWQ7Cg== 247655 2015-03-02 01:06:22 -0800 2015-03-02 10:19:18 -0800 Updated patch wk2-web-process-crash.diff text/plain 9689 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3MTk3OGFmLi5kOGQ2ZjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYg QEAKKzIwMTUtMDMtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJFR1JFU1NJT04ocjE3NzA3NSk6IFdlYlByb2Nlc3MgY3Jhc2hlcyB3aGVu IGVudGVyaW5nIGFjY2VsZXJhdGluZyBjb21wb3NpdGluZyBtb2RlIGJlZm9yZSB0aGUgV2ViVmll dyBpcyByZWFsaXplZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQyMDc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhlIHByb2JsZW0gaXMgdGhhdCB0aGUgdGV4dHVyZSBtYXBwZXIgYW5kIG5hdGl2ZSB3 aW5kb3cgaGFuZGxlcgorICAgICAgICBhcmUgaW5pdGlhbGl6ZWQgd2hlbiB0aGUgTGF5ZXJUcmVl SG9zdCBpcyBpbml0aWFsaXplZCwgYXNzdW1pbmcKKyAgICAgICAgdGhlIFVJIHByb2Nlc3MgaGFz IGFscmVhZHkgc2VudCB0aGUgbmF0aXZlIHdpbmRvdyBoYW5kbGVyIHRvIHRoZQorICAgICAgICB3 ZWIgcHJvY2VzcywgYnV0IHRoYXQgZG9lc24ndCBhbHdheXMgaGFwcGVuIHNpbmNlIHdlIG1vdmVk IHRoZQorICAgICAgICByZWRpcmVjdGVkIHdpbmRvdyBjcmVhdGlvbiB0byByZWFsaXplIGluIHIx NzcwNzUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaDoKKyAg ICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6Om5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3Np dGluZyk6IERlbGV0ZWQuCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYXdpbmdBcmVhSW1wbDo6ZW50ZXJBY2NlbGVy YXRlZENvbXBvc2l0aW5nTW9kZSk6IENhbGwKKyAgICAgICAgTGF5ZXJUcmVlSG9zdDo6c2V0TmF0 aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nIGlmIHdlCisgICAgICAgIGFscmVhZHkgaGF2 ZSBhIG5hdGl2ZSB3aW5kb3cgaGFuZGxlIGF0IHRoaXMgcG9pbnQuCisgICAgICAgIChXZWJLaXQ6 OkRyYXdpbmdBcmVhSW1wbDo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToK KyAgICAgICAgQ2FsbCBMYXllclRyZWVIb3N0OjpzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29t cG9zaXRpbmcgYWxzbyB3aGVuCisgICAgICAgIG5vdCB1c2luZyB0aHJlYWRlZCBjb21wb3NpdGlu Zy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHA6CisgICAgICAg IChXZWJLaXQ6OkxheWVyVHJlZUhvc3RHdGs6Om1ha2VDb250ZXh0Q3VycmVudCk6IEhlbHBlciBm dW5jdGlvbiB0bworICAgICAgICBlbnN1cmUgYSBjb250ZXh0IGFuZCBtYWtpbmcgaXQgY3VycmVu dC4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6ZW5zdXJlVGV4dHVyZU1hcHBl cik6IEVuc3VyZSBhIHRleHR1cmUKKyAgICAgICAgaXMgY3JlYXRlZCBmb3IgdGhlIGN1cnJlbnQg Y29udGV4dC4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0azo6aW5pdGlhbGl6ZSk6 IFVzZSBtYWtlQ29udGV4dEN1cnJlbnQoKQorICAgICAgICBhbmQgZW5zdXJlVGV4dHVyZU1hcHBl cigpLCBhbmQgcmVtb3ZlIHRoZSBMYXllclRyZWVDb250ZXh0CisgICAgICAgIGluaXRpYWxpemF0 aW9uIHNpbmNlIHRoYXQncyBpcyBub3cgYWx3YXlzIGluaXRpYWxpemVkIGluCisgICAgICAgIHNl dE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpLgorICAgICAgICAoV2ViS2l0OjpM YXllclRyZWVIb3N0R3RrOjpjb21wb3NpdGVMYXllcnNUb0NvbnRleHQpOiBVc2UKKyAgICAgICAg bWFrZUNvbnRleHRDdXJyZW50KCkgaGVscGVyIGZ1bmN0aW9uIGFuZCBhbHNvIGNhbGwKKyAgICAg ICAgZW5zdXJlVGV4dHVyZU1hcHBlcigpIGp1c3QgaW4gY2FzZSB0aGUgdGV4dHVyZSBjb3VsZCBu b3QgYmUKKyAgICAgICAgY3JlYXRlZCBkdXJpbmcgaW5pdGlhbGl6YXRpb24gYmVjYXVzZSB0aGUg bmF0aXZlIHdpbmRvdyBoYW5kbGUgd2FzCisgICAgICAgIG5vdCB5ZXQgYXZhaWxhYmxlLgorICAg ICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0R3RrOjpmbHVzaEFuZFJlbmRlckxheWVycyk6IFVz ZSBtYWtlQ29udGV4dEN1cnJlbnQoKS4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9zdEd0 azo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToKKyAgICAgICAgSW5pdGlh bGl6ZSB0aGUgTGF5ZXJUcmVlQ29udGV4dC4KKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVlSG9z dEd0azo6Z2xDb250ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv Z3RrL0xheWVyVHJlZUhvc3RHdGsuaDoKKwogMjAxNS0wMy0wMSAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIGNsaXAtcGF0aCB3b3JrIG9uIDx2 aWRlbz4sIDxjYW52YXM+IGV0Yy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0RyYXdpbmdBcmVhLmgKaW5kZXggZTQ1Mzg2OS4uOWZkNjBhNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTEyNCwxMCArMTI0 LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaFZpZXdPdmVybGF5R3JhcGhp Y3NMYXllcihXZWJDb3JlOjpGcmFtZSosIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqKSB7IH0KIAot I2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgUExBVEZPUk0oR1RLKQotICAgIHVpbnQ2NF90 IG5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZygpIHsgcmV0dXJuIG1fbmF0aXZlU3Vy ZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nOyB9Ci0jZW5kaWYKLQogcHJvdGVjdGVkOgogICAgIERy YXdpbmdBcmVhKERyYXdpbmdBcmVhVHlwZSwgV2ViUGFnZSYpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCmluZGV4IDEw M2VkMzcuLmVkN2ViMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwCkBAIC00NTYsNiArNDU2LDggQEAgdm9pZCBEcmF3 aW5nQXJlYUltcGw6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoR3JhcGhpY3NMYXll ciogZ3JhcGhpY3NMYXkKICAgICBBU1NFUlQoIW1fbGF5ZXJUcmVlSG9zdCk7CiAKICAgICBtX2xh eWVyVHJlZUhvc3QgPSBMYXllclRyZWVIb3N0OjpjcmVhdGUoJm1fd2ViUGFnZSk7CisgICAgaWYg KG1fbmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKQorICAgICAgICBtX2xheWVyVHJl ZUhvc3QtPnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyhtX25hdGl2ZVN1cmZh Y2VIYW5kbGVGb3JDb21wb3NpdGluZyk7CiAgICAgaWYgKCFtX2luVXBkYXRlQmFja2luZ1N0b3Jl U3RhdGUpCiAgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+c2V0U2hvdWxkTm90aWZ5QWZ0ZXJOZXh0 U2NoZWR1bGVkTGF5ZXJGbHVzaCh0cnVlKTsKIApAQCAtNjc3LDEwICs2NzksOCBAQCB2b2lkIERy YXdpbmdBcmVhSW1wbDo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2 NF90IGhhbmRsZSkKICAgICBtX25hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyA9IGhh bmRsZTsKICAgICBtX3dlYlBhZ2UuY29yZVBhZ2UoKS0+c2V0dGluZ3MoKS5zZXRBY2NlbGVyYXRl ZENvbXBvc2l0aW5nRW5hYmxlZCh0cnVlKTsKIAotI2lmIFVTRShDT09SRElOQVRFRF9HUkFQSElD U19USFJFQURFRCkKICAgICBpZiAobV9sYXllclRyZWVIb3N0KQogICAgICAgICBtX2xheWVyVHJl ZUhvc3QtPnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyhoYW5kbGUpOwotI2Vu ZGlmCiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0xheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9MYXllclRyZWVIb3N0LmgKaW5kZXggNjUwNzk5YS4uZDcyMTI3NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oCkBAIC05Myw2ICs5 MywxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQW5pbWF0aW9uKCkgPSAw OwogI2VuZGlmCiAKKyNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpICYmIFBMQVRGT1JNKEdUSykK KyAgICB2aXJ0dWFsIHZvaWQgc2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVp bnQ2NF90KSA9IDA7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgdm9pZCBzZXRWaWV3T3ZlcmxheVJv b3RMYXllcihXZWJDb3JlOjpHcmFwaGljc0xheWVyKikgPSAwOwogCiBwcm90ZWN0ZWQ6CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhv c3RHdGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9MYXllclRy ZWVIb3N0R3RrLmNwcAppbmRleCAzZWY3NTE0Li45NjI0Mjk2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5j cHAKQEAgLTc4LDE3ICs3OCwyOSBAQCBMYXllclRyZWVIb3N0R3RrOjpMYXllclRyZWVIb3N0R3Rr KFdlYlBhZ2UqIHdlYlBhZ2UpCiB7CiB9CiAKLUdMQ29udGV4dCogTGF5ZXJUcmVlSG9zdEd0azo6 Z2xDb250ZXh0KCkKK2Jvb2wgTGF5ZXJUcmVlSG9zdEd0azo6bWFrZUNvbnRleHRDdXJyZW50KCkK IHsKLSAgICBpZiAobV9jb250ZXh0KQotICAgICAgICByZXR1cm4gbV9jb250ZXh0LmdldCgpOwor ICAgIGlmICghbV9jb250ZXh0KSB7CisgICAgICAgIGlmICghbV9sYXllclRyZWVDb250ZXh0LmNv bnRleHRJRCkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBtX2NvbnRleHQg PSBHTENvbnRleHQ6OmNyZWF0ZUNvbnRleHRGb3JXaW5kb3cobV9sYXllclRyZWVDb250ZXh0LmNv bnRleHRJRCwgR0xDb250ZXh0OjpzaGFyaW5nQ29udGV4dCgpKTsKKyAgICAgICAgaWYgKCFtX2Nv bnRleHQpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCi0gICAgdWludDY0X3Qg d2luZG93SGFuZGxlID0gbV93ZWJQYWdlLT5kcmF3aW5nQXJlYSgpLT5uYXRpdmVTdXJmYWNlSGFu ZGxlRm9yQ29tcG9zaXRpbmcoKTsKLSAgICBpZiAoIXdpbmRvd0hhbmRsZSkKLSAgICAgICAgcmV0 dXJuIDA7CisgICAgcmV0dXJuIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7Cit9CisK K3ZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6ZW5zdXJlVGV4dHVyZU1hcHBlcigpCit7CisgICAgaWYg KG1fdGV4dHVyZU1hcHBlcikKKyAgICAgICAgcmV0dXJuOwogCi0gICAgbV9jb250ZXh0ID0gR0xD b250ZXh0OjpjcmVhdGVDb250ZXh0Rm9yV2luZG93KHdpbmRvd0hhbmRsZSwgR0xDb250ZXh0Ojpz aGFyaW5nQ29udGV4dCgpKTsKLSAgICByZXR1cm4gbV9jb250ZXh0LmdldCgpOworICAgIEFTU0VS VChtX2lzVmFsaWQpOworICAgIG1fdGV4dHVyZU1hcHBlciA9IFRleHR1cmVNYXBwZXI6OmNyZWF0 ZShUZXh0dXJlTWFwcGVyOjpPcGVuR0xNb2RlKTsKKyAgICBzdGF0aWNfY2FzdDxUZXh0dXJlTWFw cGVyR0wqPihtX3RleHR1cmVNYXBwZXIuZ2V0KCkpLT5zZXRFbmFibGVFZGdlRGlzdGFuY2VBbnRp YWxpYXNpbmcodHJ1ZSk7CisgICAgZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+ KCptX3Jvb3RMYXllcikubGF5ZXIoKS5zZXRUZXh0dXJlTWFwcGVyKG1fdGV4dHVyZU1hcHBlci5n ZXQoKSk7CiB9CiAKIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6aW5pdGlhbGl6ZSgpCkBAIC0xMTMs MTkgKzEyNSwxMSBAQCB2b2lkIExheWVyVHJlZUhvc3RHdGs6OmluaXRpYWxpemUoKQogICAgIG1f cm9vdExheWVyLT5hZGRDaGlsZChtX25vbkNvbXBvc2l0ZWRDb250ZW50TGF5ZXIuZ2V0KCkpOwog ICAgIG1fbm9uQ29tcG9zaXRlZENvbnRlbnRMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CiAKLSAg ICBtX2xheWVyVHJlZUNvbnRleHQuY29udGV4dElEID0gbV93ZWJQYWdlLT5kcmF3aW5nQXJlYSgp LT5uYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcoKTsKLQotICAgIEdMQ29udGV4dCog Y29udGV4dCA9IGdsQ29udGV4dCgpOwotICAgIGlmICghY29udGV4dCkKLSAgICAgICAgcmV0dXJu OwotCiAgICAgLy8gVGhlIGNyZWF0aW9uIG9mIHRoZSBUZXh0dXJlTWFwcGVyIG5lZWRzIGFuIGFj dGl2ZSBPcGVuR0wgY29udGV4dC4KLSAgICBjb250ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKTsK LQotICAgIG1fdGV4dHVyZU1hcHBlciA9IFRleHR1cmVNYXBwZXI6OmNyZWF0ZShUZXh0dXJlTWFw cGVyOjpPcGVuR0xNb2RlKTsKLSAgICBzdGF0aWNfY2FzdDxUZXh0dXJlTWFwcGVyR0wqPihtX3Rl eHR1cmVNYXBwZXIuZ2V0KCkpLT5zZXRFbmFibGVFZGdlRGlzdGFuY2VBbnRpYWxpYXNpbmcodHJ1 ZSk7Ci0gICAgZG93bmNhc3Q8R3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI+KCptX3Jvb3RMYXll cikubGF5ZXIoKS5zZXRUZXh0dXJlTWFwcGVyKG1fdGV4dHVyZU1hcHBlci5nZXQoKSk7CisgICAg aWYgKCFtYWtlQ29udGV4dEN1cnJlbnQoKSkKKyAgICAgICAgcmV0dXJuOwogCisgICAgZW5zdXJl VGV4dHVyZU1hcHBlcigpOwogICAgIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOwogfQogCkBAIC0yODks MTAgKzI5MywxMSBAQCBib29sIExheWVyVHJlZUhvc3RHdGs6OmZsdXNoUGVuZGluZ0xheWVyQ2hh bmdlcygpCiAKIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6Y29tcG9zaXRlTGF5ZXJzVG9Db250ZXh0 KENvbXBvc2l0ZVB1cnBvc2UgcHVycG9zZSkKIHsKLSAgICBHTENvbnRleHQqIGNvbnRleHQgPSBn bENvbnRleHQoKTsKLSAgICBpZiAoIWNvbnRleHQgfHwgIWNvbnRleHQtPm1ha2VDb250ZXh0Q3Vy cmVudCgpKQorICAgIGlmICghbWFrZUNvbnRleHRDdXJyZW50KCkpCiAgICAgICAgIHJldHVybjsK IAorICAgIGVuc3VyZVRleHR1cmVNYXBwZXIoKTsKKwogICAgIC8vIFRoZSB3aW5kb3cgc2l6ZSBt YXkgYmUgb3V0IG9mIHN5bmMgd2l0aCB0aGUgcGFnZSBzaXplIGF0IHRoaXMgcG9pbnQsIGFuZCBn ZXR0aW5nCiAgICAgLy8gdGhlIHZpZXdwb3J0IHBhcmFtZXRlcnMgaW5jb3JyZWN0LCBtZWFucyB0 aGF0IHRoZSBjb250ZW50IHdpbGwgYmUgbWlzcGxhY2VkLiBUaHVzCiAgICAgLy8gd2Ugc2V0IHRo ZSB2aWV3cG9ydCBwYXJhbWV0ZXJzIGRpcmVjdGx5IGZyb20gdGhlIHdpbmRvdyBzaXplLgpAQCAt MzA4LDcgKzMxMyw3IEBAIHZvaWQgTGF5ZXJUcmVlSG9zdEd0azo6Y29tcG9zaXRlTGF5ZXJzVG9D b250ZXh0KENvbXBvc2l0ZVB1cnBvc2UgcHVycG9zZSkKICAgICBkb3duY2FzdDxHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcj4oKm1fcm9vdExheWVyKS5sYXllcigpLnBhaW50KCk7CiAgICAgbV90 ZXh0dXJlTWFwcGVyLT5lbmRQYWludGluZygpOwogCi0gICAgY29udGV4dC0+c3dhcEJ1ZmZlcnMo KTsKKyAgICBtX2NvbnRleHQtPnN3YXBCdWZmZXJzKCk7CiB9CiAKIHZvaWQgTGF5ZXJUcmVlSG9z dEd0azo6Zmx1c2hBbmRSZW5kZXJMYXllcnMoKQpAQCAtMzIxLDggKzMyNiw3IEBAIHZvaWQgTGF5 ZXJUcmVlSG9zdEd0azo6Zmx1c2hBbmRSZW5kZXJMYXllcnMoKQogICAgICAgICAgICAgcmV0dXJu OwogICAgIH0KIAotICAgIEdMQ29udGV4dCogY29udGV4dCA9IGdsQ29udGV4dCgpOwotICAgIGlm ICghY29udGV4dCB8fCAhY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCkpCisgICAgaWYgKCFt YWtlQ29udGV4dEN1cnJlbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFmbHVzaFBl bmRpbmdMYXllckNoYW5nZXMoKSkKQEAgLTM4MCw2ICszODQsMTEgQEAgdm9pZCBMYXllclRyZWVI b3N0R3RrOjpzZXRWaWV3T3ZlcmxheVJvb3RMYXllcihXZWJDb3JlOjpHcmFwaGljc0xheWVyKiB2 aWV3T3ZlcmwKICAgICAgICAgbV9yb290TGF5ZXItPmFkZENoaWxkKG1fdmlld092ZXJsYXlSb290 TGF5ZXIpOwogfQogCit2b2lkIExheWVyVHJlZUhvc3RHdGs6OnNldE5hdGl2ZVN1cmZhY2VIYW5k bGVGb3JDb21wb3NpdGluZyh1aW50NjRfdCBoYW5kbGUpCit7CisgICAgbV9sYXllclRyZWVDb250 ZXh0LmNvbnRleHRJRCA9IGhhbmRsZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9M YXllclRyZWVIb3N0R3RrLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3Rr L0xheWVyVHJlZUhvc3RHdGsuaAppbmRleCBjODA5YjA1Li4xMGVhYzhjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RH dGsuaApAQCAtNjEsNiArNjEsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGRldmlj ZU9yUGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBw YWdlQmFja2dyb3VuZFRyYW5zcGFyZW5jeUNoYW5nZWQoKSBvdmVycmlkZTsKIAorICAgIHZpcnR1 YWwgdm9pZCBzZXROYXRpdmVTdXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcodWludDY0X3QpIG92 ZXJyaWRlOworCiBwcml2YXRlOgogICAgIC8vIExheWVyVHJlZUhvc3QKICAgICB2aXJ0dWFsIGNv bnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNvbnRleHQoKSBvdmVycmlkZTsKQEAgLTg0 LDcgKzg2LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgbGF5ZXJGbHVzaFRpbWVyRmlyZWQoKTsK IAotICAgIFdlYkNvcmU6OkdMQ29udGV4dCogZ2xDb250ZXh0KCk7CisgICAgYm9vbCBtYWtlQ29u dGV4dEN1cnJlbnQoKTsKKyAgICB2b2lkIGVuc3VyZVRleHR1cmVNYXBwZXIoKTsKIAogICAgIExh eWVyVHJlZUNvbnRleHQgbV9sYXllclRyZWVDb250ZXh0OwogICAgIGJvb2wgbV9pc1ZhbGlkOwo=