190143 2018-10-01 10:34:50 -0700 [MSE][GStreamer] Add h264parse to accept MP4 without stss 2018-10-08 23:33:16 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 190394 1 aboya aboya bugs-noreply calvaris commit-queue pnormand oldest_to_newest 1465085 0 aboya 2018-10-01 10:34:50 -0700 The MP4 file used in this URL does not contain a stss (Sync Sample Box). In consequence, in acordance with the ISO BMFF spec, all samples are assumed to be sync frames... But in this case that is not true, it's just that the file is wrong (e.g. created with a buggy muxer). http://orange-opensource.github.io/hasplayer.js/1.2.0/player.html?url=http://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism/Manifest The way it works in other browsers is because instead of trusting the MP4 stss table, they rely on parsing the h264 frames. We can do that too, using h264parse. 1465087 1 351262 aboya 2018-10-01 10:37:38 -0700 Created attachment 351262 Patch 1465415 2 351262 calvaris 2018-10-02 00:13:00 -0700 Comment on attachment 351262 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351262&action=review > Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp:872 > + RELEASE_ASSERT(h264parse); Please, add a GST_ERROR, ASSERT_NOT_REACHED and return nullptr in case there is no parser. Better a not playing element than a web process crass. And we should do the same for vorbisparse. 1465416 3 calvaris 2018-10-02 00:14:14 -0700 (In reply to Xabier Rodríguez Calvar from comment #2) > And we should do the same for vorbisparse. I don't mean we need to do it in this bug, it can be another. If you decide to do it in this bug, which I won't oppose, make it explicit in the changelog. 1465424 4 pnormand 2018-10-02 00:39:15 -0700 A long-term and generic solution could be to use parsebin. 1465454 5 351361 aboya 2018-10-02 02:18:25 -0700 Created attachment 351361 Patch 1465465 6 351361 calvaris 2018-10-02 02:37:45 -0700 Comment on attachment 351361 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351361&action=review > Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp:872 > + GstElement* h264parse = gst_element_factory_make("h264parse", parserName.get()); > + g_return_val_if_fail(h264parse, nullptr); ASSERT on the element as well to get a crash in debug. 1465475 7 aboya 2018-10-02 02:55:16 -0700 (In reply to Xabier Rodríguez Calvar from comment #6) > Comment on attachment 351361 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351361&action=review > > > Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp:872 > > + GstElement* h264parse = gst_element_factory_make("h264parse", parserName.get()); > > + g_return_val_if_fail(h264parse, nullptr); > > ASSERT on the element as well to get a crash in debug. You can use G_DEBUG=fatal-criticals for that. 1465490 8 351367 aboya 2018-10-02 03:53:42 -0700 Created attachment 351367 Patch 1465504 9 351367 commit-queue 2018-10-02 04:57:13 -0700 Comment on attachment 351367 Patch Clearing flags on attachment: 351367 Committed r236735: <https://trac.webkit.org/changeset/236735> 1465505 10 commit-queue 2018-10-02 04:57:15 -0700 All reviewed patches have been landed. Closing bug. 1467110 11 aboya 2018-10-08 10:43:49 -0700 Minor correction: it's not actually about a stss box because fragmented files use the `sample_is_difference_sample` flag of `trun` instead; but otherwise the problem is the same. 351262 2018-10-01 10:37:38 -0700 2018-10-02 02:18:21 -0700 Patch bug-190143-20181001193737.patch text/plain 2185 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODkyY2ViNjBlYWI3ZTMy MzFhZTlkOTA5NTBhZDhjOTU2NGIzZjU1YS4uZjUyM2RkY2Y3OWM3YWVlMmRmYTUxZjRkODE5NmFj Zjk4NmMzMDYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTEwLTAxICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXVtHU3Ry ZWFtZXJdIEFkZCBoMjY0cGFyc2UgdG8gYWNjZXB0IE1QNCB3aXRob3V0IHN0c3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBNUDQgZmlsZSB1c2Vk IGluIHRoaXMgVVJMIGRvZXMgbm90IGNvbnRhaW4gYSBzdHNzIChTeW5jIFNhbXBsZQorICAgICAg ICBCb3gpLiBJbiBjb25zZXF1ZW5jZSwgaW4gYWNvcmRhbmNlIHdpdGggdGhlIElTTyBCTUZGIHNw ZWMsIGFsbCBzYW1wbGVzCisgICAgICAgIGFyZSBhc3N1bWVkIHRvIGJlIHN5bmMgZnJhbWVzLi4u IEJ1dCBpbiB0aGlzIGNhc2UgdGhhdCBpcyBub3QgdHJ1ZSwKKyAgICAgICAgaXQncyBqdXN0IHRo YXQgdGhlIGZpbGUgaXMgd3JvbmcgKGUuZy4gY3JlYXRlZCB3aXRoIGEgYnVnZ3kgbXV4ZXIpLgor CisgICAgICAgIGh0dHA6Ly9vcmFuZ2Utb3BlbnNvdXJjZS5naXRodWIuaW8vaGFzcGxheWVyLmpz LzEuMi4wL3BsYXllci5odG1sP3VybD1odHRwOi8vcGxheXJlYWR5LmRpcmVjdHRhcHMubmV0L3Nt b290aHN0cmVhbWluZy9TU1dTUzcyMEgyNjQvU3VwZXJTcGVlZHdheV83MjAuaXNtL01hbmlmZXN0 CisKKyAgICAgICAgVGhlIHdheSBpdCB3b3JrcyBpbiBvdGhlciBicm93c2VycyBpcyBiZWNhdXNl IGluc3RlYWQgb2YgdHJ1c3RpbmcgdGhlCisgICAgICAgIE1QNCBzdHNzIHRhYmxlLCB0aGV5IHJl bHkgb24gcGFyc2luZyB0aGUgaDI2NCBmcmFtZXMuIFdlIGNhbiBkbyB0aGF0CisgICAgICAgIHRv by4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvQXBwZW5kUGlw ZWxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlT3B0aW9uYWxQYXJzZXJGb3JGb3Jt YXQpOgorCiAyMDE4LTEwLTAxICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBGaXggYWJvcnQgaW4gZ3N0X3NhbXBsZV9nZXRfaW5m bygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwCmluZGV4IDM2NWRlZTU3YTI5ZmVl NzIzM2YzNjc5ZDAwZWU2NzI2N2FiZDQ0NWQuLmEzOGZlMDU4NWMzN2ZiYzNjNWEyZGExYjcwNWQz YzJkNzdlOGMzMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwCkBAIC04Njcs NiArODY3LDExIEBAIGNyZWF0ZU9wdGlvbmFsUGFyc2VyRm9yRm9ybWF0KEdzdFBhZCogZGVtdXhl clNyY1BhZCkKICAgICAgICAgUkVMRUFTRV9BU1NFUlQodm9yYmlzcGFyc2UpOwogICAgICAgICBy ZXR1cm4gR1JlZlB0cjxHc3RFbGVtZW50Pih2b3JiaXNwYXJzZSk7CiAgICAgfQorICAgIGlmICgh Z19zdHJjbXAwKG1lZGlhVHlwZSwgInZpZGVvL3gtaDI2NCIpKSB7CisgICAgICAgIEdzdEVsZW1l bnQqIGgyNjRwYXJzZSA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgiaDI2NHBhcnNlIiwgcGFy c2VyTmFtZS5nZXQoKSk7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKGgyNjRwYXJzZSk7CisgICAg ICAgIHJldHVybiBHUmVmUHRyPEdzdEVsZW1lbnQ+KGgyNjRwYXJzZSk7CisgICAgfQogCiAgICAg cmV0dXJuIG51bGxwdHI7CiB9Cg== 351361 2018-10-02 02:18:25 -0700 2018-10-02 03:53:39 -0700 Patch bug-190143-20181002111824.patch text/plain 2790 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGViZDY4MGUxOTcwNDQ4 ZGVkOGIwMjc0MzUzYmVhZGQ0NDhlZmVjZC4uMWE3YjZiODU2MDdhYzcyNzhhZDA3NTc4ODRlNzg2 OGI5ZDJlY2FiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTEwLTAxICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXVtHU3Ry ZWFtZXJdIEFkZCBoMjY0cGFyc2UgdG8gYWNjZXB0IE1QNCB3aXRob3V0IHN0c3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDE0MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBNUDQgZmlsZSB1c2Vk IGluIHRoaXMgVVJMIGRvZXMgbm90IGNvbnRhaW4gYSBzdHNzIChTeW5jIFNhbXBsZQorICAgICAg ICBCb3gpLiBJbiBjb25zZXF1ZW5jZSwgaW4gYWNvcmRhbmNlIHdpdGggdGhlIElTTyBCTUZGIHNw ZWMsIGFsbCBzYW1wbGVzCisgICAgICAgIGFyZSBhc3N1bWVkIHRvIGJlIHN5bmMgZnJhbWVzLi4u IEJ1dCBpbiB0aGlzIGNhc2UgdGhhdCBpcyBub3QgdHJ1ZSwKKyAgICAgICAgaXQncyBqdXN0IHRo YXQgdGhlIGZpbGUgaXMgd3JvbmcgKGUuZy4gY3JlYXRlZCB3aXRoIGEgYnVnZ3kgbXV4ZXIpLgor CisgICAgICAgIGh0dHA6Ly9vcmFuZ2Utb3BlbnNvdXJjZS5naXRodWIuaW8vaGFzcGxheWVyLmpz LzEuMi4wL3BsYXllci5odG1sP3VybD1odHRwOi8vcGxheXJlYWR5LmRpcmVjdHRhcHMubmV0L3Nt b290aHN0cmVhbWluZy9TU1dTUzcyMEgyNjQvU3VwZXJTcGVlZHdheV83MjAuaXNtL01hbmlmZXN0 CisKKyAgICAgICAgVGhlIHdheSBpdCB3b3JrcyBpbiBvdGhlciBicm93c2VycyBpcyBiZWNhdXNl IGluc3RlYWQgb2YgdHJ1c3RpbmcgdGhlCisgICAgICAgIE1QNCBzdHNzIHRhYmxlLCB0aGV5IHJl bHkgb24gcGFyc2luZyB0aGUgaDI2NCBmcmFtZXMuIFdlIGNhbiBkbyB0aGF0CisgICAgICAgIHRv by4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gY2hhbmdlcyBSRUxFQVNFX0FTU0VSVCgpIHdo ZW4gY3JlYXRpbmcgdGhlIHBhcnNlcnMKKyAgICAgICAgdG8gR0xpYiBjcml0aWNhbHMuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU9wdGlvbmFsUGFyc2VyRm9yRm9ybWF0KToKKwog MjAxOC0xMC0wMSAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dTdHJlYW1lcl0gRml4IGFib3J0IGluIGdzdF9zYW1wbGVfZ2V0X2luZm8oKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9B cHBlbmRQaXBlbGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcAppbmRleCAzNjVkZWU1N2EyOWZlZTcyMzNmMzY3 OWQwMGVlNjcyNjdhYmQ0NDVkLi44MzZiMTRhOTA1YTQ4MmM4OGYwZWU0NjNhM2FjYjExMTgxZDU3 YjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcApAQCAtODU5LDE0ICs4NTks MTkgQEAgY3JlYXRlT3B0aW9uYWxQYXJzZXJGb3JGb3JtYXQoR3N0UGFkKiBkZW11eGVyU3JjUGFk KQogCiAgICAgaWYgKCFnX3N0cmNtcDAobWVkaWFUeXBlLCAiYXVkaW8veC1vcHVzIikpIHsKICAg ICAgICAgR3N0RWxlbWVudCogb3B1c3BhcnNlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9tYWtlKCJv cHVzcGFyc2UiLCBwYXJzZXJOYW1lLmdldCgpKTsKLSAgICAgICAgUkVMRUFTRV9BU1NFUlQob3B1 c3BhcnNlKTsKKyAgICAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwob3B1c3BhcnNlLCBudWxscHRy KTsKICAgICAgICAgcmV0dXJuIEdSZWZQdHI8R3N0RWxlbWVudD4ob3B1c3BhcnNlKTsKICAgICB9 CiAgICAgaWYgKCFnX3N0cmNtcDAobWVkaWFUeXBlLCAiYXVkaW8veC12b3JiaXMiKSkgewogICAg ICAgICBHc3RFbGVtZW50KiB2b3JiaXNwYXJzZSA9IGdzdF9lbGVtZW50X2ZhY3RvcnlfbWFrZSgi dm9yYmlzcGFyc2UiLCBwYXJzZXJOYW1lLmdldCgpKTsKLSAgICAgICAgUkVMRUFTRV9BU1NFUlQo dm9yYmlzcGFyc2UpOworICAgICAgICBnX3JldHVybl92YWxfaWZfZmFpbCh2b3JiaXNwYXJzZSwg bnVsbHB0cik7CiAgICAgICAgIHJldHVybiBHUmVmUHRyPEdzdEVsZW1lbnQ+KHZvcmJpc3BhcnNl KTsKICAgICB9CisgICAgaWYgKCFnX3N0cmNtcDAobWVkaWFUeXBlLCAidmlkZW8veC1oMjY0Iikp IHsKKyAgICAgICAgR3N0RWxlbWVudCogaDI2NHBhcnNlID0gZ3N0X2VsZW1lbnRfZmFjdG9yeV9t YWtlKCJoMjY0cGFyc2UiLCBwYXJzZXJOYW1lLmdldCgpKTsKKyAgICAgICAgZ19yZXR1cm5fdmFs X2lmX2ZhaWwoaDI2NHBhcnNlLCBudWxscHRyKTsKKyAgICAgICAgcmV0dXJuIEdSZWZQdHI8R3N0 RWxlbWVudD4oaDI2NHBhcnNlKTsKKyAgICB9CiAKICAgICByZXR1cm4gbnVsbHB0cjsKIH0K 351367 2018-10-02 03:53:42 -0700 2018-10-02 04:57:13 -0700 Patch bug-190143-20181002125341.patch text/plain 2885 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGViZDY4MGUxOTcwNDQ4 ZGVkOGIwMjc0MzUzYmVhZGQ0NDhlZmVjZC4uZjA1ZjdjNTBjMDBmY2RjNTNlMDE1MTJiMGU0YWY2 MzYxMzAwYjk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTEwLTAxICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXVtHU3Ry ZWFtZXJdIEFkZCBoMjY0cGFyc2UgdG8gYWNjZXB0IE1QNCB3aXRob3V0IHN0c3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDE0MworCisgICAgICAg IFJldmlld2VkIGJ5IFhhYmllciBSb2RyaWd1ZXotQ2FsdmFyLgorCisgICAgICAgIFRoZSBNUDQg ZmlsZSB1c2VkIGluIHRoaXMgVVJMIGRvZXMgbm90IGNvbnRhaW4gYSBzdHNzIChTeW5jIFNhbXBs ZQorICAgICAgICBCb3gpLiBJbiBjb25zZXF1ZW5jZSwgaW4gYWNvcmRhbmNlIHdpdGggdGhlIElT TyBCTUZGIHNwZWMsIGFsbCBzYW1wbGVzCisgICAgICAgIGFyZSBhc3N1bWVkIHRvIGJlIHN5bmMg ZnJhbWVzLi4uIEJ1dCBpbiB0aGlzIGNhc2UgdGhhdCBpcyBub3QgdHJ1ZSwKKyAgICAgICAgaXQn cyBqdXN0IHRoYXQgdGhlIGZpbGUgaXMgd3JvbmcgKGUuZy4gY3JlYXRlZCB3aXRoIGEgYnVnZ3kg bXV4ZXIpLgorCisgICAgICAgIGh0dHA6Ly9vcmFuZ2Utb3BlbnNvdXJjZS5naXRodWIuaW8vaGFz cGxheWVyLmpzLzEuMi4wL3BsYXllci5odG1sP3VybD1odHRwOi8vcGxheXJlYWR5LmRpcmVjdHRh cHMubmV0L3Ntb290aHN0cmVhbWluZy9TU1dTUzcyMEgyNjQvU3VwZXJTcGVlZHdheV83MjAuaXNt L01hbmlmZXN0CisKKyAgICAgICAgVGhlIHdheSBpdCB3b3JrcyBpbiBvdGhlciBicm93c2VycyBp cyBiZWNhdXNlIGluc3RlYWQgb2YgdHJ1c3RpbmcgdGhlCisgICAgICAgIE1QNCBzdHNzIHRhYmxl LCB0aGV5IHJlbHkgb24gcGFyc2luZyB0aGUgaDI2NCBmcmFtZXMuIFdlIGNhbiBkbyB0aGF0Cisg ICAgICAgIHRvby4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gY2hhbmdlcyBSRUxFQVNFX0FT U0VSVCgpIHdoZW4gY3JlYXRpbmcgdGhlIHBhcnNlcnMKKyAgICAgICAgdG8gR0xpYiBjcml0aWNh bHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBp cGVsaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU9wdGlvbmFsUGFyc2VyRm9yRm9y bWF0KToKKwogMjAxOC0xMC0wMSAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gRml4IGFib3J0IGluIGdzdF9zYW1wbGVfZ2V0X2lu Zm8oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcAppbmRleCAzNjVkZWU1N2EyOWZl ZTcyMzNmMzY3OWQwMGVlNjcyNjdhYmQ0NDVkLi40YTQ3YTkwYmVkYjE0ZTM1OGJlM2EzNTFkZjM0 ZTQ5MTczMWEyMDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL0FwcGVuZFBpcGVsaW5lLmNwcApAQCAtODU5 LDE0ICs4NTksMjIgQEAgY3JlYXRlT3B0aW9uYWxQYXJzZXJGb3JGb3JtYXQoR3N0UGFkKiBkZW11 eGVyU3JjUGFkKQogCiAgICAgaWYgKCFnX3N0cmNtcDAobWVkaWFUeXBlLCAiYXVkaW8veC1vcHVz IikpIHsKICAgICAgICAgR3N0RWxlbWVudCogb3B1c3BhcnNlID0gZ3N0X2VsZW1lbnRfZmFjdG9y eV9tYWtlKCJvcHVzcGFyc2UiLCBwYXJzZXJOYW1lLmdldCgpKTsKLSAgICAgICAgUkVMRUFTRV9B U1NFUlQob3B1c3BhcnNlKTsKKyAgICAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwob3B1c3BhcnNl LCBudWxscHRyKTsKKyAgICAgICAgQVNTRVJUKG9wdXNwYXJzZSk7CiAgICAgICAgIHJldHVybiBH UmVmUHRyPEdzdEVsZW1lbnQ+KG9wdXNwYXJzZSk7CiAgICAgfQogICAgIGlmICghZ19zdHJjbXAw KG1lZGlhVHlwZSwgImF1ZGlvL3gtdm9yYmlzIikpIHsKICAgICAgICAgR3N0RWxlbWVudCogdm9y YmlzcGFyc2UgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoInZvcmJpc3BhcnNlIiwgcGFyc2Vy TmFtZS5nZXQoKSk7Ci0gICAgICAgIFJFTEVBU0VfQVNTRVJUKHZvcmJpc3BhcnNlKTsKKyAgICAg ICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwodm9yYmlzcGFyc2UsIG51bGxwdHIpOworICAgICAgICBB U1NFUlQodm9yYmlzcGFyc2UpOwogICAgICAgICByZXR1cm4gR1JlZlB0cjxHc3RFbGVtZW50Pih2 b3JiaXNwYXJzZSk7CiAgICAgfQorICAgIGlmICghZ19zdHJjbXAwKG1lZGlhVHlwZSwgInZpZGVv L3gtaDI2NCIpKSB7CisgICAgICAgIEdzdEVsZW1lbnQqIGgyNjRwYXJzZSA9IGdzdF9lbGVtZW50 X2ZhY3RvcnlfbWFrZSgiaDI2NHBhcnNlIiwgcGFyc2VyTmFtZS5nZXQoKSk7CisgICAgICAgIGdf cmV0dXJuX3ZhbF9pZl9mYWlsKGgyNjRwYXJzZSwgbnVsbHB0cik7CisgICAgICAgIEFTU0VSVCho MjY0cGFyc2UpOworICAgICAgICByZXR1cm4gR1JlZlB0cjxHc3RFbGVtZW50PihoMjY0cGFyc2Up OworICAgIH0KIAogICAgIHJldHVybiBudWxscHRyOwogfQo=