186590 2018-06-13 07:54:04 -0700 [GStreamer] fast/canvas/webgl crashes 2018-06-13 12:29:23 -0700 1 1 1 Unclassified WebKit Platform Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris clopez webkit-bug-importer zan oldest_to_newest 1432644 0 pnormand 2018-06-13 07:54:04 -0700 fast/canvas/webgl/texImage2D-video-flipY-true.html fast/canvas/canvas-createPattern-video-loading.html fast/canvas/webgl/texImage2D-video-flipY-false.html I think this is a regression of r232747 ... Thread 1 (Thread 0x7f2ae68bd3c0 (LWP 37892)): #0 _g_log_abort () at /home/slave/webkitgtk/gtk-linux-64-release-tests/build/WebKitBuild/DependenciesGTK/Source/glib-2.54.2/glib/gmessages.c:554 #1 0x00007f2aee4b4415 in g_logv () at /home/slave/webkitgtk/gtk-linux-64-release-tests/build/WebKitBuild/DependenciesGTK/Source/glib-2.54.2/glib/gmessages.c:1362 #2 0x00007f2aee4b4562 in g_log () at /home/slave/webkitgtk/gtk-linux-64-release-tests/build/WebKitBuild/DependenciesGTK/Source/glib-2.54.2/glib/gmessages.c:1403 #3 0x00007f2aef35290a in gst_video_frame_map_id () at /home/slave/webkitgtk/gtk-linux-64-release-tests/build/WebKitBuild/DependenciesGTK/Source/gst-plugins-base-1.14.1/gst-libs/gst/video/video-frame.c:78 #4 0x00007f2af66cba52 in _ZN7WebCore31MediaPlayerPrivateGStreamerBase33copyVideoTextureToPlatformTextureEPNS_17GraphicsContext3DEjjijjjbb.part.126 () from /home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #5 0x00007f2af5dc099c in _ZN7WebCore16HTMLVideoElement33copyVideoTextureToPlatformTextureEPNS_17GraphicsContext3DEjjijjjbb () from /home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #6 0x00007f2af668a4c7 in _ZN3WTF15__visitor_tableIRNS_7VisitorIZN7WebCore25WebGLRenderingContextBase10texImage2DEjijjjSt8optionalINS_7VariantIJNS_6RefPtrINS2_9ImageDataENS_13DumbPtrTraitsIS7_EEEENS6_INS2_16HTMLImageElementENS8_ISB_EEEENS6_INS2_17HTMLCanvasElementENS8_ISE_EEEENS6_INS2_16HTMLVideoElementENS8_ISH_EEEEEEEEEUlRKSA_E_JZNS3_10texImage2DEjijjjSL_EUlRKSD_E0_ZNS3_10texImage2DEjijjjSL_EUlRKSG_E1_ZNS3_10texImage2DEjijjjSL_EUlRKSJ_E2_EEEJSA_SD_SG_SJ_EE17__trampoline_funcISJ_EENS2_11ExceptionOrIvEESZ_RSK_ () from /home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #7 0x00007f2af6681366 in _ZN7WebCore25WebGLRenderingContextBase10texImage2DEjijjjSt8optionalIN3WTF7VariantIJNS2_6RefPtrINS_9ImageDataENS2_13DumbPtrTraitsIS5_EEEENS4_INS_16HTMLImageElementENS6_IS9_EEEENS4_INS_17HTMLCanvasElementENS6_ISC_EEEENS4_INS_16HTMLVideoElementENS6_ISF_EEEEEEEE () from /home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #8 0x00007f2af572ddbd in _ZN7WebCore50jsWebGLRenderingContextPrototypeFunctionTexImage2DEPN3JSC9ExecStateE () from /home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release/lib/libwebkit2gtk-4.0.so.37 #9 0x00007f2a9e8a3177 in ?? () #10 0x00007fffcc257af0 in ?? () #11 0x00007f2af2a2535e in llint_entry () from /home/slave/webkitgtk/gtk-linux-64-release/build/WebKitBuild/Release/lib/libjavascriptcoregtk-4.0.so.18 Backtrace stopped: frame did not save the PC STDERR: STDERR: warning: core file may not match specified executable file. STDERR: error: XDG_RUNTIME_DIR not set in the environment. STDERR: failed to create drawable STDERR: failed to create drawable STDERR: gst_video_frame_map_id: assertion 'GST_IS_BUFFER (buffer)' failed 1432646 1 342656 pnormand 2018-06-13 07:59:54 -0700 Created attachment 342656 Patch 1432648 2 342657 pnormand 2018-06-13 08:10:09 -0700 Created attachment 342657 Patch 1432713 3 clopez 2018-06-13 10:48:38 -0700 *** Bug 186599 has been marked as a duplicate of this bug. *** 1432719 4 pnormand 2018-06-13 10:58:27 -0700 Committed r232795: <https://trac.webkit.org/changeset/232795> 1432757 5 webkit-bug-importer 2018-06-13 12:29:23 -0700 <rdar://problem/41097197> 342656 2018-06-13 07:59:54 -0700 2018-06-13 08:10:05 -0700 Patch bug-186590-20180613155952.patch text/plain 8294 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2YTBlNzYxNjMzMDdj M2FlNTFmODAxZmUwZWNkZmI1YTkyOGIzZC4uN2M5NWVjYjYxYjZmMzM0MWZkMDhjMmI0ZDQzMzJj MDE4NjE1NzZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA2LTEzICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBmYXN0L2NhbnZhcy93ZWJnbCBjcmFzaGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODY1OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZnRlciByMjMyNzQ3IHRoZSBzYW1wbGUgbWFuYWdlZCBieSB0 aGUgcGxheWVyIGNhbiBiZSBlbXB0eSwKKyAgICAgICAgd2l0aG91dCBidWZmZXIuIFNvIHdlIG5l ZWQgdG8gY2hlY2sgZm9yIHRoaXMgYmVmb3JlIG1hcHBpbmcgdmlkZW8KKyAgICAgICAgZnJhbWVz LiBBbHNvIHVzZSB0aGUgR3N0VmlkZW9GcmFtZUhvbGRlciBpbiBtb3JlIHBsYWNlcyB0byByZWR1 Y2UKKyAgICAgICAgY29weS1wYXN0ZSBjaHVybi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1lci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1lckNhaXJvLmNwcDoKKyAgICAgICAgKEltYWdlR1N0 cmVhbWVyOjpJbWFnZUdTdHJlYW1lcik6CisgICAgICAgIChJbWFnZUdTdHJlYW1lcjo6fkltYWdl R1N0cmVhbWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHc3RWaWRl b0ZyYW1lSG9sZGVyOjpHc3RWaWRlb0ZyYW1lSG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNvcHlWaWRlb1RleHR1cmVUb1BsYXRmb3Jt VGV4dHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJC YXNlOjpuYXRpdmVJbWFnZUZvckN1cnJlbnRUaW1lKToKKwogMjAxOC0wNi0xMiAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gVmlk ZW8gZnJlZXplcyB3aGVuIEdTdHJlYW1lckdMIGlzIG5vdCBpbnN0YWxsZWQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1l ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0 cmVhbWVyLmgKaW5kZXggYjY0NDlhN2JjNmM0ZDUyN2I5Zjg3YzJhYWVjMjJjOGE0OGFkMDdlMC4u NDA3MjRlYTcyNTEyOWVjNTEwODEwYjIyYjExNjg0ZjNlMzA5YzI1ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0cmVhbWVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0 cmVhbWVyLmgKQEAgLTYzLDkgKzYzLDkgQEAgY2xhc3MgSW1hZ2VHU3RyZWFtZXIgOiBwdWJsaWMg UmVmQ291bnRlZDxJbWFnZUdTdHJlYW1lcj4gewogICAgICAgICBJbWFnZUdTdHJlYW1lcihHc3RT YW1wbGUqKTsKICAgICAgICAgUmVmUHRyPEJpdG1hcEltYWdlPiBtX2ltYWdlOwogICAgICAgICBG bG9hdFJlY3QgbV9jcm9wUmVjdDsKLQogI2lmIFVTRShDQUlSTykKICAgICAgICAgR3N0VmlkZW9G cmFtZSBtX3ZpZGVvRnJhbWU7CisgICAgICAgIGJvb2wgbV9mcmFtZU1hcHBlZCB7IGZhbHNlIH07 CiAjZW5kaWYKICAgICB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0cmVhbWVyQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0cmVhbWVyQ2Fpcm8uY3BwCmlu ZGV4IGEzZDVhNTUyNjAyOWNiOTMzNTM4MmRlNGMxY2E5OTBmMmEzZWQ3M2UuLmJlZDY2MDQzZTY5 YTNkMDI2N2M3MTBhYzNlMjU2NWJkNjk2YTA2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1lckNhaXJvLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvSW1hZ2VHU3RyZWFt ZXJDYWlyby5jcHAKQEAgLTQzLDcgKzQzLDExIEBAIEltYWdlR1N0cmVhbWVyOjpJbWFnZUdTdHJl YW1lcihHc3RTYW1wbGUqIHNhbXBsZSkKICAgICBBU1NFUlQoR1NUX1ZJREVPX0lORk9fTl9QTEFO RVMoJnZpZGVvSW5mbykgPT0gMSk7CiAKICAgICBHc3RCdWZmZXIqIGJ1ZmZlciA9IGdzdF9zYW1w bGVfZ2V0X2J1ZmZlcihzYW1wbGUpOwotICAgIGlmICghZ3N0X3ZpZGVvX2ZyYW1lX21hcCgmbV92 aWRlb0ZyYW1lLCAmdmlkZW9JbmZvLCBidWZmZXIsIEdTVF9NQVBfUkVBRCkpCisgICAgaWYgKFVO TElLRUxZKCFHU1RfSVNfQlVGRkVSKGJ1ZmZlcikpKQorICAgICAgICByZXR1cm47CisKKyAgICBt X2ZyYW1lTWFwcGVkID0gZ3N0X3ZpZGVvX2ZyYW1lX21hcCgmbV92aWRlb0ZyYW1lLCAmdmlkZW9J bmZvLCBidWZmZXIsIEdTVF9NQVBfUkVBRCk7CisgICAgaWYgKCFtX2ZyYW1lTWFwcGVkKQogICAg ICAgICByZXR1cm47CiAKICAgICB1bnNpZ25lZCBjaGFyKiBidWZmZXJEYXRhID0gcmVpbnRlcnBy ZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oR1NUX1ZJREVPX0ZSQU1FX1BMQU5FX0RBVEEoJm1fdmlk ZW9GcmFtZSwgMCkpOwpAQCAtMTEwLDYgKzExNCw3IEBAIEltYWdlR1N0cmVhbWVyOjp+SW1hZ2VH U3RyZWFtZXIoKQogCiAgICAgLy8gV2Uga2VlcCB0aGUgYnVmZmVyIG1lbW9yeSBtYXBwZWQgdW50 aWwgdGhlIGltYWdlIGlzIGRlc3Ryb3llZCBiZWNhdXNlIHRoZSBpbnRlcm5hbAogICAgIC8vIGNh aXJvX3N1cmZhY2VfdCB3YXMgY3JlYXRlZCB1c2luZyBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0 ZV9mb3JfZGF0YSgpLgotICAgIGdzdF92aWRlb19mcmFtZV91bm1hcCgmbV92aWRlb0ZyYW1lKTsK KyAgICBpZiAobV9mcmFtZU1hcHBlZCkKKyAgICAgICAgZ3N0X3ZpZGVvX2ZyYW1lX3VubWFwKCZt X3ZpZGVvRnJhbWUpOwogfQogI2VuZGlmIC8vIFVTRShHU1RSRUFNRVIpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKaW5kZXggNGY4YWFh NGFkZTlkMDc0NzUwNzZiNTY4Yzk3YTQ0Yzc1OWQ0ZDg4ZS4uZWVkNmFmZGEyM2FjYjNjYWU0OTRl MjQ3NzQwNzEwZTRjZDI0OWViOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcApAQCAtMjExLDYgKzIxMSw4IEBAIHB1YmxpYzoKICAg ICAgICAgbV9zaXplID0gSW50U2l6ZShHU1RfVklERU9fSU5GT19XSURUSCgmdmlkZW9JbmZvKSwg R1NUX1ZJREVPX0lORk9fSEVJR0hUKCZ2aWRlb0luZm8pKTsKICAgICAgICAgbV9oYXNBbHBoYUNo YW5uZWwgPSBHU1RfVklERU9fSU5GT19IQVNfQUxQSEEoJnZpZGVvSW5mbyk7CiAgICAgICAgIG1f YnVmZmVyID0gZ3N0X3NhbXBsZV9nZXRfYnVmZmVyKHNhbXBsZSk7CisgICAgICAgIGlmIChVTkxJ S0VMWSghR1NUX0lTX0JVRkZFUihtX2J1ZmZlcikpKQorICAgICAgICAgICAgcmV0dXJuOwogCiAj aWYgVVNFKEdTVFJFQU1FUl9HTCkKICAgICAgICAgbV9mbGFncyA9IGZsYWdzIHwgKG1faGFzQWxw aGFDaGFubmVsID8gVGV4dHVyZU1hcHBlckdMOjpTaG91bGRCbGVuZCA6IDApIHwgVEVYVFVSRV9N QVBQRVJfQ09MT1JfQ09OVkVSVF9GTEFHOwpAQCAtOTIxLDM1ICs5MjMsMzEgQEAgYm9vbCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRl eHR1cmUoR3JhcGhpY3MKICAgICBVTlVTRURfUEFSQU0oY29udGV4dCk7CiAKICAgICBpZiAobV91 c2luZ0ZhbGxiYWNrVmlkZW9TaW5rKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJl dHVybiBudWxscHRyOwogCiAgICAgaWYgKHByZW11bHRpcGx5QWxwaGEpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAogICAgIGF1dG8gc2FtcGxlTG9ja2VyID0gaG9sZExvY2sobV9zYW1wbGVNdXRl eCk7CiAKLSAgICBHc3RWaWRlb0luZm8gdmlkZW9JbmZvOwotICAgIGlmICghZ2V0U2FtcGxlVmlk ZW9JbmZvKG1fc2FtcGxlLmdldCgpLCB2aWRlb0luZm8pKQorICAgIGlmICghR1NUX0lTX1NBTVBM RShtX3NhbXBsZS5nZXQoKSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIEdzdEJ1ZmZl ciogYnVmZmVyID0gZ3N0X3NhbXBsZV9nZXRfYnVmZmVyKG1fc2FtcGxlLmdldCgpKTsKLSAgICBH c3RWaWRlb0ZyYW1lIHZpZGVvRnJhbWU7Ci0gICAgaWYgKCFnc3RfdmlkZW9fZnJhbWVfbWFwKCZ2 aWRlb0ZyYW1lLCAmdmlkZW9JbmZvLCBidWZmZXIsIHN0YXRpY19jYXN0PEdzdE1hcEZsYWdzPihH U1RfTUFQX1JFQUQgfCBHU1RfTUFQX0dMKSkpCisgICAgc3RkOjp1bmlxdWVfcHRyPEdzdFZpZGVv RnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gc3RkOjptYWtlX3VuaXF1ZTxHc3RWaWRlb0ZyYW1l SG9sZGVyPihtX3NhbXBsZS5nZXQoKSwgdGV4TWFwRmxhZ0Zyb21PcmllbnRhdGlvbihtX3ZpZGVv U291cmNlT3JpZW50YXRpb24pLCB0cnVlKTsKKworICAgIGF1dG8gdGV4dHVyZUlEID0gZnJhbWVI b2xkZXItPnRleHR1cmVJRCgpOworICAgIEFTU0VSVCh0ZXh0dXJlSUQpOworICAgIGlmICghdGV4 dHVyZUlEKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBJbnRTaXplIHNpemUoR1NUX1ZJ REVPX0lORk9fV0lEVEgoJnZpZGVvSW5mbyksIEdTVF9WSURFT19JTkZPX0hFSUdIVCgmdmlkZW9J bmZvKSk7CisgICAgYXV0byBzaXplID0gZnJhbWVIb2xkZXItPnNpemUoKTsKICAgICBpZiAobV92 aWRlb1NvdXJjZU9yaWVudGF0aW9uLnVzZXNXaWR0aEFzSGVpZ2h0KCkpCiAgICAgICAgIHNpemUg PSBzaXplLnRyYW5zcG9zZWRTaXplKCk7Ci0gICAgdW5zaWduZWQgdGV4dHVyZUlEID0gKnJlaW50 ZXJwcmV0X2Nhc3Q8dW5zaWduZWQqPih2aWRlb0ZyYW1lLmRhdGFbMF0pOwogCiAgICAgaWYgKCFt X3ZpZGVvVGV4dHVyZUNvcGllcikKICAgICAgICAgbV92aWRlb1RleHR1cmVDb3BpZXIgPSBzdGQ6 Om1ha2VfdW5pcXVlPFZpZGVvVGV4dHVyZUNvcGllckdTdHJlYW1lcj4oVEVYVFVSRV9DT1BJRVJf Q09MT1JfQ09OVkVSVF9GTEFHKTsKIAotICAgIGJvb2wgY29waWVkID0gbV92aWRlb1RleHR1cmVD b3BpZXItPmNvcHlWaWRlb1RleHR1cmVUb1BsYXRmb3JtVGV4dHVyZSh0ZXh0dXJlSUQsIHNpemUs IG91dHB1dFRleHR1cmUsIG91dHB1dFRhcmdldCwgbGV2ZWwsIGludGVybmFsRm9ybWF0LCBmb3Jt YXQsIHR5cGUsIGZsaXBZLCBtX3ZpZGVvU291cmNlT3JpZW50YXRpb24pOwotCi0gICAgZ3N0X3Zp ZGVvX2ZyYW1lX3VubWFwKCZ2aWRlb0ZyYW1lKTsKLQotICAgIHJldHVybiBjb3BpZWQ7CisgICAg cmV0dXJuIG1fdmlkZW9UZXh0dXJlQ29waWVyLT5jb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRl eHR1cmUodGV4dHVyZUlELCBzaXplLCBvdXRwdXRUZXh0dXJlLCBvdXRwdXRUYXJnZXQsIGxldmVs LCBpbnRlcm5hbEZvcm1hdCwgZm9ybWF0LCB0eXBlLCBmbGlwWSwgbV92aWRlb1NvdXJjZU9yaWVu dGF0aW9uKTsKIH0KIAogTmF0aXZlSW1hZ2VQdHIgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZTo6bmF0aXZlSW1hZ2VGb3JDdXJyZW50VGltZSgpCkBAIC05NjAsMTYgKzk1OCwxNyBAQCBO YXRpdmVJbWFnZVB0ciBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpuYXRpdmVJbWFn ZUZvckN1cnJlbnRUaW1lKCkKIAogICAgIGF1dG8gc2FtcGxlTG9ja2VyID0gaG9sZExvY2sobV9z YW1wbGVNdXRleCk7CiAKLSAgICBHc3RWaWRlb0luZm8gdmlkZW9JbmZvOwotICAgIGlmICghZ2V0 U2FtcGxlVmlkZW9JbmZvKG1fc2FtcGxlLmdldCgpLCB2aWRlb0luZm8pKQorICAgIGlmICghR1NU X0lTX1NBTVBMRShtX3NhbXBsZS5nZXQoKSkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0g ICAgR3N0QnVmZmVyKiBidWZmZXIgPSBnc3Rfc2FtcGxlX2dldF9idWZmZXIobV9zYW1wbGUuZ2V0 KCkpOwotICAgIEdzdFZpZGVvRnJhbWUgdmlkZW9GcmFtZTsKLSAgICBpZiAoIWdzdF92aWRlb19m cmFtZV9tYXAoJnZpZGVvRnJhbWUsICZ2aWRlb0luZm8sIGJ1ZmZlciwgc3RhdGljX2Nhc3Q8R3N0 TWFwRmxhZ3M+KEdTVF9NQVBfUkVBRCB8IEdTVF9NQVBfR0wpKSkKKyAgICBzdGQ6OnVuaXF1ZV9w dHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEdz dFZpZGVvRnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCB0ZXhNYXBGbGFnRnJvbU9yaWVudGF0 aW9uKG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbiksIHRydWUpOworCisgICAgYXV0byB0ZXh0dXJl SUQgPSBmcmFtZUhvbGRlci0+dGV4dHVyZUlEKCk7CisgICAgQVNTRVJUKHRleHR1cmVJRCk7Cisg ICAgaWYgKCF0ZXh0dXJlSUQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgSW50U2l6 ZSBzaXplKEdTVF9WSURFT19JTkZPX1dJRFRIKCZ2aWRlb0luZm8pLCBHU1RfVklERU9fSU5GT19I RUlHSFQoJnZpZGVvSW5mbykpOworICAgIGF1dG8gc2l6ZSA9IGZyYW1lSG9sZGVyLT5zaXplKCk7 CiAgICAgaWYgKG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbi51c2VzV2lkdGhBc0hlaWdodCgpKQog ICAgICAgICBzaXplID0gc2l6ZS50cmFuc3Bvc2VkU2l6ZSgpOwogCkBAIC05NzksMTEgKzk3OCw3 IEBAIE5hdGl2ZUltYWdlUHRyIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5hdGl2 ZUltYWdlRm9yQ3VycmVudFRpbWUoKQogICAgIGlmICghbV92aWRlb1RleHR1cmVDb3BpZXIpCiAg ICAgICAgIG1fdmlkZW9UZXh0dXJlQ29waWVyID0gc3RkOjptYWtlX3VuaXF1ZTxWaWRlb1RleHR1 cmVDb3BpZXJHU3RyZWFtZXI+KFRFWFRVUkVfQ09QSUVSX0NPTE9SX0NPTlZFUlRfRkxBRyk7CiAK LSAgICB1bnNpZ25lZCB0ZXh0dXJlSUQgPSAqcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZCo+KHZp ZGVvRnJhbWUuZGF0YVswXSk7Ci0gICAgYm9vbCBjb3BpZWQgPSBtX3ZpZGVvVGV4dHVyZUNvcGll ci0+Y29weVZpZGVvVGV4dHVyZVRvUGxhdGZvcm1UZXh0dXJlKHRleHR1cmVJRCwgc2l6ZSwgMCwg R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JB LCBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSwgR3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lHTkVEX0JZ VEUsIGZhbHNlLCBtX3ZpZGVvU291cmNlT3JpZW50YXRpb24pOwotICAgIGdzdF92aWRlb19mcmFt ZV91bm1hcCgmdmlkZW9GcmFtZSk7Ci0KLSAgICBpZiAoIWNvcGllZCkKKyAgICBpZiAoIW1fdmlk ZW9UZXh0dXJlQ29waWVyLT5jb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUodGV4dHVy ZUlELCBzaXplLCAwLCBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgMCwgR3JhcGhpY3ND b250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBHcmFwaGljc0NvbnRleHQz RDo6VU5TSUdORURfQllURSwgZmFsc2UsIG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbikpCiAgICAg ICAgIHJldHVybiBudWxscHRyOwogCiAgICAgcmV0dXJuIGFkb3B0UmVmKGNhaXJvX2dsX3N1cmZh Y2VfY3JlYXRlX2Zvcl90ZXh0dXJlKGNvbnRleHQtPmNhaXJvRGV2aWNlKCksIENBSVJPX0NPTlRF TlRfQ09MT1JfQUxQSEEsIG1fdmlkZW9UZXh0dXJlQ29waWVyLT5yZXN1bHRUZXh0dXJlKCksIHNp emUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSkpOwo= 342657 2018-06-13 08:10:09 -0700 2018-06-13 10:55:00 -0700 Patch bug-186590-20180613161008.patch text/plain 8129 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2YTBlNzYxNjMzMDdj M2FlNTFmODAxZmUwZWNkZmI1YTkyOGIzZC4uN2M5NWVjYjYxYjZmMzM0MWZkMDhjMmI0ZDQzMzJj MDE4NjE1NzZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA2LTEzICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBmYXN0L2NhbnZhcy93ZWJnbCBjcmFzaGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODY1OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZnRlciByMjMyNzQ3IHRoZSBzYW1wbGUgbWFuYWdlZCBieSB0 aGUgcGxheWVyIGNhbiBiZSBlbXB0eSwKKyAgICAgICAgd2l0aG91dCBidWZmZXIuIFNvIHdlIG5l ZWQgdG8gY2hlY2sgZm9yIHRoaXMgYmVmb3JlIG1hcHBpbmcgdmlkZW8KKyAgICAgICAgZnJhbWVz LiBBbHNvIHVzZSB0aGUgR3N0VmlkZW9GcmFtZUhvbGRlciBpbiBtb3JlIHBsYWNlcyB0byByZWR1 Y2UKKyAgICAgICAgY29weS1wYXN0ZSBjaHVybi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1lci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1lckNhaXJvLmNwcDoKKyAgICAgICAgKEltYWdlR1N0 cmVhbWVyOjpJbWFnZUdTdHJlYW1lcik6CisgICAgICAgIChJbWFnZUdTdHJlYW1lcjo6fkltYWdl R1N0cmVhbWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHc3RWaWRl b0ZyYW1lSG9sZGVyOjpHc3RWaWRlb0ZyYW1lSG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNvcHlWaWRlb1RleHR1cmVUb1BsYXRmb3Jt VGV4dHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJC YXNlOjpuYXRpdmVJbWFnZUZvckN1cnJlbnRUaW1lKToKKwogMjAxOC0wNi0xMiAgUGhpbGlwcGUg Tm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gVmlk ZW8gZnJlZXplcyB3aGVuIEdTdHJlYW1lckdMIGlzIG5vdCBpbnN0YWxsZWQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1l ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0 cmVhbWVyLmgKaW5kZXggYjY0NDlhN2JjNmM0ZDUyN2I5Zjg3YzJhYWVjMjJjOGE0OGFkMDdlMC4u NDA3MjRlYTcyNTEyOWVjNTEwODEwYjIyYjExNjg0ZjNlMzA5YzI1ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0cmVhbWVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0 cmVhbWVyLmgKQEAgLTYzLDkgKzYzLDkgQEAgY2xhc3MgSW1hZ2VHU3RyZWFtZXIgOiBwdWJsaWMg UmVmQ291bnRlZDxJbWFnZUdTdHJlYW1lcj4gewogICAgICAgICBJbWFnZUdTdHJlYW1lcihHc3RT YW1wbGUqKTsKICAgICAgICAgUmVmUHRyPEJpdG1hcEltYWdlPiBtX2ltYWdlOwogICAgICAgICBG bG9hdFJlY3QgbV9jcm9wUmVjdDsKLQogI2lmIFVTRShDQUlSTykKICAgICAgICAgR3N0VmlkZW9G cmFtZSBtX3ZpZGVvRnJhbWU7CisgICAgICAgIGJvb2wgbV9mcmFtZU1hcHBlZCB7IGZhbHNlIH07 CiAjZW5kaWYKICAgICB9OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0cmVhbWVyQ2Fpcm8uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0ltYWdlR1N0cmVhbWVyQ2Fpcm8uY3BwCmlu ZGV4IGEzZDVhNTUyNjAyOWNiOTMzNTM4MmRlNGMxY2E5OTBmMmEzZWQ3M2UuLmJlZDY2MDQzZTY5 YTNkMDI2N2M3MTBhYzNlMjU2NWJkNjk2YTA2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9JbWFnZUdTdHJlYW1lckNhaXJvLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvSW1hZ2VHU3RyZWFt ZXJDYWlyby5jcHAKQEAgLTQzLDcgKzQzLDExIEBAIEltYWdlR1N0cmVhbWVyOjpJbWFnZUdTdHJl YW1lcihHc3RTYW1wbGUqIHNhbXBsZSkKICAgICBBU1NFUlQoR1NUX1ZJREVPX0lORk9fTl9QTEFO RVMoJnZpZGVvSW5mbykgPT0gMSk7CiAKICAgICBHc3RCdWZmZXIqIGJ1ZmZlciA9IGdzdF9zYW1w bGVfZ2V0X2J1ZmZlcihzYW1wbGUpOwotICAgIGlmICghZ3N0X3ZpZGVvX2ZyYW1lX21hcCgmbV92 aWRlb0ZyYW1lLCAmdmlkZW9JbmZvLCBidWZmZXIsIEdTVF9NQVBfUkVBRCkpCisgICAgaWYgKFVO TElLRUxZKCFHU1RfSVNfQlVGRkVSKGJ1ZmZlcikpKQorICAgICAgICByZXR1cm47CisKKyAgICBt X2ZyYW1lTWFwcGVkID0gZ3N0X3ZpZGVvX2ZyYW1lX21hcCgmbV92aWRlb0ZyYW1lLCAmdmlkZW9J bmZvLCBidWZmZXIsIEdTVF9NQVBfUkVBRCk7CisgICAgaWYgKCFtX2ZyYW1lTWFwcGVkKQogICAg ICAgICByZXR1cm47CiAKICAgICB1bnNpZ25lZCBjaGFyKiBidWZmZXJEYXRhID0gcmVpbnRlcnBy ZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oR1NUX1ZJREVPX0ZSQU1FX1BMQU5FX0RBVEEoJm1fdmlk ZW9GcmFtZSwgMCkpOwpAQCAtMTEwLDYgKzExNCw3IEBAIEltYWdlR1N0cmVhbWVyOjp+SW1hZ2VH U3RyZWFtZXIoKQogCiAgICAgLy8gV2Uga2VlcCB0aGUgYnVmZmVyIG1lbW9yeSBtYXBwZWQgdW50 aWwgdGhlIGltYWdlIGlzIGRlc3Ryb3llZCBiZWNhdXNlIHRoZSBpbnRlcm5hbAogICAgIC8vIGNh aXJvX3N1cmZhY2VfdCB3YXMgY3JlYXRlZCB1c2luZyBjYWlyb19pbWFnZV9zdXJmYWNlX2NyZWF0 ZV9mb3JfZGF0YSgpLgotICAgIGdzdF92aWRlb19mcmFtZV91bm1hcCgmbV92aWRlb0ZyYW1lKTsK KyAgICBpZiAobV9mcmFtZU1hcHBlZCkKKyAgICAgICAgZ3N0X3ZpZGVvX2ZyYW1lX3VubWFwKCZt X3ZpZGVvRnJhbWUpOwogfQogI2VuZGlmIC8vIFVTRShHU1RSRUFNRVIpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyQmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKaW5kZXggNGY4YWFh NGFkZTlkMDc0NzUwNzZiNTY4Yzk3YTQ0Yzc1OWQ0ZDg4ZS4uZWZiNzZiMjA5MDRiMjdjZjhlMjQw NGE5NTZlNDI4NjkzNjVhOWYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcApAQCAtMjExLDYgKzIxMSw4IEBAIHB1YmxpYzoKICAg ICAgICAgbV9zaXplID0gSW50U2l6ZShHU1RfVklERU9fSU5GT19XSURUSCgmdmlkZW9JbmZvKSwg R1NUX1ZJREVPX0lORk9fSEVJR0hUKCZ2aWRlb0luZm8pKTsKICAgICAgICAgbV9oYXNBbHBoYUNo YW5uZWwgPSBHU1RfVklERU9fSU5GT19IQVNfQUxQSEEoJnZpZGVvSW5mbyk7CiAgICAgICAgIG1f YnVmZmVyID0gZ3N0X3NhbXBsZV9nZXRfYnVmZmVyKHNhbXBsZSk7CisgICAgICAgIGlmIChVTkxJ S0VMWSghR1NUX0lTX0JVRkZFUihtX2J1ZmZlcikpKQorICAgICAgICAgICAgcmV0dXJuOwogCiAj aWYgVVNFKEdTVFJFQU1FUl9HTCkKICAgICAgICAgbV9mbGFncyA9IGZsYWdzIHwgKG1faGFzQWxw aGFDaGFubmVsID8gVGV4dHVyZU1hcHBlckdMOjpTaG91bGRCbGVuZCA6IDApIHwgVEVYVFVSRV9N QVBQRVJfQ09MT1JfQ09OVkVSVF9GTEFHOwpAQCAtOTI4LDI4ICs5MzAsMjQgQEAgYm9vbCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRl eHR1cmUoR3JhcGhpY3MKIAogICAgIGF1dG8gc2FtcGxlTG9ja2VyID0gaG9sZExvY2sobV9zYW1w bGVNdXRleCk7CiAKLSAgICBHc3RWaWRlb0luZm8gdmlkZW9JbmZvOwotICAgIGlmICghZ2V0U2Ft cGxlVmlkZW9JbmZvKG1fc2FtcGxlLmdldCgpLCB2aWRlb0luZm8pKQorICAgIGlmICghR1NUX0lT X1NBTVBMRShtX3NhbXBsZS5nZXQoKSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIEdz dEJ1ZmZlciogYnVmZmVyID0gZ3N0X3NhbXBsZV9nZXRfYnVmZmVyKG1fc2FtcGxlLmdldCgpKTsK LSAgICBHc3RWaWRlb0ZyYW1lIHZpZGVvRnJhbWU7Ci0gICAgaWYgKCFnc3RfdmlkZW9fZnJhbWVf bWFwKCZ2aWRlb0ZyYW1lLCAmdmlkZW9JbmZvLCBidWZmZXIsIHN0YXRpY19jYXN0PEdzdE1hcEZs YWdzPihHU1RfTUFQX1JFQUQgfCBHU1RfTUFQX0dMKSkpCisgICAgc3RkOjp1bmlxdWVfcHRyPEdz dFZpZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gc3RkOjptYWtlX3VuaXF1ZTxHc3RWaWRl b0ZyYW1lSG9sZGVyPihtX3NhbXBsZS5nZXQoKSwgdGV4TWFwRmxhZ0Zyb21PcmllbnRhdGlvbiht X3ZpZGVvU291cmNlT3JpZW50YXRpb24pLCB0cnVlKTsKKworICAgIGF1dG8gdGV4dHVyZUlEID0g ZnJhbWVIb2xkZXItPnRleHR1cmVJRCgpOworICAgIEFTU0VSVCh0ZXh0dXJlSUQpOworICAgIGlm ICghdGV4dHVyZUlEKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBJbnRTaXplIHNpemUo R1NUX1ZJREVPX0lORk9fV0lEVEgoJnZpZGVvSW5mbyksIEdTVF9WSURFT19JTkZPX0hFSUdIVCgm dmlkZW9JbmZvKSk7CisgICAgYXV0byBzaXplID0gZnJhbWVIb2xkZXItPnNpemUoKTsKICAgICBp ZiAobV92aWRlb1NvdXJjZU9yaWVudGF0aW9uLnVzZXNXaWR0aEFzSGVpZ2h0KCkpCiAgICAgICAg IHNpemUgPSBzaXplLnRyYW5zcG9zZWRTaXplKCk7Ci0gICAgdW5zaWduZWQgdGV4dHVyZUlEID0g KnJlaW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQqPih2aWRlb0ZyYW1lLmRhdGFbMF0pOwogCiAgICAg aWYgKCFtX3ZpZGVvVGV4dHVyZUNvcGllcikKICAgICAgICAgbV92aWRlb1RleHR1cmVDb3BpZXIg PSBzdGQ6Om1ha2VfdW5pcXVlPFZpZGVvVGV4dHVyZUNvcGllckdTdHJlYW1lcj4oVEVYVFVSRV9D T1BJRVJfQ09MT1JfQ09OVkVSVF9GTEFHKTsKIAotICAgIGJvb2wgY29waWVkID0gbV92aWRlb1Rl eHR1cmVDb3BpZXItPmNvcHlWaWRlb1RleHR1cmVUb1BsYXRmb3JtVGV4dHVyZSh0ZXh0dXJlSUQs IHNpemUsIG91dHB1dFRleHR1cmUsIG91dHB1dFRhcmdldCwgbGV2ZWwsIGludGVybmFsRm9ybWF0 LCBmb3JtYXQsIHR5cGUsIGZsaXBZLCBtX3ZpZGVvU291cmNlT3JpZW50YXRpb24pOwotCi0gICAg Z3N0X3ZpZGVvX2ZyYW1lX3VubWFwKCZ2aWRlb0ZyYW1lKTsKLQotICAgIHJldHVybiBjb3BpZWQ7 CisgICAgcmV0dXJuIG1fdmlkZW9UZXh0dXJlQ29waWVyLT5jb3B5VmlkZW9UZXh0dXJlVG9QbGF0 Zm9ybVRleHR1cmUodGV4dHVyZUlELCBzaXplLCBvdXRwdXRUZXh0dXJlLCBvdXRwdXRUYXJnZXQs IGxldmVsLCBpbnRlcm5hbEZvcm1hdCwgZm9ybWF0LCB0eXBlLCBmbGlwWSwgbV92aWRlb1NvdXJj ZU9yaWVudGF0aW9uKTsKIH0KIAogTmF0aXZlSW1hZ2VQdHIgTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZTo6bmF0aXZlSW1hZ2VGb3JDdXJyZW50VGltZSgpCkBAIC05NjAsMTYgKzk1OCwx NyBAQCBOYXRpdmVJbWFnZVB0ciBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpuYXRp dmVJbWFnZUZvckN1cnJlbnRUaW1lKCkKIAogICAgIGF1dG8gc2FtcGxlTG9ja2VyID0gaG9sZExv Y2sobV9zYW1wbGVNdXRleCk7CiAKLSAgICBHc3RWaWRlb0luZm8gdmlkZW9JbmZvOwotICAgIGlm ICghZ2V0U2FtcGxlVmlkZW9JbmZvKG1fc2FtcGxlLmdldCgpLCB2aWRlb0luZm8pKQorICAgIGlm ICghR1NUX0lTX1NBTVBMRShtX3NhbXBsZS5nZXQoKSkpCiAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgR3N0QnVmZmVyKiBidWZmZXIgPSBnc3Rfc2FtcGxlX2dldF9idWZmZXIobV9zYW1w bGUuZ2V0KCkpOwotICAgIEdzdFZpZGVvRnJhbWUgdmlkZW9GcmFtZTsKLSAgICBpZiAoIWdzdF92 aWRlb19mcmFtZV9tYXAoJnZpZGVvRnJhbWUsICZ2aWRlb0luZm8sIGJ1ZmZlciwgc3RhdGljX2Nh c3Q8R3N0TWFwRmxhZ3M+KEdTVF9NQVBfUkVBRCB8IEdTVF9NQVBfR0wpKSkKKyAgICBzdGQ6OnVu aXF1ZV9wdHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBzdGQ6Om1ha2VfdW5p cXVlPEdzdFZpZGVvRnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCB0ZXhNYXBGbGFnRnJvbU9y aWVudGF0aW9uKG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbiksIHRydWUpOworCisgICAgYXV0byB0 ZXh0dXJlSUQgPSBmcmFtZUhvbGRlci0+dGV4dHVyZUlEKCk7CisgICAgQVNTRVJUKHRleHR1cmVJ RCk7CisgICAgaWYgKCF0ZXh0dXJlSUQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAg SW50U2l6ZSBzaXplKEdTVF9WSURFT19JTkZPX1dJRFRIKCZ2aWRlb0luZm8pLCBHU1RfVklERU9f SU5GT19IRUlHSFQoJnZpZGVvSW5mbykpOworICAgIGF1dG8gc2l6ZSA9IGZyYW1lSG9sZGVyLT5z aXplKCk7CiAgICAgaWYgKG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbi51c2VzV2lkdGhBc0hlaWdo dCgpKQogICAgICAgICBzaXplID0gc2l6ZS50cmFuc3Bvc2VkU2l6ZSgpOwogCkBAIC05NzksMTEg Kzk3OCw3IEBAIE5hdGl2ZUltYWdlUHRyIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6 Om5hdGl2ZUltYWdlRm9yQ3VycmVudFRpbWUoKQogICAgIGlmICghbV92aWRlb1RleHR1cmVDb3Bp ZXIpCiAgICAgICAgIG1fdmlkZW9UZXh0dXJlQ29waWVyID0gc3RkOjptYWtlX3VuaXF1ZTxWaWRl b1RleHR1cmVDb3BpZXJHU3RyZWFtZXI+KFRFWFRVUkVfQ09QSUVSX0NPTE9SX0NPTlZFUlRfRkxB Ryk7CiAKLSAgICB1bnNpZ25lZCB0ZXh0dXJlSUQgPSAqcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25l ZCo+KHZpZGVvRnJhbWUuZGF0YVswXSk7Ci0gICAgYm9vbCBjb3BpZWQgPSBtX3ZpZGVvVGV4dHVy ZUNvcGllci0+Y29weVZpZGVvVGV4dHVyZVRvUGxhdGZvcm1UZXh0dXJlKHRleHR1cmVJRCwgc2l6 ZSwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIEdyYXBoaWNzQ29udGV4dDNE OjpSR0JBLCBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSwgR3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lH TkVEX0JZVEUsIGZhbHNlLCBtX3ZpZGVvU291cmNlT3JpZW50YXRpb24pOwotICAgIGdzdF92aWRl b19mcmFtZV91bm1hcCgmdmlkZW9GcmFtZSk7Ci0KLSAgICBpZiAoIWNvcGllZCkKKyAgICBpZiAo IW1fdmlkZW9UZXh0dXJlQ29waWVyLT5jb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUo dGV4dHVyZUlELCBzaXplLCAwLCBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgMCwgR3Jh cGhpY3NDb250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBHcmFwaGljc0Nv bnRleHQzRDo6VU5TSUdORURfQllURSwgZmFsc2UsIG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbikp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgcmV0dXJuIGFkb3B0UmVmKGNhaXJvX2ds X3N1cmZhY2VfY3JlYXRlX2Zvcl90ZXh0dXJlKGNvbnRleHQtPmNhaXJvRGV2aWNlKCksIENBSVJP X0NPTlRFTlRfQ09MT1JfQUxQSEEsIG1fdmlkZW9UZXh0dXJlQ29waWVyLT5yZXN1bHRUZXh0dXJl KCksIHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSkpOwo=