201537 2019-09-06 01:19:12 -0700 [GStreamer] YUV buffers on iMX platforms have to be treated as RGBA 2019-09-06 01:52:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan calvaris clord pnormand vjaquez webkit-bug-importer oldest_to_newest 1568431 0 zan 2019-09-06 01:19:12 -0700 [GStreamer] YUV buffers on iMX platforms have to be treated as RGBA 1568436 1 378166 zan 2019-09-06 01:29:30 -0700 Created attachment 378166 Patch 1568442 2 378166 pnormand 2019-09-06 01:37:59 -0700 Comment on attachment 378166 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378166&action=review Looks good, I'll give it a test run on my board, please hold on :) > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:2432 > + else if (g_str_has_prefix(elementName.get(), "imxvpudecoder")) Can you make the prefix a bit shorter? It would alloww to cover the gst-imx v2 branch if "imxvpudec" is used. > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:237 > + fprintf(stderr, "\tYUV but weird\n"); :) 1568445 3 378170 zan 2019-09-06 01:50:28 -0700 Created attachment 378170 Patch 1568447 4 378170 zan 2019-09-06 01:51:29 -0700 Comment on attachment 378170 Patch Clearing flags on attachment: 378170 Committed r249568: <https://trac.webkit.org/changeset/249568> 1568448 5 zan 2019-09-06 01:51:33 -0700 All reviewed patches have been landed. Closing bug. 1568449 6 webkit-bug-importer 2019-09-06 01:52:15 -0700 <rdar://problem/55104803> 1568450 7 webkit-bug-importer 2019-09-06 01:52:16 -0700 <rdar://problem/55104807> 378166 2019-09-06 01:29:30 -0700 2019-09-06 01:50:25 -0700 Patch bug-201537-20190906102929.patch text/plain 9598 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE2NTMzNWNkMDg5NmU2 NzlkNDUwYzg0YzU0MGQzOWQyMTQ0YTUxMy4uYjlmMWY1MDA2MDdmMDY2ZmRiMmQ3NzI0NjM3NWQ0 NTExNzAzMTMyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBZ VVYgYnVmZmVycyBvbiBpTVggcGxhdGZvcm1zIGhhdmUgdG8gYmUgdHJlYXRlZCBhcyBSR0JBCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE1MzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaW14dnB1 ZGVjb2RlciBlbGVtZW50IG9uIGlNWCBwbGF0Zm9ybXMgZGVjb2RlcyBZVVYgZGF0YSBpbiBhCisg ICAgICAgIHBsYXRmb3JtLXNwZWNpZmljIHdheSwgZ2F0aGVyaW5nIHRoZSBZVVYgZGF0YSBpbiBh IHNpbmdsZSB0ZXh0dXJlIGFuZAorICAgICAgICB0aGVuIHJlbHlpbmcgb24gdGhlIHNhbXBsZXIg aW4gdGhlIFZpdmFudGUgZ3JhcGhpY3MgZHJpdmVycyB0bworICAgICAgICBhdXRvbWFnaWNhbGx5 IGRlY29kZSB0aGF0IFlVViBkYXRhIGludG8gUkdCQSB2YWx1ZXMuCisKKyAgICAgICAgVG8gY29y cmVjdGx5IGRpc3BsYXkgc3VjaCBkZWNvZGVkIGRhdGEsIHdlIGhhdmUgdG8gcmVwcmVzZW50IHRo YXQKKyAgICAgICAgc2luZ2xlIHRleHR1cmUgYXMgYW4gUkdCQSB0ZXh0dXJlLCBldmVuIHdoZW4g dGhlIEdTdHJlYW1lciBidWZmZXIgaXMKKyAgICAgICAgY3JhZnRlZCBhcyBjb250YWluaW5nIHBs YW5hciBZVVYgZGF0YS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJDb21tb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbik6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2Uu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3N0VmlkZW9GcmFtZUhvbGRlcjo6R3N0VmlkZW9GcmFt ZUhvbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpHc3RWaWRlb0ZyYW1lSG9sZGVyOjpwbGF0Zm9y bUxheWVyQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lckJhc2U6On5NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlKToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OnB1c2hUZXh0dXJlVG9Db21w b3NpdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2U6OmZsdXNoQ3VycmVudEJ1ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlOjpjb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6bmF0aXZl SW1hZ2VGb3JDdXJyZW50VGltZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaDoKKwogMjAxOS0wOS0wNSAgRnVq aWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXSBB ZGQgc3VwcG9ydCBmb3IgTW91c2VFdmVudC5idXR0b25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgK aW5kZXggNDE5MGQ2NGZiZTFhZjU3NTMyYmM3Njg2MjZlN2M4YmMyNjBmM2Q2MS4uYzgxM2I3OGMz MjI5Zjk4NGVlOTQ1ZjA0YjRkYmE5MGNhZTJjMDM1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24u aApAQCAtMjE5LDYgKzIxOSw4IEBAIHByaXZhdGU6CiB2b2lkIGNvbm5lY3RTaW1wbGVCdXNNZXNz YWdlQ2FsbGJhY2soR3N0RWxlbWVudCogcGlwZWxpbmUpOwogdm9pZCBkaXNjb25uZWN0U2ltcGxl QnVzTWVzc2FnZUNhbGxiYWNrKEdzdEVsZW1lbnQqIHBpcGVsaW5lKTsKIAorZW51bSBjbGFzcyBH c3RWaWRlb0RlY29kZXJQbGF0Zm9ybSB7IElteFZQVSwgVmlkZW80TGludXggfTsKKwogfQogCiAj aWZuZGVmIEdTVF9CVUZGRVJfRFRTX09SX1BUUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBlZmNhMmY1Yzc0OTgzZTM4YjdlYjVhNzNkN2Q1 YzRjMmQwMDU0YjE3Li40NTAzMDIzNDY3YjdiOTlkMWJiNjRkZjY3OWJiNDI3ZDczOWY1ZTJkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAt MjQyOCw3ICsyNDI4LDkgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNyZWF0 ZUdTVFBsYXlCaW4oY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYKIAogICAgICAgICBHVW5p cXVlUHRyPGNoYXI+IGVsZW1lbnROYW1lKGdzdF9lbGVtZW50X2dldF9uYW1lKGVsZW1lbnQpKTsK ICAgICAgICAgaWYgKGdfc3RyX2hhc19wcmVmaXgoZWxlbWVudE5hbWUuZ2V0KCksICJ2NGwyIikp Ci0gICAgICAgICAgICBwbGF5ZXItPm1fdmlkZW9EZWNvZGVyUGxhdGZvcm0gPSBXZWJLaXRHc3RW aWRlb0RlY29kZXJQbGF0Zm9ybTo6VmlkZW80TGludXg7CisgICAgICAgICAgICBwbGF5ZXItPm1f dmlkZW9EZWNvZGVyUGxhdGZvcm0gPSBHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybTo6VmlkZW80TGlu dXg7CisgICAgICAgIGVsc2UgaWYgKGdfc3RyX2hhc19wcmVmaXgoZWxlbWVudE5hbWUuZ2V0KCks ICJpbXh2cHVkZWNvZGVyIikpCisgICAgICAgICAgICBwbGF5ZXItPm1fdmlkZW9EZWNvZGVyUGxh dGZvcm0gPSBHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybTo6SW14VlBVOwogCiAjaWYgVVNFKFRFWFRV UkVfTUFQUEVSX0dMKQogICAgICAgICBwbGF5ZXItPnVwZGF0ZVRleHR1cmVNYXBwZXJGbGFncygp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2Uu Y3BwCmluZGV4IDhlOTVmMzRkZGRjYTdmMGU3NzMyYmQ4MjcxMzc0ZDg0MzA1M2U2ZjcuLjg5MTI0 ZDM1YjIwNTI2MGE4NjU2MWY3YTljNzc0ZWU0MTA1Y2M2ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKQEAgLTEyNyw3ICsxMjcs OCBAQCBzdGF0aWMgaW50IGdyZWF0ZXN0Q29tbW9uRGl2aXNvcihpbnQgYSwgaW50IGIpCiAjaWYg VVNFKFRFWFRVUkVfTUFQUEVSX0dMKQogY2xhc3MgR3N0VmlkZW9GcmFtZUhvbGRlciA6IHB1Ymxp YyBUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcjo6VW5tYW5hZ2VkQnVmZmVyRGF0YUhv bGRlciB7CiBwdWJsaWM6Ci0gICAgZXhwbGljaXQgR3N0VmlkZW9GcmFtZUhvbGRlcihHc3RTYW1w bGUqIHNhbXBsZSwgVGV4dHVyZU1hcHBlckdMOjpGbGFncyBmbGFncywgYm9vbCBnc3RHTEVuYWJs ZWQpCisgICAgZXhwbGljaXQgR3N0VmlkZW9GcmFtZUhvbGRlcihHc3RTYW1wbGUqIHNhbXBsZSwg T3B0aW9uYWw8R3N0VmlkZW9EZWNvZGVyUGxhdGZvcm0+IHZpZGVvRGVjb2RlclBsYXRmb3JtLCBU ZXh0dXJlTWFwcGVyR0w6OkZsYWdzIGZsYWdzLCBib29sIGdzdEdMRW5hYmxlZCkKKyAgICAgICAg OiBtX3ZpZGVvRGVjb2RlclBsYXRmb3JtKHZpZGVvRGVjb2RlclBsYXRmb3JtKQogICAgIHsKICAg ICAgICAgUkVMRUFTRV9BU1NFUlQoR1NUX0lTX1NBTVBMRShzYW1wbGUpKTsKIApAQCAtMjMyLDYg KzIzMywxNCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBpZiAoR1NUX1ZJREVPX0lORk9fTl9DT01Q T05FTlRTKCZtX3ZpZGVvRnJhbWUuaW5mbykgPCAzIHx8IEdTVF9WSURFT19JTkZPX05fUExBTkVT KCZtX3ZpZGVvRnJhbWUuaW5mbykgPiAzKQogICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogCisgICAgICAgICAgICBpZiAobV92aWRlb0RlY29kZXJQbGF0Zm9ybSAmJiAqbV92aWRlb0Rl Y29kZXJQbGF0Zm9ybSA9PSBHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybTo6SW14VlBVKSB7CisgICAg ICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJcdFlVViBidXQgd2VpcmRcbiIpOworICAgICAg ICAgICAgICAgIC8vIElNWCBWUFUgZGVjb2RlciBkZWNvZGVzIFlVViBkYXRhIG9ubHkgaW50byB0 aGUgWSB0ZXh0dXJlIGZyb20gd2hpY2ggdGhlIHNhbXBsZXIKKyAgICAgICAgICAgICAgICAvLyB0 aGVuIGRpcmVjdGx5IHByb2R1Y2VzIFJHQkEgZGF0YS4gVGV4dHVyZXMgZm9yIG90aGVyIHBsYW5l cyBhcmVuJ3QgdXNlZCwgYnV0CisgICAgICAgICAgICAgICAgLy8gdGhhdCdzIGRlY29kZXIncyBw cm9ibGVtLiBXZSBoYXZlIHRvIHRyZWF0IHRoYXQgWSB0ZXh0dXJlIGFzIGhhdmluZyBSR0JBIGRh dGEuCisgICAgICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8QnVmZmVyPihCdWZmZXI6OlRl eHR1cmVWYXJpYW50IHsgQnVmZmVyOjpSR0JUZXh0dXJlIHsgKnN0YXRpY19jYXN0PEdMdWludCo+ KG1fdmlkZW9GcmFtZS5kYXRhWzBdKSB9IH0sIG1fc2l6ZSwgbV9mbGFncywgR3JhcGhpY3NDb250 ZXh0M0Q6OlJHQkEpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB1bnNpZ25lZCBudW1i ZXJPZlBsYW5lcyA9IEdTVF9WSURFT19JTkZPX05fUExBTkVTKCZtX3ZpZGVvRnJhbWUuaW5mbyk7 CiAgICAgICAgICAgICBzdGQ6OmFycmF5PEdMdWludCwgMz4gcGxhbmVzOwogICAgICAgICAgICAg c3RkOjphcnJheTx1bnNpZ25lZCwgMz4geXV2UGxhbmU7CkBAIC0yNzAsNiArMjc5LDcgQEAgcHJp dmF0ZToKICAgICBHc3RWaWRlb0ZyYW1lIG1fdmlkZW9GcmFtZSB7IH07CiAgICAgSW50U2l6ZSBt X3NpemU7CiAgICAgYm9vbCBtX2hhc0FscGhhQ2hhbm5lbDsKKyAgICBPcHRpb25hbDxHc3RWaWRl b0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29kZXJQbGF0Zm9ybTsKICAgICBUZXh0dXJlTWFw cGVyR0w6OkZsYWdzIG1fZmxhZ3MgeyB9OwogICAgIEdMdWludCBtX3RleHR1cmVJRCB7IDAgfTsK ICAgICBib29sIG1faXNNYXBwZWQgeyBmYWxzZSB9OwpAQCAtMzAyLDcgKzMxMiw3IEBAIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2UoTWVkaWFQbGF5ZXIqIHBsCiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjp+TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSgpCiB7CiAjaWYgVVNFKEdTVFJFQU1FUl9HTCkK LSAgICBpZiAobV92aWRlb0RlY29kZXJQbGF0Zm9ybSA9PSBXZWJLaXRHc3RWaWRlb0RlY29kZXJQ bGF0Zm9ybTo6VmlkZW80TGludXgpCisgICAgaWYgKG1fdmlkZW9EZWNvZGVyUGxhdGZvcm0gPT0g R3N0VmlkZW9EZWNvZGVyUGxhdGZvcm06OlZpZGVvNExpbnV4KQogICAgICAgICBmbHVzaEN1cnJl bnRCdWZmZXIoKTsKICNlbmRpZgogI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgVVNFKE5J Q09TSUEpCkBAIC03NzksNyArNzg5LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlOjpwdXNoVGV4dHVyZVRvQ29tcG9zaXRvcigpCiAgICAgICAgICAgICBpZiAoIXByb3h5 LmlzQWN0aXZlKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBtYWtlVW5pcXVl PEdzdFZpZGVvRnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCBtX3RleHR1cmVNYXBwZXJGbGFn cywgIW1fdXNpbmdGYWxsYmFja1ZpZGVvU2luayk7CisgICAgICAgICAgICBzdGQ6OnVuaXF1ZV9w dHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBtYWtlVW5pcXVlPEdzdFZpZGVv RnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCBtX3ZpZGVvRGVjb2RlclBsYXRmb3JtLCBtX3Rl eHR1cmVNYXBwZXJGbGFncywgIW1fdXNpbmdGYWxsYmFja1ZpZGVvU2luayk7CiAKICAgICAgICAg ICAgIHN0ZDo6dW5pcXVlX3B0cjxUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4gbGF5 ZXJCdWZmZXI7CiAgICAgICAgICAgICBpZiAoZnJhbWVIb2xkZXItPmhhc01hcHBlZFRleHR1cmVz KCkpIHsKQEAgLTkzNyw3ICs5NDcsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OmZsdXNoQ3VycmVudEJ1ZmZlcigpCiAgICAgICAgICAgICBnc3Rfc2FtcGxlX2dldF9z ZWdtZW50KG1fc2FtcGxlLmdldCgpKSwgaW5mbyA/IGdzdF9zdHJ1Y3R1cmVfY29weShpbmZvKSA6 IG51bGxwdHIpKTsKICAgICB9CiAKLSAgICBib29sIHNob3VsZFdhaXQgPSBtX3ZpZGVvRGVjb2Rl clBsYXRmb3JtID09IFdlYktpdEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtOjpWaWRlbzRMaW51eDsK KyAgICBib29sIHNob3VsZFdhaXQgPSBtX3ZpZGVvRGVjb2RlclBsYXRmb3JtID09IEdzdFZpZGVv RGVjb2RlclBsYXRmb3JtOjpWaWRlbzRMaW51eDsKICAgICBhdXRvIHByb3h5T3BlcmF0aW9uID0g W3Nob3VsZFdhaXQsIHBpcGVsaW5lID0gcGlwZWxpbmUoKV0oVGV4dHVyZU1hcHBlclBsYXRmb3Jt TGF5ZXJQcm94eSYgcHJveHkpIHsKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSwg IkZsdXNoaW5nIHZpZGVvIHNhbXBsZSAlcyIsIHNob3VsZFdhaXQgPyAic3luY2hyb25vdXNseSIg OiAiIik7CiAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKCFzaG91bGRXYWl0ID8gJnByb3h5Lmxv Y2soKSA6IG51bGxwdHIpOwpAQCAtMTAzOCw3ICsxMDQ4LDcgQEAgYm9vbCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlOjpjb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUoR3Jh cGhpY3MKICAgICBpZiAoIUdTVF9JU19TQU1QTEUobV9zYW1wbGUuZ2V0KCkpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4g ZnJhbWVIb2xkZXIgPSBtYWtlVW5pcXVlPEdzdFZpZGVvRnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdl dCgpLCBtX3RleHR1cmVNYXBwZXJGbGFncywgdHJ1ZSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPEdz dFZpZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gbWFrZVVuaXF1ZTxHc3RWaWRlb0ZyYW1l SG9sZGVyPihtX3NhbXBsZS5nZXQoKSwgbV92aWRlb0RlY29kZXJQbGF0Zm9ybSwgbV90ZXh0dXJl TWFwcGVyRmxhZ3MsIHRydWUpOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFRleHR1cmVNYXBwZXJQ bGF0Zm9ybUxheWVyQnVmZmVyPiBsYXllckJ1ZmZlciA9IGZyYW1lSG9sZGVyLT5wbGF0Zm9ybUxh eWVyQnVmZmVyKCk7CiAgICAgaWYgKCFsYXllckJ1ZmZlcikKQEAgLTEwNjcsNyArMTA3Nyw3IEBA IE5hdGl2ZUltYWdlUHRyIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5hdGl2ZUlt YWdlRm9yQ3VycmVudFRpbWUoKQogICAgIGlmICghR1NUX0lTX1NBTVBMRShtX3NhbXBsZS5nZXQo KSkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEdzdFZp ZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gbWFrZVVuaXF1ZTxHc3RWaWRlb0ZyYW1lSG9s ZGVyPihtX3NhbXBsZS5nZXQoKSwgbV90ZXh0dXJlTWFwcGVyRmxhZ3MsIHRydWUpOworICAgIHN0 ZDo6dW5pcXVlX3B0cjxHc3RWaWRlb0ZyYW1lSG9sZGVyPiBmcmFtZUhvbGRlciA9IG1ha2VVbmlx dWU8R3N0VmlkZW9GcmFtZUhvbGRlcj4obV9zYW1wbGUuZ2V0KCksIG1fdmlkZW9EZWNvZGVyUGxh dGZvcm0sIG1fdGV4dHVyZU1hcHBlckZsYWdzLCB0cnVlKTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0 cjxUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4gbGF5ZXJCdWZmZXIgPSBmcmFtZUhv bGRlci0+cGxhdGZvcm1MYXllckJ1ZmZlcigpOwogICAgIGlmICghbGF5ZXJCdWZmZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAppbmRleCAz ZWExZDEwMjFkOGJjMGVhMThlMzIyNjczMjZiZjMyYmJiMTYzZTIwLi4zMTJjNzA1YTE4NWQyMTMz ODM3MTNkODVjZjE4YjA2ZmIzYzI4N2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKQEAgLTMxNCw4ICszMTQsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgYm9vbCBtX3dhaXRpbmdGb3JLZXkgeyBmYWxzZSB9OwogI2VuZGlmCiAKLSAgICBlbnVt IGNsYXNzIFdlYktpdEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtIHsgVmlkZW80TGludXggfTsKLSAg ICBPcHRpb25hbDxXZWJLaXRHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29kZXJQ bGF0Zm9ybTsKKyAgICBPcHRpb25hbDxHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0Rl Y29kZXJQbGF0Zm9ybTsKIAogcHJpdmF0ZToKICAgICBGbG9hdFNpemUgbmF0dXJhbFNpemVGcm9t Q2FwcyhHc3RDYXBzKikgY29uc3Q7Cg== 378170 2019-09-06 01:50:28 -0700 2019-09-06 01:50:28 -0700 Patch bug-201537-20190906105027.patch text/plain 9541 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE2NTMzNWNkMDg5NmU2 NzlkNDUwYzg0YzU0MGQzOWQyMTQ0YTUxMy4uOWRmNzk3M2ExZjkzMjBlYTMzZjlmMzI1YTY3YTE1 MTQwNTY4ZTAyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXSBZ VVYgYnVmZmVycyBvbiBpTVggcGxhdGZvcm1zIGhhdmUgdG8gYmUgdHJlYXRlZCBhcyBSR0JBCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE1MzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBQaGlsaXBwZSBOb3JtYW5kLgorCisgICAgICAgIFRoZSBpbXh2 cHVkZWNvZGVyIGVsZW1lbnQgb24gaU1YIHBsYXRmb3JtcyBkZWNvZGVzIFlVViBkYXRhIGluIGEK KyAgICAgICAgcGxhdGZvcm0tc3BlY2lmaWMgd2F5LCBnYXRoZXJpbmcgdGhlIFlVViBkYXRhIGlu IGEgc2luZ2xlIHRleHR1cmUgYW5kCisgICAgICAgIHRoZW4gcmVseWluZyBvbiB0aGUgc2FtcGxl ciBpbiB0aGUgVml2YW50ZSBncmFwaGljcyBkcml2ZXJzIHRvCisgICAgICAgIGF1dG9tYWdpY2Fs bHkgZGVjb2RlIHRoYXQgWVVWIGRhdGEgaW50byBSR0JBIHZhbHVlcy4KKworICAgICAgICBUbyBj b3JyZWN0bHkgZGlzcGxheSBzdWNoIGRlY29kZWQgZGF0YSwgd2UgaGF2ZSB0byByZXByZXNlbnQg dGhhdAorICAgICAgICBzaW5nbGUgdGV4dHVyZSBhcyBhbiBSR0JBIHRleHR1cmUsIGV2ZW4gd2hl biB0aGUgR1N0cmVhbWVyIGJ1ZmZlciBpcworICAgICAgICBjcmFmdGVkIGFzIGNvbnRhaW5pbmcg cGxhbmFyIFlVViBkYXRhLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L0dTdHJlYW1lckNvbW1vbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFz ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHc3RWaWRlb0ZyYW1lSG9sZGVyOjpHc3RWaWRlb0Zy YW1lSG9sZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdzdFZpZGVvRnJhbWVIb2xkZXI6OnBsYXRm b3JtTGF5ZXJCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZTo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6cHVzaFRleHR1cmVUb0Nv bXBvc2l0b3IpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy QmFzZTo6Zmx1c2hDdXJyZW50QnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2U6OmNvcHlWaWRlb1RleHR1cmVUb1BsYXRmb3JtVGV4dHVyZSk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpuYXRp dmVJbWFnZUZvckN1cnJlbnRUaW1lKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oOgorCiAyMDE5LTA5LTA1ICBG dWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5d IEFkZCBzdXBwb3J0IGZvciBNb3VzZUV2ZW50LmJ1dHRvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24u aAppbmRleCA0MTkwZDY0ZmJlMWFmNTc1MzJiYzc2ODYyNmU3YzhiYzI2MGYzZDYxLi5jODEzYjc4 YzMyMjlmOTg0ZWU5NDVmMDRiNGRiYTkwY2FlMmMwMzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1v bi5oCkBAIC0yMTksNiArMjE5LDggQEAgcHJpdmF0ZToKIHZvaWQgY29ubmVjdFNpbXBsZUJ1c01l c3NhZ2VDYWxsYmFjayhHc3RFbGVtZW50KiBwaXBlbGluZSk7CiB2b2lkIGRpc2Nvbm5lY3RTaW1w bGVCdXNNZXNzYWdlQ2FsbGJhY2soR3N0RWxlbWVudCogcGlwZWxpbmUpOwogCitlbnVtIGNsYXNz IEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtIHsgSW14VlBVLCBWaWRlbzRMaW51eCB9OworCiB9CiAK ICNpZm5kZWYgR1NUX0JVRkZFUl9EVFNfT1JfUFRTCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGVmY2EyZjVjNzQ5ODNlMzhiN2ViNWE3M2Q3 ZDVjNGMyZDAwNTRiMTcuLjA1YzI0N2ZkMmRkZjFhNDJhMDJlODIwMDA5MzQ2MzI1MTkxZTVjMzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBA IC0yNDI4LDcgKzI0MjgsOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3Jl YXRlR1NUUGxheUJpbihjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJgogCiAgICAgICAgIEdV bmlxdWVQdHI8Y2hhcj4gZWxlbWVudE5hbWUoZ3N0X2VsZW1lbnRfZ2V0X25hbWUoZWxlbWVudCkp OwogICAgICAgICBpZiAoZ19zdHJfaGFzX3ByZWZpeChlbGVtZW50TmFtZS5nZXQoKSwgInY0bDIi KSkKLSAgICAgICAgICAgIHBsYXllci0+bV92aWRlb0RlY29kZXJQbGF0Zm9ybSA9IFdlYktpdEdz dFZpZGVvRGVjb2RlclBsYXRmb3JtOjpWaWRlbzRMaW51eDsKKyAgICAgICAgICAgIHBsYXllci0+ bV92aWRlb0RlY29kZXJQbGF0Zm9ybSA9IEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtOjpWaWRlbzRM aW51eDsKKyAgICAgICAgZWxzZSBpZiAoZ19zdHJfaGFzX3ByZWZpeChlbGVtZW50TmFtZS5nZXQo KSwgImlteHZwdWRlYyIpKQorICAgICAgICAgICAgcGxheWVyLT5tX3ZpZGVvRGVjb2RlclBsYXRm b3JtID0gR3N0VmlkZW9EZWNvZGVyUGxhdGZvcm06OklteFZQVTsKIAogI2lmIFVTRShURVhUVVJF X01BUFBFUl9HTCkKICAgICAgICAgcGxheWVyLT51cGRhdGVUZXh0dXJlTWFwcGVyRmxhZ3MoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNw cAppbmRleCA4ZTk1ZjM0ZGRkY2E3ZjBlNzczMmJkODI3MTM3NGQ4NDMwNTNlNmY3Li45ZjE5YmIy ZjlmZDRhODI2NmVhZDEwZWFiYmQ4NzEyMzI4ZjFkY2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCkBAIC0xMjcsNyArMTI3LDgg QEAgc3RhdGljIGludCBncmVhdGVzdENvbW1vbkRpdmlzb3IoaW50IGEsIGludCBiKQogI2lmIFVT RShURVhUVVJFX01BUFBFUl9HTCkKIGNsYXNzIEdzdFZpZGVvRnJhbWVIb2xkZXIgOiBwdWJsaWMg VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJCdWZmZXI6OlVubWFuYWdlZEJ1ZmZlckRhdGFIb2xk ZXIgewogcHVibGljOgotICAgIGV4cGxpY2l0IEdzdFZpZGVvRnJhbWVIb2xkZXIoR3N0U2FtcGxl KiBzYW1wbGUsIFRleHR1cmVNYXBwZXJHTDo6RmxhZ3MgZmxhZ3MsIGJvb2wgZ3N0R0xFbmFibGVk KQorICAgIGV4cGxpY2l0IEdzdFZpZGVvRnJhbWVIb2xkZXIoR3N0U2FtcGxlKiBzYW1wbGUsIE9w dGlvbmFsPEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtPiB2aWRlb0RlY29kZXJQbGF0Zm9ybSwgVGV4 dHVyZU1hcHBlckdMOjpGbGFncyBmbGFncywgYm9vbCBnc3RHTEVuYWJsZWQpCisgICAgICAgIDog bV92aWRlb0RlY29kZXJQbGF0Zm9ybSh2aWRlb0RlY29kZXJQbGF0Zm9ybSkKICAgICB7CiAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKEdTVF9JU19TQU1QTEUoc2FtcGxlKSk7CiAKQEAgLTIzMiw2ICsy MzMsMTMgQEAgcHVibGljOgogICAgICAgICAgICAgaWYgKEdTVF9WSURFT19JTkZPX05fQ09NUE9O RU5UUygmbV92aWRlb0ZyYW1lLmluZm8pIDwgMyB8fCBHU1RfVklERU9fSU5GT19OX1BMQU5FUygm bV92aWRlb0ZyYW1lLmluZm8pID4gMykKICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsK IAorICAgICAgICAgICAgaWYgKG1fdmlkZW9EZWNvZGVyUGxhdGZvcm0gJiYgKm1fdmlkZW9EZWNv ZGVyUGxhdGZvcm0gPT0gR3N0VmlkZW9EZWNvZGVyUGxhdGZvcm06OklteFZQVSkgeworICAgICAg ICAgICAgICAgIC8vIElNWCBWUFUgZGVjb2RlciBkZWNvZGVzIFlVViBkYXRhIG9ubHkgaW50byB0 aGUgWSB0ZXh0dXJlIGZyb20gd2hpY2ggdGhlIHNhbXBsZXIKKyAgICAgICAgICAgICAgICAvLyB0 aGVuIGRpcmVjdGx5IHByb2R1Y2VzIFJHQkEgZGF0YS4gVGV4dHVyZXMgZm9yIG90aGVyIHBsYW5l cyBhcmVuJ3QgdXNlZCwgYnV0CisgICAgICAgICAgICAgICAgLy8gdGhhdCdzIGRlY29kZXIncyBw cm9ibGVtLiBXZSBoYXZlIHRvIHRyZWF0IHRoYXQgWSB0ZXh0dXJlIGFzIGhhdmluZyBSR0JBIGRh dGEuCisgICAgICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8QnVmZmVyPihCdWZmZXI6OlRl eHR1cmVWYXJpYW50IHsgQnVmZmVyOjpSR0JUZXh0dXJlIHsgKnN0YXRpY19jYXN0PEdMdWludCo+ KG1fdmlkZW9GcmFtZS5kYXRhWzBdKSB9IH0sIG1fc2l6ZSwgbV9mbGFncywgR3JhcGhpY3NDb250 ZXh0M0Q6OlJHQkEpOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICB1bnNpZ25lZCBudW1i ZXJPZlBsYW5lcyA9IEdTVF9WSURFT19JTkZPX05fUExBTkVTKCZtX3ZpZGVvRnJhbWUuaW5mbyk7 CiAgICAgICAgICAgICBzdGQ6OmFycmF5PEdMdWludCwgMz4gcGxhbmVzOwogICAgICAgICAgICAg c3RkOjphcnJheTx1bnNpZ25lZCwgMz4geXV2UGxhbmU7CkBAIC0yNzAsNiArMjc4LDcgQEAgcHJp dmF0ZToKICAgICBHc3RWaWRlb0ZyYW1lIG1fdmlkZW9GcmFtZSB7IH07CiAgICAgSW50U2l6ZSBt X3NpemU7CiAgICAgYm9vbCBtX2hhc0FscGhhQ2hhbm5lbDsKKyAgICBPcHRpb25hbDxHc3RWaWRl b0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29kZXJQbGF0Zm9ybTsKICAgICBUZXh0dXJlTWFw cGVyR0w6OkZsYWdzIG1fZmxhZ3MgeyB9OwogICAgIEdMdWludCBtX3RleHR1cmVJRCB7IDAgfTsK ICAgICBib29sIG1faXNNYXBwZWQgeyBmYWxzZSB9OwpAQCAtMzAyLDcgKzMxMSw3IEBAIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2UoTWVkaWFQbGF5ZXIqIHBsCiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjp+TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSgpCiB7CiAjaWYgVVNFKEdTVFJFQU1FUl9HTCkK LSAgICBpZiAobV92aWRlb0RlY29kZXJQbGF0Zm9ybSA9PSBXZWJLaXRHc3RWaWRlb0RlY29kZXJQ bGF0Zm9ybTo6VmlkZW80TGludXgpCisgICAgaWYgKG1fdmlkZW9EZWNvZGVyUGxhdGZvcm0gPT0g R3N0VmlkZW9EZWNvZGVyUGxhdGZvcm06OlZpZGVvNExpbnV4KQogICAgICAgICBmbHVzaEN1cnJl bnRCdWZmZXIoKTsKICNlbmRpZgogI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkgJiYgVVNFKE5J Q09TSUEpCkBAIC03NzksNyArNzg4LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlOjpwdXNoVGV4dHVyZVRvQ29tcG9zaXRvcigpCiAgICAgICAgICAgICBpZiAoIXByb3h5 LmlzQWN0aXZlKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBtYWtlVW5pcXVl PEdzdFZpZGVvRnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCBtX3RleHR1cmVNYXBwZXJGbGFn cywgIW1fdXNpbmdGYWxsYmFja1ZpZGVvU2luayk7CisgICAgICAgICAgICBzdGQ6OnVuaXF1ZV9w dHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBtYWtlVW5pcXVlPEdzdFZpZGVv RnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCBtX3ZpZGVvRGVjb2RlclBsYXRmb3JtLCBtX3Rl eHR1cmVNYXBwZXJGbGFncywgIW1fdXNpbmdGYWxsYmFja1ZpZGVvU2luayk7CiAKICAgICAgICAg ICAgIHN0ZDo6dW5pcXVlX3B0cjxUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4gbGF5 ZXJCdWZmZXI7CiAgICAgICAgICAgICBpZiAoZnJhbWVIb2xkZXItPmhhc01hcHBlZFRleHR1cmVz KCkpIHsKQEAgLTkzNyw3ICs5NDYsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ckJhc2U6OmZsdXNoQ3VycmVudEJ1ZmZlcigpCiAgICAgICAgICAgICBnc3Rfc2FtcGxlX2dldF9z ZWdtZW50KG1fc2FtcGxlLmdldCgpKSwgaW5mbyA/IGdzdF9zdHJ1Y3R1cmVfY29weShpbmZvKSA6 IG51bGxwdHIpKTsKICAgICB9CiAKLSAgICBib29sIHNob3VsZFdhaXQgPSBtX3ZpZGVvRGVjb2Rl clBsYXRmb3JtID09IFdlYktpdEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtOjpWaWRlbzRMaW51eDsK KyAgICBib29sIHNob3VsZFdhaXQgPSBtX3ZpZGVvRGVjb2RlclBsYXRmb3JtID09IEdzdFZpZGVv RGVjb2RlclBsYXRmb3JtOjpWaWRlbzRMaW51eDsKICAgICBhdXRvIHByb3h5T3BlcmF0aW9uID0g W3Nob3VsZFdhaXQsIHBpcGVsaW5lID0gcGlwZWxpbmUoKV0oVGV4dHVyZU1hcHBlclBsYXRmb3Jt TGF5ZXJQcm94eSYgcHJveHkpIHsKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSwg IkZsdXNoaW5nIHZpZGVvIHNhbXBsZSAlcyIsIHNob3VsZFdhaXQgPyAic3luY2hyb25vdXNseSIg OiAiIik7CiAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKCFzaG91bGRXYWl0ID8gJnByb3h5Lmxv Y2soKSA6IG51bGxwdHIpOwpAQCAtMTAzOCw3ICsxMDQ3LDcgQEAgYm9vbCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlOjpjb3B5VmlkZW9UZXh0dXJlVG9QbGF0Zm9ybVRleHR1cmUoR3Jh cGhpY3MKICAgICBpZiAoIUdTVF9JU19TQU1QTEUobV9zYW1wbGUuZ2V0KCkpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8R3N0VmlkZW9GcmFtZUhvbGRlcj4g ZnJhbWVIb2xkZXIgPSBtYWtlVW5pcXVlPEdzdFZpZGVvRnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdl dCgpLCBtX3RleHR1cmVNYXBwZXJGbGFncywgdHJ1ZSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPEdz dFZpZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gbWFrZVVuaXF1ZTxHc3RWaWRlb0ZyYW1l SG9sZGVyPihtX3NhbXBsZS5nZXQoKSwgbV92aWRlb0RlY29kZXJQbGF0Zm9ybSwgbV90ZXh0dXJl TWFwcGVyRmxhZ3MsIHRydWUpOwogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFRleHR1cmVNYXBwZXJQ bGF0Zm9ybUxheWVyQnVmZmVyPiBsYXllckJ1ZmZlciA9IGZyYW1lSG9sZGVyLT5wbGF0Zm9ybUxh eWVyQnVmZmVyKCk7CiAgICAgaWYgKCFsYXllckJ1ZmZlcikKQEAgLTEwNjcsNyArMTA3Niw3IEBA IE5hdGl2ZUltYWdlUHRyIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5hdGl2ZUlt YWdlRm9yQ3VycmVudFRpbWUoKQogICAgIGlmICghR1NUX0lTX1NBTVBMRShtX3NhbXBsZS5nZXQo KSkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEdzdFZp ZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gbWFrZVVuaXF1ZTxHc3RWaWRlb0ZyYW1lSG9s ZGVyPihtX3NhbXBsZS5nZXQoKSwgbV90ZXh0dXJlTWFwcGVyRmxhZ3MsIHRydWUpOworICAgIHN0 ZDo6dW5pcXVlX3B0cjxHc3RWaWRlb0ZyYW1lSG9sZGVyPiBmcmFtZUhvbGRlciA9IG1ha2VVbmlx dWU8R3N0VmlkZW9GcmFtZUhvbGRlcj4obV9zYW1wbGUuZ2V0KCksIG1fdmlkZW9EZWNvZGVyUGxh dGZvcm0sIG1fdGV4dHVyZU1hcHBlckZsYWdzLCB0cnVlKTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0 cjxUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4gbGF5ZXJCdWZmZXIgPSBmcmFtZUhv bGRlci0+cGxhdGZvcm1MYXllckJ1ZmZlcigpOwogICAgIGlmICghbGF5ZXJCdWZmZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAppbmRleCAz ZWExZDEwMjFkOGJjMGVhMThlMzIyNjczMjZiZjMyYmJiMTYzZTIwLi4zMTJjNzA1YTE4NWQyMTMz ODM3MTNkODVjZjE4YjA2ZmIzYzI4N2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKQEAgLTMxNCw4ICszMTQsNyBAQCBwcm90ZWN0ZWQ6 CiAgICAgYm9vbCBtX3dhaXRpbmdGb3JLZXkgeyBmYWxzZSB9OwogI2VuZGlmCiAKLSAgICBlbnVt IGNsYXNzIFdlYktpdEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtIHsgVmlkZW80TGludXggfTsKLSAg ICBPcHRpb25hbDxXZWJLaXRHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29kZXJQ bGF0Zm9ybTsKKyAgICBPcHRpb25hbDxHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0Rl Y29kZXJQbGF0Zm9ybTsKIAogcHJpdmF0ZToKICAgICBGbG9hdFNpemUgbmF0dXJhbFNpemVGcm9t Q2FwcyhHc3RDYXBzKikgY29uc3Q7Cg==