214047 2020-07-07 09:08:26 -0700 REGRESSION(r263836): [GStreamer] Debug ASSERT hits 2020-07-08 04:06:10 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand aboya calvaris eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer oldest_to_newest 1669413 0 pnormand 2020-07-07 09:08:26 -0700 In Debug test bots, several webrtc and fast/mediastream tests crash, webrtc/audio-video-element-playing.html for example. Thread 1 (Thread 0x7f552ffff700 (LWP 30445)): #0 0x00007f5698fd0202 in WTFCrash() () at ../../Source/WTF/wtf/Assertions.cpp:295 #1 0x00007f56a72f5ec3 in WTF::RefCountedBase::applyRefDerefThreadingCheck() const (this=0x7f55fc206f90) at DerivedSources/ForwardingHeaders/wtf/RefCounted.h:114 #2 0x00007f56a72f5f60 in WTF::RefCountedBase::derefBase() const (this=0x7f55fc206f90) at DerivedSources/ForwardingHeaders/wtf/RefCounted.h:130 #3 0x00007f56a8a295f9 in WTF::RefCounted<WebCore::MediaStreamTrackPrivate, std::default_delete<WebCore::MediaStreamTrackPrivate> >::deref() const (this=0x7f55fc206f90) at DerivedSources/ForwardingHeaders/wtf/RefCounted.h:189 #4 0x00007f56a8a28fe4 in WTF::derefIfNotNull<WebCore::MediaStreamTrackPrivate>(WebCore::MediaStreamTrackPrivate*) (ptr=0x7f55fc206f78) at DerivedSources/ForwardingHeaders/wtf/RefPtr.h:44 #5 0x00007f56a8a28422 in WTF::RefPtr<WebCore::MediaStreamTrackPrivate, WTF::DumbPtrTraits<WebCore::MediaStreamTrackPrivate> >::~RefPtr() (this=0x7f55a4084958, __in_chrg=<optimized out>) at DerivedSources/ForwardingHeaders/wtf/RefPtr.h:70 #6 0x00007f56a8a27e6c in ProbeData::~ProbeData() (this=0x7f55a4084948, __in_chrg=<optimized out>) at ../../Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:450 #7 0x00007f56a8a255fa in <lambda(gpointer)>::operator()(gpointer) const (__closure=0x0, data=0x7f55a4084948) at ../../Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:500 #8 0x00007f56a8a25627 in <lambda(gpointer)>::_FUN(gpointer) () at ../../Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:501 #9 0x00007f56923b6f7d in g_hook_free (hook_list=0x55e1719cb668, hook=0x7f5520009e40) at ../glib/ghook.c:302 #10 0x00007f56923b7486 in g_hook_next_valid (hook_list=<optimized out>, hook=<optimized out>, may_be_in_call=<optimized out>) at ../glib/ghook.c:757 #11 0x00007f56923b78ae in g_hook_list_marshal (hook_list=hook_list@entry=0x55e1719cb668, may_recurse=may_recurse@entry=1, marshaller=marshaller@entry=0x7f5692ce7440 <probe_hook_marshal>, data=data@entry=0x7f552fffe800) at ../glib/ghook.c:676 #12 0x00007f5692ce6ede in do_probe_callbacks (pad=pad@entry=0x55e1719cb5d0 [GstPad|src], info=<optimized out>, defaultval=defaultval@entry=GST_FLOW_OK) at ../gst/gstpad.c:3728 #13 0x00007f5692cea617 in gst_pad_push_event_unchecked (pad=pad@entry=0x55e1719cb5d0 [GstPad|src], event=0x7f5528024a30 [GstEvent], type=type@entry=GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) at ../gst/gstpad.c:5376 #14 0x00007f5692ceabca in push_sticky (pad=pad@entry=0x55e1719cb5d0 [GstPad|src], ev=ev@entry=0x7f552fffea10, user_data=user_data@entry=0x7f552fffea80) at ../gst/gstevent.h:438 #15 0x00007f5692ce8520 in events_foreach (pad=pad@entry=0x55e1719cb5d0 [GstPad|src], func=func@entry=0x7f5692ceab70 <push_sticky>, user_data=user_data@entry=0x7f552fffea80) at ../gst/gstpad.c:608 #16 0x00007f5692cf3491 in check_sticky (event=0x7f5528024a30 [GstEvent], pad=0x55e1719cb5d0 [GstPad|src]) at ../gst/gstpad.c:3986 #17 0x00007f5692cf3491 in gst_pad_push_event (pad=0x55e1719cb5d0 [GstPad|src], event=event@entry=0x7f5528024a30 [GstEvent]) at ../gst/gstpad.c:5542 #18 0x00007f5692deda38 in gst_base_src_send_stream_start (src=src@entry=0x55e170dd1bd0 [GstAppSrc|appsrc4]) at ../libs/gst/base/gstbasesrc.c:916 #19 0x00007f5692dee2e8 in gst_base_src_send_stream_start (src=0x55e170dd1bd0 [GstAppSrc|appsrc4]) at ../libs/gst/base/gstbasesrc.c:3401 #20 0x00007f5692dee2e8 in gst_base_src_loop (pad=0x55e1719cb5d0 [GstPad|src]) at ../libs/gst/base/gstbasesrc.c:2797 #21 0x00007f5692d20be7 in gst_task_func (task=0x7f54e0002950 [GstTask|appsrc4:src]) at ../gst/gsttask.c:328 #22 0x00007f56923f2004 in g_thread_pool_thread_proxy (data=<optimized out>) at ../glib/gthreadpool.c:354 #23 0x00007f56923f1761 in g_thread_proxy (data=0x7f5528006b00) at ../glib/gthread.c:807 #24 0x00007f56934455e2 in start_thread (arg=<optimized out>) at pthread_create.c:479 #25 0x00007f56910d5473 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 1669415 1 403696 pnormand 2020-07-07 09:11:51 -0700 Created attachment 403696 Patch 1669418 2 403697 pnormand 2020-07-07 09:17:28 -0700 Created attachment 403697 Patch 1669429 3 403697 calvaris 2020-07-07 09:36:36 -0700 Comment on attachment 403697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403697&action=review > Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:450 > + ProbeData(GstElement* element, GstStaticPadTemplate* padTemplate, GRefPtr<GstTagList> tags, const char* trackId) GRefPtr<GstTagList>&& tags > Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:453 > + , tags(tags) WTFMove > Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp:501 > + auto* data = new ProbeData(GST_ELEMENT_CAST(self), padTemplate, tags, track->id().utf8().data()); WTFMove 1669675 4 403762 pnormand 2020-07-08 00:41:30 -0700 Created attachment 403762 Patch 1669683 5 ews-feeder 2020-07-08 01:03:33 -0700 Committed r264062: <https://trac.webkit.org/changeset/264062> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403762. 1669684 6 webkit-bug-importer 2020-07-08 01:04:17 -0700 <rdar://problem/65213424> 1669715 7 pnormand 2020-07-08 04:06:10 -0700 *** Bug 214073 has been marked as a duplicate of this bug. *** 403696 2020-07-07 09:11:51 -0700 2020-07-07 09:17:23 -0700 Patch bug-214047-20200707091149.patch text/plain 5253 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk5MWEzOTEwMTg3M2Q5 MTE5OGM3N2Y5NTU0Y2Y2YzRmODNkMzMzYi4uNTUwMTRjYjc4ZWU2NDEyNTdmYzg4ZWQzZGRhNzQ1 NGM0MWRiODg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA3LTA3ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O KHIyNjM4MzYpOiBbR1N0cmVhbWVyXSBEZWJ1ZyBBU1NFUlQgaGl0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MDQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVkdWNlIHRoZSBlbGVtZW50IGRlcGVu ZGVuY3kgb24gUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPiB3aGljaCBpcyBub3QgTVQt c2FmZS4gVGhlCisgICAgICAgIGRhdGEgd2UgbmVlZCBmcm9tIGl0IGFyZSBpdHMgSUQgYW5kIHRo ZSBjb250ZW50cyByZXF1aXJlZCB0byBidWlsZCBhIEdzdFRhZ0xpc3QuIFNvIHdlIG5vdworICAg ICAgICBjcmVhdGUgdGhpcyB0YWctbGlzdCB1cGZyb250IGFuZCBrZWVwIHRyYWNrIG9mIHRoZSB0 cmFja0lEIGFzIHdlbGwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFt ZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwOgorICAgICAgICAod2Via2l0TWVkaWFT dHJlYW1TcmNBZGRQYWQpOgorICAgICAgICAoUHJvYmVEYXRhOjpQcm9iZURhdGEpOgorICAgICAg ICAod2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9iZUNiKToKKyAgICAgICAgKHdlYmtpdE1lZGlh U3RyZWFtU3JjU2V0dXBTcmMpOgorCiAyMDIwLTA3LTA3ICBUb21va2kgSW1haSAgPFRvbW9raS5J bWFpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5dIEltcGxlbWVudCBQYXN0ZWJvYXJkOjp3cml0 ZUN1c3RvbURhdGEgZm9yIFdlYiBJbnNwZWN0b3IgQ29uc29sZSB0YWIKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJNZWRp YVN0cmVhbVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9n c3RyZWFtZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwCmluZGV4IDI2MGM0MWM2ZmFh NWUzMzE3NWYzNDNhNWQ3ZjQ0N2JkODM0YmViNDYuLjBhMWUyOWQ1ODc3Mzc1MjdlMmMzZmNiZjQ4 YmI5NGMyNjY0Y2Q1NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lck1lZGlh U3RyZWFtU291cmNlLmNwcApAQCAtNDI5LDcgKzQyOSw3IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJu IHdlYmtpdE1lZGlhU3RyZWFtU3JjQ2hhaW4oR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50 LCBHCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJl YW1TcmNBZGRQYWQoV2ViS2l0TWVkaWFTdHJlYW1TcmMqIHNlbGYsIEdzdFBhZCogdGFyZ2V0LCBH c3RTdGF0aWNQYWRUZW1wbGF0ZSogcGFkVGVtcGxhdGUsIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRl KiB0cmFjaykKK3N0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjQWRkUGFkKFdlYktpdE1l ZGlhU3RyZWFtU3JjKiBzZWxmLCBHc3RQYWQqIHRhcmdldCwgR3N0U3RhdGljUGFkVGVtcGxhdGUq IHBhZFRlbXBsYXRlLCBHUmVmUHRyPEdzdFRhZ0xpc3Q+JiYgdGFncykKIHsKICAgICBHU1RfREVC VUdfT0JKRUNUKHNlbGYsICIlcyBHaG9zdGluZyAlIiBHU1RfUFRSX0ZPUk1BVCwgZ3N0X29iamVj dF9nZXRfcGF0aF9zdHJpbmcoR1NUX09CSkVDVF9DQVNUKHNlbGYpKSwgdGFyZ2V0KTsKIApAQCAt NDQzLDIwICs0NDMsMjMgQEAgc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJlYW1TcmNBZGRQYWQo V2ViS2l0TWVkaWFTdHJlYW1TcmMqIHNlbGYsIEdzdFBhZCogdGFyZ2UKICAgICBnc3RfZmxvd19j b21iaW5lcl9hZGRfcGFkKHNlbGYtPnByaXYtPmZsb3dDb21iaW5lci5nZXQoKSwgcHJveHlQYWQu Z2V0KCkpOwogICAgIGdzdF9wYWRfc2V0X2NoYWluX2Z1bmN0aW9uKHByb3h5UGFkLmdldCgpLCBz dGF0aWNfY2FzdDxHc3RQYWRDaGFpbkZ1bmN0aW9uPih3ZWJraXRNZWRpYVN0cmVhbVNyY0NoYWlu KSk7CiAKLSAgICBhdXRvIHRhZ3MgPSBtZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZUdldFRhZ3ModHJh Y2spOwogICAgIGdzdF9wYWRfcHVzaF9ldmVudCh0YXJnZXQsIGdzdF9ldmVudF9uZXdfdGFnKHRh Z3MubGVha1JlZigpKSk7CiB9CiAKIHN0cnVjdCBQcm9iZURhdGEgewotICAgIFdURl9NQUtFX1NU UlVDVF9GQVNUX0FMTE9DQVRFRDsKLSAgICBQcm9iZURhdGEoR3N0RWxlbWVudCogZWxlbWVudCwg R3N0U3RhdGljUGFkVGVtcGxhdGUqIHBhZFRlbXBsYXRlLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFj a1ByaXZhdGU+IHRyYWNrKQorICAgIFByb2JlRGF0YShHc3RFbGVtZW50KiBlbGVtZW50LCBHc3RT dGF0aWNQYWRUZW1wbGF0ZSogcGFkVGVtcGxhdGUsIEdSZWZQdHI8R3N0VGFnTGlzdD4gdGFncywg Y29uc3QgY2hhciogdHJhY2tJZCkKICAgICAgICAgOiBlbGVtZW50KGVsZW1lbnQpCiAgICAgICAg ICwgcGFkVGVtcGxhdGUocGFkVGVtcGxhdGUpCi0gICAgICAgICwgdHJhY2sodHJhY2spIHsgfQor ICAgICAgICAsIHRhZ3ModGFncykKKyAgICB7CisgICAgICAgIHRoaXMtPnRyYWNrSWQucmVzZXQo Z19zdHJkdXAodHJhY2tJZCkpOworICAgIH0KIAogICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gZWxl bWVudDsKICAgICBHc3RTdGF0aWNQYWRUZW1wbGF0ZSogcGFkVGVtcGxhdGU7CiAgICAgUmVmUHRy PE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPiB0cmFjazsKKyAgICBHUmVmUHRyPEdzdFRhZ0xpc3Q+ IHRhZ3M7CisgICAgR1VuaXF1ZVB0cjxjaGFyPiB0cmFja0lkOwogfTsKIAogc3RhdGljIEdzdFBh ZFByb2JlUmV0dXJuIHdlYmtpdE1lZGlhU3RyZWFtU3JjUGFkUHJvYmVDYihHc3RQYWQqIHBhZCwg R3N0UGFkUHJvYmVJbmZvKiBpbmZvLCBQcm9iZURhdGEqIGRhdGEpCkBAIC00NjksMTYgKzQ3Miwx NiBAQCBzdGF0aWMgR3N0UGFkUHJvYmVSZXR1cm4gd2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9i ZUNiKEdzdFBhZCogcGFkLCBHc3RQYWRQcm9iZQogICAgIGNhc2UgR1NUX0VWRU5UX1NUUkVBTV9T VEFSVDogewogICAgICAgICBjb25zdCBjaGFyKiBzdHJlYW1JZDsKICAgICAgICAgZ3N0X2V2ZW50 X3BhcnNlX3N0cmVhbV9zdGFydChldmVudCwgJnN0cmVhbUlkKTsKLSAgICAgICAgaWYgKCFnX3N0 cmNtcDAoc3RyZWFtSWQsIGRhdGEtPnRyYWNrLT5pZCgpLnV0ZjgoKS5kYXRhKCkpKSB7CisgICAg ICAgIGlmICghZ19zdHJjbXAwKHN0cmVhbUlkLCBkYXRhLT50cmFja0lkLmdldCgpKSkgewogICAg ICAgICAgICAgR1NUX0lORk9fT0JKRUNUKHBhZCwgIkV2ZW50IGhhcyBiZWVuIHN0aWNrZWQgYWxy ZWFkeSIpOwogICAgICAgICAgICAgcmV0dXJuIEdTVF9QQURfUFJPQkVfUkVNT1ZFOwogICAgICAg ICB9CiAKLSAgICAgICAgYXV0byogc3RyZWFtU3RhcnQgPSBnc3RfZXZlbnRfbmV3X3N0cmVhbV9z dGFydChkYXRhLT50cmFjay0+aWQoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgYXV0byogc3Ry ZWFtU3RhcnQgPSBnc3RfZXZlbnRfbmV3X3N0cmVhbV9zdGFydChkYXRhLT50cmFja0lkLmdldCgp KTsKICAgICAgICAgZ3N0X2V2ZW50X3NldF9ncm91cF9pZChzdHJlYW1TdGFydCwgMSk7CiAgICAg ICAgIGdzdF9wYWRfcHVzaF9ldmVudChwYWQsIHN0cmVhbVN0YXJ0KTsKIAotICAgICAgICB3ZWJr aXRNZWRpYVN0cmVhbVNyY0FkZFBhZChzZWxmLCBwYWQsIGRhdGEtPnBhZFRlbXBsYXRlLCBkYXRh LT50cmFjay5nZXQoKSk7CisgICAgICAgIHdlYmtpdE1lZGlhU3RyZWFtU3JjQWRkUGFkKHNlbGYs IHBhZCwgZGF0YS0+cGFkVGVtcGxhdGUsIFdURk1vdmUoZGF0YS0+dGFncykpOwogICAgICAgICBy ZXR1cm4gR1NUX1BBRF9QUk9CRV9SRU1PVkU7CiAgICAgfQogICAgIGRlZmF1bHQ6CkBAIC00OTQs MTQgKzQ5NywxNSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRNZWRpYVN0cmVhbVNyY1NldHVwU3JjKFdl YktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLCBNZWRpYVN0cmVhbQogICAgIGdzdF9iaW5fYWRkKEdT VF9CSU5fQ0FTVChzZWxmKSwgZWxlbWVudCk7CiAKICAgICBhdXRvIHBhZCA9IGFkb3B0R1JlZihn c3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChlbGVtZW50LCAic3JjIikpOworICAgIGF1dG8gdGFn cyA9IG1lZGlhU3RyZWFtVHJhY2tQcml2YXRlR2V0VGFncyh0cmFjayk7CiAgICAgaWYgKCFvbmx5 VHJhY2spIHsKLSAgICAgICAgYXV0byogZGF0YSA9IG5ldyBQcm9iZURhdGEoR1NUX0VMRU1FTlRf Q0FTVChzZWxmKSwgcGFkVGVtcGxhdGUsIHRyYWNrKTsKKyAgICAgICAgYXV0byogZGF0YSA9IG5l dyBQcm9iZURhdGEoR1NUX0VMRU1FTlRfQ0FTVChzZWxmKSwgcGFkVGVtcGxhdGUsIHRhZ3MsIHRy YWNrLT5pZCgpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBnc3RfcGFkX2FkZF9wcm9iZShwYWQu Z2V0KCksIEdTVF9QQURfUFJPQkVfVFlQRV9FVkVOVF9ET1dOU1RSRUFNLCByZWludGVycHJldF9j YXN0PEdzdFBhZFByb2JlQ2FsbGJhY2s+KHdlYmtpdE1lZGlhU3RyZWFtU3JjUGFkUHJvYmVDYiks IGRhdGEsIFtdKGdwb2ludGVyIGRhdGEpIHsKICAgICAgICAgICAgIGRlbGV0ZSByZWludGVycHJl dF9jYXN0PFByb2JlRGF0YSo+KGRhdGEpOwogICAgICAgICB9KTsKICAgICB9IGVsc2UgewogICAg ICAgICBnc3RfcGFkX3NldF9hY3RpdmUocGFkLmdldCgpLCBUUlVFKTsKLSAgICAgICAgd2Via2l0 TWVkaWFTdHJlYW1TcmNBZGRQYWQoc2VsZiwgcGFkLmdldCgpLCBwYWRUZW1wbGF0ZSwgdHJhY2sp OworICAgICAgICB3ZWJraXRNZWRpYVN0cmVhbVNyY0FkZFBhZChzZWxmLCBwYWQuZ2V0KCksIHBh ZFRlbXBsYXRlLCBXVEZNb3ZlKHRhZ3MpKTsKICAgICB9CiAKICAgICBhdXRvKiBwcml2ID0gc2Vs Zi0+cHJpdjsK 403697 2020-07-07 09:17:28 -0700 2020-07-08 00:41:25 -0700 Patch bug-214047-20200707091726.patch text/plain 5253 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk5MWEzOTEwMTg3M2Q5 MTE5OGM3N2Y5NTU0Y2Y2YzRmODNkMzMzYi4uNTUwMTRjYjc4ZWU2NDEyNTdmYzg4ZWQzZGRhNzQ1 NGM0MWRiODg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA3LTA3ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O KHIyNjM4MzYpOiBbR1N0cmVhbWVyXSBEZWJ1ZyBBU1NFUlQgaGl0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MDQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVkdWNlIHRoZSBlbGVtZW50IGRlcGVu ZGVuY3kgb24gUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPiB3aGljaCBpcyBub3QgTVQt c2FmZS4gVGhlCisgICAgICAgIGRhdGEgd2UgbmVlZCBmcm9tIGl0IGFyZSBpdHMgSUQgYW5kIHRo ZSBjb250ZW50cyByZXF1aXJlZCB0byBidWlsZCBhIEdzdFRhZ0xpc3QuIFNvIHdlIG5vdworICAg ICAgICBjcmVhdGUgdGhpcyB0YWctbGlzdCB1cGZyb250IGFuZCBrZWVwIHRyYWNrIG9mIHRoZSB0 cmFja0lEIGFzIHdlbGwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFt ZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwOgorICAgICAgICAod2Via2l0TWVkaWFT dHJlYW1TcmNBZGRQYWQpOgorICAgICAgICAoUHJvYmVEYXRhOjpQcm9iZURhdGEpOgorICAgICAg ICAod2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9iZUNiKToKKyAgICAgICAgKHdlYmtpdE1lZGlh U3RyZWFtU3JjU2V0dXBTcmMpOgorCiAyMDIwLTA3LTA3ICBUb21va2kgSW1haSAgPFRvbW9raS5J bWFpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5dIEltcGxlbWVudCBQYXN0ZWJvYXJkOjp3cml0 ZUN1c3RvbURhdGEgZm9yIFdlYiBJbnNwZWN0b3IgQ29uc29sZSB0YWIKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJNZWRp YVN0cmVhbVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9n c3RyZWFtZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwCmluZGV4IDI2MGM0MWM2ZmFh NWUzMzE3NWYzNDNhNWQ3ZjQ0N2JkODM0YmViNDYuLjkwYjY0MWY1MjdmNTQ5ZDgwZTc3NDQ3M2Q3 MDQ5ZjFiODdkODNmYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lck1lZGlh U3RyZWFtU291cmNlLmNwcApAQCAtNDI5LDcgKzQyOSw3IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJu IHdlYmtpdE1lZGlhU3RyZWFtU3JjQ2hhaW4oR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50 LCBHCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJl YW1TcmNBZGRQYWQoV2ViS2l0TWVkaWFTdHJlYW1TcmMqIHNlbGYsIEdzdFBhZCogdGFyZ2V0LCBH c3RTdGF0aWNQYWRUZW1wbGF0ZSogcGFkVGVtcGxhdGUsIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRl KiB0cmFjaykKK3N0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjQWRkUGFkKFdlYktpdE1l ZGlhU3RyZWFtU3JjKiBzZWxmLCBHc3RQYWQqIHRhcmdldCwgR3N0U3RhdGljUGFkVGVtcGxhdGUq IHBhZFRlbXBsYXRlLCBHUmVmUHRyPEdzdFRhZ0xpc3Q+JiYgdGFncykKIHsKICAgICBHU1RfREVC VUdfT0JKRUNUKHNlbGYsICIlcyBHaG9zdGluZyAlIiBHU1RfUFRSX0ZPUk1BVCwgZ3N0X29iamVj dF9nZXRfcGF0aF9zdHJpbmcoR1NUX09CSkVDVF9DQVNUKHNlbGYpKSwgdGFyZ2V0KTsKIApAQCAt NDQzLDIwICs0NDMsMjIgQEAgc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJlYW1TcmNBZGRQYWQo V2ViS2l0TWVkaWFTdHJlYW1TcmMqIHNlbGYsIEdzdFBhZCogdGFyZ2UKICAgICBnc3RfZmxvd19j b21iaW5lcl9hZGRfcGFkKHNlbGYtPnByaXYtPmZsb3dDb21iaW5lci5nZXQoKSwgcHJveHlQYWQu Z2V0KCkpOwogICAgIGdzdF9wYWRfc2V0X2NoYWluX2Z1bmN0aW9uKHByb3h5UGFkLmdldCgpLCBz dGF0aWNfY2FzdDxHc3RQYWRDaGFpbkZ1bmN0aW9uPih3ZWJraXRNZWRpYVN0cmVhbVNyY0NoYWlu KSk7CiAKLSAgICBhdXRvIHRhZ3MgPSBtZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZUdldFRhZ3ModHJh Y2spOwogICAgIGdzdF9wYWRfcHVzaF9ldmVudCh0YXJnZXQsIGdzdF9ldmVudF9uZXdfdGFnKHRh Z3MubGVha1JlZigpKSk7CiB9CiAKIHN0cnVjdCBQcm9iZURhdGEgewotICAgIFdURl9NQUtFX1NU UlVDVF9GQVNUX0FMTE9DQVRFRDsKLSAgICBQcm9iZURhdGEoR3N0RWxlbWVudCogZWxlbWVudCwg R3N0U3RhdGljUGFkVGVtcGxhdGUqIHBhZFRlbXBsYXRlLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFj a1ByaXZhdGU+IHRyYWNrKQorICAgIFByb2JlRGF0YShHc3RFbGVtZW50KiBlbGVtZW50LCBHc3RT dGF0aWNQYWRUZW1wbGF0ZSogcGFkVGVtcGxhdGUsIEdSZWZQdHI8R3N0VGFnTGlzdD4gdGFncywg Y29uc3QgY2hhciogdHJhY2tJZCkKICAgICAgICAgOiBlbGVtZW50KGVsZW1lbnQpCiAgICAgICAg ICwgcGFkVGVtcGxhdGUocGFkVGVtcGxhdGUpCi0gICAgICAgICwgdHJhY2sodHJhY2spIHsgfQor ICAgICAgICAsIHRhZ3ModGFncykKKyAgICB7CisgICAgICAgIHRoaXMtPnRyYWNrSWQucmVzZXQo Z19zdHJkdXAodHJhY2tJZCkpOworICAgIH0KIAogICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gZWxl bWVudDsKICAgICBHc3RTdGF0aWNQYWRUZW1wbGF0ZSogcGFkVGVtcGxhdGU7Ci0gICAgUmVmUHRy PE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPiB0cmFjazsKKyAgICBHUmVmUHRyPEdzdFRhZ0xpc3Q+ IHRhZ3M7CisgICAgR1VuaXF1ZVB0cjxjaGFyPiB0cmFja0lkOwogfTsKIAogc3RhdGljIEdzdFBh ZFByb2JlUmV0dXJuIHdlYmtpdE1lZGlhU3RyZWFtU3JjUGFkUHJvYmVDYihHc3RQYWQqIHBhZCwg R3N0UGFkUHJvYmVJbmZvKiBpbmZvLCBQcm9iZURhdGEqIGRhdGEpCkBAIC00NjksMTYgKzQ3MSwx NiBAQCBzdGF0aWMgR3N0UGFkUHJvYmVSZXR1cm4gd2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9i ZUNiKEdzdFBhZCogcGFkLCBHc3RQYWRQcm9iZQogICAgIGNhc2UgR1NUX0VWRU5UX1NUUkVBTV9T VEFSVDogewogICAgICAgICBjb25zdCBjaGFyKiBzdHJlYW1JZDsKICAgICAgICAgZ3N0X2V2ZW50 X3BhcnNlX3N0cmVhbV9zdGFydChldmVudCwgJnN0cmVhbUlkKTsKLSAgICAgICAgaWYgKCFnX3N0 cmNtcDAoc3RyZWFtSWQsIGRhdGEtPnRyYWNrLT5pZCgpLnV0ZjgoKS5kYXRhKCkpKSB7CisgICAg ICAgIGlmICghZ19zdHJjbXAwKHN0cmVhbUlkLCBkYXRhLT50cmFja0lkLmdldCgpKSkgewogICAg ICAgICAgICAgR1NUX0lORk9fT0JKRUNUKHBhZCwgIkV2ZW50IGhhcyBiZWVuIHN0aWNrZWQgYWxy ZWFkeSIpOwogICAgICAgICAgICAgcmV0dXJuIEdTVF9QQURfUFJPQkVfUkVNT1ZFOwogICAgICAg ICB9CiAKLSAgICAgICAgYXV0byogc3RyZWFtU3RhcnQgPSBnc3RfZXZlbnRfbmV3X3N0cmVhbV9z dGFydChkYXRhLT50cmFjay0+aWQoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgYXV0byogc3Ry ZWFtU3RhcnQgPSBnc3RfZXZlbnRfbmV3X3N0cmVhbV9zdGFydChkYXRhLT50cmFja0lkLmdldCgp KTsKICAgICAgICAgZ3N0X2V2ZW50X3NldF9ncm91cF9pZChzdHJlYW1TdGFydCwgMSk7CiAgICAg ICAgIGdzdF9wYWRfcHVzaF9ldmVudChwYWQsIHN0cmVhbVN0YXJ0KTsKIAotICAgICAgICB3ZWJr aXRNZWRpYVN0cmVhbVNyY0FkZFBhZChzZWxmLCBwYWQsIGRhdGEtPnBhZFRlbXBsYXRlLCBkYXRh LT50cmFjay5nZXQoKSk7CisgICAgICAgIHdlYmtpdE1lZGlhU3RyZWFtU3JjQWRkUGFkKHNlbGYs IHBhZCwgZGF0YS0+cGFkVGVtcGxhdGUsIFdURk1vdmUoZGF0YS0+dGFncykpOwogICAgICAgICBy ZXR1cm4gR1NUX1BBRF9QUk9CRV9SRU1PVkU7CiAgICAgfQogICAgIGRlZmF1bHQ6CkBAIC00OTQs MTQgKzQ5NiwxNSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRNZWRpYVN0cmVhbVNyY1NldHVwU3JjKFdl YktpdE1lZGlhU3RyZWFtU3JjKiBzZWxmLCBNZWRpYVN0cmVhbQogICAgIGdzdF9iaW5fYWRkKEdT VF9CSU5fQ0FTVChzZWxmKSwgZWxlbWVudCk7CiAKICAgICBhdXRvIHBhZCA9IGFkb3B0R1JlZihn c3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZChlbGVtZW50LCAic3JjIikpOworICAgIGF1dG8gdGFn cyA9IG1lZGlhU3RyZWFtVHJhY2tQcml2YXRlR2V0VGFncyh0cmFjayk7CiAgICAgaWYgKCFvbmx5 VHJhY2spIHsKLSAgICAgICAgYXV0byogZGF0YSA9IG5ldyBQcm9iZURhdGEoR1NUX0VMRU1FTlRf Q0FTVChzZWxmKSwgcGFkVGVtcGxhdGUsIHRyYWNrKTsKKyAgICAgICAgYXV0byogZGF0YSA9IG5l dyBQcm9iZURhdGEoR1NUX0VMRU1FTlRfQ0FTVChzZWxmKSwgcGFkVGVtcGxhdGUsIHRhZ3MsIHRy YWNrLT5pZCgpLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICBnc3RfcGFkX2FkZF9wcm9iZShwYWQu Z2V0KCksIEdTVF9QQURfUFJPQkVfVFlQRV9FVkVOVF9ET1dOU1RSRUFNLCByZWludGVycHJldF9j YXN0PEdzdFBhZFByb2JlQ2FsbGJhY2s+KHdlYmtpdE1lZGlhU3RyZWFtU3JjUGFkUHJvYmVDYiks IGRhdGEsIFtdKGdwb2ludGVyIGRhdGEpIHsKICAgICAgICAgICAgIGRlbGV0ZSByZWludGVycHJl dF9jYXN0PFByb2JlRGF0YSo+KGRhdGEpOwogICAgICAgICB9KTsKICAgICB9IGVsc2UgewogICAg ICAgICBnc3RfcGFkX3NldF9hY3RpdmUocGFkLmdldCgpLCBUUlVFKTsKLSAgICAgICAgd2Via2l0 TWVkaWFTdHJlYW1TcmNBZGRQYWQoc2VsZiwgcGFkLmdldCgpLCBwYWRUZW1wbGF0ZSwgdHJhY2sp OworICAgICAgICB3ZWJraXRNZWRpYVN0cmVhbVNyY0FkZFBhZChzZWxmLCBwYWQuZ2V0KCksIHBh ZFRlbXBsYXRlLCBXVEZNb3ZlKHRhZ3MpKTsKICAgICB9CiAKICAgICBhdXRvKiBwcml2ID0gc2Vs Zi0+cHJpdjsK 403762 2020-07-08 00:41:30 -0700 2020-07-08 01:03:34 -0700 Patch bug-214047-20200708004128.patch text/plain 5255 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y2YzIxNWNjMzY1MTQz MTY1YzUxMzllOTM1Y2Y2MWFjNTJiMDlmNS4uODQwNmNjNTNmN2ZlZTk2OGUyZDczYjAzYzM3ZTZi OWVjNjg2NzlhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA3LTA4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O KHIyNjM4MzYpOiBbR1N0cmVhbWVyXSBEZWJ1ZyBBU1NFUlQgaGl0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MDQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgWGFiaWVyIFJvZHJpZ3Vlei1DYWx2YXIuCisKKyAgICAgICAgUmVkdWNlIHRoZSBlbGVt ZW50IGRlcGVuZGVuY3kgb24gUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlPiB3aGljaCBp cyBub3QgTVQtc2FmZS4gVGhlCisgICAgICAgIGRhdGEgd2UgbmVlZCBmcm9tIGl0IGFyZSBpdHMg SUQgYW5kIHRoZSBjb250ZW50cyByZXF1aXJlZCB0byBidWlsZCBhIEdzdFRhZ0xpc3QuIFNvIHdl IG5vdworICAgICAgICBjcmVhdGUgdGhpcyB0YWctbGlzdCB1cGZyb250IGFuZCBrZWVwIHRyYWNr IG9mIHRoZSB0cmFja0lEIGFzIHdlbGwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVh bS9nc3RyZWFtZXIvR1N0cmVhbWVyTWVkaWFTdHJlYW1Tb3VyY2UuY3BwOgorICAgICAgICAod2Vi a2l0TWVkaWFTdHJlYW1TcmNBZGRQYWQpOgorICAgICAgICAoUHJvYmVEYXRhOjpQcm9iZURhdGEp OgorICAgICAgICAod2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9iZUNiKToKKyAgICAgICAgKHdl YmtpdE1lZGlhU3RyZWFtU3JjU2V0dXBTcmMpOgorCiAyMDIwLTA3LTA3ICBBbmR5IEVzdGVzICA8 YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbQXBwbGUgUGF5XSBGaXggdGhlIGJ1aWxkIG9u IENhdGFsaW5hIGludGVybmFsIFNES3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVy TWVkaWFTdHJlYW1Tb3VyY2UuY3BwCmluZGV4IDI2MGM0MWM2ZmFhNWUzMzE3NWYzNDNhNWQ3ZjQ0 N2JkODM0YmViNDYuLjA0YzI1MTgzN2MxMGUzZTJiNGY2ODY1ZDc2NzdlMzhmZGVkYmQ3Y2QgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9H U3RyZWFtZXJNZWRpYVN0cmVhbVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lck1lZGlhU3RyZWFtU291cmNlLmNwcApA QCAtNDI5LDcgKzQyOSw3IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHdlYmtpdE1lZGlhU3RyZWFt U3JjQ2hhaW4oR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50LCBHCiAgICAgcmV0dXJuIHJl c3VsdDsKIH0KIAotc3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJlYW1TcmNBZGRQYWQoV2ViS2l0 TWVkaWFTdHJlYW1TcmMqIHNlbGYsIEdzdFBhZCogdGFyZ2V0LCBHc3RTdGF0aWNQYWRUZW1wbGF0 ZSogcGFkVGVtcGxhdGUsIE1lZGlhU3RyZWFtVHJhY2tQcml2YXRlKiB0cmFjaykKK3N0YXRpYyB2 b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjQWRkUGFkKFdlYktpdE1lZGlhU3RyZWFtU3JjKiBzZWxm LCBHc3RQYWQqIHRhcmdldCwgR3N0U3RhdGljUGFkVGVtcGxhdGUqIHBhZFRlbXBsYXRlLCBHUmVm UHRyPEdzdFRhZ0xpc3Q+JiYgdGFncykKIHsKICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICIl cyBHaG9zdGluZyAlIiBHU1RfUFRSX0ZPUk1BVCwgZ3N0X29iamVjdF9nZXRfcGF0aF9zdHJpbmco R1NUX09CSkVDVF9DQVNUKHNlbGYpKSwgdGFyZ2V0KTsKIApAQCAtNDQzLDIwICs0NDMsMjIgQEAg c3RhdGljIHZvaWQgd2Via2l0TWVkaWFTdHJlYW1TcmNBZGRQYWQoV2ViS2l0TWVkaWFTdHJlYW1T cmMqIHNlbGYsIEdzdFBhZCogdGFyZ2UKICAgICBnc3RfZmxvd19jb21iaW5lcl9hZGRfcGFkKHNl bGYtPnByaXYtPmZsb3dDb21iaW5lci5nZXQoKSwgcHJveHlQYWQuZ2V0KCkpOwogICAgIGdzdF9w YWRfc2V0X2NoYWluX2Z1bmN0aW9uKHByb3h5UGFkLmdldCgpLCBzdGF0aWNfY2FzdDxHc3RQYWRD aGFpbkZ1bmN0aW9uPih3ZWJraXRNZWRpYVN0cmVhbVNyY0NoYWluKSk7CiAKLSAgICBhdXRvIHRh Z3MgPSBtZWRpYVN0cmVhbVRyYWNrUHJpdmF0ZUdldFRhZ3ModHJhY2spOwogICAgIGdzdF9wYWRf cHVzaF9ldmVudCh0YXJnZXQsIGdzdF9ldmVudF9uZXdfdGFnKHRhZ3MubGVha1JlZigpKSk7CiB9 CiAKIHN0cnVjdCBQcm9iZURhdGEgewotICAgIFdURl9NQUtFX1NUUlVDVF9GQVNUX0FMTE9DQVRF RDsKLSAgICBQcm9iZURhdGEoR3N0RWxlbWVudCogZWxlbWVudCwgR3N0U3RhdGljUGFkVGVtcGxh dGUqIHBhZFRlbXBsYXRlLCBSZWZQdHI8TWVkaWFTdHJlYW1UcmFja1ByaXZhdGU+IHRyYWNrKQor ICAgIFByb2JlRGF0YShHc3RFbGVtZW50KiBlbGVtZW50LCBHc3RTdGF0aWNQYWRUZW1wbGF0ZSog cGFkVGVtcGxhdGUsIEdSZWZQdHI8R3N0VGFnTGlzdD4mJiB0YWdzLCBjb25zdCBjaGFyKiB0cmFj a0lkKQogICAgICAgICA6IGVsZW1lbnQoZWxlbWVudCkKICAgICAgICAgLCBwYWRUZW1wbGF0ZShw YWRUZW1wbGF0ZSkKLSAgICAgICAgLCB0cmFjayh0cmFjaykgeyB9CisgICAgICAgICwgdGFncyhX VEZNb3ZlKHRhZ3MpKQorICAgIHsKKyAgICAgICAgdGhpcy0+dHJhY2tJZC5yZXNldChnX3N0cmR1 cCh0cmFja0lkKSk7CisgICAgfQogCiAgICAgR1JlZlB0cjxHc3RFbGVtZW50PiBlbGVtZW50Owog ICAgIEdzdFN0YXRpY1BhZFRlbXBsYXRlKiBwYWRUZW1wbGF0ZTsKLSAgICBSZWZQdHI8TWVkaWFT dHJlYW1UcmFja1ByaXZhdGU+IHRyYWNrOworICAgIEdSZWZQdHI8R3N0VGFnTGlzdD4gdGFnczsK KyAgICBHVW5pcXVlUHRyPGNoYXI+IHRyYWNrSWQ7CiB9OwogCiBzdGF0aWMgR3N0UGFkUHJvYmVS ZXR1cm4gd2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9iZUNiKEdzdFBhZCogcGFkLCBHc3RQYWRQ cm9iZUluZm8qIGluZm8sIFByb2JlRGF0YSogZGF0YSkKQEAgLTQ2OSwxNiArNDcxLDE2IEBAIHN0 YXRpYyBHc3RQYWRQcm9iZVJldHVybiB3ZWJraXRNZWRpYVN0cmVhbVNyY1BhZFByb2JlQ2IoR3N0 UGFkKiBwYWQsIEdzdFBhZFByb2JlCiAgICAgY2FzZSBHU1RfRVZFTlRfU1RSRUFNX1NUQVJUOiB7 CiAgICAgICAgIGNvbnN0IGNoYXIqIHN0cmVhbUlkOwogICAgICAgICBnc3RfZXZlbnRfcGFyc2Vf c3RyZWFtX3N0YXJ0KGV2ZW50LCAmc3RyZWFtSWQpOwotICAgICAgICBpZiAoIWdfc3RyY21wMChz dHJlYW1JZCwgZGF0YS0+dHJhY2stPmlkKCkudXRmOCgpLmRhdGEoKSkpIHsKKyAgICAgICAgaWYg KCFnX3N0cmNtcDAoc3RyZWFtSWQsIGRhdGEtPnRyYWNrSWQuZ2V0KCkpKSB7CiAgICAgICAgICAg ICBHU1RfSU5GT19PQkpFQ1QocGFkLCAiRXZlbnQgaGFzIGJlZW4gc3RpY2tlZCBhbHJlYWR5Iik7 CiAgICAgICAgICAgICByZXR1cm4gR1NUX1BBRF9QUk9CRV9SRU1PVkU7CiAgICAgICAgIH0KIAot ICAgICAgICBhdXRvKiBzdHJlYW1TdGFydCA9IGdzdF9ldmVudF9uZXdfc3RyZWFtX3N0YXJ0KGRh dGEtPnRyYWNrLT5pZCgpLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBhdXRvKiBzdHJlYW1TdGFy dCA9IGdzdF9ldmVudF9uZXdfc3RyZWFtX3N0YXJ0KGRhdGEtPnRyYWNrSWQuZ2V0KCkpOwogICAg ICAgICBnc3RfZXZlbnRfc2V0X2dyb3VwX2lkKHN0cmVhbVN0YXJ0LCAxKTsKICAgICAgICAgZ3N0 X3BhZF9wdXNoX2V2ZW50KHBhZCwgc3RyZWFtU3RhcnQpOwogCi0gICAgICAgIHdlYmtpdE1lZGlh U3RyZWFtU3JjQWRkUGFkKHNlbGYsIHBhZCwgZGF0YS0+cGFkVGVtcGxhdGUsIGRhdGEtPnRyYWNr LmdldCgpKTsKKyAgICAgICAgd2Via2l0TWVkaWFTdHJlYW1TcmNBZGRQYWQoc2VsZiwgcGFkLCBk YXRhLT5wYWRUZW1wbGF0ZSwgV1RGTW92ZShkYXRhLT50YWdzKSk7CiAgICAgICAgIHJldHVybiBH U1RfUEFEX1BST0JFX1JFTU9WRTsKICAgICB9CiAgICAgZGVmYXVsdDoKQEAgLTQ5NCwxNCArNDk2 LDE1IEBAIHN0YXRpYyB2b2lkIHdlYmtpdE1lZGlhU3RyZWFtU3JjU2V0dXBTcmMoV2ViS2l0TWVk aWFTdHJlYW1TcmMqIHNlbGYsIE1lZGlhU3RyZWFtCiAgICAgZ3N0X2Jpbl9hZGQoR1NUX0JJTl9D QVNUKHNlbGYpLCBlbGVtZW50KTsKIAogICAgIGF1dG8gcGFkID0gYWRvcHRHUmVmKGdzdF9lbGVt ZW50X2dldF9zdGF0aWNfcGFkKGVsZW1lbnQsICJzcmMiKSk7CisgICAgYXV0byB0YWdzID0gbWVk aWFTdHJlYW1UcmFja1ByaXZhdGVHZXRUYWdzKHRyYWNrKTsKICAgICBpZiAoIW9ubHlUcmFjaykg ewotICAgICAgICBhdXRvKiBkYXRhID0gbmV3IFByb2JlRGF0YShHU1RfRUxFTUVOVF9DQVNUKHNl bGYpLCBwYWRUZW1wbGF0ZSwgdHJhY2spOworICAgICAgICBhdXRvKiBkYXRhID0gbmV3IFByb2Jl RGF0YShHU1RfRUxFTUVOVF9DQVNUKHNlbGYpLCBwYWRUZW1wbGF0ZSwgV1RGTW92ZSh0YWdzKSwg dHJhY2stPmlkKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGdzdF9wYWRfYWRkX3Byb2JlKHBh ZC5nZXQoKSwgR1NUX1BBRF9QUk9CRV9UWVBFX0VWRU5UX0RPV05TVFJFQU0sIHJlaW50ZXJwcmV0 X2Nhc3Q8R3N0UGFkUHJvYmVDYWxsYmFjaz4od2Via2l0TWVkaWFTdHJlYW1TcmNQYWRQcm9iZUNi KSwgZGF0YSwgW10oZ3BvaW50ZXIgZGF0YSkgewogICAgICAgICAgICAgZGVsZXRlIHJlaW50ZXJw cmV0X2Nhc3Q8UHJvYmVEYXRhKj4oZGF0YSk7CiAgICAgICAgIH0pOwogICAgIH0gZWxzZSB7CiAg ICAgICAgIGdzdF9wYWRfc2V0X2FjdGl2ZShwYWQuZ2V0KCksIFRSVUUpOwotICAgICAgICB3ZWJr aXRNZWRpYVN0cmVhbVNyY0FkZFBhZChzZWxmLCBwYWQuZ2V0KCksIHBhZFRlbXBsYXRlLCB0cmFj ayk7CisgICAgICAgIHdlYmtpdE1lZGlhU3RyZWFtU3JjQWRkUGFkKHNlbGYsIHBhZC5nZXQoKSwg cGFkVGVtcGxhdGUsIFdURk1vdmUodGFncykpOwogICAgIH0KIAogICAgIGF1dG8qIHByaXYgPSBz ZWxmLT5wcml2Owo=