208046 2020-02-21 02:05:55 -0800 [GStreamer][WPE] Add GstGLMemoryEGL support for the video-plane-display 2020-02-24 01:15:16 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris cgarcia eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj sergio vjaquez webkit-bug-importer zan oldest_to_newest 1621595 0 pnormand 2020-02-21 02:05:55 -0800 Also ensure the stride is valid. 1621596 1 391389 pnormand 2020-02-21 02:09:44 -0800 Created attachment 391389 Patch 1621605 2 391390 pnormand 2020-02-21 03:23:50 -0800 Created attachment 391390 Patch 1621608 3 391390 zan 2020-02-21 03:43:37 -0800 Comment on attachment 391390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391390&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:224 > + if (hasDMABuf() && (m_dmabufStride == -1)) { Extra parentheses not necessary, but OK. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:226 > + m_isMapped = gst_video_frame_map(&m_videoFrame, &videoInfo, m_buffer.get(), GST_MAP_READ); > + RELEASE_ASSERT(m_isMapped); Is this really a given? or can it fail in some obscure fashion, now or in the future? 1622077 4 pnormand 2020-02-24 01:10:45 -0800 (In reply to Zan Dobersek from comment #3) > > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:226 > > + m_isMapped = gst_video_frame_map(&m_videoFrame, &videoInfo, m_buffer.get(), GST_MAP_READ); > > + RELEASE_ASSERT(m_isMapped); > > Is this really a given? or can it fail in some obscure fashion, now or in > the future? It can fail indeed, especially if no video meta is attached to the buffer. I'll relax this ASSERT. 1622080 5 pnormand 2020-02-24 01:14:08 -0800 Committed r257202: <https://trac.webkit.org/changeset/257202> 1622081 6 webkit-bug-importer 2020-02-24 01:15:16 -0800 <rdar://problem/59718023> 391389 2020-02-21 02:09:44 -0800 2020-02-21 03:23:46 -0800 Patch bug-208046-20200221100942.patch text/plain 4150 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODYzZmJkZWNmZmM2ZDkz MDlhZTAxNmM0NTQwZDFlZGNkM2ZhMTdjMy4uOGRlY2UxNDVlNjE1YTdhMzg3NmZmZjZjMTRhNDE4 NzRmYTFiZDcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAyLTIxICBQaGls aXBwZSBOb3JtYW5kICA8cGhpbG5AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtX UEVdIEFkZCBHc3RHTE1lbW9yeUVHTCBzdXBwb3J0IGZvciB0aGUgdmlkZW8tcGxhbmUtZGlzcGxh eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4MDQ2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGds dXBsb2FkIGVsZW1lbnQgbWlnaHQgZmlsbCBFR0wgbWVtb3JpZXMgaW4gc29tZSBjYXNlcywgc28g Zm9yCisgICAgICAgIHRoZSB2aWRlbyBzaW5rIHdlIGNhbiB0aGVuIGRpcmVjdGx5IGFjY2VzcyB0 aGUgY29ycmVzcG9uZGluZworICAgICAgICBFR0xJbWFnZSBhbmQgZXhwb3J0IGl0IHRvIERNQUJ1 ZiwgaW5zdGVhZCBvZiB1c2luZyB0aGUgbW9yZQorICAgICAgICBnZW5lcmFsIEdMTWVtb3J5IGNv ZGUgcGF0aC4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2ggd2UgYWxzbyBlbnN1cmUgdGhhdCBi b3RoIERNQUJ1ZiBGRCBhbmQgc3RyaWRlIGFyZSB2YWxpZC4KKyAgICAgICAgCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHc3RWaWRlb0ZyYW1lSG9sZGVyOjpHc3RWaWRlb0ZyYW1l SG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdzdFZpZGVvRnJhbWVIb2xkZXI6OmhhbmRvZmZW aWRlb0RtYUJ1Zik6CisKIDIwMjAtMDItMjEgIEphY2sgTGVlICA8c2hpaGNoaWVoX2xlZUBhcHBs ZS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBjcmFzaCBpbiBSZW5kZXJTdHlsZTo6aXNGbGlwcGVk QmxvY2tzV3JpdGluZ01vZGUgd2hlbiBmcmFnbWVudCBmbG93IGdhaW5zIGEgbmV3IGluLWZsb3cg ZGVzY2VuZGFudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAppbmRleCA1NTNkOGVlM2ViNDU1Njk5MTIzYmJhYmQ1OWRmM2EyNGUwMzllOGI4Li5hMDVj YTY2NTVjZWQ5MWRlZmJkNTcxZDYwZTkyMzYwYzcyZGJkZTc4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTQ4LDYgKzE0OCw3IEBACiAj aWYgVVNFKFdQRV9WSURFT19QTEFORV9ESVNQTEFZX0RNQUJVRikKICNpbmNsdWRlICJQbGF0Zm9y bURpc3BsYXlMaWJXUEUuaCIKICNpbmNsdWRlIDxnc3QvZ2wvZWdsL2dzdGVnbGltYWdlLmg+Cisj aW5jbHVkZSA8Z3N0L2dsL2VnbC9nc3RnbG1lbW9yeWVnbC5oPgogI2luY2x1ZGUgPHdwZS9leHRl bnNpb25zL3ZpZGVvLXBsYW5lLWRpc3BsYXktZG1hYnVmLmg+CiAjZW5kaWYKIApAQCAtMjA3LDE0 ICsyMDgsMjggQEAgcHVibGljOgogICAgICAgICBtX2ZsYWdzID0gZmxhZ3MgfCAobV9oYXNBbHBo YUNoYW5uZWwgPyBUZXh0dXJlTWFwcGVyR0w6OlNob3VsZEJsZW5kIDogMCk7CiAKICNpZiBVU0Uo V1BFX1ZJREVPX1BMQU5FX0RJU1BMQVlfRE1BQlVGKQorICAgICAgICBtX2RtYWJ1ZkZEID0gMDsK KyAgICAgICAgZ3NpemUgb2Zmc2V0OwogICAgICAgICBHc3RNZW1vcnkqIG1lbW9yeSA9IGdzdF9i dWZmZXJfcGVla19tZW1vcnkobV9idWZmZXIuZ2V0KCksIDApOwotICAgICAgICBpZiAoZ3N0X2lz X2dsX21lbW9yeShtZW1vcnkpKSB7Ci0gICAgICAgICAgICBHc3RHTE1lbW9yeSogZ2xNZW1vcnkg PSBHU1RfR0xfTUVNT1JZX0NBU1QobWVtb3J5KTsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0RUdM SW1hZ2U+IGVnbEltYWdlID0gYWRvcHRHUmVmKGdzdF9lZ2xfaW1hZ2VfZnJvbV90ZXh0dXJlKEdT VF9HTF9CQVNFX01FTU9SWV9DQVNUKG1lbW9yeSktPmNvbnRleHQsIGdsTWVtb3J5LCBudWxscHRy KSk7Ci0gICAgICAgICAgICBnc2l6ZSBvZmZzZXQ7Ci0gICAgICAgICAgICBpZiAoZWdsSW1hZ2Ug JiYgZ3N0X2VnbF9pbWFnZV9leHBvcnRfZG1hYnVmKGVnbEltYWdlLmdldCgpLCAmbV9kbWFidWZG RCwgJm1fZG1hYnVmU3RyaWRlLCAmb2Zmc2V0KSkKLSAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIGlmIChnc3RfaXNfZ2xfbWVtb3J5X2VnbChtZW1vcnkpKSB7CisgICAgICAgICAgICBH c3RHTE1lbW9yeUVHTCogZWdsTWVtb3J5ID0gKEdzdEdMTWVtb3J5RUdMKikgbWVtb3J5OworICAg ICAgICAgICAgZ3N0X2VnbF9pbWFnZV9leHBvcnRfZG1hYnVmKGVnbE1lbW9yeS0+aW1hZ2UsICZt X2RtYWJ1ZkZELCAmbV9kbWFidWZTdHJpZGUsICZvZmZzZXQpOworICAgICAgICB9IGVsc2UgaWYg KGdzdF9pc19nbF9tZW1vcnkobWVtb3J5KSkgeworICAgICAgICAgICAgR1JlZlB0cjxHc3RFR0xJ bWFnZT4gZWdsSW1hZ2UgPSBhZG9wdEdSZWYoZ3N0X2VnbF9pbWFnZV9mcm9tX3RleHR1cmUoR1NU X0dMX0JBU0VfTUVNT1JZX0NBU1QobWVtb3J5KS0+Y29udGV4dCwgR1NUX0dMX01FTU9SWV9DQVNU KG1lbW9yeSksIG51bGxwdHIpKTsKKworICAgICAgICAgICAgaWYgKGVnbEltYWdlKQorICAgICAg ICAgICAgICAgIGdzdF9lZ2xfaW1hZ2VfZXhwb3J0X2RtYWJ1ZihlZ2xJbWFnZS5nZXQoKSwgJm1f ZG1hYnVmRkQsICZtX2RtYWJ1ZlN0cmlkZSwgJm9mZnNldCk7CisgICAgICAgIH0KKworICAgICAg ICBpZiAobV9kbWFidWZGRCAmJiAobV9kbWFidWZTdHJpZGUgPT0gLTEpKSB7CisgICAgICAgICAg ICBtX2lzTWFwcGVkID0gZ3N0X3ZpZGVvX2ZyYW1lX21hcCgmbV92aWRlb0ZyYW1lLCAmdmlkZW9J bmZvLCBtX2J1ZmZlci5nZXQoKSwgR1NUX01BUF9SRUFEKTsKKyAgICAgICAgICAgIFJFTEVBU0Vf QVNTRVJUKG1faXNNYXBwZWQpOworICAgICAgICAgICAgbV9kbWFidWZTdHJpZGUgPSBHU1RfVklE RU9fSU5GT19QTEFORV9TVFJJREUoJm1fdmlkZW9GcmFtZS5pbmZvLCAwKTsKICAgICAgICAgfQor CisgICAgICAgIGlmIChtX2RtYWJ1ZkZEICYmIG1fZG1hYnVmU3RyaWRlKQorICAgICAgICAgICAg cmV0dXJuOworCiAgICAgICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBzX29uY2VGbGFnOwogICAg ICAgICBzdGQ6OmNhbGxfb25jZShzX29uY2VGbGFnLCBbXSB7CiAgICAgICAgICAgICBHU1RfV0FS TklORygiVGV4dHVyZSBleHBvcnQgdG8gRE1BQnVmIGZhaWxlZCwgZmFsbGluZyBiYWNrIHRvIGlu dGVybmFsIHJlbmRlcmluZyIpOwpAQCAtMjU3LDkgKzI3Miw2IEBAIHB1YmxpYzoKICAgICAgICAg aWYgKG1fZG1hYnVmRkQgPD0gMCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAo bV9kbWFidWZTdHJpZGUgPT0gLTEpCi0gICAgICAgICAgICBtX2RtYWJ1ZlN0cmlkZSA9IEdTVF9W SURFT19JTkZPX1BMQU5FX1NUUklERSgmbV92aWRlb0ZyYW1lLmluZm8sIDApOwotCiAgICAgICAg IHdwZV92aWRlb19wbGFuZV9kaXNwbGF5X2RtYWJ1Zl9zb3VyY2VfdXBkYXRlKHZpZGVvUGxhbmVE aXNwbGF5RG1hQnVmU291cmNlLCBtX2RtYWJ1ZkZELCByZWN0LngoKSwgcmVjdC55KCksIG1fc2l6 ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCksIG1fZG1hYnVmU3RyaWRlLCBbXSh2b2lkKiBkYXRh KSB7CiAgICAgICAgICAgICBnc3RfYnVmZmVyX3VucmVmKEdTVF9CVUZGRVJfQ0FTVChkYXRhKSk7 CiAgICAgICAgIH0sIGdzdF9idWZmZXJfcmVmKG1fYnVmZmVyLmdldCgpKSk7Cg== 391390 2020-02-21 03:23:50 -0800 2020-02-21 03:43:37 -0800 Patch bug-208046-20200221112349.patch text/plain 4153 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODYzZmJkZWNmZmM2ZDkz MDlhZTAxNmM0NTQwZDFlZGNkM2ZhMTdjMy4uOGRlY2UxNDVlNjE1YTdhMzg3NmZmZjZjMTRhNDE4 NzRmYTFiZDcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAyLTIxICBQaGls aXBwZSBOb3JtYW5kICA8cGhpbG5AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtX UEVdIEFkZCBHc3RHTE1lbW9yeUVHTCBzdXBwb3J0IGZvciB0aGUgdmlkZW8tcGxhbmUtZGlzcGxh eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4MDQ2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGds dXBsb2FkIGVsZW1lbnQgbWlnaHQgZmlsbCBFR0wgbWVtb3JpZXMgaW4gc29tZSBjYXNlcywgc28g Zm9yCisgICAgICAgIHRoZSB2aWRlbyBzaW5rIHdlIGNhbiB0aGVuIGRpcmVjdGx5IGFjY2VzcyB0 aGUgY29ycmVzcG9uZGluZworICAgICAgICBFR0xJbWFnZSBhbmQgZXhwb3J0IGl0IHRvIERNQUJ1 ZiwgaW5zdGVhZCBvZiB1c2luZyB0aGUgbW9yZQorICAgICAgICBnZW5lcmFsIEdMTWVtb3J5IGNv ZGUgcGF0aC4KKworICAgICAgICBXaXRoIHRoaXMgcGF0Y2ggd2UgYWxzbyBlbnN1cmUgdGhhdCBi b3RoIERNQUJ1ZiBGRCBhbmQgc3RyaWRlIGFyZSB2YWxpZC4KKyAgICAgICAgCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHc3RWaWRlb0ZyYW1lSG9sZGVyOjpHc3RWaWRlb0ZyYW1l SG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdzdFZpZGVvRnJhbWVIb2xkZXI6OmhhbmRvZmZW aWRlb0RtYUJ1Zik6CisKIDIwMjAtMDItMjEgIEphY2sgTGVlICA8c2hpaGNoaWVoX2xlZUBhcHBs ZS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBjcmFzaCBpbiBSZW5kZXJTdHlsZTo6aXNGbGlwcGVk QmxvY2tzV3JpdGluZ01vZGUgd2hlbiBmcmFnbWVudCBmbG93IGdhaW5zIGEgbmV3IGluLWZsb3cg ZGVzY2VuZGFudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcAppbmRleCA1NTNkOGVlM2ViNDU1Njk5MTIzYmJhYmQ1OWRmM2EyNGUwMzllOGI4Li45OWI3 M2Q1MjA1Y2RhM2U5N2MzMzNjOGRhZTY4MGU2Yjg1ZTVkZTJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTQ4LDYgKzE0OCw3IEBACiAj aWYgVVNFKFdQRV9WSURFT19QTEFORV9ESVNQTEFZX0RNQUJVRikKICNpbmNsdWRlICJQbGF0Zm9y bURpc3BsYXlMaWJXUEUuaCIKICNpbmNsdWRlIDxnc3QvZ2wvZWdsL2dzdGVnbGltYWdlLmg+Cisj aW5jbHVkZSA8Z3N0L2dsL2VnbC9nc3RnbG1lbW9yeWVnbC5oPgogI2luY2x1ZGUgPHdwZS9leHRl bnNpb25zL3ZpZGVvLXBsYW5lLWRpc3BsYXktZG1hYnVmLmg+CiAjZW5kaWYKIApAQCAtMjA3LDE0 ICsyMDgsMjggQEAgcHVibGljOgogICAgICAgICBtX2ZsYWdzID0gZmxhZ3MgfCAobV9oYXNBbHBo YUNoYW5uZWwgPyBUZXh0dXJlTWFwcGVyR0w6OlNob3VsZEJsZW5kIDogMCk7CiAKICNpZiBVU0Uo V1BFX1ZJREVPX1BMQU5FX0RJU1BMQVlfRE1BQlVGKQorICAgICAgICBtX2RtYWJ1ZkZEID0gLTE7 CisgICAgICAgIGdzaXplIG9mZnNldDsKICAgICAgICAgR3N0TWVtb3J5KiBtZW1vcnkgPSBnc3Rf YnVmZmVyX3BlZWtfbWVtb3J5KG1fYnVmZmVyLmdldCgpLCAwKTsKLSAgICAgICAgaWYgKGdzdF9p c19nbF9tZW1vcnkobWVtb3J5KSkgewotICAgICAgICAgICAgR3N0R0xNZW1vcnkqIGdsTWVtb3J5 ID0gR1NUX0dMX01FTU9SWV9DQVNUKG1lbW9yeSk7Ci0gICAgICAgICAgICBHUmVmUHRyPEdzdEVH TEltYWdlPiBlZ2xJbWFnZSA9IGFkb3B0R1JlZihnc3RfZWdsX2ltYWdlX2Zyb21fdGV4dHVyZShH U1RfR0xfQkFTRV9NRU1PUllfQ0FTVChtZW1vcnkpLT5jb250ZXh0LCBnbE1lbW9yeSwgbnVsbHB0 cikpOwotICAgICAgICAgICAgZ3NpemUgb2Zmc2V0OwotICAgICAgICAgICAgaWYgKGVnbEltYWdl ICYmIGdzdF9lZ2xfaW1hZ2VfZXhwb3J0X2RtYWJ1ZihlZ2xJbWFnZS5nZXQoKSwgJm1fZG1hYnVm RkQsICZtX2RtYWJ1ZlN0cmlkZSwgJm9mZnNldCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICBpZiAoZ3N0X2lzX2dsX21lbW9yeV9lZ2wobWVtb3J5KSkgeworICAgICAgICAgICAg R3N0R0xNZW1vcnlFR0wqIGVnbE1lbW9yeSA9IChHc3RHTE1lbW9yeUVHTCopIG1lbW9yeTsKKyAg ICAgICAgICAgIGdzdF9lZ2xfaW1hZ2VfZXhwb3J0X2RtYWJ1ZihlZ2xNZW1vcnktPmltYWdlLCAm bV9kbWFidWZGRCwgJm1fZG1hYnVmU3RyaWRlLCAmb2Zmc2V0KTsKKyAgICAgICAgfSBlbHNlIGlm IChnc3RfaXNfZ2xfbWVtb3J5KG1lbW9yeSkpIHsKKyAgICAgICAgICAgIEdSZWZQdHI8R3N0RUdM SW1hZ2U+IGVnbEltYWdlID0gYWRvcHRHUmVmKGdzdF9lZ2xfaW1hZ2VfZnJvbV90ZXh0dXJlKEdT VF9HTF9CQVNFX01FTU9SWV9DQVNUKG1lbW9yeSktPmNvbnRleHQsIEdTVF9HTF9NRU1PUllfQ0FT VChtZW1vcnkpLCBudWxscHRyKSk7CisKKyAgICAgICAgICAgIGlmIChlZ2xJbWFnZSkKKyAgICAg ICAgICAgICAgICBnc3RfZWdsX2ltYWdlX2V4cG9ydF9kbWFidWYoZWdsSW1hZ2UuZ2V0KCksICZt X2RtYWJ1ZkZELCAmbV9kbWFidWZTdHJpZGUsICZvZmZzZXQpOworICAgICAgICB9CisKKyAgICAg ICAgaWYgKGhhc0RNQUJ1ZigpICYmIChtX2RtYWJ1ZlN0cmlkZSA9PSAtMSkpIHsKKyAgICAgICAg ICAgIG1faXNNYXBwZWQgPSBnc3RfdmlkZW9fZnJhbWVfbWFwKCZtX3ZpZGVvRnJhbWUsICZ2aWRl b0luZm8sIG1fYnVmZmVyLmdldCgpLCBHU1RfTUFQX1JFQUQpOworICAgICAgICAgICAgUkVMRUFT RV9BU1NFUlQobV9pc01hcHBlZCk7CisgICAgICAgICAgICBtX2RtYWJ1ZlN0cmlkZSA9IEdTVF9W SURFT19JTkZPX1BMQU5FX1NUUklERSgmbV92aWRlb0ZyYW1lLmluZm8sIDApOwogICAgICAgICB9 CisKKyAgICAgICAgaWYgKGhhc0RNQUJ1ZigpICYmIG1fZG1hYnVmU3RyaWRlKQorICAgICAgICAg ICAgcmV0dXJuOworCiAgICAgICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBzX29uY2VGbGFnOwog ICAgICAgICBzdGQ6OmNhbGxfb25jZShzX29uY2VGbGFnLCBbXSB7CiAgICAgICAgICAgICBHU1Rf V0FSTklORygiVGV4dHVyZSBleHBvcnQgdG8gRE1BQnVmIGZhaWxlZCwgZmFsbGluZyBiYWNrIHRv IGludGVybmFsIHJlbmRlcmluZyIpOwpAQCAtMjU3LDkgKzI3Miw2IEBAIHB1YmxpYzoKICAgICAg ICAgaWYgKG1fZG1hYnVmRkQgPD0gMCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBp ZiAobV9kbWFidWZTdHJpZGUgPT0gLTEpCi0gICAgICAgICAgICBtX2RtYWJ1ZlN0cmlkZSA9IEdT VF9WSURFT19JTkZPX1BMQU5FX1NUUklERSgmbV92aWRlb0ZyYW1lLmluZm8sIDApOwotCiAgICAg ICAgIHdwZV92aWRlb19wbGFuZV9kaXNwbGF5X2RtYWJ1Zl9zb3VyY2VfdXBkYXRlKHZpZGVvUGxh bmVEaXNwbGF5RG1hQnVmU291cmNlLCBtX2RtYWJ1ZkZELCByZWN0LngoKSwgcmVjdC55KCksIG1f c2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCksIG1fZG1hYnVmU3RyaWRlLCBbXSh2b2lkKiBk YXRhKSB7CiAgICAgICAgICAgICBnc3RfYnVmZmVyX3VucmVmKEdTVF9CVUZGRVJfQ0FTVChkYXRh KSk7CiAgICAgICAgIH0sIGdzdF9idWZmZXJfcmVmKG1fYnVmZmVyLmdldCgpKSk7Cg==