208001 2020-02-20 04:34:40 -0800 [GStreamer] Fix race in TextCombinerGStreamer 2020-02-21 04:31:42 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=208041 P2 Normal --- 1 aboya aboya bugs-noreply calvaris cgarcia clopez commit-queue ews-watchlist gustavo menard pnormand vjaquez oldest_to_newest 1621161 0 aboya 2020-02-20 04:34:40 -0800 TextCombinerGStreamer uses the CAPS event to determine whether adding a webvttenc between the text track pad and the funnel element used to be able to display several subtitles at the same time. The way this was done previously had a race though: all text track pads were preemptively linked directly to the funnel, only adding the webvttenc element later in the middle when receiving the CAPS event. When two or more text tracks were present, it wasn't infrequent that one track had its CAPS event processed (causing the webvttenc element to be added) and propagated (fixating the funnel caps) before another track attempted caps negotiation. Because the pads were connected to the funnel preemptively, and because without the webvttenc element the caps of the text pad don't match the funnel's, this causes a caps mismatch error, stopping playback completely. The CAPS event is therefore never sent. To avoid this race, we must avoid linking elements until we get the CAPS events, when we actually know where we should link them to, therefore avoiding early caps negotiation errors. 1621162 1 391277 aboya 2020-02-20 04:35:39 -0800 Created attachment 391277 Patch 1621213 2 391277 calvaris 2020-02-20 07:43:00 -0800 Comment on attachment 391277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391277&action=review > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:69 > + GstPad* funnelPad; This seems to be never released. Please gst_object_unref during dispose. Actually I think it would be a wonderful idea to turn the Finalize into a Dispose (conceptually more correct, I think) and add the unref there. > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:146 > + /* Caps are plain text, we want a WebVTT encoder between the ghostpad and the funnel. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:148 > + /* Setup a WebVTT encoder. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:158 > + /* Switch the ghostpad to target the WebVTT encoder. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:165 > + /* Connect the WebVTT encoder to the funnel. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:173 > + /* Caps are not plain text, we assume it's WebVTT. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:175 > + /* Remove the WebVTT encoder if present. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:184 > + /* Link the pad to the funnel. */ // > Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp:188 > + } /* else: pipeline is already correct. */ // 1621303 3 391309 aboya 2020-02-20 10:58:44 -0800 Created attachment 391309 Patch for landing 1621384 4 commit-queue 2020-02-20 13:09:43 -0800 The commit-queue encountered the following flaky tests while processing attachment 391309: editing/spelling/spellcheck-input-search-crash.html bug 207995 (authors: arv@chromium.org, g.czajkowski@samsung.com, mark.lam@apple.com, and morrita@google.com) The commit-queue is continuing to process your patch. 1621387 5 commit-queue 2020-02-20 13:09:52 -0800 The commit-queue encountered the following flaky tests while processing attachment 391309: fetch/fetch-worker-crash.html bug 187257 (author: youennf@gmail.com) The commit-queue is continuing to process your patch. 1621420 6 391309 commit-queue 2020-02-20 14:31:23 -0800 Comment on attachment 391309 Patch for landing Clearing flags on attachment: 391309 Committed r257090: <https://trac.webkit.org/changeset/257090> 1621421 7 commit-queue 2020-02-20 14:31:25 -0800 All reviewed patches have been landed. Closing bug. 1621612 8 clopez 2020-02-21 04:19:14 -0800 (In reply to WebKit Commit Bot from comment #6) > Comment on attachment 391309 [details] > Patch for landing > > Clearing flags on attachment: 391309 > > Committed r257090: <https://trac.webkit.org/changeset/257090> This has broken the build on the GTK minimum dependencies bots: Debian 10: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20Debian%20Stable%20%28Build%29/builds/30091 Ubuntu 18.04: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20Ubuntu%20LTS%20%28Build%29/builds/29626 gst_clear_object and gst_clear_tag_list require GStreamer 1.16 Meanwhile both Debian 10 and Ubuntu 18.04 ship GStreamer 1.14 1621613 9 pnormand 2020-02-21 04:20:47 -0800 (In reply to Carlos Alberto Lopez Perez from comment #8) > (In reply to WebKit Commit Bot from comment #6) > > Comment on attachment 391309 [details] > > Patch for landing > > > > Clearing flags on attachment: 391309 > > > > Committed r257090: <https://trac.webkit.org/changeset/257090> > > This has broken the build on the GTK minimum dependencies bots: > > Debian 10: > https://build.webkit.org/builders/GTK%20Linux%2064- > bit%20Release%20Debian%20Stable%20%28Build%29/builds/30091 > Ubuntu 18.04: > https://build.webkit.org/builders/GTK%20Linux%2064- > bit%20Release%20Ubuntu%20LTS%20%28Build%29/builds/29626 > > gst_clear_object and gst_clear_tag_list require GStreamer 1.16 > > Meanwhile both Debian 10 and Ubuntu 18.04 ship GStreamer 1.14 See also https://bugs.webkit.org/show_bug.cgi?id=208041 391277 2020-02-20 04:35:39 -0800 2020-02-20 10:58:40 -0800 Patch bug-208001-20200220133537.patch text/plain 9901 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmYwNGQyODJhODQ1MTBi NmE3Nzg3NGY2ODllMDVkMjhmNDVhN2Q5My4uNThmMWNiNjM3M2JjNjk2NmQwZWJhMTNmNWVlZTI0 NzE2NTdmMGU4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIwLTAyLTIwICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBGaXggcmFjZSBpbiBUZXh0Q29tYmluZXJHU3RyZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAwMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHRDb21iaW5lckdTdHJlYW1lciB1c2VzIHRo ZSBDQVBTIGV2ZW50IHRvIGRldGVybWluZSB3aGV0aGVyIGFkZGluZworICAgICAgICBhIHdlYnZ0 dGVuYyBiZXR3ZWVuIHRoZSB0ZXh0IHRyYWNrIHBhZCBhbmQgdGhlIGZ1bm5lbCBlbGVtZW50IHVz ZWQgdG8KKyAgICAgICAgYmUgYWJsZSB0byBkaXNwbGF5IHNldmVyYWwgc3VidGl0bGVzIGF0IHRo ZSBzYW1lIHRpbWUuCisKKyAgICAgICAgVGhlIHdheSB0aGlzIHdhcyBkb25lIHByZXZpb3VzbHkg aGFkIGEgcmFjZSB0aG91Z2g6IGFsbCB0ZXh0IHRyYWNrCisgICAgICAgIHBhZHMgd2VyZSBwcmVl bXB0aXZlbHkgbGlua2VkIGRpcmVjdGx5IHRvIHRoZSBmdW5uZWwsIG9ubHkgYWRkaW5nIHRoZQor ICAgICAgICB3ZWJ2dHRlbmMgZWxlbWVudCBsYXRlciBpbiB0aGUgbWlkZGxlIHdoZW4gcmVjZWl2 aW5nIHRoZSBDQVBTIGV2ZW50LgorCisgICAgICAgIFdoZW4gdHdvIG9yIG1vcmUgdGV4dCB0cmFj a3Mgd2VyZSBwcmVzZW50LCBpdCB3YXNuJ3QgaW5mcmVxdWVudCB0aGF0CisgICAgICAgIG9uZSB0 cmFjayBoYWQgaXRzIENBUFMgZXZlbnQgcHJvY2Vzc2VkIChjYXVzaW5nIHRoZSB3ZWJ2dHRlbmMg ZWxlbWVudAorICAgICAgICB0byBiZSBhZGRlZCkgYW5kIHByb3BhZ2F0ZWQgKGZpeGF0aW5nIHRo ZSBmdW5uZWwgY2FwcykgYmVmb3JlIGFub3RoZXIKKyAgICAgICAgdHJhY2sgYXR0ZW1wdGVkIGNh cHMgbmVnb3RpYXRpb24uIEJlY2F1c2UgdGhlIHBhZHMgd2VyZSBjb25uZWN0ZWQgdG8KKyAgICAg ICAgdGhlIGZ1bm5lbCBwcmVlbXB0aXZlbHksIGFuZCBiZWNhdXNlIHdpdGhvdXQgdGhlIHdlYnZ0 dGVuYyBlbGVtZW50IHRoZQorICAgICAgICBjYXBzIG9mIHRoZSB0ZXh0IHBhZCBkb24ndCBtYXRj aCB0aGUgZnVubmVsJ3MsIHRoaXMgY2F1c2VzIGEgY2FwcworICAgICAgICBtaXNtYXRjaCBlcnJv ciwgc3RvcHBpbmcgcGxheWJhY2sgY29tcGxldGVseS4gVGhlIENBUFMgZXZlbnQgaXMKKyAgICAg ICAgdGhlcmVmb3JlIG5ldmVyIHNlbnQuCisKKyAgICAgICAgVG8gYXZvaWQgdGhpcyByYWNlLCB3 ZSBtdXN0IGF2b2lkIGxpbmtpbmcgZWxlbWVudHMgdW50aWwgd2UgZ2V0IHRoZQorICAgICAgICBD QVBTIGV2ZW50cywgd2hlbiB3ZSBhY3R1YWxseSBrbm93IHdoZXJlIHdlIHNob3VsZCBsaW5rIHRo ZW0gdG8sCisgICAgICAgIHRoZXJlZm9yZSBhdm9pZGluZyBlYXJseSBjYXBzIG5lZ290aWF0aW9u IGVycm9ycy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0Q29t YmluZXJHU3RyZWFtZXIuY3BwOgorICAgICAgICAod2Via2l0VGV4dENvbWJpbmVyUGFkRmluYWxp emUpOgorICAgICAgICAod2Via2l0VGV4dENvbWJpbmVyUGFkRXZlbnQpOgorICAgICAgICAod2Vi a2l0VGV4dENvbWJpbmVyUmVxdWVzdE5ld1BhZCk6CisgICAgICAgICh3ZWJraXRUZXh0Q29tYmlu ZXJSZWxlYXNlUGFkKToKKyAgICAgICAgKHdlYmtpdF90ZXh0X2NvbWJpbmVyX2NsYXNzX2luaXQp OgorCiAyMDIwLTAxLTE2ICBQaGlsaXBwZSBOb3JtYW5kICA8cGhpbG5AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1N0cmVhbWVyXVtXUEVdIENsaWVudC1zaWRlIHZpZGVvIHJlbmRlcmluZyBzdXBw b3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvVGV4dENvbWJpbmVyR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCmluZGV4IGRjMTk3OTJm OTlhMzEwMzhmZGQ3NjJkYzViZTE4ZjdlZGVmMTQyODkuLmEzNjQxZDc1NmMyZTAyODZlYjU1MGYx NGQ3NTgxMzYzNTEyNDgwMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIu Y3BwCkBAIC02Niw2ICs2Niw3IEBAIHN0cnVjdCBfV2ViS2l0VGV4dENvbWJpbmVyUGFkIHsKICAg ICBHc3RHaG9zdFBhZCBwYXJlbnQ7CiAKICAgICBHc3RUYWdMaXN0KiB0YWdzOworICAgIEdzdFBh ZCogZnVubmVsUGFkOwogfTsKIAogc3RydWN0IF9XZWJLaXRUZXh0Q29tYmluZXJQYWRDbGFzcyB7 CkBAIC03NCw2ICs3NSw4IEBAIHN0cnVjdCBfV2ViS2l0VGV4dENvbWJpbmVyUGFkQ2xhc3Mgewog CiBHX0RFRklORV9UWVBFKFdlYktpdFRleHRDb21iaW5lclBhZCwgd2Via2l0X3RleHRfY29tYmlu ZXJfcGFkLCBHU1RfVFlQRV9HSE9TVF9QQUQpOwogCitzdGF0aWMgR1R5cGUgd2ViVlRURW5jVHlw ZTsKKwogc3RhdGljIGdib29sZWFuIHdlYmtpdFRleHRDb21iaW5lclBhZEV2ZW50KEdzdFBhZCos IEdzdE9iamVjdCogcGFyZW50LCBHc3RFdmVudCopOwogCiBzdGF0aWMgdm9pZCB3ZWJraXRfdGV4 dF9jb21iaW5lcl9pbml0KFdlYktpdFRleHRDb21iaW5lciogY29tYmluZXIpCkBAIC05OSw5ICsx MDIsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfdGV4dF9jb21iaW5lcl9wYWRfaW5pdChXZWJLaXRU ZXh0Q29tYmluZXJQYWQqIHBhZCkKIAogc3RhdGljIHZvaWQgd2Via2l0VGV4dENvbWJpbmVyUGFk RmluYWxpemUoR09iamVjdCogb2JqZWN0KQogewotICAgIFdlYktpdFRleHRDb21iaW5lclBhZCog cGFkID0gV0VCS0lUX1RFWFRfQ09NQklORVJfUEFEKG9iamVjdCk7Ci0gICAgaWYgKHBhZC0+dGFn cykKLSAgICAgICAgZ3N0X3RhZ19saXN0X3VucmVmKHBhZC0+dGFncyk7CisgICAgV2ViS2l0VGV4 dENvbWJpbmVyUGFkKiBjb21iaW5lclBhZCA9IFdFQktJVF9URVhUX0NPTUJJTkVSX1BBRChvYmpl Y3QpOworICAgIGdzdF9jbGVhcl90YWdfbGlzdCgmY29tYmluZXJQYWQtPnRhZ3MpOworICAgIGdz dF9jbGVhcl9vYmplY3QoJmNvbWJpbmVyUGFkLT5mdW5uZWxQYWQpOwogICAgIEdfT0JKRUNUX0NM QVNTKHdlYmtpdF90ZXh0X2NvbWJpbmVyX3BhZF9wYXJlbnRfY2xhc3MpLT5maW5hbGl6ZShvYmpl Y3QpOwogfQogCkBAIC0xMzYsMTcgKzEzOSwxMyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0VGV4 dENvbWJpbmVyUGFkRXZlbnQoR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50LCBHc3RFdgog ICAgICAgICBBU1NFUlQoY2Fwcyk7CiAKICAgICAgICAgR1JlZlB0cjxHc3RQYWQ+IHRhcmdldCA9 IGFkb3B0R1JlZihnc3RfZ2hvc3RfcGFkX2dldF90YXJnZXQoR1NUX0dIT1NUX1BBRChwYWQpKSk7 Ci0gICAgICAgIEFTU0VSVCh0YXJnZXQpOwotCi0gICAgICAgIEdSZWZQdHI8R3N0RWxlbWVudD4g dGFyZ2V0UGFyZW50ID0gYWRvcHRHUmVmKGdzdF9wYWRfZ2V0X3BhcmVudF9lbGVtZW50KHRhcmdl dC5nZXQoKSkpOwotICAgICAgICBBU1NFUlQodGFyZ2V0UGFyZW50KTsKKyAgICAgICAgR1JlZlB0 cjxHc3RFbGVtZW50PiB0YXJnZXRQYXJlbnQgPSB0YXJnZXQgPyBhZG9wdEdSZWYoZ3N0X3BhZF9n ZXRfcGFyZW50X2VsZW1lbnQodGFyZ2V0LmdldCgpKSkgOiBudWxscHRyOwogCiAgICAgICAgIEdS ZWZQdHI8R3N0Q2Fwcz4gdGV4dENhcHMgPSBhZG9wdEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3Np bXBsZSgidGV4dC94LXJhdyIpKTsKICAgICAgICAgaWYgKGdzdF9jYXBzX2Nhbl9pbnRlcnNlY3Qo dGV4dENhcHMuZ2V0KCksIGNhcHMpKSB7Ci0gICAgICAgICAgICAvKiBDYXBzIGFyZSBwbGFpbiB0 ZXh0LCBwdXQgYSBXZWJWVFQgZW5jb2RlciBiZXR3ZWVuIHRoZSBnaG9zdHBhZCBhbmQKLSAgICAg ICAgICAgICAqIHRoZSBmdW5uZWwgKi8KLSAgICAgICAgICAgIGlmICh0YXJnZXRQYXJlbnQuZ2V0 KCkgPT0gY29tYmluZXItPmZ1bm5lbCkgewotICAgICAgICAgICAgICAgIC8qIFNldHVwIGEgV2Vi VlRUIGVuY29kZXIgKi8KKyAgICAgICAgICAgIC8qIENhcHMgYXJlIHBsYWluIHRleHQsIHdlIHdh bnQgYSBXZWJWVFQgZW5jb2RlciBiZXR3ZWVuIHRoZSBnaG9zdHBhZCBhbmQgdGhlIGZ1bm5lbC4g Ki8KKyAgICAgICAgICAgIGlmICghdGFyZ2V0IHx8IEdfVFlQRV9GUk9NX0lOU1RBTkNFKHRhcmdl dFBhcmVudC5nZXQoKSkgIT0gd2ViVlRURW5jVHlwZSkgeworICAgICAgICAgICAgICAgIC8qIFNl dHVwIGEgV2ViVlRUIGVuY29kZXIuICovCiAgICAgICAgICAgICAgICAgR3N0RWxlbWVudCogZW5j b2RlciA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgid2VidnR0ZW5jIiwgbnVsbHB0cik7CiAg ICAgICAgICAgICAgICAgQVNTRVJUKGVuY29kZXIpOwogCkBAIC0xNTYsMzggKzE1NSwzNyBAQCBz dGF0aWMgZ2Jvb2xlYW4gd2Via2l0VGV4dENvbWJpbmVyUGFkRXZlbnQoR3N0UGFkKiBwYWQsIEdz dE9iamVjdCogcGFyZW50LCBHc3RFdgogICAgICAgICAgICAgICAgIHJldCA9IGdzdF9lbGVtZW50 X3N5bmNfc3RhdGVfd2l0aF9wYXJlbnQoZW5jb2Rlcik7CiAgICAgICAgICAgICAgICAgQVNTRVJU KHJldCk7CiAKLSAgICAgICAgICAgICAgICAvKiBTd2l0Y2ggdGhlIGdob3N0cGFkIHRvIHRhcmdl dCB0aGUgV2ViVlRUIGVuY29kZXIgKi8KKyAgICAgICAgICAgICAgICAvKiBTd2l0Y2ggdGhlIGdo b3N0cGFkIHRvIHRhcmdldCB0aGUgV2ViVlRUIGVuY29kZXIuICovCiAgICAgICAgICAgICAgICAg R1JlZlB0cjxHc3RQYWQ+IHNpbmtQYWQgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZ2V0X3N0YXRp Y19wYWQoZW5jb2RlciwgInNpbmsiKSk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHNpbmtQYWQp OwogCiAgICAgICAgICAgICAgICAgcmV0ID0gZ3N0X2dob3N0X3BhZF9zZXRfdGFyZ2V0KEdTVF9H SE9TVF9QQUQocGFkKSwgc2lua1BhZC5nZXQoKSk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJl dCk7CiAKLSAgICAgICAgICAgICAgICAvKiBDb25uZWN0IHRoZSBXZWJWVFQgZW5jb2RlciB0byB0 aGUgZnVubmVsICovCisgICAgICAgICAgICAgICAgLyogQ29ubmVjdCB0aGUgV2ViVlRUIGVuY29k ZXIgdG8gdGhlIGZ1bm5lbC4gKi8KICAgICAgICAgICAgICAgICBHUmVmUHRyPEdzdFBhZD4gc3Jj UGFkID0gYWRvcHRHUmVmKGdzdF9lbGVtZW50X2dldF9zdGF0aWNfcGFkKGVuY29kZXIsICJzcmMi KSk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHNyY1BhZCk7CiAKLSAgICAgICAgICAgICAgICBy ZXQgPSBHU1RfUEFEX0xJTktfU1VDQ0VTU0ZVTChnc3RfcGFkX2xpbmsoc3JjUGFkLmdldCgpLCB0 YXJnZXQuZ2V0KCkpKTsKKyAgICAgICAgICAgICAgICByZXQgPSBHU1RfUEFEX0xJTktfU1VDQ0VT U0ZVTChnc3RfcGFkX2xpbmsoc3JjUGFkLmdldCgpLCBjb21iaW5lclBhZC0+ZnVubmVsUGFkKSk7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJldCk7CiAgICAgICAgICAgICB9IC8qIGVsc2U6IHBp cGVsaW5lIGlzIGFscmVhZHkgY29ycmVjdCAqLwogICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgLyogQ2FwcyBhcmUgbm90IHBsYWluIHRleHQsIHJlbW92ZSB0aGUgV2ViVlRUIGVuY29kZXIg Ki8KLSAgICAgICAgICAgIGlmICh0YXJnZXRQYXJlbnQuZ2V0KCkgIT0gY29tYmluZXItPmZ1bm5l bCkgewotICAgICAgICAgICAgICAgIC8qIEdldCB0aGUgZnVubmVsIHNpbmsgcGFkICovCi0gICAg ICAgICAgICAgICAgR1JlZlB0cjxHc3RQYWQ+IHNyY1BhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVu dF9nZXRfc3RhdGljX3BhZCh0YXJnZXRQYXJlbnQuZ2V0KCksICJzcmMiKSk7Ci0gICAgICAgICAg ICAgICAgQVNTRVJUKHNyY1BhZCk7CisgICAgICAgICAgICAvKiBDYXBzIGFyZSBub3QgcGxhaW4g dGV4dCwgd2UgYXNzdW1lIGl0J3MgV2ViVlRULiAqLwogCi0gICAgICAgICAgICAgICAgR1JlZlB0 cjxHc3RQYWQ+IHNpbmtQYWQgPSBhZG9wdEdSZWYoZ3N0X3BhZF9nZXRfcGVlcihzcmNQYWQuZ2V0 KCkpKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQoc2lua1BhZCk7Ci0KLSAgICAgICAgICAgICAg ICAvKiBTd2l0Y2ggdGhlIGdob3N0cGFkIHRvIHRhcmdldCB0aGUgZnVubmVsICovCi0gICAgICAg ICAgICAgICAgcmV0ID0gZ3N0X2dob3N0X3BhZF9zZXRfdGFyZ2V0KEdTVF9HSE9TVF9QQUQocGFk KSwgc2lua1BhZC5nZXQoKSk7CisgICAgICAgICAgICAvKiBSZW1vdmUgdGhlIFdlYlZUVCBlbmNv ZGVyIGlmIHByZXNlbnQuICovCisgICAgICAgICAgICBpZiAodGFyZ2V0ICYmIEdfVFlQRV9GUk9N X0lOU1RBTkNFKHRhcmdldFBhcmVudC5nZXQoKSkgPT0gd2ViVlRURW5jVHlwZSkgeworICAgICAg ICAgICAgICAgIHJldCA9IGdzdF9iaW5fcmVtb3ZlKEdTVF9CSU4oY29tYmluZXIpLCB0YXJnZXRQ YXJlbnQuZ2V0KCkpOwogICAgICAgICAgICAgICAgIEFTU0VSVChyZXQpOwogCi0gICAgICAgICAg ICAgICAgLyogUmVtb3ZlIHRoZSBXZWJWVFQgZW5jb2RlciAqLwotICAgICAgICAgICAgICAgIHJl dCA9IGdzdF9iaW5fcmVtb3ZlKEdTVF9CSU4oY29tYmluZXIpLCB0YXJnZXRQYXJlbnQuZ2V0KCkp OworICAgICAgICAgICAgICAgIHRhcmdldCA9IG51bGxwdHI7CisgICAgICAgICAgICAgICAgdGFy Z2V0UGFyZW50ID0gbnVsbHB0cjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLyogTGlu ayB0aGUgcGFkIHRvIHRoZSBmdW5uZWwuICovCisgICAgICAgICAgICBpZiAoIXRhcmdldCkgewor ICAgICAgICAgICAgICAgIHJldCA9IGdzdF9naG9zdF9wYWRfc2V0X3RhcmdldChHU1RfR0hPU1Rf UEFEKHBhZCksIGNvbWJpbmVyUGFkLT5mdW5uZWxQYWQpOwogICAgICAgICAgICAgICAgIEFTU0VS VChyZXQpOwotICAgICAgICAgICAgfSAvKiBlbHNlOiBwaXBlbGluZSBpcyBhbHJlYWR5IGNvcnJl Y3QgKi8KKyAgICAgICAgICAgIH0gLyogZWxzZTogcGlwZWxpbmUgaXMgYWxyZWFkeSBjb3JyZWN0 LiAqLwogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTIyMiwxNyArMjIwLDE1 IEBAIHN0YXRpYyBHc3RQYWQqIHdlYmtpdFRleHRDb21iaW5lclJlcXVlc3ROZXdQYWQoR3N0RWxl bWVudCAqIGVsZW1lbnQsCiAgICAgV2ViS2l0VGV4dENvbWJpbmVyKiBjb21iaW5lciA9IFdFQktJ VF9URVhUX0NPTUJJTkVSKGVsZW1lbnQpOwogICAgIEFTU0VSVChjb21iaW5lcik7CiAKLSAgICBH c3RQYWQqIHBhZCA9IGdzdF9lbGVtZW50X3JlcXVlc3RfcGFkKGNvbWJpbmVyLT5mdW5uZWwsIHRl bXBsLCBuYW1lLCBjYXBzKTsKLSAgICBBU1NFUlQocGFkKTsKLQotICAgIEdzdFBhZCogZ2hvc3RQ YWQgPSBHU1RfUEFEKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9URVhUX0NPTUJJTkVSX1BBRCwg ImRpcmVjdGlvbiIsIGdzdF9wYWRfZ2V0X2RpcmVjdGlvbihwYWQpLCBudWxscHRyKSk7CisgICAg R3N0UGFkKiBnaG9zdFBhZCA9IEdTVF9QQUQoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1RFWFRf Q09NQklORVJfUEFELCAiZGlyZWN0aW9uIiwgR1NUX1BBRF9TSU5LLCBudWxscHRyKSk7CiAgICAg QVNTRVJUKGdob3N0UGFkKTsKIAogICAgIHJldCA9IGdzdF9naG9zdF9wYWRfY29uc3RydWN0KEdT VF9HSE9TVF9QQUQoZ2hvc3RQYWQpKTsKICAgICBBU1NFUlQocmV0KTsKIAotICAgIHJldCA9IGdz dF9naG9zdF9wYWRfc2V0X3RhcmdldChHU1RfR0hPU1RfUEFEKGdob3N0UGFkKSwgcGFkKTsKLSAg ICBBU1NFUlQocmV0KTsKKyAgICBXZWJLaXRUZXh0Q29tYmluZXJQYWQqIGNvbWJpbmVyUGFkID0g V0VCS0lUX1RFWFRfQ09NQklORVJfUEFEKGdob3N0UGFkKTsKKyAgICBjb21iaW5lclBhZC0+ZnVu bmVsUGFkID0gZ3N0X2VsZW1lbnRfcmVxdWVzdF9wYWQoY29tYmluZXItPmZ1bm5lbCwgdGVtcGws IG5hbWUsIGNhcHMpOworICAgIEFTU0VSVChjb21iaW5lclBhZC0+ZnVubmVsUGFkKTsKIAogICAg IHJldCA9IGdzdF9wYWRfc2V0X2FjdGl2ZShnaG9zdFBhZCwgdHJ1ZSk7CiAgICAgQVNTRVJUKHJl dCk7CkBAIC0yNDUsMTQgKzI0MSwxNiBAQCBzdGF0aWMgR3N0UGFkKiB3ZWJraXRUZXh0Q29tYmlu ZXJSZXF1ZXN0TmV3UGFkKEdzdEVsZW1lbnQgKiBlbGVtZW50LAogc3RhdGljIHZvaWQgd2Via2l0 VGV4dENvbWJpbmVyUmVsZWFzZVBhZChHc3RFbGVtZW50ICplbGVtZW50LCBHc3RQYWQgKnBhZCkK IHsKICAgICBXZWJLaXRUZXh0Q29tYmluZXIqIGNvbWJpbmVyID0gV0VCS0lUX1RFWFRfQ09NQklO RVIoZWxlbWVudCk7CisgICAgV2ViS2l0VGV4dENvbWJpbmVyUGFkKiBjb21iaW5lclBhZCA9IFdF QktJVF9URVhUX0NPTUJJTkVSX1BBRChwYWQpOworCiAgICAgaWYgKEdSZWZQdHI8R3N0UGFkPiBw ZWVyID0gYWRvcHRHUmVmKGdzdF9wYWRfZ2V0X3BlZXIocGFkKSkpIHsKICAgICAgICAgR1JlZlB0 cjxHc3RFbGVtZW50PiBwYXJlbnQgPSBhZG9wdEdSZWYoZ3N0X3BhZF9nZXRfcGFyZW50X2VsZW1l bnQocGVlci5nZXQoKSkpOwogICAgICAgICBBU1NFUlQocGFyZW50KTsKLSAgICAgICAgZ3N0X2Vs ZW1lbnRfcmVsZWFzZV9yZXF1ZXN0X3BhZChwYXJlbnQuZ2V0KCksIHBlZXIuZ2V0KCkpOwotICAg ICAgICBpZiAocGFyZW50LmdldCgpICE9IGNvbWJpbmVyLT5mdW5uZWwpCisgICAgICAgIGlmIChH X1RZUEVfRlJPTV9JTlNUQU5DRShwYXJlbnQuZ2V0KCkpID09IHdlYlZUVEVuY1R5cGUpCiAgICAg ICAgICAgICBnc3RfYmluX3JlbW92ZShHU1RfQklOKGNvbWJpbmVyKSwgcGFyZW50LmdldCgpKTsK ICAgICB9CiAKKyAgICBnc3RfZWxlbWVudF9yZWxlYXNlX3JlcXVlc3RfcGFkKGNvbWJpbmVyLT5m dW5uZWwsIGNvbWJpbmVyUGFkLT5mdW5uZWxQYWQpOwogICAgIGdzdF9lbGVtZW50X3JlbW92ZV9w YWQoZWxlbWVudCwgcGFkKTsKIH0KIApAQCAtMjcxLDYgKzI2OSwxMSBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRfdGV4dF9jb21iaW5lcl9jbGFzc19pbml0KFdlYktpdFRleHRDb21iaW5lckNsYXNzKiBr bGFzcykKICAgICAgICAgR1NUX0RFQlVHX0ZVTkNQVFIod2Via2l0VGV4dENvbWJpbmVyUmVxdWVz dE5ld1BhZCk7CiAgICAgZWxlbWVudENsYXNzLT5yZWxlYXNlX3BhZCA9CiAgICAgICAgIEdTVF9E RUJVR19GVU5DUFRSKHdlYmtpdFRleHRDb21iaW5lclJlbGVhc2VQYWQpOworCisgICAgR1JlZlB0 cjxHc3RFbGVtZW50RmFjdG9yeT4gd2ViVlRURW5jRmFjdG9yeSA9IGFkb3B0R1JlZihnc3RfZWxl bWVudF9mYWN0b3J5X2ZpbmQoIndlYnZ0dGVuYyIpKTsKKyAgICBnc3Rfb2JqZWN0X3VucmVmKGdz dF9wbHVnaW5fZmVhdHVyZV9sb2FkKEdTVF9QTFVHSU5fRkVBVFVSRSh3ZWJWVFRFbmNGYWN0b3J5 LmdldCgpKSkpOworICAgIHdlYlZUVEVuY1R5cGUgPSBnc3RfZWxlbWVudF9mYWN0b3J5X2dldF9l bGVtZW50X3R5cGUod2ViVlRURW5jRmFjdG9yeS5nZXQoKSk7CisgICAgQVNTRVJUKHdlYlZUVEVu Y1R5cGUpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRfdGV4dF9jb21iaW5lcl9wYWRfY2xhc3Nf aW5pdChXZWJLaXRUZXh0Q29tYmluZXJQYWRDbGFzcyoga2xhc3MpCg== 391309 2020-02-20 10:58:44 -0800 2020-02-20 14:31:23 -0800 Patch for landing bug-208001-20200220195843.patch text/plain 10696 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmYwNGQyODJhODQ1MTBi NmE3Nzg3NGY2ODllMDVkMjhmNDVhN2Q5My4uMzAzYjQyOWFlNWMxM2MzYjE3NDFkNzViNzk5MGI5 MDg2ZTcyNDcwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTAyLTIwICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBGaXggcmFjZSBpbiBUZXh0Q29tYmluZXJHU3RyZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODAwMQorCisgICAgICAgIFJldmlld2VkIGJ5 IFhhYmllciBSb2RyaWd1ZXotQ2FsdmFyLgorCisgICAgICAgIFRleHRDb21iaW5lckdTdHJlYW1l ciB1c2VzIHRoZSBDQVBTIGV2ZW50IHRvIGRldGVybWluZSB3aGV0aGVyIGFkZGluZworICAgICAg ICBhIHdlYnZ0dGVuYyBiZXR3ZWVuIHRoZSB0ZXh0IHRyYWNrIHBhZCBhbmQgdGhlIGZ1bm5lbCBl bGVtZW50IHVzZWQgdG8KKyAgICAgICAgYmUgYWJsZSB0byBkaXNwbGF5IHNldmVyYWwgc3VidGl0 bGVzIGF0IHRoZSBzYW1lIHRpbWUuCisKKyAgICAgICAgVGhlIHdheSB0aGlzIHdhcyBkb25lIHBy ZXZpb3VzbHkgaGFkIGEgcmFjZSB0aG91Z2g6IGFsbCB0ZXh0IHRyYWNrCisgICAgICAgIHBhZHMg d2VyZSBwcmVlbXB0aXZlbHkgbGlua2VkIGRpcmVjdGx5IHRvIHRoZSBmdW5uZWwsIG9ubHkgYWRk aW5nIHRoZQorICAgICAgICB3ZWJ2dHRlbmMgZWxlbWVudCBsYXRlciBpbiB0aGUgbWlkZGxlIHdo ZW4gcmVjZWl2aW5nIHRoZSBDQVBTIGV2ZW50LgorCisgICAgICAgIFdoZW4gdHdvIG9yIG1vcmUg dGV4dCB0cmFja3Mgd2VyZSBwcmVzZW50LCBpdCB3YXNuJ3QgaW5mcmVxdWVudCB0aGF0CisgICAg ICAgIG9uZSB0cmFjayBoYWQgaXRzIENBUFMgZXZlbnQgcHJvY2Vzc2VkIChjYXVzaW5nIHRoZSB3 ZWJ2dHRlbmMgZWxlbWVudAorICAgICAgICB0byBiZSBhZGRlZCkgYW5kIHByb3BhZ2F0ZWQgKGZp eGF0aW5nIHRoZSBmdW5uZWwgY2FwcykgYmVmb3JlIGFub3RoZXIKKyAgICAgICAgdHJhY2sgYXR0 ZW1wdGVkIGNhcHMgbmVnb3RpYXRpb24uIEJlY2F1c2UgdGhlIHBhZHMgd2VyZSBjb25uZWN0ZWQg dG8KKyAgICAgICAgdGhlIGZ1bm5lbCBwcmVlbXB0aXZlbHksIGFuZCBiZWNhdXNlIHdpdGhvdXQg dGhlIHdlYnZ0dGVuYyBlbGVtZW50IHRoZQorICAgICAgICBjYXBzIG9mIHRoZSB0ZXh0IHBhZCBk b24ndCBtYXRjaCB0aGUgZnVubmVsJ3MsIHRoaXMgY2F1c2VzIGEgY2FwcworICAgICAgICBtaXNt YXRjaCBlcnJvciwgc3RvcHBpbmcgcGxheWJhY2sgY29tcGxldGVseS4gVGhlIENBUFMgZXZlbnQg aXMKKyAgICAgICAgdGhlcmVmb3JlIG5ldmVyIHNlbnQuCisKKyAgICAgICAgVG8gYXZvaWQgdGhp cyByYWNlLCB3ZSBtdXN0IGF2b2lkIGxpbmtpbmcgZWxlbWVudHMgdW50aWwgd2UgZ2V0IHRoZQor ICAgICAgICBDQVBTIGV2ZW50cywgd2hlbiB3ZSBhY3R1YWxseSBrbm93IHdoZXJlIHdlIHNob3Vs ZCBsaW5rIHRoZW0gdG8sCisgICAgICAgIHRoZXJlZm9yZSBhdm9pZGluZyBlYXJseSBjYXBzIG5l Z290aWF0aW9uIGVycm9ycy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwOgorICAgICAgICAod2Via2l0VGV4dENvbWJpbmVy UGFkRGlzcG9zZSk6CisgICAgICAgICh3ZWJraXRUZXh0Q29tYmluZXJQYWRFdmVudCk6CisgICAg ICAgICh3ZWJraXRUZXh0Q29tYmluZXJSZXF1ZXN0TmV3UGFkKToKKyAgICAgICAgKHdlYmtpdFRl eHRDb21iaW5lclJlbGVhc2VQYWQpOgorICAgICAgICAod2Via2l0X3RleHRfY29tYmluZXJfY2xh c3NfaW5pdCk6CisgICAgICAgICh3ZWJraXRUZXh0Q29tYmluZXJQYWRGaW5hbGl6ZSk6IERlbGV0 ZWQuCisKIDIwMjAtMDEtMTYgIFBoaWxpcHBlIE5vcm1hbmQgIDxwaGlsbkBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHU3RyZWFtZXJdW1dQRV0gQ2xpZW50LXNpZGUgdmlkZW8gcmVuZGVyaW5nIHN1 cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9UZXh0Q29tYmluZXJHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1RleHRDb21iaW5lckdTdHJlYW1lci5jcHAKaW5kZXggZGMxOTc5 MmY5OWEzMTAzOGZkZDc2MmRjNWJlMThmN2VkZWYxNDI4OS4uYzhiYTUyODliMjMzOGU3ZjUwZDM3 YTBlODBiNWUwZWVhMWM2ZjE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1RleHRDb21iaW5lckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1RleHRDb21iaW5lckdTdHJlYW1l ci5jcHAKQEAgLTY2LDYgKzY2LDcgQEAgc3RydWN0IF9XZWJLaXRUZXh0Q29tYmluZXJQYWQgewog ICAgIEdzdEdob3N0UGFkIHBhcmVudDsKIAogICAgIEdzdFRhZ0xpc3QqIHRhZ3M7CisgICAgR3N0 UGFkKiBmdW5uZWxQYWQ7CiB9OwogCiBzdHJ1Y3QgX1dlYktpdFRleHRDb21iaW5lclBhZENsYXNz IHsKQEAgLTc0LDYgKzc1LDggQEAgc3RydWN0IF9XZWJLaXRUZXh0Q29tYmluZXJQYWRDbGFzcyB7 CiAKIEdfREVGSU5FX1RZUEUoV2ViS2l0VGV4dENvbWJpbmVyUGFkLCB3ZWJraXRfdGV4dF9jb21i aW5lcl9wYWQsIEdTVF9UWVBFX0dIT1NUX1BBRCk7CiAKK3N0YXRpYyBHVHlwZSB3ZWJWVFRFbmNU eXBlOworCiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0VGV4dENvbWJpbmVyUGFkRXZlbnQoR3N0UGFk KiwgR3N0T2JqZWN0KiBwYXJlbnQsIEdzdEV2ZW50Kik7CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF90 ZXh0X2NvbWJpbmVyX2luaXQoV2ViS2l0VGV4dENvbWJpbmVyKiBjb21iaW5lcikKQEAgLTk3LDEy ICsxMDAsMTIgQEAgc3RhdGljIHZvaWQgd2Via2l0X3RleHRfY29tYmluZXJfcGFkX2luaXQoV2Vi S2l0VGV4dENvbWJpbmVyUGFkKiBwYWQpCiAgICAgZ3N0X3BhZF9zZXRfZXZlbnRfZnVuY3Rpb24o R1NUX1BBRChwYWQpLCB3ZWJraXRUZXh0Q29tYmluZXJQYWRFdmVudCk7CiB9CiAKLXN0YXRpYyB2 b2lkIHdlYmtpdFRleHRDb21iaW5lclBhZEZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKK3N0YXRp YyB2b2lkIHdlYmtpdFRleHRDb21iaW5lclBhZERpc3Bvc2UoR09iamVjdCogb2JqZWN0KQogewot ICAgIFdlYktpdFRleHRDb21iaW5lclBhZCogcGFkID0gV0VCS0lUX1RFWFRfQ09NQklORVJfUEFE KG9iamVjdCk7Ci0gICAgaWYgKHBhZC0+dGFncykKLSAgICAgICAgZ3N0X3RhZ19saXN0X3VucmVm KHBhZC0+dGFncyk7Ci0gICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3RleHRfY29tYmluZXJfcGFk X3BhcmVudF9jbGFzcyktPmZpbmFsaXplKG9iamVjdCk7CisgICAgV2ViS2l0VGV4dENvbWJpbmVy UGFkKiBjb21iaW5lclBhZCA9IFdFQktJVF9URVhUX0NPTUJJTkVSX1BBRChvYmplY3QpOworICAg IGdzdF9jbGVhcl90YWdfbGlzdCgmY29tYmluZXJQYWQtPnRhZ3MpOworICAgIGdzdF9jbGVhcl9v YmplY3QoJmNvbWJpbmVyUGFkLT5mdW5uZWxQYWQpOworICAgIEdfT0JKRUNUX0NMQVNTKHdlYmtp dF90ZXh0X2NvbWJpbmVyX3BhZF9wYXJlbnRfY2xhc3MpLT5kaXNwb3NlKG9iamVjdCk7CiB9CiAK IHN0YXRpYyB2b2lkIHdlYmtpdFRleHRDb21iaW5lclBhZEdldFByb3BlcnR5KEdPYmplY3QqIG9i amVjdCwgZ3VpbnQgcHJvcGVydHlJZCwgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcHNwZWMp CkBAIC0xMzYsMTcgKzEzOSwxMyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0VGV4dENvbWJpbmVy UGFkRXZlbnQoR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50LCBHc3RFdgogICAgICAgICBB U1NFUlQoY2Fwcyk7CiAKICAgICAgICAgR1JlZlB0cjxHc3RQYWQ+IHRhcmdldCA9IGFkb3B0R1Jl Zihnc3RfZ2hvc3RfcGFkX2dldF90YXJnZXQoR1NUX0dIT1NUX1BBRChwYWQpKSk7Ci0gICAgICAg IEFTU0VSVCh0YXJnZXQpOwotCi0gICAgICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gdGFyZ2V0UGFy ZW50ID0gYWRvcHRHUmVmKGdzdF9wYWRfZ2V0X3BhcmVudF9lbGVtZW50KHRhcmdldC5nZXQoKSkp OwotICAgICAgICBBU1NFUlQodGFyZ2V0UGFyZW50KTsKKyAgICAgICAgR1JlZlB0cjxHc3RFbGVt ZW50PiB0YXJnZXRQYXJlbnQgPSB0YXJnZXQgPyBhZG9wdEdSZWYoZ3N0X3BhZF9nZXRfcGFyZW50 X2VsZW1lbnQodGFyZ2V0LmdldCgpKSkgOiBudWxscHRyOwogCiAgICAgICAgIEdSZWZQdHI8R3N0 Q2Fwcz4gdGV4dENhcHMgPSBhZG9wdEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3NpbXBsZSgidGV4 dC94LXJhdyIpKTsKICAgICAgICAgaWYgKGdzdF9jYXBzX2Nhbl9pbnRlcnNlY3QodGV4dENhcHMu Z2V0KCksIGNhcHMpKSB7Ci0gICAgICAgICAgICAvKiBDYXBzIGFyZSBwbGFpbiB0ZXh0LCBwdXQg YSBXZWJWVFQgZW5jb2RlciBiZXR3ZWVuIHRoZSBnaG9zdHBhZCBhbmQKLSAgICAgICAgICAgICAq IHRoZSBmdW5uZWwgKi8KLSAgICAgICAgICAgIGlmICh0YXJnZXRQYXJlbnQuZ2V0KCkgPT0gY29t YmluZXItPmZ1bm5lbCkgewotICAgICAgICAgICAgICAgIC8qIFNldHVwIGEgV2ViVlRUIGVuY29k ZXIgKi8KKyAgICAgICAgICAgIC8vIENhcHMgYXJlIHBsYWluIHRleHQsIHdlIHdhbnQgYSBXZWJW VFQgZW5jb2RlciBiZXR3ZWVuIHRoZSBnaG9zdHBhZCBhbmQgdGhlIGZ1bm5lbC4KKyAgICAgICAg ICAgIGlmICghdGFyZ2V0IHx8IEdfVFlQRV9GUk9NX0lOU1RBTkNFKHRhcmdldFBhcmVudC5nZXQo KSkgIT0gd2ViVlRURW5jVHlwZSkgeworICAgICAgICAgICAgICAgIC8vIFNldHVwIGEgV2ViVlRU IGVuY29kZXIuCiAgICAgICAgICAgICAgICAgR3N0RWxlbWVudCogZW5jb2RlciA9IGdzdF9lbGVt ZW50X2ZhY3RvcnlfbWFrZSgid2VidnR0ZW5jIiwgbnVsbHB0cik7CiAgICAgICAgICAgICAgICAg QVNTRVJUKGVuY29kZXIpOwogCkBAIC0xNTYsMzggKzE1NSwzNyBAQCBzdGF0aWMgZ2Jvb2xlYW4g d2Via2l0VGV4dENvbWJpbmVyUGFkRXZlbnQoR3N0UGFkKiBwYWQsIEdzdE9iamVjdCogcGFyZW50 LCBHc3RFdgogICAgICAgICAgICAgICAgIHJldCA9IGdzdF9lbGVtZW50X3N5bmNfc3RhdGVfd2l0 aF9wYXJlbnQoZW5jb2Rlcik7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJldCk7CiAKLSAgICAg ICAgICAgICAgICAvKiBTd2l0Y2ggdGhlIGdob3N0cGFkIHRvIHRhcmdldCB0aGUgV2ViVlRUIGVu Y29kZXIgKi8KKyAgICAgICAgICAgICAgICAvLyBTd2l0Y2ggdGhlIGdob3N0cGFkIHRvIHRhcmdl dCB0aGUgV2ViVlRUIGVuY29kZXIuCiAgICAgICAgICAgICAgICAgR1JlZlB0cjxHc3RQYWQ+IHNp bmtQYWQgPSBhZG9wdEdSZWYoZ3N0X2VsZW1lbnRfZ2V0X3N0YXRpY19wYWQoZW5jb2RlciwgInNp bmsiKSk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHNpbmtQYWQpOwogCiAgICAgICAgICAgICAg ICAgcmV0ID0gZ3N0X2dob3N0X3BhZF9zZXRfdGFyZ2V0KEdTVF9HSE9TVF9QQUQocGFkKSwgc2lu a1BhZC5nZXQoKSk7CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJldCk7CiAKLSAgICAgICAgICAg ICAgICAvKiBDb25uZWN0IHRoZSBXZWJWVFQgZW5jb2RlciB0byB0aGUgZnVubmVsICovCisgICAg ICAgICAgICAgICAgLy8gQ29ubmVjdCB0aGUgV2ViVlRUIGVuY29kZXIgdG8gdGhlIGZ1bm5lbC4K ICAgICAgICAgICAgICAgICBHUmVmUHRyPEdzdFBhZD4gc3JjUGFkID0gYWRvcHRHUmVmKGdzdF9l bGVtZW50X2dldF9zdGF0aWNfcGFkKGVuY29kZXIsICJzcmMiKSk7CiAgICAgICAgICAgICAgICAg QVNTRVJUKHNyY1BhZCk7CiAKLSAgICAgICAgICAgICAgICByZXQgPSBHU1RfUEFEX0xJTktfU1VD Q0VTU0ZVTChnc3RfcGFkX2xpbmsoc3JjUGFkLmdldCgpLCB0YXJnZXQuZ2V0KCkpKTsKKyAgICAg ICAgICAgICAgICByZXQgPSBHU1RfUEFEX0xJTktfU1VDQ0VTU0ZVTChnc3RfcGFkX2xpbmsoc3Jj UGFkLmdldCgpLCBjb21iaW5lclBhZC0+ZnVubmVsUGFkKSk7CiAgICAgICAgICAgICAgICAgQVNT RVJUKHJldCk7Ci0gICAgICAgICAgICB9IC8qIGVsc2U6IHBpcGVsaW5lIGlzIGFscmVhZHkgY29y cmVjdCAqLworICAgICAgICAgICAgfSAvLyBFbHNlOiBwaXBlbGluZSBpcyBhbHJlYWR5IGNvcnJl Y3QuCiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAvKiBDYXBzIGFyZSBub3QgcGxhaW4g dGV4dCwgcmVtb3ZlIHRoZSBXZWJWVFQgZW5jb2RlciAqLwotICAgICAgICAgICAgaWYgKHRhcmdl dFBhcmVudC5nZXQoKSAhPSBjb21iaW5lci0+ZnVubmVsKSB7Ci0gICAgICAgICAgICAgICAgLyog R2V0IHRoZSBmdW5uZWwgc2luayBwYWQgKi8KLSAgICAgICAgICAgICAgICBHUmVmUHRyPEdzdFBh ZD4gc3JjUGFkID0gYWRvcHRHUmVmKGdzdF9lbGVtZW50X2dldF9zdGF0aWNfcGFkKHRhcmdldFBh cmVudC5nZXQoKSwgInNyYyIpKTsKLSAgICAgICAgICAgICAgICBBU1NFUlQoc3JjUGFkKTsKKyAg ICAgICAgICAgIC8vIENhcHMgYXJlIG5vdCBwbGFpbiB0ZXh0LCB3ZSBhc3N1bWUgaXQncyBXZWJW VFQuCiAKLSAgICAgICAgICAgICAgICBHUmVmUHRyPEdzdFBhZD4gc2lua1BhZCA9IGFkb3B0R1Jl Zihnc3RfcGFkX2dldF9wZWVyKHNyY1BhZC5nZXQoKSkpOwotICAgICAgICAgICAgICAgIEFTU0VS VChzaW5rUGFkKTsKLQotICAgICAgICAgICAgICAgIC8qIFN3aXRjaCB0aGUgZ2hvc3RwYWQgdG8g dGFyZ2V0IHRoZSBmdW5uZWwgKi8KLSAgICAgICAgICAgICAgICByZXQgPSBnc3RfZ2hvc3RfcGFk X3NldF90YXJnZXQoR1NUX0dIT1NUX1BBRChwYWQpLCBzaW5rUGFkLmdldCgpKTsKKyAgICAgICAg ICAgIC8vIFJlbW92ZSB0aGUgV2ViVlRUIGVuY29kZXIgaWYgcHJlc2VudC4KKyAgICAgICAgICAg IGlmICh0YXJnZXQgJiYgR19UWVBFX0ZST01fSU5TVEFOQ0UodGFyZ2V0UGFyZW50LmdldCgpKSA9 PSB3ZWJWVFRFbmNUeXBlKSB7CisgICAgICAgICAgICAgICAgcmV0ID0gZ3N0X2Jpbl9yZW1vdmUo R1NUX0JJTihjb21iaW5lciksIHRhcmdldFBhcmVudC5nZXQoKSk7CiAgICAgICAgICAgICAgICAg QVNTRVJUKHJldCk7CiAKLSAgICAgICAgICAgICAgICAvKiBSZW1vdmUgdGhlIFdlYlZUVCBlbmNv ZGVyICovCi0gICAgICAgICAgICAgICAgcmV0ID0gZ3N0X2Jpbl9yZW1vdmUoR1NUX0JJTihjb21i aW5lciksIHRhcmdldFBhcmVudC5nZXQoKSk7CisgICAgICAgICAgICAgICAgdGFyZ2V0ID0gbnVs bHB0cjsKKyAgICAgICAgICAgICAgICB0YXJnZXRQYXJlbnQgPSBudWxscHRyOworICAgICAgICAg ICAgfQorCisgICAgICAgICAgICAvLyBMaW5rIHRoZSBwYWQgdG8gdGhlIGZ1bm5lbC4KKyAgICAg ICAgICAgIGlmICghdGFyZ2V0KSB7CisgICAgICAgICAgICAgICAgcmV0ID0gZ3N0X2dob3N0X3Bh ZF9zZXRfdGFyZ2V0KEdTVF9HSE9TVF9QQUQocGFkKSwgY29tYmluZXJQYWQtPmZ1bm5lbFBhZCk7 CiAgICAgICAgICAgICAgICAgQVNTRVJUKHJldCk7Ci0gICAgICAgICAgICB9IC8qIGVsc2U6IHBp cGVsaW5lIGlzIGFscmVhZHkgY29ycmVjdCAqLworICAgICAgICAgICAgfSAvLyBFbHNlOiBwaXBl bGluZSBpcyBhbHJlYWR5IGNvcnJlY3QuCiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAg fQpAQCAtMjIyLDE3ICsyMjAsMTUgQEAgc3RhdGljIEdzdFBhZCogd2Via2l0VGV4dENvbWJpbmVy UmVxdWVzdE5ld1BhZChHc3RFbGVtZW50ICogZWxlbWVudCwKICAgICBXZWJLaXRUZXh0Q29tYmlu ZXIqIGNvbWJpbmVyID0gV0VCS0lUX1RFWFRfQ09NQklORVIoZWxlbWVudCk7CiAgICAgQVNTRVJU KGNvbWJpbmVyKTsKIAotICAgIEdzdFBhZCogcGFkID0gZ3N0X2VsZW1lbnRfcmVxdWVzdF9wYWQo Y29tYmluZXItPmZ1bm5lbCwgdGVtcGwsIG5hbWUsIGNhcHMpOwotICAgIEFTU0VSVChwYWQpOwot Ci0gICAgR3N0UGFkKiBnaG9zdFBhZCA9IEdTVF9QQUQoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBF X1RFWFRfQ09NQklORVJfUEFELCAiZGlyZWN0aW9uIiwgZ3N0X3BhZF9nZXRfZGlyZWN0aW9uKHBh ZCksIG51bGxwdHIpKTsKKyAgICBHc3RQYWQqIGdob3N0UGFkID0gR1NUX1BBRChnX29iamVjdF9u ZXcoV0VCS0lUX1RZUEVfVEVYVF9DT01CSU5FUl9QQUQsICJkaXJlY3Rpb24iLCBHU1RfUEFEX1NJ TkssIG51bGxwdHIpKTsKICAgICBBU1NFUlQoZ2hvc3RQYWQpOwogCiAgICAgcmV0ID0gZ3N0X2do b3N0X3BhZF9jb25zdHJ1Y3QoR1NUX0dIT1NUX1BBRChnaG9zdFBhZCkpOwogICAgIEFTU0VSVChy ZXQpOwogCi0gICAgcmV0ID0gZ3N0X2dob3N0X3BhZF9zZXRfdGFyZ2V0KEdTVF9HSE9TVF9QQUQo Z2hvc3RQYWQpLCBwYWQpOwotICAgIEFTU0VSVChyZXQpOworICAgIFdlYktpdFRleHRDb21iaW5l clBhZCogY29tYmluZXJQYWQgPSBXRUJLSVRfVEVYVF9DT01CSU5FUl9QQUQoZ2hvc3RQYWQpOwor ICAgIGNvbWJpbmVyUGFkLT5mdW5uZWxQYWQgPSBnc3RfZWxlbWVudF9yZXF1ZXN0X3BhZChjb21i aW5lci0+ZnVubmVsLCB0ZW1wbCwgbmFtZSwgY2Fwcyk7CisgICAgQVNTRVJUKGNvbWJpbmVyUGFk LT5mdW5uZWxQYWQpOwogCiAgICAgcmV0ID0gZ3N0X3BhZF9zZXRfYWN0aXZlKGdob3N0UGFkLCB0 cnVlKTsKICAgICBBU1NFUlQocmV0KTsKQEAgLTI0NSwxNCArMjQxLDE2IEBAIHN0YXRpYyBHc3RQ YWQqIHdlYmtpdFRleHRDb21iaW5lclJlcXVlc3ROZXdQYWQoR3N0RWxlbWVudCAqIGVsZW1lbnQs CiBzdGF0aWMgdm9pZCB3ZWJraXRUZXh0Q29tYmluZXJSZWxlYXNlUGFkKEdzdEVsZW1lbnQgKmVs ZW1lbnQsIEdzdFBhZCAqcGFkKQogewogICAgIFdlYktpdFRleHRDb21iaW5lciogY29tYmluZXIg PSBXRUJLSVRfVEVYVF9DT01CSU5FUihlbGVtZW50KTsKKyAgICBXZWJLaXRUZXh0Q29tYmluZXJQ YWQqIGNvbWJpbmVyUGFkID0gV0VCS0lUX1RFWFRfQ09NQklORVJfUEFEKHBhZCk7CisKICAgICBp ZiAoR1JlZlB0cjxHc3RQYWQ+IHBlZXIgPSBhZG9wdEdSZWYoZ3N0X3BhZF9nZXRfcGVlcihwYWQp KSkgewogICAgICAgICBHUmVmUHRyPEdzdEVsZW1lbnQ+IHBhcmVudCA9IGFkb3B0R1JlZihnc3Rf cGFkX2dldF9wYXJlbnRfZWxlbWVudChwZWVyLmdldCgpKSk7CiAgICAgICAgIEFTU0VSVChwYXJl bnQpOwotICAgICAgICBnc3RfZWxlbWVudF9yZWxlYXNlX3JlcXVlc3RfcGFkKHBhcmVudC5nZXQo KSwgcGVlci5nZXQoKSk7Ci0gICAgICAgIGlmIChwYXJlbnQuZ2V0KCkgIT0gY29tYmluZXItPmZ1 bm5lbCkKKyAgICAgICAgaWYgKEdfVFlQRV9GUk9NX0lOU1RBTkNFKHBhcmVudC5nZXQoKSkgPT0g d2ViVlRURW5jVHlwZSkKICAgICAgICAgICAgIGdzdF9iaW5fcmVtb3ZlKEdTVF9CSU4oY29tYmlu ZXIpLCBwYXJlbnQuZ2V0KCkpOwogICAgIH0KIAorICAgIGdzdF9lbGVtZW50X3JlbGVhc2VfcmVx dWVzdF9wYWQoY29tYmluZXItPmZ1bm5lbCwgY29tYmluZXJQYWQtPmZ1bm5lbFBhZCk7CiAgICAg Z3N0X2VsZW1lbnRfcmVtb3ZlX3BhZChlbGVtZW50LCBwYWQpOwogfQogCkBAIC0yNzEsMTMgKzI2 OSwxOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfdGV4dF9jb21iaW5lcl9jbGFzc19pbml0KFdlYktp dFRleHRDb21iaW5lckNsYXNzKiBrbGFzcykKICAgICAgICAgR1NUX0RFQlVHX0ZVTkNQVFIod2Vi a2l0VGV4dENvbWJpbmVyUmVxdWVzdE5ld1BhZCk7CiAgICAgZWxlbWVudENsYXNzLT5yZWxlYXNl X3BhZCA9CiAgICAgICAgIEdTVF9ERUJVR19GVU5DUFRSKHdlYmtpdFRleHRDb21iaW5lclJlbGVh c2VQYWQpOworCisgICAgR1JlZlB0cjxHc3RFbGVtZW50RmFjdG9yeT4gd2ViVlRURW5jRmFjdG9y eSA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9mYWN0b3J5X2ZpbmQoIndlYnZ0dGVuYyIpKTsKKyAg ICBnc3Rfb2JqZWN0X3VucmVmKGdzdF9wbHVnaW5fZmVhdHVyZV9sb2FkKEdTVF9QTFVHSU5fRkVB VFVSRSh3ZWJWVFRFbmNGYWN0b3J5LmdldCgpKSkpOworICAgIHdlYlZUVEVuY1R5cGUgPSBnc3Rf ZWxlbWVudF9mYWN0b3J5X2dldF9lbGVtZW50X3R5cGUod2ViVlRURW5jRmFjdG9yeS5nZXQoKSk7 CisgICAgQVNTRVJUKHdlYlZUVEVuY1R5cGUpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRfdGV4 dF9jb21iaW5lcl9wYWRfY2xhc3NfaW5pdChXZWJLaXRUZXh0Q29tYmluZXJQYWRDbGFzcyoga2xh c3MpCiB7CiAgICAgR09iamVjdENsYXNzKiBnb2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFTUyhr bGFzcyk7CiAKLSAgICBnb2JqZWN0Q2xhc3MtPmZpbmFsaXplID0gR1NUX0RFQlVHX0ZVTkNQVFIo d2Via2l0VGV4dENvbWJpbmVyUGFkRmluYWxpemUpOworICAgIGdvYmplY3RDbGFzcy0+ZGlzcG9z ZSA9IEdTVF9ERUJVR19GVU5DUFRSKHdlYmtpdFRleHRDb21iaW5lclBhZERpc3Bvc2UpOwogICAg IGdvYmplY3RDbGFzcy0+Z2V0X3Byb3BlcnR5ID0gR1NUX0RFQlVHX0ZVTkNQVFIod2Via2l0VGV4 dENvbWJpbmVyUGFkR2V0UHJvcGVydHkpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9w cm9wZXJ0eShnb2JqZWN0Q2xhc3MsIFBST1BfUEFEX1RBR1MsCg==