176789 2017-09-12 10:02:52 -0700 [GTK][GStreamer] Replaying a webm video twice causes the video to stop getting rendered 2018-02-19 02:50:13 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cturner pnormand bugs-noreply calvaris magomez pnormand oldest_to_newest 1347951 0 cturner 2017-09-12 10:02:52 -0700 If you visit, https://bug787579.bugzilla-attachments.gnome.org/attachment.cgi?id=359591 You can do this, 1) Let the video play out 2) Click play again, let the video play out 3) And again 4) Click play again and you get some junk rendered and then a black screen. I don't see any GStreamer related error messages. 1396805 1 pnormand 2018-02-06 09:23:31 -0800 I suppose this is happening with gst-gl enabled? Here rendering goes black at 3rd run, not the 4th. 1397201 2 333294 pnormand 2018-02-07 09:25:24 -0800 Created attachment 333294 workaround Maybe you can test this patch. It works here by ensuring the video sink has a valid context for every run but ideally I think we should receive the need-context everytime but it's not currently the case. See also https://bugzilla.gnome.org/show_bug.cgi?id=793224 1400293 3 334143 pnormand 2018-02-19 01:12:35 -0800 Created attachment 334143 Patch 1400303 4 334143 calvaris 2018-02-19 02:12:21 -0800 Comment on attachment 334143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=334143&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:411 > +GstContext* MediaPlayerPrivateGStreamerBase::requestGLContext(const gchar* contextType) gchar -> char > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:80 > + GstContext* requestGLContext(const gchar* contextType); gchar -> char 1400309 5 pnormand 2018-02-19 02:50:13 -0800 Committed r228641: <https://trac.webkit.org/changeset/228641> 333294 2018-02-07 09:25:24 -0800 2018-02-19 01:12:28 -0800 workaround workaround.diff text/plain 7570 pnormand ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXgg ZTg4MjY2ZmQ2ZjYuLmY2ZjUxYjFjNGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTY1LDYgKzE2NSw4IEBAIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKE1lZGlhUGxheWVyKiBw bGF5ZXIpCiAKIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcigpCiB7CisgICAgR1NUX0RFQlVHKCJEaXNwb3NpbmcgcGxheWVyIik7CisKICNp ZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2F1ZGlv VHJhY2tzLnNpemUoKTsgKytpKQogICAgICAgICBtX2F1ZGlvVHJhY2tzW2ldLT5kaXNjb25uZWN0 KCk7CkBAIC0zMzYsNiArMzM4LDcgQEAgTWVkaWFUaW1lIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6cGxheWJhY2tQb3NpdGlvbigpIGNvbnN0CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpyZWFkeVRpbWVyRmlyZWQoKQogeworICAgIEdTVF9ERUJVRygiSW4gUkVBRFkg Zm9yIHRvbyBsb25nLiBSZWxlYXNpbmcgcGlwZWxpbmUgcmVzb3VyY2VzLiIpOwogICAgIGNoYW5n ZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX05VTEwpOwogfQogCkBAIC0zNTYsNiArMzU5LDExIEBA IGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjaGFuZ2VQaXBlbGluZVN0YXRlKEdz dFN0YXRlIG5ld1N0YXRlKQogICAgIEdTVF9ERUJVRygiQ2hhbmdpbmcgc3RhdGUgY2hhbmdlIHRv ICVzIGZyb20gJXMgd2l0aCAlcyBwZW5kaW5nIiwgZ3N0X2VsZW1lbnRfc3RhdGVfZ2V0X25hbWUo bmV3U3RhdGUpLAogICAgICAgICBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShjdXJyZW50U3Rh dGUpLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRfbmFtZShwZW5kaW5nKSk7CiAKKyNpZiBVU0UoR1NU UkVBTUVSX0dMKQorICAgIGlmIChjdXJyZW50U3RhdGUgPT0gR1NUX1NUQVRFX1JFQURZICYmIG5l d1N0YXRlID09IEdTVF9TVEFURV9QQVVTRUQpCisgICAgICAgIGVuc3VyZUdMVmlkZW9TaW5rQ29u dGV4dCgpOworI2VuZGlmCisKICAgICBHc3RTdGF0ZUNoYW5nZVJldHVybiBzZXRTdGF0ZVJlc3Vs dCA9IGdzdF9lbGVtZW50X3NldF9zdGF0ZShtX3BpcGVsaW5lLmdldCgpLCBuZXdTdGF0ZSk7CiAg ICAgR3N0U3RhdGUgcGF1c2VkT3JQbGF5aW5nID0gbmV3U3RhdGUgPT0gR1NUX1NUQVRFX1BMQVlJ TkcgPyBHU1RfU1RBVEVfUEFVU0VEIDogR1NUX1NUQVRFX1BMQVlJTkc7CiAgICAgaWYgKGN1cnJl bnRTdGF0ZSAhPSBwYXVzZWRPclBsYXlpbmcgJiYgc2V0U3RhdGVSZXN1bHQgPT0gR1NUX1NUQVRF X0NIQU5HRV9GQUlMVVJFKSB7CkBAIC0xNzk1LDYgKzE4MDMsOCBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6dGltZUNoYW5nZWQoKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6ZGlkRW5kKCkKIHsKKyAgICBHU1RfSU5GTygiUGxheWJhY2sgZW5kZWQiKTsK KwogICAgIC8vIFN5bmNocm9uaXplIHBvc2l0aW9uIGFuZCBkdXJhdGlvbiB2YWx1ZXMgdG8gbm90 IGNvbmZ1c2UgdGhlCiAgICAgLy8gSFRNTE1lZGlhRWxlbWVudC4gSW4gc29tZSBjYXNlcyBsaWtl IHJldmVyc2UgcGxheWJhY2sgdGhlCiAgICAgLy8gcG9zaXRpb24gaXMgbm90IGFsd2F5cyByZXBv cnRlZCBhcyAwIGZvciBpbnN0YW5jZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAppbmRleCBhMTY1NDNhMzFhYi4uYmNjNWIxMTlhOWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFz ZS5jcHAKQEAgLTMyMiw5ICszMjIsMTAgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlOjpoYW5kbGVTeW5jTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogCiAgICAgY29u c3QgZ2NoYXIqIGNvbnRleHRUeXBlOwogICAgIGdzdF9tZXNzYWdlX3BhcnNlX2NvbnRleHRfdHlw ZShtZXNzYWdlLCAmY29udGV4dFR5cGUpOworICAgIEdTVF9ERUJVRygiSGFuZGxpbmcgJXMgbmVl ZC1jb250ZXh0IG1lc3NhZ2UgZm9yICVzIiwgY29udGV4dFR5cGUsIEdTVF9NRVNTQUdFX1NSQ19O QU1FKG1lc3NhZ2UpKTsKIAogI2lmIFVTRShHU1RSRUFNRVJfR0wpCi0gICAgR1JlZlB0cjxHc3RD b250ZXh0PiBlbGVtZW50Q29udGV4dCA9IGFkb3B0R1JlZihyZXF1ZXN0R0xDb250ZXh0KGNvbnRl eHRUeXBlLCB0aGlzKSk7CisgICAgR1JlZlB0cjxHc3RDb250ZXh0PiBlbGVtZW50Q29udGV4dCA9 IGFkb3B0R1JlZihyZXF1ZXN0R0xDb250ZXh0KGNvbnRleHRUeXBlKSk7CiAgICAgaWYgKGVsZW1l bnRDb250ZXh0KSB7CiAgICAgICAgIGdzdF9lbGVtZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5U KG1lc3NhZ2UtPnNyYyksIGVsZW1lbnRDb250ZXh0LmdldCgpKTsKICAgICAgICAgcmV0dXJuIHRy dWU7CkBAIC00MDcsMTQgKzQwOCwxNCBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OmhhbmRsZVN5bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiB9CiAKICNpZiBV U0UoR1NUUkVBTUVSX0dMKQotR3N0Q29udGV4dCogTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZTo6cmVxdWVzdEdMQ29udGV4dChjb25zdCBnY2hhciogY29udGV4dFR5cGUsIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UqIHBsYXllcikKK0dzdENvbnRleHQqIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2U6OnJlcXVlc3RHTENvbnRleHQoY29uc3QgZ2NoYXIqIGNvbnRl eHRUeXBlKQogewotICAgIGlmICghcGxheWVyLT5lbnN1cmVHc3RHTENvbnRleHQoKSkKKyAgICBp ZiAoIWVuc3VyZUdzdEdMQ29udGV4dCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAg IGlmICghZ19zdHJjbXAwKGNvbnRleHRUeXBlLCBHU1RfR0xfRElTUExBWV9DT05URVhUX1RZUEUp KSB7CiAgICAgICAgIEdzdENvbnRleHQqIGRpc3BsYXlDb250ZXh0ID0gZ3N0X2NvbnRleHRfbmV3 KEdTVF9HTF9ESVNQTEFZX0NPTlRFWFRfVFlQRSwgVFJVRSk7Ci0gICAgICAgIGdzdF9jb250ZXh0 X3NldF9nbF9kaXNwbGF5KGRpc3BsYXlDb250ZXh0LCBwbGF5ZXItPmdzdEdMRGlzcGxheSgpKTsK KyAgICAgICAgZ3N0X2NvbnRleHRfc2V0X2dsX2Rpc3BsYXkoZGlzcGxheUNvbnRleHQsIGdzdEdM RGlzcGxheSgpKTsKICAgICAgICAgcmV0dXJuIGRpc3BsYXlDb250ZXh0OwogICAgIH0KIApAQCAt NDIyLDkgKzQyMyw5IEBAIEdzdENvbnRleHQqIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2U6OnJlcXVlc3RHTENvbnRleHQoY29uc3QgZ2NoYXIqIGNvbnRlCiAgICAgICAgIEdzdENvbnRl eHQqIGFwcENvbnRleHQgPSBnc3RfY29udGV4dF9uZXcoImdzdC5nbC5hcHBfY29udGV4dCIsIFRS VUUpOwogICAgICAgICBHc3RTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGdzdF9jb250ZXh0X3dyaXRh YmxlX3N0cnVjdHVyZShhcHBDb250ZXh0KTsKICNpZiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxMSwg MCkKLSAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXQoc3RydWN0dXJlLCAiY29udGV4dCIsIEdTVF9U WVBFX0dMX0NPTlRFWFQsIHBsYXllci0+Z3N0R0xDb250ZXh0KCksIG51bGxwdHIpOworICAgICAg ICBnc3Rfc3RydWN0dXJlX3NldChzdHJ1Y3R1cmUsICJjb250ZXh0IiwgR1NUX1RZUEVfR0xfQ09O VEVYVCwgZ3N0R0xDb250ZXh0KCksIG51bGxwdHIpOwogI2Vsc2UKLSAgICAgICAgZ3N0X3N0cnVj dHVyZV9zZXQoc3RydWN0dXJlLCAiY29udGV4dCIsIEdTVF9HTF9UWVBFX0NPTlRFWFQsIHBsYXll ci0+Z3N0R0xDb250ZXh0KCksIG51bGxwdHIpOworICAgICAgICBnc3Rfc3RydWN0dXJlX3NldChz dHJ1Y3R1cmUsICJjb250ZXh0IiwgR1NUX0dMX1RZUEVfQ09OVEVYVCwgZ3N0R0xDb250ZXh0KCks IG51bGxwdHIpOwogI2VuZGlmCiAgICAgICAgIHJldHVybiBhcHBDb250ZXh0OwogICAgIH0KQEAg LTg0MCw2ICs4NDEsNyBAQCBHc3RGbG93UmV0dXJuIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6Om5ld1ByZXJvbGxDYWxsYmFjayhHc3RFbGVtZW50KiBzaQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmZsdXNoQ3VycmVudEJ1ZmZlcigpCiB7CisgICAgR1NU X0RFQlVHKCJGbHVzaGluZyB2aWRlbyBzYW1wbGUiKTsKICAgICBXVEY6OkdNdXRleExvY2tlcjxH TXV0ZXg+IGxvY2sobV9zYW1wbGVNdXRleCk7CiAgICAgbV9zYW1wbGUuY2xlYXIoKTsKIApAQCAt MTAxNywxMCArMTAxOSw2IEBAIEdzdEVsZW1lbnQqIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OmNyZWF0ZUdMQXBwU2luaygpCiAKIEdzdEVsZW1lbnQqIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2U6OmNyZWF0ZVZpZGVvU2lua0dMKCkKIHsKLSAgICAvLyBGSVhNRTogQ3Vy cmVudGx5IGl0J3Mgbm90IHBvc3NpYmxlIHRvIGdldCB0aGUgdmlkZW8gZnJhbWVzIGFuZCBjYXBz IHVzaW5nIHRoaXMgYXBwcm9hY2ggdW50aWwKLSAgICAvLyB0aGUgcGlwZWxpbmUgZ2V0cyBpbnRv IHBsYXlpbmcgc3RhdGUuIER1ZSB0byB0aGlzLCB0cnlpbmcgdG8gZ3JhYiBhIGZyYW1lIGFuZCBw YWludGluZyBpdCBieSBzb21lCi0gICAgLy8gb3RoZXIgbWVhbiAoY2FudmFzIG9yIHdlYmdsKSBi ZWZvcmUgcGxheWluZyBzdGF0ZSBjYW4gcmVzdWx0IGluIGEgY3Jhc2guCi0gICAgLy8gVGhpcyBp cyBiZWluZyBoYW5kbGVkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNTk0NjAuCiAgICAgaWYgKCF3ZWJraXRHc3RDaGVja1ZlcnNpb24oMSwgOCwgMCkpCiAgICAg ICAgIHJldHVybiBudWxscHRyOwogCkBAIC0xMDYxLDYgKzEwNTksMjEgQEAgR3N0RWxlbWVudCog TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3JlYXRlVmlkZW9TaW5rR0woKQogICAg IH0KICAgICByZXR1cm4gdmlkZW9TaW5rOwogfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmVuc3VyZUdMVmlkZW9TaW5rQ29udGV4dCgpCit7CisgICAgaWYgKCFtX2ds RGlzcGxheUVsZW1lbnRDb250ZXh0KQorICAgICAgICBtX2dsRGlzcGxheUVsZW1lbnRDb250ZXh0 ID0gYWRvcHRHUmVmKHJlcXVlc3RHTENvbnRleHQoR1NUX0dMX0RJU1BMQVlfQ09OVEVYVF9UWVBF KSk7CisKKyAgICBpZiAobV9nbERpc3BsYXlFbGVtZW50Q29udGV4dCkKKyAgICAgICAgZ3N0X2Vs ZW1lbnRfc2V0X2NvbnRleHQobV92aWRlb1NpbmsuZ2V0KCksIG1fZ2xEaXNwbGF5RWxlbWVudENv bnRleHQuZ2V0KCkpOworCisgICAgaWYgKCFtX2dsQXBwRWxlbWVudENvbnRleHQpCisgICAgICAg IG1fZ2xBcHBFbGVtZW50Q29udGV4dCA9IGFkb3B0R1JlZihyZXF1ZXN0R0xDb250ZXh0KCJnc3Qu Z2wuYXBwX2NvbnRleHQiKSk7CisKKyAgICBpZiAobV9nbEFwcEVsZW1lbnRDb250ZXh0KQorICAg ICAgICBnc3RfZWxlbWVudF9zZXRfY29udGV4dChtX3ZpZGVvU2luay5nZXQoKSwgbV9nbEFwcEVs ZW1lbnRDb250ZXh0LmdldCgpKTsKK30KICNlbmRpZiAvLyBVU0UoR1NUUkVBTUVSX0dMKQogCiBH c3RFbGVtZW50KiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjcmVhdGVWaWRlb1Np bmsoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl LmgKaW5kZXggMDNmZWRlYTk3NTkuLjAzOGVlMWQxMWFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKQEAgLTc3LDcgKzc3LDcgQEAgcHVi bGljOgogCiAjaWYgVVNFKEdTVFJFQU1FUl9HTCkKICAgICBib29sIGVuc3VyZUdzdEdMQ29udGV4 dCgpOwotICAgIHN0YXRpYyBHc3RDb250ZXh0KiByZXF1ZXN0R0xDb250ZXh0KGNvbnN0IGdjaGFy KiBjb250ZXh0VHlwZSwgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSopOworICAgIEdz dENvbnRleHQqIHJlcXVlc3RHTENvbnRleHQoY29uc3QgZ2NoYXIqIGNvbnRleHRUeXBlKTsKICNl bmRpZgogICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVHU3RyZWFtZXJBbmRSZWdpc3RlcldlYktp dEVsZW1lbnRzKCk7CiAgICAgYm9vbCBzdXBwb3J0c011dGluZygpIGNvbnN0IG92ZXJyaWRlIHsg cmV0dXJuIHRydWU7IH0KQEAgLTE3MCw2ICsxNzAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgR3N0RWxl bWVudCogY3JlYXRlVmlkZW9TaW5rR0woKTsKICAgICBHc3RHTENvbnRleHQqIGdzdEdMQ29udGV4 dCgpIGNvbnN0IHsgcmV0dXJuIG1fZ2xDb250ZXh0LmdldCgpOyB9CiAgICAgR3N0R0xEaXNwbGF5 KiBnc3RHTERpc3BsYXkoKSBjb25zdCB7IHJldHVybiBtX2dsRGlzcGxheS5nZXQoKTsgfQorICAg IHZvaWQgZW5zdXJlR0xWaWRlb1NpbmtDb250ZXh0KCk7CiAjZW5kaWYKIAogI2lmIFVTRShURVhU VVJFX01BUFBFUl9HTCkKQEAgLTI0MSw2ICsyNDIsOCBAQCBwcm90ZWN0ZWQ6CiAjaWYgVVNFKEdT VFJFQU1FUl9HTCkKICAgICBHUmVmUHRyPEdzdEdMQ29udGV4dD4gbV9nbENvbnRleHQ7CiAgICAg R1JlZlB0cjxHc3RHTERpc3BsYXk+IG1fZ2xEaXNwbGF5OworICAgIEdSZWZQdHI8R3N0Q29udGV4 dD4gbV9nbERpc3BsYXlFbGVtZW50Q29udGV4dDsKKyAgICBHUmVmUHRyPEdzdENvbnRleHQ+IG1f Z2xBcHBFbGVtZW50Q29udGV4dDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VmlkZW9UZXh0dXJlQ29w aWVyR1N0cmVhbWVyPiBtX3ZpZGVvVGV4dHVyZUNvcGllcjsKICNlbmRpZgogCg== 334143 2018-02-19 01:12:35 -0800 2018-02-19 02:12:21 -0800 Patch bug-176789-20180219091234.patch text/plain 9914 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc1ZGY1N2E0NDYzNWZl NGIxNTcxM2RjY2EwMzRiMWJkYTE1MTgyMi4uYmNlNDJkYjI2YjE4ZjY2Yzk3Zjc5YzQ4NTI4OThk MDdkNGU2NWUwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE4LTAyLTE5ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtHU3Ry ZWFtZXJdIFJlcGxheWluZyBhIHdlYm0gdmlkZW8gdHdpY2UgY2F1c2VzIHRoZSB2aWRlbyB0byBz dG9wIGdldHRpbmcgcmVuZGVyZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3Njc4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEVuc3VyZSB0aGUgd3JhcHBlZCBHc3RHTENvbnRleHQgaXMgc2V0IHdoZW4g dGhlIHBpcGVsaW5lIGdvZXMgZnJvbQorICAgICAgICBSRUFEWSB0byBQQVVTRUQgc3RhdGUuIFRo aXMgaXMgYSB3b3JrYXJvdW5kIGZvcgorICAgICAgICBodHRwczovL2J1Z3ppbGxhLmdub21lLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzU3OTMzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIpOiBBZGQgZGVidWcgc3RhdGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpyZWFkeVRpbWVyRmlyZWQpOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2hhbmdlUGlwZWxpbmVTdGF0ZSk6 CisgICAgICAgIEVuc3VyZSB0aGUgd3JhcHBlZCBHc3RHTENvbnRleHQgaXMgc2V0IHdoZW4gdGhl IHBpcGVsaW5lIGdvZXMgZnJvbQorICAgICAgICBSRUFEWSB0byBQQVVTRUQgc3RhdGUuCisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmRpZEVuZCk6IEFkZCBk ZWJ1ZyBzdGF0ZW1lbnQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwOgorICAgICAgICBDaGFuZ2UgdGhlIHJl cXVlc3RHTENvbnRleHQgdG8gYmUgYSBtZXRob2QgaW5zdGVhZCBvZiBhIHN0YXRpYworICAgICAg ICBmdW5jdGlvbi4gQmVpbmcgYSBzdGF0aWMgZnVuY3Rpb24gd2FzIGEgcmVxdWlyZW1lbnQgZm9y IHRoZSBub3ctcmVtb3ZlZCBPcGVuV2ViUlRDIHBsYXllci4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmhhbmRsZVN5bmNNZXNzYWdlKTogQWRkCisg ICAgICAgIGRlYnVnIHN0YXRlbWVudCwgZml4IHJlcXVlc3RHTENvbnRleHQgdXNhZ2UuCisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpyZXF1ZXN0R0xD b250ZXh0KTogUmVmYWN0b3IgYXMgbWV0aG9kLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Zmx1c2hDdXJyZW50QnVmZmVyKTogRml4IHJlcXVlc3RH TENvbnRleHQgdXNhZ2UuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjpjcmVhdGVWaWRlb1NpbmtHTCk6IFJlbW92ZSBmaXhlZCBGSVhNRS4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmVuc3VyZUdMVmlk ZW9TaW5rQ29udGV4dCk6CisgICAgICAgIFNldCBkaXNwbGF5IGFuZCBhcHAgd3JhcHBlZCBjb250 ZXh0cyBvbiB0aGUgdmlkZW8gc2luay4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oOgorCiAyMDE4LTAyLTE5ICBQ aGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVh bWVyXSBQbGF5YmluMyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXIuY3BwCmluZGV4IDgwYTcxMzE2ODNjYzljODZlZmY3M2VhNzk2YjI1MTk5ZjEy NjE0MzUuLmNmZDc0M2UzODZmOTJiYzc3NTU1Yzg5OGI4YzFlNDU4ODVkYTUyMTkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0xNjUsNiAr MTY1LDggQEAgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIoTWVkaWFQbGF5ZXIqIHBsYXllcikKIAogTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKCkKIHsKKyAgICBHU1RfREVCVUcoIkRp c3Bvc2luZyBwbGF5ZXIiKTsKKwogI2lmIEVOQUJMRShWSURFT19UUkFDSykKICAgICBmb3IgKGF1 dG8mIHRyYWNrIDogbV9hdWRpb1RyYWNrcy52YWx1ZXMoKSkKICAgICAgICAgdHJhY2stPmRpc2Nv bm5lY3QoKTsKQEAgLTM0NCw2ICszNDYsNyBAQCBNZWRpYVRpbWUgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpwbGF5YmFja1Bvc2l0aW9uKCkgY29uc3QKIAogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OnJlYWR5VGltZXJGaXJlZCgpCiB7CisgICAgR1NUX0RFQlVHKCJJbiBS RUFEWSBmb3IgdG9vIGxvbmcuIFJlbGVhc2luZyBwaXBlbGluZSByZXNvdXJjZXMuIik7CiAgICAg Y2hhbmdlUGlwZWxpbmVTdGF0ZShHU1RfU1RBVEVfTlVMTCk7CiB9CiAKQEAgLTM2NCw2ICszNjcs MTEgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNoYW5nZVBpcGVsaW5lU3Rh dGUoR3N0U3RhdGUgbmV3U3RhdGUpCiAgICAgR1NUX0RFQlVHKCJDaGFuZ2luZyBzdGF0ZSBjaGFu Z2UgdG8gJXMgZnJvbSAlcyB3aXRoICVzIHBlbmRpbmciLCBnc3RfZWxlbWVudF9zdGF0ZV9nZXRf bmFtZShuZXdTdGF0ZSksCiAgICAgICAgIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKGN1cnJl bnRTdGF0ZSksIGdzdF9lbGVtZW50X3N0YXRlX2dldF9uYW1lKHBlbmRpbmcpKTsKIAorI2lmIFVT RShHU1RSRUFNRVJfR0wpCisgICAgaWYgKGN1cnJlbnRTdGF0ZSA9PSBHU1RfU1RBVEVfUkVBRFkg JiYgbmV3U3RhdGUgPT0gR1NUX1NUQVRFX1BBVVNFRCkKKyAgICAgICAgZW5zdXJlR0xWaWRlb1Np bmtDb250ZXh0KCk7CisjZW5kaWYKKwogICAgIEdzdFN0YXRlQ2hhbmdlUmV0dXJuIHNldFN0YXRl UmVzdWx0ID0gZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGlwZWxpbmUuZ2V0KCksIG5ld1N0YXRl KTsKICAgICBHc3RTdGF0ZSBwYXVzZWRPclBsYXlpbmcgPSBuZXdTdGF0ZSA9PSBHU1RfU1RBVEVf UExBWUlORyA/IEdTVF9TVEFURV9QQVVTRUQgOiBHU1RfU1RBVEVfUExBWUlORzsKICAgICBpZiAo Y3VycmVudFN0YXRlICE9IHBhdXNlZE9yUGxheWluZyAmJiBzZXRTdGF0ZVJlc3VsdCA9PSBHU1Rf U1RBVEVfQ0hBTkdFX0ZBSUxVUkUpIHsKQEAgLTIwNjEsNiArMjA2OSw4IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp0aW1lQ2hhbmdlZCgpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpkaWRFbmQoKQogeworICAgIEdTVF9JTkZPKCJQbGF5YmFjayBlbmRl ZCIpOworCiAgICAgLy8gU3luY2hyb25pemUgcG9zaXRpb24gYW5kIGR1cmF0aW9uIHZhbHVlcyB0 byBub3QgY29uZnVzZSB0aGUKICAgICAvLyBIVE1MTWVkaWFFbGVtZW50LiBJbiBzb21lIGNhc2Vz IGxpa2UgcmV2ZXJzZSBwbGF5YmFjayB0aGUKICAgICAvLyBwb3NpdGlvbiBpcyBub3QgYWx3YXlz IHJlcG9ydGVkIGFzIDAgZm9yIGluc3RhbmNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCmluZGV4IGI0YTI4MGQyNjQwZjJhYjBiODcw NjA3ZTcwOTE1MTllYmE0YzZhOWUuLmRkOGY0NTVhNWZkMDM3ZDhmNGRkNjkwZThkZWIyMmEwMTRj MWNjNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5jcHAKQEAgLTMyMiw5ICszMjIsMTAgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlOjpoYW5kbGVTeW5jTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogCiAg ICAgY29uc3QgZ2NoYXIqIGNvbnRleHRUeXBlOwogICAgIGdzdF9tZXNzYWdlX3BhcnNlX2NvbnRl eHRfdHlwZShtZXNzYWdlLCAmY29udGV4dFR5cGUpOworICAgIEdTVF9ERUJVRygiSGFuZGxpbmcg JXMgbmVlZC1jb250ZXh0IG1lc3NhZ2UgZm9yICVzIiwgY29udGV4dFR5cGUsIEdTVF9NRVNTQUdF X1NSQ19OQU1FKG1lc3NhZ2UpKTsKIAogI2lmIFVTRShHU1RSRUFNRVJfR0wpCi0gICAgR1JlZlB0 cjxHc3RDb250ZXh0PiBlbGVtZW50Q29udGV4dCA9IGFkb3B0R1JlZihyZXF1ZXN0R0xDb250ZXh0 KGNvbnRleHRUeXBlLCB0aGlzKSk7CisgICAgR1JlZlB0cjxHc3RDb250ZXh0PiBlbGVtZW50Q29u dGV4dCA9IGFkb3B0R1JlZihyZXF1ZXN0R0xDb250ZXh0KGNvbnRleHRUeXBlKSk7CiAgICAgaWYg KGVsZW1lbnRDb250ZXh0KSB7CiAgICAgICAgIGdzdF9lbGVtZW50X3NldF9jb250ZXh0KEdTVF9F TEVNRU5UKG1lc3NhZ2UtPnNyYyksIGVsZW1lbnRDb250ZXh0LmdldCgpKTsKICAgICAgICAgcmV0 dXJuIHRydWU7CkBAIC00MDcsMTQgKzQwOCwxNCBAQCBib29sIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmhhbmRsZVN5bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiB9CiAK ICNpZiBVU0UoR1NUUkVBTUVSX0dMKQotR3N0Q29udGV4dCogTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZTo6cmVxdWVzdEdMQ29udGV4dChjb25zdCBnY2hhciogY29udGV4dFR5cGUsIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UqIHBsYXllcikKK0dzdENvbnRleHQqIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnJlcXVlc3RHTENvbnRleHQoY29uc3QgZ2NoYXIq IGNvbnRleHRUeXBlKQogewotICAgIGlmICghcGxheWVyLT5lbnN1cmVHc3RHTENvbnRleHQoKSkK KyAgICBpZiAoIWVuc3VyZUdzdEdMQ29udGV4dCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsK IAogICAgIGlmICghZ19zdHJjbXAwKGNvbnRleHRUeXBlLCBHU1RfR0xfRElTUExBWV9DT05URVhU X1RZUEUpKSB7CiAgICAgICAgIEdzdENvbnRleHQqIGRpc3BsYXlDb250ZXh0ID0gZ3N0X2NvbnRl eHRfbmV3KEdTVF9HTF9ESVNQTEFZX0NPTlRFWFRfVFlQRSwgVFJVRSk7Ci0gICAgICAgIGdzdF9j b250ZXh0X3NldF9nbF9kaXNwbGF5KGRpc3BsYXlDb250ZXh0LCBwbGF5ZXItPmdzdEdMRGlzcGxh eSgpKTsKKyAgICAgICAgZ3N0X2NvbnRleHRfc2V0X2dsX2Rpc3BsYXkoZGlzcGxheUNvbnRleHQs IGdzdEdMRGlzcGxheSgpKTsKICAgICAgICAgcmV0dXJuIGRpc3BsYXlDb250ZXh0OwogICAgIH0K IApAQCAtNDIyLDkgKzQyMyw5IEBAIEdzdENvbnRleHQqIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lckJhc2U6OnJlcXVlc3RHTENvbnRleHQoY29uc3QgZ2NoYXIqIGNvbnRlCiAgICAgICAgIEdz dENvbnRleHQqIGFwcENvbnRleHQgPSBnc3RfY29udGV4dF9uZXcoImdzdC5nbC5hcHBfY29udGV4 dCIsIFRSVUUpOwogICAgICAgICBHc3RTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGdzdF9jb250ZXh0 X3dyaXRhYmxlX3N0cnVjdHVyZShhcHBDb250ZXh0KTsKICNpZiBHU1RfQ0hFQ0tfVkVSU0lPTigx LCAxMSwgMCkKLSAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXQoc3RydWN0dXJlLCAiY29udGV4dCIs IEdTVF9UWVBFX0dMX0NPTlRFWFQsIHBsYXllci0+Z3N0R0xDb250ZXh0KCksIG51bGxwdHIpOwor ICAgICAgICBnc3Rfc3RydWN0dXJlX3NldChzdHJ1Y3R1cmUsICJjb250ZXh0IiwgR1NUX1RZUEVf R0xfQ09OVEVYVCwgZ3N0R0xDb250ZXh0KCksIG51bGxwdHIpOwogI2Vsc2UKLSAgICAgICAgZ3N0 X3N0cnVjdHVyZV9zZXQoc3RydWN0dXJlLCAiY29udGV4dCIsIEdTVF9HTF9UWVBFX0NPTlRFWFQs IHBsYXllci0+Z3N0R0xDb250ZXh0KCksIG51bGxwdHIpOworICAgICAgICBnc3Rfc3RydWN0dXJl X3NldChzdHJ1Y3R1cmUsICJjb250ZXh0IiwgR1NUX0dMX1RZUEVfQ09OVEVYVCwgZ3N0R0xDb250 ZXh0KCksIG51bGxwdHIpOwogI2VuZGlmCiAgICAgICAgIHJldHVybiBhcHBDb250ZXh0OwogICAg IH0KQEAgLTg0MCw2ICs4NDEsNyBAQCBHc3RGbG93UmV0dXJuIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6Om5ld1ByZXJvbGxDYWxsYmFjayhHc3RFbGVtZW50KiBzaQogCiB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmZsdXNoQ3VycmVudEJ1ZmZlcigpCiB7Cisg ICAgR1NUX0RFQlVHKCJGbHVzaGluZyB2aWRlbyBzYW1wbGUiKTsKICAgICBXVEY6OkdNdXRleExv Y2tlcjxHTXV0ZXg+IGxvY2sobV9zYW1wbGVNdXRleCk7CiAgICAgbV9zYW1wbGUuY2xlYXIoKTsK IApAQCAtMTAxNywxMCArMTAxOSw2IEBAIEdzdEVsZW1lbnQqIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lckJhc2U6OmNyZWF0ZUdMQXBwU2luaygpCiAKIEdzdEVsZW1lbnQqIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNyZWF0ZVZpZGVvU2lua0dMKCkKIHsKLSAgICAvLyBGSVhN RTogQ3VycmVudGx5IGl0J3Mgbm90IHBvc3NpYmxlIHRvIGdldCB0aGUgdmlkZW8gZnJhbWVzIGFu ZCBjYXBzIHVzaW5nIHRoaXMgYXBwcm9hY2ggdW50aWwKLSAgICAvLyB0aGUgcGlwZWxpbmUgZ2V0 cyBpbnRvIHBsYXlpbmcgc3RhdGUuIER1ZSB0byB0aGlzLCB0cnlpbmcgdG8gZ3JhYiBhIGZyYW1l IGFuZCBwYWludGluZyBpdCBieSBzb21lCi0gICAgLy8gb3RoZXIgbWVhbiAoY2FudmFzIG9yIHdl YmdsKSBiZWZvcmUgcGxheWluZyBzdGF0ZSBjYW4gcmVzdWx0IGluIGEgY3Jhc2guCi0gICAgLy8g VGhpcyBpcyBiZWluZyBoYW5kbGVkIGluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTk0NjAuCiAgICAgaWYgKCF3ZWJraXRHc3RDaGVja1ZlcnNpb24oMSwgOCwgMCkp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC0xMDYxLDYgKzEwNTksMjEgQEAgR3N0RWxl bWVudCogTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y3JlYXRlVmlkZW9TaW5rR0wo KQogICAgIH0KICAgICByZXR1cm4gdmlkZW9TaW5rOwogfQorCit2b2lkIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lckJhc2U6OmVuc3VyZUdMVmlkZW9TaW5rQ29udGV4dCgpCit7CisgICAgaWYg KCFtX2dsRGlzcGxheUVsZW1lbnRDb250ZXh0KQorICAgICAgICBtX2dsRGlzcGxheUVsZW1lbnRD b250ZXh0ID0gYWRvcHRHUmVmKHJlcXVlc3RHTENvbnRleHQoR1NUX0dMX0RJU1BMQVlfQ09OVEVY VF9UWVBFKSk7CisKKyAgICBpZiAobV9nbERpc3BsYXlFbGVtZW50Q29udGV4dCkKKyAgICAgICAg Z3N0X2VsZW1lbnRfc2V0X2NvbnRleHQobV92aWRlb1NpbmsuZ2V0KCksIG1fZ2xEaXNwbGF5RWxl bWVudENvbnRleHQuZ2V0KCkpOworCisgICAgaWYgKCFtX2dsQXBwRWxlbWVudENvbnRleHQpCisg ICAgICAgIG1fZ2xBcHBFbGVtZW50Q29udGV4dCA9IGFkb3B0R1JlZihyZXF1ZXN0R0xDb250ZXh0 KCJnc3QuZ2wuYXBwX2NvbnRleHQiKSk7CisKKyAgICBpZiAobV9nbEFwcEVsZW1lbnRDb250ZXh0 KQorICAgICAgICBnc3RfZWxlbWVudF9zZXRfY29udGV4dChtX3ZpZGVvU2luay5nZXQoKSwgbV9n bEFwcEVsZW1lbnRDb250ZXh0LmdldCgpKTsKK30KICNlbmRpZiAvLyBVU0UoR1NUUkVBTUVSX0dM KQogCiBHc3RFbGVtZW50KiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpjcmVhdGVW aWRlb1NpbmsoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlLmgKaW5kZXggN2ZiMTFhMWFkMmUxNzZkNzhjNjgyNDY5MTk4MGFlNGY5M2NhNjFmNy4u MTFjMzY0MmI2Mjg5Y2ExZjA0YTUzOGE1ZDYxOTAyYmMyNjFmYjRlMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCkBAIC03Nyw3ICs3Nyw3 IEBAIHB1YmxpYzoKIAogI2lmIFVTRShHU1RSRUFNRVJfR0wpCiAgICAgYm9vbCBlbnN1cmVHc3RH TENvbnRleHQoKTsKLSAgICBzdGF0aWMgR3N0Q29udGV4dCogcmVxdWVzdEdMQ29udGV4dChjb25z dCBnY2hhciogY29udGV4dFR5cGUsIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UqKTsK KyAgICBHc3RDb250ZXh0KiByZXF1ZXN0R0xDb250ZXh0KGNvbnN0IGdjaGFyKiBjb250ZXh0VHlw ZSk7CiAjZW5kaWYKICAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplR1N0cmVhbWVyQW5kUmVnaXN0 ZXJXZWJLaXRFbGVtZW50cygpOwogICAgIGJvb2wgc3VwcG9ydHNNdXRpbmcoKSBjb25zdCBvdmVy cmlkZSB7IHJldHVybiB0cnVlOyB9CkBAIC0xNzAsNiArMTcwLDcgQEAgcHJvdGVjdGVkOgogICAg IEdzdEVsZW1lbnQqIGNyZWF0ZVZpZGVvU2lua0dMKCk7CiAgICAgR3N0R0xDb250ZXh0KiBnc3RH TENvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2dsQ29udGV4dC5nZXQoKTsgfQogICAgIEdzdEdM RGlzcGxheSogZ3N0R0xEaXNwbGF5KCkgY29uc3QgeyByZXR1cm4gbV9nbERpc3BsYXkuZ2V0KCk7 IH0KKyAgICB2b2lkIGVuc3VyZUdMVmlkZW9TaW5rQ29udGV4dCgpOwogI2VuZGlmCiAKICNpZiBV U0UoVEVYVFVSRV9NQVBQRVJfR0wpCkBAIC0yNDQsNiArMjQ1LDggQEAgcHJvdGVjdGVkOgogI2lm IFVTRShHU1RSRUFNRVJfR0wpCiAgICAgR1JlZlB0cjxHc3RHTENvbnRleHQ+IG1fZ2xDb250ZXh0 OwogICAgIEdSZWZQdHI8R3N0R0xEaXNwbGF5PiBtX2dsRGlzcGxheTsKKyAgICBHUmVmUHRyPEdz dENvbnRleHQ+IG1fZ2xEaXNwbGF5RWxlbWVudENvbnRleHQ7CisgICAgR1JlZlB0cjxHc3RDb250 ZXh0PiBtX2dsQXBwRWxlbWVudENvbnRleHQ7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFZpZGVvVGV4 dHVyZUNvcGllckdTdHJlYW1lcj4gbV92aWRlb1RleHR1cmVDb3BpZXI7CiAjZW5kaWYKIAo=