196913 2019-04-15 09:40:27 -0700 [GStreamer] Crash in AudioTrackPrivate with playbin3 enabled 2019-04-24 05:13:17 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris mcatanzaro tsaunier webkit-bug-importer oldest_to_newest 1527189 0 pnormand 2019-04-15 09:40:27 -0700 https://www.reddit.com/r/WTF/comments/bcqcar/engine_cold_start_turkish_style/ (gdb) bt #0 0x00007f40b2c38510 in _ZN7WebCore17AudioTrackPrivate10setEnabledEb (enabled=true, this=0x0) at ../Source/WebCore/platform/graphics/AudioTrackPrivate.h:53 #1 0x00007f40b2c38510 in _ZN7WebCore26AudioTrackPrivateGStreamer12markAsActiveEv (this=0x0) at ../Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.cpp:83 #2 0x00007f40b2ab9c86 in _ZN7WebCore27MediaPlayerPrivateGStreamer13handleMessageEP11_GstMessage (this=0x7f27492b9c00, message=0x5650ca7a86a0) at ../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1451 #3 0x00007f40a7c918ee in ffi_call_unix64 () at /usr/lib/x86_64-linux-gnu/libffi.so.6 #4 0x00007f40a7c912bf in ffi_call () at /usr/lib/x86_64-linux-gnu/libffi.so.6 #9 0x00007f40aa2c191f in <emit signal message:streams-selected on instance 0x5650c99cab90 [GstBus]> (instance=instance@entry=0x5650c99cab90, signal_id=<optimized out>, detail=<optimized out>) at ../../../gobject/gsignal.c:3447 #5 0x00007f40aa2a5472 in g_cclosure_marshal_generic (closure=0x5650ca76c190, return_gvalue=0x0, n_param_values=<optimized out>, param_values=<optimized out>, invocation_hint=<optimized out>, marshal_data=<optimized out>) at ../../../gobject/gclosure.c:1496 #6 0x00007f40aa2a4c7d in g_closure_invoke (closure=0x5650ca76c190, return_value=0x0, n_param_values=2, param_values=0x7ffe1bf88fd0, invocation_hint=0x7ffe1bf88f50) at ../../../gobject/gclosure.c:810 #7 0x00007f40aa2b8345 in signal_emit_unlocked_R (node=node@entry=0x5650ca3ad310, detail=detail@entry=1632, instance=instance@entry=0x5650c99cab90, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7ffe1bf88fd0) at ../../../gobject/gsignal.c:3635 #8 0x00007f40aa2c125e in g_signal_emit_valist (instance=<optimized out>, signal_id=<optimized out>, detail=<optimized out>, var_args=var_args@entry=0x7ffe1bf891a0) at ../../../gobject/gsignal.c:3391 #10 0x00007f40aaec9c34 in gst_bus_async_signal_func (bus=0x5650c99cab90 [GstBus], message=0x5650ca7a86a0, data=<optimized out>) at ../subprojects/gstreamer/gst/gstbus.c:1261 #11 0x00007f40aaecaa4d in gst_bus_source_dispatch (source=0x5650ca73b390, callback=0x7f40aaec9be0 <gst_bus_async_signal_func>, user_data=0x0) at ../subprojects/gstreamer/gst/gstbus.c:839 #12 0x00007f40aa1c2dd8 in g_main_dispatch (context=0x5650c993d020) at ../../../glib/gmain.c:3182 #13 0x00007f40aa1c2dd8 in g_main_context_dispatch (context=context@entry=0x5650c993d020) at ../../../glib/gmain.c:3847 #14 0x00007f40aa1c31c8 in g_main_context_iterate (context=0x5650c993d020, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at ../../../glib/gmain.c:3920 #15 0x00007f40aa1c34c2 in g_main_loop_run (loop=0x5650c9b0f990) at ../../../glib/gmain.c:4116 #16 0x00007f40aedd2a70 in _ZN3WTF7RunLoop3runEv () at ../Source/WTF/wtf/glib/RunLoopGLib.cpp:96 #17 0x00007f40b160c8c8 in _ZN6WebKit20AuxiliaryProcessMainINS_10WebProcessENS_14WebProcessMainEEEiiPPc (argc=<optimized out>, argv=0x7ffe1bf89588) at ../Source/WebKit/Shared/unix/AuxiliaryProcessMain.h:66 #18 0x00007f40a916309b in __libc_start_main (main=0x5650c7b94f20 <main(int, char**)>, argc=3, argv=0x7ffe1bf89588, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7ffe1bf89578) at ../csu/libc-start.c:308 #19 0x00005650c7b94faa in _start () 1527193 1 pnormand 2019-04-15 09:43:35 -0700 m_audioTracks looks empty? This is with a RelWithDebInfo build: (gdb) f 2 #2 0x00007f40b2ab9c86 in _ZN7WebCore27MediaPlayerPrivateGStreamer13handleMessageEP11_GstMessage (this=0x7f27492b9c00, message=0x5650ca7a86a0) at ../Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1451 1451 track->markAsActive(); (gdb) p track $1 = <optimized out> (gdb) p m_audioTracks warning: can't find linker symbol for virtual table for `WebCore::MediaPlayerPrivateGStreamer' value warning: found `_ZTVN7WebCore30MediaPlayerPrivateGStreamerMSEE' instead $2 = {m_impl = {static m_maxLoad = 2, static m_minLoad = 6, m_table = 0x0, m_tableSize = 0, m_tableSizeMask = 0, m_keyCount = 0, m_deletedCount = 0}} (gdb) p streamId $3 = "511baabfffee5fa8069fe40b80215508" 1527213 2 367421 pnormand 2019-04-15 10:23:12 -0700 Created attachment 367421 Patch 1527247 3 367421 tsaunier 2019-04-15 10:55:02 -0700 Comment on attachment 367421 Patch lgtm, but if someone set USE_PLAYBIN3, it will still break... should we unset it on `gst_init`? 1527254 4 pnormand 2019-04-15 11:01:07 -0700 (In reply to Thibault Saunier from comment #3) > Comment on attachment 367421 [details] > Patch > > lgtm, but if someone set USE_PLAYBIN3, it will still break... should we > unset it on `gst_init`? What would break? I've added a test to ensure we process stream collections only when the new var is set. 1527663 5 367421 pnormand 2019-04-16 01:39:07 -0700 Comment on attachment 367421 Patch I found more issues, unfortunately :( Will update the patch, sorry. 1527666 6 pnormand 2019-04-16 01:43:24 -0700 (In reply to Thibault Saunier from comment #3) > Comment on attachment 367421 [details] > Patch > > lgtm, but if someone set USE_PLAYBIN3, it will still break... should we > unset it on `gst_init`? Good idea :P 1527668 7 367516 pnormand 2019-04-16 01:56:19 -0700 Created attachment 367516 Patch 1527708 8 367516 calvaris 2019-04-16 04:09:50 -0700 Comment on attachment 367516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367516&action=review From the GStreamer PoV, this is ok. I'll let Michael have the final word about the env variables. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2372 > + if ((!isMediaSource() && g_getenv("WEBKIT_GST_USE_PLAYBIN3")) || (url.protocolIs("mediastream"))) I think there are issues here with too many () . 1527730 9 367516 mcatanzaro 2019-04-16 07:41:18 -0700 Comment on attachment 367516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367516&action=review > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:230 > + // USE_PLAYBIN3 is dangerous for us because its potential sneaky effect > + // is to register the playbin3 element under the playbin namespace. We > + // can't allow this, when we create playbin, we want playbin2, not > + // playbin3. > + unsetenv("USE_PLAYBIN3"); This will need a rethink. See https://bugs.webkit.org/show_bug.cgi?id=194370#c6 for why you can't do this. 1527733 10 367536 pnormand 2019-04-16 08:22:02 -0700 Created attachment 367536 Patch 1528992 11 mcatanzaro 2019-04-19 18:04:59 -0700 This got lost. 1529941 12 367536 calvaris 2019-04-24 03:31:16 -0700 Comment on attachment 367536 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367536&action=review > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:230 > + if (getenv("USE_PLAYBIN3")) I'd use g_getenv and we're good to go. 1529955 13 pnormand 2019-04-24 05:12:17 -0700 Committed r244584: <https://trac.webkit.org/changeset/244584> 1529956 14 webkit-bug-importer 2019-04-24 05:13:17 -0700 <rdar://problem/50164498> 367421 2019-04-15 10:23:12 -0700 2019-04-16 01:39:07 -0700 Patch bug-196913-20190415182310.patch text/plain 2717 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ0ODdlYmMyODlkMmYy ZmMzMjA3YWQ2NmI1M2RjOWU1OTBkOWUwMS4uZjljYzcyZWI2ZDNmMjVmZmYxZDk5Njc4MzkzMDc0 YjJlMjdjZTZlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA0LTE1ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDcmFzaCBpbiBBdWRpb1RyYWNrUHJpdmF0ZSB3aXRoIHBsYXliaW4zIGVuYWJsZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjkxMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjcmFzaCB3YXMg ZHVlIHRvIGEgcGxheWJpbjMgY29kZSBwYXRoIGJlaW5nIHRyaWdnZXJlZCBkdXJpbmcKKyAgICAg ICAgTVNFIHBsYXliYWNrLCB3aGljaCBpcyBub3Qgc3VwcG9zZWQgdG8gd29yayBpbiBwbGF5Ymlu MyBhbnl3YXkuCisgICAgICAgIFRoZSBwcm9ibGVtIGlzIHRoYXQgc2V0dGluZyB0aGUgVVNFX1BM QVlCSU4zIGVudmlyb25tZW50IHZhcmlhYmxlCisgICAgICAgIHRvICIxIiBtYWtlcyB0aGUgR1N0 cmVhbWVyIHBsYXliYWNrIHBsdWdpbiByZWdpc3RlciB0aGUgcGxheWJpbjMKKyAgICAgICAgZWxl bWVudCB1bmRlciB0aGUgcGxheWJpbiBuYW1lLiBTbyB0aGF0IGxlYWRzIHRvIHBsYXliaW4zIGJl aW5nCisgICAgICAgIHVzZWQgZXZlcnl3aGVyZSBpbiBXZWJLaXQgd2hlcmUgd2UgYXNzdW1lIHRo ZSBwbGF5YmluIGVsZW1lbnQgaXMKKyAgICAgICAgdXNlZC4gU28gdGhlIHByb3Bvc2VkIHNvbHV0 aW9uIGlzIHRvIHVzZSBhIFdlYktpdC1zcGVjaWZpYworICAgICAgICBlbnZpcm9ubWVudCB2YXJp YWJsZSBpbnN0ZWFkIG9mIHRoZSBHU3RyZWFtZXIgVVNFX1BMQVlCSU4zCisgICAgICAgIHZhcmlh YmxlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBsYXlCaW4pOgorCiAyMDE5LTA0LTE1ICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgRW5zdXJlIGlPUyBsYXlvdXQgdHJh aXRzIGFyZSB1c2VkIGZvciBtZWRpYSBjb250cm9scyBpbiBtb2Rlcm4gY29tcGF0aWJpbGl0eSBt b2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmlu ZGV4IDNmNTI2M2RiNjYyZTFiNmFjOWZlMzU0N2I1YjQ5YTA2NmVkNWJkZjUuLjg5MzU5ZGE5ZGFh YzdmY2NmYTI5ZjNkYzczNGZmM2FiZjM0NGRjMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0xNDIwLDYgKzE0MjAsMTIgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZU1lc3NhZ2UoR3N0TWVzc2FnZSogbWVz c2FnZSkKICAgICB9CiAjaWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTAsIDApCiAgICAgY2FzZSBH U1RfTUVTU0FHRV9TVFJFQU1TX1NFTEVDVEVEOiB7CisgICAgICAgIC8vIFNvbWVvbmUgbWlnaHQg YmUgdGVtcHRlZCB0byBzZXQgVVNFX1BMQVlCSU4zLCBidXQgd2UgZG9uJ3Qgc3VwcG9ydAorICAg ICAgICAvLyB0aGF0IHZhcmlhYmxlIGFueW1vcmUgYmVjYXVzZSBpdCBjYW4gZWFzaWx5IGltcGx5 IHRoZSBwbGF5YmluMworICAgICAgICAvLyBlbGVtZW50IGlzIHJlZ2lzdGVyZWQgYXMgJ3BsYXli aW4nLCBzbyBicmVhayBvdXQgZWFybHkuCisgICAgICAgIGlmICghZ19nZXRlbnYoIldFQktJVF9H U1RfVVNFX1BMQVlCSU4zIikpCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgCiAgICAgICAg IEdSZWZQdHI8R3N0U3RyZWFtQ29sbGVjdGlvbj4gY29sbGVjdGlvbjsKICAgICAgICAgZ3N0X21l c3NhZ2VfcGFyc2Vfc3RyZWFtc19zZWxlY3RlZChtZXNzYWdlLCAmY29sbGVjdGlvbi5vdXRQdHIo KSk7CiAKQEAgLTIzODQsNyArMjM5MCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpjcmVhdGVHU1RQbGF5QmluKGNvbnN0IGdjaGFyKiBwbGF5YmluTmFtZSwgY29uCiAgICAg QVNTRVJUKCFtX3BpcGVsaW5lKTsKIAogI2lmIEdTVF9DSEVDS19WRVJTSU9OKDEsIDEwLCAwKQot ICAgIGlmIChnX2dldGVudigiVVNFX1BMQVlCSU4zIikpCisgICAgaWYgKGdfZ2V0ZW52KCJXRUJL SVRfR1NUX1VTRV9QTEFZQklOMyIpKQogICAgICAgICBwbGF5YmluTmFtZSA9ICJwbGF5YmluMyI7 CiAjZWxzZQogICAgIHBsYXliaW5OYW1lID0gInBsYXliaW4iOwo= 367516 2019-04-16 01:56:19 -0700 2019-04-16 08:21:58 -0700 Patch bug-196913-20190416095618.patch text/plain 7647 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MjYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ0ODdlYmMyODlkMmYy ZmMzMjA3YWQ2NmI1M2RjOWU1OTBkOWUwMS4uNzlmNDBkNzYwNzdjZjI5MTJmYmYwNzc0ZjMwNGQ1 ZjQ3YzJiZGUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA0LTE1ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDcmFzaCBpbiBBdWRpb1RyYWNrUHJpdmF0ZSB3aXRoIHBsYXliaW4zIGVuYWJsZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjkxMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjcmFzaCB3YXMg ZHVlIHRvIGEgcGxheWJpbjMgY29kZSBwYXRoIGJlaW5nIHRyaWdnZXJlZCBkdXJpbmcKKyAgICAg ICAgTVNFIHBsYXliYWNrLCB3aGljaCBpcyBub3Qgc3VwcG9zZWQgdG8gd29yayBpbiBwbGF5Ymlu MyBhbnl3YXkuCisgICAgICAgIFRoZSBwcm9ibGVtIGlzIHRoYXQgc2V0dGluZyB0aGUgVVNFX1BM QVlCSU4zIGVudmlyb25tZW50IHZhcmlhYmxlCisgICAgICAgIHRvICIxIiBtYWtlcyB0aGUgR1N0 cmVhbWVyIHBsYXliYWNrIHBsdWdpbiByZWdpc3RlciB0aGUgcGxheWJpbjMKKyAgICAgICAgZWxl bWVudCB1bmRlciB0aGUgcGxheWJpbiBuYW1lLiBTbyB0aGF0IGxlYWRzIHRvIHBsYXliaW4zIGJl aW5nCisgICAgICAgIHVzZWQgZXZlcnl3aGVyZSBpbiBXZWJLaXQgd2hlcmUgd2UgYXNzdW1lIHRo ZSBwbGF5YmluIGVsZW1lbnQgaXMKKyAgICAgICAgdXNlZC4gU28gdGhlIHByb3Bvc2VkIHNvbHV0 aW9uIGlzIHRvOgorCisgICAgICAgIC0gdXNlIGEgV2ViS2l0LXNwZWNpZmljIGVudmlyb25tZW50 IHZhcmlhYmxlIGluc3RlYWQgb2YgdGhlCisgICAgICAgIEdTdHJlYW1lciBVU0VfUExBWUJJTjMg dmFyaWFibGUuCisgICAgICAgIC0gZW5zdXJlIFVTRV9QTEFZQklOMyBpcyBub3Qgc2V0IGF0IGFs bCBiZWZvcmUgaW5pdGlhbGl6aW5nIEdTdHJlYW1lcgorCisgICAgICAgIFRoZSBwYXRjaCBhbHNv IGluY2x1ZGVzIGEgY29kZSBjbGVhbnVwIG9mIHRoZSBwbGF5ZXIgbWV0aG9kCisgICAgICAgIGhh bmRsaW5nIHRoZSBwaXBlbGluZSBjcmVhdGlvbi4gVGhlIHByZXZpb3VzIGNvZGUgaGFkIGEgYnVn CisgICAgICAgIGxlYWRpbmcgdG8gcGxheWJpbjMgYmVpbmcgdXNlZCBmb3IgTVNFLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OmNyZWF0ZUdTVFBsYXlCaW4pOgorCiAyMDE5LTA0LTE1ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0 c0BhcHBsZS5jb20+CiAKICAgICAgICAgRW5zdXJlIGlPUyBsYXlvdXQgdHJhaXRzIGFyZSB1c2Vk IGZvciBtZWRpYSBjb250cm9scyBpbiBtb2Rlcm4gY29tcGF0aWJpbGl0eSBtb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVy Q29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJDb21tb24uY3BwCmluZGV4IGRiMzU2M2FmNDMyM2JhMjA0YzllMTU0MjQxNjU3M2U4 ZGY2ZTRlMzcuLjZkOTY4OTE2MDU3MGYwYTI5MGM1NzczYmU0YTI3NDFiMTYyOTA0NDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFt ZXJDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9HU3RyZWFtZXJDb21tb24uY3BwCkBAIC0yMjMsNiArMjIzLDEyIEBAIGJvb2wgaW5pdGlh bGl6ZUdTdHJlYW1lcihPcHRpb25hbDxWZWN0b3I8U3RyaW5nPj4mJiBvcHRpb25zKQogICAgIHN0 ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbb3B0aW9ucyA9IFdURk1vdmUob3B0aW9ucyldIHsKICAg ICAgICAgaXNHU3RyZWFtZXJJbml0aWFsaXplZCA9IGZhbHNlOwogCisgICAgICAgIC8vIFVTRV9Q TEFZQklOMyBpcyBkYW5nZXJvdXMgZm9yIHVzIGJlY2F1c2UgaXRzIHBvdGVudGlhbCBzbmVha3kg ZWZmZWN0CisgICAgICAgIC8vIGlzIHRvIHJlZ2lzdGVyIHRoZSBwbGF5YmluMyBlbGVtZW50IHVu ZGVyIHRoZSBwbGF5YmluIG5hbWVzcGFjZS4gV2UKKyAgICAgICAgLy8gY2FuJ3QgYWxsb3cgdGhp cywgd2hlbiB3ZSBjcmVhdGUgcGxheWJpbiwgd2Ugd2FudCBwbGF5YmluMiwgbm90CisgICAgICAg IC8vIHBsYXliaW4zLgorICAgICAgICB1bnNldGVudigiVVNFX1BMQVlCSU4zIik7CisKICNpZiBF TkFCTEUoVklERU8pIHx8IEVOQUJMRShXRUJfQVVESU8pCiAgICAgICAgIFZlY3RvcjxTdHJpbmc+ IHBhcmFtZXRlcnMgPSBvcHRpb25zLnZhbHVlT3IoZXh0cmFjdEdTdHJlYW1lck9wdGlvbnNGcm9t Q29tbWFuZExpbmUoKSk7CiAgICAgICAgIGNoYXIqKiBhcmd2ID0gZ19uZXcwKGNoYXIqLCBwYXJh bWV0ZXJzLnNpemUoKSArIDIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcAppbmRleCAzZjUyNjNkYjY2MmUxYjZhYzlmZTM1NDdiNWI0OWEwNjZlZDVi ZGY1Li4yODAwNDk3ZWNkNGMwNjU1YjZiYzJlY2RlOGE2YTRmYjZiZGY3ZGMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMjQ4LDcgKzI0 OCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRQbGF5YmluVVJMKGNv bnN0IFVSTCYgdXJsKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZChj b25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKLSAgICBsb2FkRnVsbCh1cmxTdHJpbmcsIG51bGxw dHIsIFN0cmluZygpKTsKKyAgICBsb2FkRnVsbCh1cmxTdHJpbmcsIFN0cmluZygpKTsKIH0KIAog c3RhdGljIHZvaWQgc2V0U3luY09uQ2xvY2soR3N0RWxlbWVudCAqZWxlbWVudCwgYm9vbCBzeW5j KQpAQCAtMjczLDggKzI3Myw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpz eW5jT25DbG9jayhib29sIHN5bmMpCiAgICAgc2V0U3luY09uQ2xvY2soYXVkaW9TaW5rKCksIHN5 bmMpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6bG9hZEZ1bGwoY29u c3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IGdjaGFyKiBwbGF5YmluTmFtZSwKLSAgICBjb25z dCBTdHJpbmcmIHBpcGVsaW5lTmFtZSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojpsb2FkRnVsbChjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU3RyaW5nJiBwaXBlbGlu ZU5hbWUpCiB7CiAgICAgLy8gRklYTUU6IFRoaXMgbWV0aG9kIGlzIHN0aWxsIGNhbGxlZCBldmVu IGlmIHN1cHBvcnRzVHlwZSgpIHJldHVybmVkCiAgICAgLy8gSXNOb3RTdXBwb3J0ZWQuIFRoaXMg d291bGQgZGVzZXJ2ZSBtb3JlIGludmVzdGlnYXRpb24gYnV0IG1lYW53aGlsZSBtYWtlCkBAIC0y ODksNyArMjg4LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWRGdWxs KGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBnY2hhcioKICAgICAgICAgcmV0dXJuOwog CiAgICAgaWYgKCFtX3BpcGVsaW5lKQotICAgICAgICBjcmVhdGVHU1RQbGF5QmluKGlzTWVkaWFT b3VyY2UoKSA/ICJwbGF5YmluIiA6IHBsYXliaW5OYW1lLCBwaXBlbGluZU5hbWUpOworICAgICAg ICBjcmVhdGVHU1RQbGF5QmluKHVybCwgcGlwZWxpbmVOYW1lKTsKICAgICBzeW5jT25DbG9jayh0 cnVlKTsKICAgICBpZiAobV9maWxsVGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV9maWxsVGlt ZXIuc3RvcCgpOwpAQCAtMzM1LDcgKzMzNCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyOjpsb2FkKE1lZGlhU3RyZWFtUHJpdmF0ZSYgc3RyZWFtKQogICAgICAgICAoc3RyZWFt Lmhhc0NhcHR1cmVWaWRlb1NvdXJjZSgpIHx8IHN0cmVhbS5oYXNDYXB0dXJlQXVkaW9Tb3VyY2Uo KSkgPyAiTG9jYWwiIDogIlJlbW90ZSIsCiAgICAgICAgICJfMHgiLCBoZXgocmVpbnRlcnByZXRf Y2FzdDx1aW50cHRyX3Q+KHRoaXMpLCBMb3dlcmNhc2UpKTsKIAotICAgIGxvYWRGdWxsKFN0cmlu ZygibWVkaWFzdHJlYW06Ly8iKSArIHN0cmVhbS5pZCgpLCAicGxheWJpbjMiLCBwaXBlbGluZU5h bWUpOworICAgIGxvYWRGdWxsKFN0cmluZygibWVkaWFzdHJlYW06Ly8iKSArIHN0cmVhbS5pZCgp LCBwaXBlbGluZU5hbWUpOwogICAgIHN5bmNPbkNsb2NrKGZhbHNlKTsKIAogI2lmIFVTRShHU1RS RUFNRVJfR0wpCkBAIC0yMzYyLDM3ICsyMzYxLDMxIEBAIEF1ZGlvU291cmNlUHJvdmlkZXIqIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YXVkaW9Tb3VyY2VQcm92aWRlcigpCiB9CiAjZW5k aWYKIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0ZUdTVFBsYXlCaW4o Y29uc3QgZ2NoYXIqIHBsYXliaW5OYW1lLCBjb25zdCBTdHJpbmcmIHBpcGVsaW5lTmFtZSkKK3Zv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKGNvbnN0IFVS TCYgdXJsLCBjb25zdCBTdHJpbmcmIHBpcGVsaW5lTmFtZSkKIHsKLSAgICBpZiAobV9waXBlbGlu ZSkgewotICAgICAgICBpZiAoIXBsYXliaW5OYW1lKSB7Ci0gICAgICAgICAgICBHU1RfSU5GT19P QkpFQ1QocGlwZWxpbmUoKSwgIktlZXBpbmcgc2FtZSBwbGF5YmluIGFzIG5vdGhpbmcgZm9yY2Vk Iik7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBjb25zdCBnY2hhciogcGxh eWJpbk5hbWUgPSAicGxheWJpbiI7CisKKyAgICAvLyBNU0UgZG9lc24ndCBzdXBwb3J0IHBsYXli aW4zLiBNZWRpYXN0cmVhbSByZXF1aXJlcyBwbGF5YmluMy4gUmVndWxhcgorICAgIC8vIHBsYXli YWNrIGNhbiB1c2UgcGxheWJpbjMgb24tZGVtYW5kIHdpdGggdGhlIFdFQktJVF9HU1RfVVNFX1BM QVlCSU4zCisgICAgLy8gZW52aXJvbm1lbnQgdmFyaWFibGUuCisjaWYgR1NUX0NIRUNLX1ZFUlNJ T04oMSwgMTAsIDApCisgICAgaWYgKCghaXNNZWRpYVNvdXJjZSgpICYmIGdfZ2V0ZW52KCJXRUJL SVRfR1NUX1VTRV9QTEFZQklOMyIpKSB8fCAodXJsLnByb3RvY29sSXMoIm1lZGlhc3RyZWFtIikp KQorICAgICAgICBwbGF5YmluTmFtZSA9ICJwbGF5YmluMyI7CisjZW5kaWYKIAorICAgIGlmICht X3BpcGVsaW5lKSB7CiAgICAgICAgIGlmICghZ19zdHJjbXAwKEdTVF9PQkpFQ1RfTkFNRShnc3Rf ZWxlbWVudF9nZXRfZmFjdG9yeShtX3BpcGVsaW5lLmdldCgpKSksIHBsYXliaW5OYW1lKSkgewog ICAgICAgICAgICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJBbHJlYWR5IHVzaW5nICVz IiwgcGxheWJpbk5hbWUpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg ICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJUZWFyaW5nIGRvd24gYXMgd2UgbmVlZCB0 byB1c2UgJXMgbm93LiIsCi0gICAgICAgICAgICBwbGF5YmluTmFtZSk7CisgICAgICAgIEdTVF9J TkZPX09CSkVDVChwaXBlbGluZSgpLCAiVGVhcmluZyBkb3duIGFzIHdlIG5lZWQgdG8gdXNlICVz IG5vdy4iLCBwbGF5YmluTmFtZSk7CiAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NU QVRFX05VTEwpOwogICAgICAgICBtX3BpcGVsaW5lID0gbnVsbHB0cjsKICAgICB9CiAKICAgICBB U1NFUlQoIW1fcGlwZWxpbmUpOwogCi0jaWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTAsIDApCi0g ICAgaWYgKGdfZ2V0ZW52KCJVU0VfUExBWUJJTjMiKSkKLSAgICAgICAgcGxheWJpbk5hbWUgPSAi cGxheWJpbjMiOwotI2Vsc2UKLSAgICBwbGF5YmluTmFtZSA9ICJwbGF5YmluIjsKLSNlbmRpZgot Ci0gICAgaWYgKCFwbGF5YmluTmFtZSkKLSAgICAgICAgcGxheWJpbk5hbWUgPSAicGxheWJpbiI7 Ci0KICAgICBtX2lzTGVnYWN5UGxheWJpbiA9ICFnX3N0cmNtcDAocGxheWJpbk5hbWUsICJwbGF5 YmluIik7CiAKICAgICAvLyBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoKSByZXR1cm5zIGEgZmxv YXRpbmcgcmVmZXJlbmNlIHNvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmgKaW5kZXggMWY1NzRiMjBhMTE4MTE0ODIzZDczZGFkOGM1MDZkZmJkYTAyODQzMy4u ODJkYjgwMDQ2NjY4OWQyZmYyMmJiODhmN2FjNTMzZjFjOWM0ZTU2ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtMTQ5LDcgKzE0OSw3IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVN0YXRlcygpOwogICAgIHZpcnR1YWwgdm9p ZCBhc3luY1N0YXRlQ2hhbmdlRG9uZSgpOwogCi0gICAgdm9pZCBjcmVhdGVHU1RQbGF5QmluKGNv bnN0IGdjaGFyKiBwbGF5YmluTmFtZSwgY29uc3QgU3RyaW5nJiBwaXBlbGluZU5hbWUpOworICAg IHZvaWQgY3JlYXRlR1NUUGxheUJpbihjb25zdCBVUkwmLCBjb25zdCBTdHJpbmcmIHBpcGVsaW5l TmFtZSk7CiAKICAgICBib29sIGxvYWROZXh0TG9jYXRpb24oKTsKICAgICB2b2lkIG1lZGlhTG9j YXRpb25DaGFuZ2VkKEdzdE1lc3NhZ2UqKTsKQEAgLTE4MCw3ICsxODAsNyBAQCBwcml2YXRlOgog ICAgIHN0YXRpYyB2b2lkIGRvd25sb2FkQnVmZmVyRmlsZUNyZWF0ZWRDYWxsYmFjayhNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIqKTsKIAogICAgIHZvaWQgc2V0UGxheWJpblVSTChjb25zdCBV UkwmIHVybFN0cmluZyk7Ci0gICAgdm9pZCBsb2FkRnVsbChjb25zdCBTdHJpbmcmIHVybCwgY29u c3QgZ2NoYXIqIHBsYXliaW5OYW1lLCBjb25zdCBTdHJpbmcmIHBpcGVsaW5lTmFtZSk7CisgICAg dm9pZCBsb2FkRnVsbChjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBwaXBlbGluZU5h bWUpOwogCiAjaWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTAsIDApCiAgICAgdm9pZCB1cGRhdGVU cmFja3MoKTsK 367536 2019-04-16 08:22:02 -0700 2019-04-24 03:31:16 -0700 Patch bug-196913-20190416162201.patch text/plain 7834 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRmNjIxYjAwNjRjNDYx Y2FlMzFhMzMxZWE3ZjU2MjJjOGUzYTVlNC4uOTkwZTAxYzZmMWFiZDFkYTdjNjUyYTZiYjZlOGEx MzZlMmUwZDM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTA0LTE1ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDcmFzaCBpbiBBdWRpb1RyYWNrUHJpdmF0ZSB3aXRoIHBsYXliaW4zIGVuYWJsZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjkxMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjcmFzaCB3YXMg ZHVlIHRvIGEgcGxheWJpbjMgY29kZSBwYXRoIGJlaW5nIHRyaWdnZXJlZCBkdXJpbmcKKyAgICAg ICAgTVNFIHBsYXliYWNrLCB3aGljaCBpcyBub3Qgc3VwcG9zZWQgdG8gd29yayBpbiBwbGF5Ymlu MyBhbnl3YXkuCisgICAgICAgIFRoZSBwcm9ibGVtIGlzIHRoYXQgc2V0dGluZyB0aGUgVVNFX1BM QVlCSU4zIGVudmlyb25tZW50IHZhcmlhYmxlCisgICAgICAgIHRvICIxIiBtYWtlcyB0aGUgR1N0 cmVhbWVyIHBsYXliYWNrIHBsdWdpbiByZWdpc3RlciB0aGUgcGxheWJpbjMKKyAgICAgICAgZWxl bWVudCB1bmRlciB0aGUgcGxheWJpbiBuYW1lLiBTbyB0aGF0IGxlYWRzIHRvIHBsYXliaW4zIGJl aW5nCisgICAgICAgIHVzZWQgZXZlcnl3aGVyZSBpbiBXZWJLaXQgd2hlcmUgd2UgYXNzdW1lIHRo ZSBwbGF5YmluIGVsZW1lbnQgaXMKKyAgICAgICAgdXNlZC4gU28gdGhlIHByb3Bvc2VkIHNvbHV0 aW9uIGlzIHRvOgorCisgICAgICAgIC0gdXNlIGEgV2ViS2l0LXNwZWNpZmljIGVudmlyb25tZW50 IHZhcmlhYmxlIGluc3RlYWQgb2YgdGhlCisgICAgICAgIEdTdHJlYW1lciBVU0VfUExBWUJJTjMg dmFyaWFibGUuCisgICAgICAgIC0gZW1pdCBhIHdhcm5pbmcgaWYgdGhlIFVTRV9QTEFZQklOMyBl bnZpcm9ubWVudCB2YXJpYWJsZSBpcworICAgICAgICBkZXRlY3RlZC4gV2UgY2FuJ3QgdW5zZXQg aXQgb3Vyc2VsdmVzIGZvciBzZWN1cml0eSByZWFzb25zLgorCisgICAgICAgIFRoZSBwYXRjaCBh bHNvIGluY2x1ZGVzIGEgY29kZSBjbGVhbnVwIG9mIHRoZSBwbGF5ZXIgbWV0aG9kCisgICAgICAg IGhhbmRsaW5nIHRoZSBwaXBlbGluZSBjcmVhdGlvbi4gVGhlIHByZXZpb3VzIGNvZGUgaGFkIGEg YnVnCisgICAgICAgIGxlYWRpbmcgdG8gcGxheWJpbjMgYmVpbmcgdXNlZCBmb3IgTVNFLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OmNyZWF0ZUdTVFBsYXlCaW4pOgorCiAyMDE5LTA0LTE1ICBBbnRvaW5lIFF1aW50ICA8Z3Jh b3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUmVkdW5kYW50IHBvaW50ZXIgZXZlbnRz IGNhdXNlcyBtYXRlcmlhbCBkZXNpZ24gYnV0dG9ucyB0byBmbHVzaCB0d2ljZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNv bW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyQ29tbW9uLmNwcAppbmRleCBkYjM1NjNhZjQzMjNiYTIwNGM5ZTE1NDI0MTY1NzNlOGRm NmU0ZTM3Li4zNTMzZTA0MmY1ZGZiNWVmNGFjODAxODU2YzBkMmFjZGM4M2FiMTBiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVy Q29tbW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvR1N0cmVhbWVyQ29tbW9uLmNwcApAQCAtMjIzLDYgKzIyMywxMyBAQCBib29sIGluaXRpYWxp emVHU3RyZWFtZXIoT3B0aW9uYWw8VmVjdG9yPFN0cmluZz4+JiYgb3B0aW9ucykKICAgICBzdGQ6 OmNhbGxfb25jZShvbmNlRmxhZywgW29wdGlvbnMgPSBXVEZNb3ZlKG9wdGlvbnMpXSB7CiAgICAg ICAgIGlzR1N0cmVhbWVySW5pdGlhbGl6ZWQgPSBmYWxzZTsKIAorICAgICAgICAvLyBVU0VfUExB WUJJTjMgaXMgZGFuZ2Vyb3VzIGZvciB1cyBiZWNhdXNlIGl0cyBwb3RlbnRpYWwgc25lYWt5IGVm ZmVjdAorICAgICAgICAvLyBpcyB0byByZWdpc3RlciB0aGUgcGxheWJpbjMgZWxlbWVudCB1bmRl ciB0aGUgcGxheWJpbiBuYW1lc3BhY2UuIFdlCisgICAgICAgIC8vIGNhbid0IGFsbG93IHRoaXMs IHdoZW4gd2UgY3JlYXRlIHBsYXliaW4sIHdlIHdhbnQgcGxheWJpbjIsIG5vdAorICAgICAgICAv LyBwbGF5YmluMy4KKyAgICAgICAgaWYgKGdldGVudigiVVNFX1BMQVlCSU4zIikpCisgICAgICAg ICAgICBXVEZMb2dBbHdheXMoIlRoZSBVU0VfUExBWUJJTjMgdmFyaWFibGUgd2FzIGRldGVjdGVk IGluIHRoZSBlbnZpcm9ubWVudC4gRXhwZWN0IHBsYXliYWNrIGlzc3VlcyBvciBwbGVhc2UgdW5z ZXQgaXQuIik7CisKICNpZiBFTkFCTEUoVklERU8pIHx8IEVOQUJMRShXRUJfQVVESU8pCiAgICAg ICAgIFZlY3RvcjxTdHJpbmc+IHBhcmFtZXRlcnMgPSBvcHRpb25zLnZhbHVlT3IoZXh0cmFjdEdT dHJlYW1lck9wdGlvbnNGcm9tQ29tbWFuZExpbmUoKSk7CiAgICAgICAgIGNoYXIqKiBhcmd2ID0g Z19uZXcwKGNoYXIqLCBwYXJhbWV0ZXJzLnNpemUoKSArIDIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAzZjUyNjNkYjY2MmUxYjZhYzlm ZTM1NDdiNWI0OWEwNjZlZDViZGY1Li5iODQ5ZjZiYWE0Y2RmZTBlOWJmMmJlM2ZkNDBhNTY3MTBh ODE1OGEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcApAQCAtMjQ4LDcgKzI0OCw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy OjpzZXRQbGF5YmluVVJMKGNvbnN0IFVSTCYgdXJsKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6bG9hZChjb25zdCBTdHJpbmcmIHVybFN0cmluZykKIHsKLSAgICBsb2FkRnVs bCh1cmxTdHJpbmcsIG51bGxwdHIsIFN0cmluZygpKTsKKyAgICBsb2FkRnVsbCh1cmxTdHJpbmcs IFN0cmluZygpKTsKIH0KIAogc3RhdGljIHZvaWQgc2V0U3luY09uQ2xvY2soR3N0RWxlbWVudCAq ZWxlbWVudCwgYm9vbCBzeW5jKQpAQCAtMjczLDggKzI3Myw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpzeW5jT25DbG9jayhib29sIHN5bmMpCiAgICAgc2V0U3luY09uQ2xv Y2soYXVkaW9TaW5rKCksIHN5bmMpOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6bG9hZEZ1bGwoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IGdjaGFyKiBwbGF5 YmluTmFtZSwKLSAgICBjb25zdCBTdHJpbmcmIHBpcGVsaW5lTmFtZSkKK3ZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkRnVsbChjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29u c3QgU3RyaW5nJiBwaXBlbGluZU5hbWUpCiB7CiAgICAgLy8gRklYTUU6IFRoaXMgbWV0aG9kIGlz IHN0aWxsIGNhbGxlZCBldmVuIGlmIHN1cHBvcnRzVHlwZSgpIHJldHVybmVkCiAgICAgLy8gSXNO b3RTdXBwb3J0ZWQuIFRoaXMgd291bGQgZGVzZXJ2ZSBtb3JlIGludmVzdGlnYXRpb24gYnV0IG1l YW53aGlsZSBtYWtlCkBAIC0yODksNyArMjg4LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OmxvYWRGdWxsKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBnY2hhcioK ICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFtX3BpcGVsaW5lKQotICAgICAgICBjcmVhdGVH U1RQbGF5QmluKGlzTWVkaWFTb3VyY2UoKSA/ICJwbGF5YmluIiA6IHBsYXliaW5OYW1lLCBwaXBl bGluZU5hbWUpOworICAgICAgICBjcmVhdGVHU1RQbGF5QmluKHVybCwgcGlwZWxpbmVOYW1lKTsK ICAgICBzeW5jT25DbG9jayh0cnVlKTsKICAgICBpZiAobV9maWxsVGltZXIuaXNBY3RpdmUoKSkK ICAgICAgICAgbV9maWxsVGltZXIuc3RvcCgpOwpAQCAtMzM1LDcgKzMzNCw3IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKE1lZGlhU3RyZWFtUHJpdmF0ZSYgc3RyZWFt KQogICAgICAgICAoc3RyZWFtLmhhc0NhcHR1cmVWaWRlb1NvdXJjZSgpIHx8IHN0cmVhbS5oYXND YXB0dXJlQXVkaW9Tb3VyY2UoKSkgPyAiTG9jYWwiIDogIlJlbW90ZSIsCiAgICAgICAgICJfMHgi LCBoZXgocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KHRoaXMpLCBMb3dlcmNhc2UpKTsKIAot ICAgIGxvYWRGdWxsKFN0cmluZygibWVkaWFzdHJlYW06Ly8iKSArIHN0cmVhbS5pZCgpLCAicGxh eWJpbjMiLCBwaXBlbGluZU5hbWUpOworICAgIGxvYWRGdWxsKFN0cmluZygibWVkaWFzdHJlYW06 Ly8iKSArIHN0cmVhbS5pZCgpLCBwaXBlbGluZU5hbWUpOwogICAgIHN5bmNPbkNsb2NrKGZhbHNl KTsKIAogI2lmIFVTRShHU1RSRUFNRVJfR0wpCkBAIC0yMzYyLDM3ICsyMzYxLDMxIEBAIEF1ZGlv U291cmNlUHJvdmlkZXIqIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YXVkaW9Tb3VyY2VQ cm92aWRlcigpCiB9CiAjZW5kaWYKIAotdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OmNyZWF0ZUdTVFBsYXlCaW4oY29uc3QgZ2NoYXIqIHBsYXliaW5OYW1lLCBjb25zdCBTdHJpbmcm IHBpcGVsaW5lTmFtZSkKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVH U1RQbGF5QmluKGNvbnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHBpcGVsaW5lTmFtZSkKIHsK LSAgICBpZiAobV9waXBlbGluZSkgewotICAgICAgICBpZiAoIXBsYXliaW5OYW1lKSB7Ci0gICAg ICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIktlZXBpbmcgc2FtZSBwbGF5Ymlu IGFzIG5vdGhpbmcgZm9yY2VkIik7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAg ICBjb25zdCBnY2hhciogcGxheWJpbk5hbWUgPSAicGxheWJpbiI7CisKKyAgICAvLyBNU0UgZG9l c24ndCBzdXBwb3J0IHBsYXliaW4zLiBNZWRpYXN0cmVhbSByZXF1aXJlcyBwbGF5YmluMy4gUmVn dWxhcgorICAgIC8vIHBsYXliYWNrIGNhbiB1c2UgcGxheWJpbjMgb24tZGVtYW5kIHdpdGggdGhl IFdFQktJVF9HU1RfVVNFX1BMQVlCSU4zCisgICAgLy8gZW52aXJvbm1lbnQgdmFyaWFibGUuCisj aWYgR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTAsIDApCisgICAgaWYgKCghaXNNZWRpYVNvdXJjZSgp ICYmIGdfZ2V0ZW52KCJXRUJLSVRfR1NUX1VTRV9QTEFZQklOMyIpKSB8fCB1cmwucHJvdG9jb2xJ cygibWVkaWFzdHJlYW0iKSkKKyAgICAgICAgcGxheWJpbk5hbWUgPSAicGxheWJpbjMiOworI2Vu ZGlmCiAKKyAgICBpZiAobV9waXBlbGluZSkgewogICAgICAgICBpZiAoIWdfc3RyY21wMChHU1Rf T0JKRUNUX05BTUUoZ3N0X2VsZW1lbnRfZ2V0X2ZhY3RvcnkobV9waXBlbGluZS5nZXQoKSkpLCBw bGF5YmluTmFtZSkpIHsKICAgICAgICAgICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAi QWxyZWFkeSB1c2luZyAlcyIsIHBsYXliaW5OYW1lKTsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQogCi0gICAgICAgIEdTVF9JTkZPX09CSkVDVChwaXBlbGluZSgpLCAiVGVhcmluZyBk b3duIGFzIHdlIG5lZWQgdG8gdXNlICVzIG5vdy4iLAotICAgICAgICAgICAgcGxheWJpbk5hbWUp OworICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIlRlYXJpbmcgZG93biBhcyB3 ZSBuZWVkIHRvIHVzZSAlcyBub3cuIiwgcGxheWJpbk5hbWUpOwogICAgICAgICBjaGFuZ2VQaXBl bGluZVN0YXRlKEdTVF9TVEFURV9OVUxMKTsKICAgICAgICAgbV9waXBlbGluZSA9IG51bGxwdHI7 CiAgICAgfQogCiAgICAgQVNTRVJUKCFtX3BpcGVsaW5lKTsKIAotI2lmIEdTVF9DSEVDS19WRVJT SU9OKDEsIDEwLCAwKQotICAgIGlmIChnX2dldGVudigiVVNFX1BMQVlCSU4zIikpCi0gICAgICAg IHBsYXliaW5OYW1lID0gInBsYXliaW4zIjsKLSNlbHNlCi0gICAgcGxheWJpbk5hbWUgPSAicGxh eWJpbiI7Ci0jZW5kaWYKLQotICAgIGlmICghcGxheWJpbk5hbWUpCi0gICAgICAgIHBsYXliaW5O YW1lID0gInBsYXliaW4iOwotCiAgICAgbV9pc0xlZ2FjeVBsYXliaW4gPSAhZ19zdHJjbXAwKHBs YXliaW5OYW1lLCAicGxheWJpbiIpOwogCiAgICAgLy8gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtl KCkgcmV0dXJucyBhIGZsb2F0aW5nIHJlZmVyZW5jZSBzbwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDFmNTc0YjIwYTExODExNDgyM2Q3M2RhZDhj NTA2ZGZiZGEwMjg0MzMuLjgyZGI4MDA0NjY2ODlkMmZmMjJiYjg4ZjdhYzUzM2YxYzljNGU1NmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKQEAgLTE0 OSw3ICsxNDksNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVTdGF0ZXMoKTsK ICAgICB2aXJ0dWFsIHZvaWQgYXN5bmNTdGF0ZUNoYW5nZURvbmUoKTsKIAotICAgIHZvaWQgY3Jl YXRlR1NUUGxheUJpbihjb25zdCBnY2hhciogcGxheWJpbk5hbWUsIGNvbnN0IFN0cmluZyYgcGlw ZWxpbmVOYW1lKTsKKyAgICB2b2lkIGNyZWF0ZUdTVFBsYXlCaW4oY29uc3QgVVJMJiwgY29uc3Qg U3RyaW5nJiBwaXBlbGluZU5hbWUpOwogCiAgICAgYm9vbCBsb2FkTmV4dExvY2F0aW9uKCk7CiAg ICAgdm9pZCBtZWRpYUxvY2F0aW9uQ2hhbmdlZChHc3RNZXNzYWdlKik7CkBAIC0xODAsNyArMTgw LDcgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCBkb3dubG9hZEJ1ZmZlckZpbGVDcmVhdGVk Q2FsbGJhY2soTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKik7CiAKICAgICB2b2lkIHNldFBs YXliaW5VUkwoY29uc3QgVVJMJiB1cmxTdHJpbmcpOwotICAgIHZvaWQgbG9hZEZ1bGwoY29uc3Qg U3RyaW5nJiB1cmwsIGNvbnN0IGdjaGFyKiBwbGF5YmluTmFtZSwgY29uc3QgU3RyaW5nJiBwaXBl bGluZU5hbWUpOworICAgIHZvaWQgbG9hZEZ1bGwoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0 cmluZyYgcGlwZWxpbmVOYW1lKTsKIAogI2lmIEdTVF9DSEVDS19WRVJTSU9OKDEsIDEwLCAwKQog ICAgIHZvaWQgdXBkYXRlVHJhY2tzKCk7Cg==