204674 2019-11-28 03:11:37 -0800 [GStreamer] Convert GLVideoSink and WebKitWebSrc to WEBKIT_DEFINE_TYPE 2019-11-28 04:57:23 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=204673 InRadar P2 Normal --- 1 pnormand pnormand calvaris cgarcia eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj sergio vjaquez webkit-bug-importer oldest_to_newest 1593994 0 pnormand 2019-11-28 03:11:37 -0800 . 1593998 1 384446 pnormand 2019-11-28 03:35:58 -0800 Created attachment 384446 Patch 1593999 2 384446 cgarcia 2019-11-28 03:51:27 -0800 Comment on attachment 384446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384446&action=review > Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:78 > + GST_DEBUG_CATEGORY_INIT(webkit_gl_video_sink_debug, "webkitglvideosink", 0, "GL video sink element")); We don't need the ; > Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:121 > + GST_CALL_PARENT(G_OBJECT_CLASS, constructed, (object)); Do this at the beginning, in the case of constructed we want to construct the parent first. > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:187 > +); We don't need the ; > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:273 > + GST_CALL_PARENT(G_OBJECT_CLASS, constructed, (object)); Same here, do this at the beginning. 1594000 3 384447 pnormand 2019-11-28 03:52:41 -0800 Created attachment 384447 Patch 1594012 4 pnormand 2019-11-28 04:52:57 -0800 Committed r252918: <https://trac.webkit.org/changeset/252918> 1594013 5 webkit-bug-importer 2019-11-28 04:53:25 -0800 <rdar://problem/57519310> 384446 2019-11-28 03:35:58 -0800 2019-11-28 03:52:37 -0800 Patch bug-204674-20191128113557.patch text/plain 9062 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NmY2FlYjZhMzNjMzI2 MWU4MTUzODM0NTViYTMyMzBhMTAxZDdhYi4uZWQ5OGUzODlmODY0NjFlNTFhYWY4NThjYzU0YTQ0 MzM2ZTM3ZTIxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTExLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDb252ZXJ0IEdMVmlkZW9TaW5rIGFuZCBXZWJLaXRXZWJTcmMgdG8gV0VCS0lUX0RFRklORV9U WVBFCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2 NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGlzIG1vc3RseSBhIHJlZmFjdG9yaW5nLCBzaW1wbGlmeWluZyB0aGUgY29kZS1iYXNlIGEgYml0 LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dMVmlkZW9TaW5rR1N0 cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYktpdEdMVmlkZW9TaW5rQ29uc3RydWN0ZWQpOgorICAg ICAgICAod2ViS2l0R0xWaWRlb1NpbmtGaW5hbGl6ZSk6CisgICAgICAgICh3ZWJraXRfZ2xfdmlk ZW9fc2lua19jbGFzc19pbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfc3Jj X2NsYXNzX2luaXQpOgorICAgICAgICAod2ViS2l0V2ViU3JjQ29uc3RydWN0ZWQpOgorCiAyMDE5 LTExLTI4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1N0cmVhbWVyXSBNb3ZlIEdMIHZpZGVvIHNpbmsgdG8gaXRzIG93biBHc3RCaW4gc3ViLWNs YXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvR0xWaWRlb1NpbmtHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL0dMVmlkZW9TaW5rR1N0cmVhbWVyLmNwcAppbmRleCA4YjAwMTYyMjM5 MDUyMjhjYTg5Y2VjMTczYjEwNGYxMTVjYTE2NGM4Li44YmNiOTFkZDI4N2RlZThlYzY2Y2NiNTNi ZmEyMmM5OWRkZDZlZWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvR0xWaWRlb1NpbmtHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHAK QEAgLTI1LDYgKzI1LDggQEAKICNpbmNsdWRlICJHTENvbnRleHQuaCIKICNpbmNsdWRlICJHU3Ry ZWFtZXJDb21tb24uaCIKICNpbmNsdWRlICJNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCIK KyNpbmNsdWRlIDxnc3QvYXBwL2dzdGFwcHNpbmsuaD4KKyNpbmNsdWRlIDx3dGYvZ2xpYi9XVEZH VHlwZS5oPgogCiAjaWYgVVNFKEdMWCkKICNpbmNsdWRlICJHTENvbnRleHRHTFguaCIKQEAgLTU0 LDggKzU2LDYgQEAKICN1bmRlZiBOb25lCiAjZW5kaWYgLy8gUExBVEZPUk0oWDExKSAmJiBHU1Rf R0xfSEFWRV9QTEFURk9STV9FR0wKIAotI2luY2x1ZGUgPGdzdC9hcHAvZ3N0YXBwc2luay5oPgot CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogc3RydWN0IF9XZWJLaXRHTFZpZGVvU2lua1By aXZhdGUgewpAQCAtNzMsMTYgKzczLDEzIEBAIEdTVF9ERUJVR19DQVRFR09SWV9TVEFUSUMod2Vi a2l0X2dsX3ZpZGVvX3NpbmtfZGVidWcpOwogI2RlZmluZSBHU1RfR0xfQ0FQU19GT1JNQVQgInsg UkdCeCwgUkdCQSwgSTQyMCwgWTQ0NCwgWVYxMiwgWTQxQiwgWTQyQiwgTlYxMiwgTlYyMSwgVlVZ QSB9Igogc3RhdGljIEdzdFN0YXRpY1BhZFRlbXBsYXRlIHNpbmtUZW1wbGF0ZSA9IEdTVF9TVEFU SUNfUEFEX1RFTVBMQVRFKCJzaW5rIiwgR1NUX1BBRF9TSU5LLCBHU1RfUEFEX0FMV0FZUywgR1NU X1NUQVRJQ19DQVBTX0FOWSk7CiAKLSNkZWZpbmUgV0VCS0lUX0dMX1ZJREVPX1NJTktfR0VUX1BS SVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQ RV9HTF9WSURFT19TSU5LLCBXZWJLaXRHTFZpZGVvU2lua1ByaXZhdGUpKQotCiAjZGVmaW5lIHdl YmtpdF9nbF92aWRlb19zaW5rX3BhcmVudF9jbGFzcyBwYXJlbnRfY2xhc3MKLSNkZWZpbmUgV0VC S0lUX0dMX1ZJREVPX1NJTktfQ0FURUdPUllfSU5JVCBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3 ZWJraXRfZ2xfdmlkZW9fc2lua19kZWJ1ZywgIndlYmtpdGdsdmlkZW9zaW5rIiwgMCwgIkdMIHZp ZGVvIHNpbmsgZWxlbWVudCIpOwotR19ERUZJTkVfVFlQRV9XSVRIX0NPREUoV2ViS2l0R0xWaWRl b1NpbmssIHdlYmtpdF9nbF92aWRlb19zaW5rLCBHU1RfVFlQRV9CSU4sIFdFQktJVF9HTF9WSURF T19TSU5LX0NBVEVHT1JZX0lOSVQpOworV0VCS0lUX0RFRklORV9UWVBFX1dJVEhfQ09ERShXZWJL aXRHTFZpZGVvU2luaywgd2Via2l0X2dsX3ZpZGVvX3NpbmssIEdTVF9UWVBFX0JJTiwKKyAgICBH U1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRfZ2xfdmlkZW9fc2lua19kZWJ1ZywgIndlYmtp dGdsdmlkZW9zaW5rIiwgMCwgIkdMIHZpZGVvIHNpbmsgZWxlbWVudCIpKTsKIAotc3RhdGljIHZv aWQgd2Via2l0X2dsX3ZpZGVvX3NpbmtfaW5pdChXZWJLaXRHTFZpZGVvU2luayogc2luaykKK3N0 YXRpYyB2b2lkIHdlYktpdEdMVmlkZW9TaW5rQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQog ewotICAgIHNpbmstPnByaXYgPSBXRUJLSVRfR0xfVklERU9fU0lOS19HRVRfUFJJVkFURShzaW5r KTsKLSAgICBuZXcgKHNpbmstPnByaXYpIFdlYktpdEdMVmlkZW9TaW5rUHJpdmF0ZSgpOworICAg IFdlYktpdEdMVmlkZW9TaW5rKiBzaW5rID0gV0VCS0lUX0dMX1ZJREVPX1NJTksob2JqZWN0KTsK IAogICAgIHNpbmstPnByaXYtPmFwcFNpbmsgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImFw cHNpbmsiLCAid2Via2l0LWdsLXZpZGVvLWFwcHNpbmsiKTsKICAgICBBU1NFUlQoc2luay0+cHJp di0+YXBwU2luayk7CkBAIC0xMjAsMTEgKzExNywxMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZ2xf dmlkZW9fc2lua19pbml0KFdlYktpdEdMVmlkZW9TaW5rKiBzaW5rKQogCiAgICAgR1JlZlB0cjxH c3RQYWQ+IHBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZCh1cGxvYWQs ICJzaW5rIikpOwogICAgIGdzdF9lbGVtZW50X2FkZF9wYWQoR1NUX0VMRU1FTlRfQ0FTVChzaW5r KSwgZ3N0X2dob3N0X3BhZF9uZXcoInNpbmsiLCBwYWQuZ2V0KCkpKTsKKworICAgIEdTVF9DQUxM X1BBUkVOVChHX09CSkVDVF9DTEFTUywgY29uc3RydWN0ZWQsIChvYmplY3QpKTsKIH0KIAogdm9p ZCB3ZWJLaXRHTFZpZGVvU2lua0ZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKIHsKLSAgICBBU1NF UlQoV1RGOjppc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAog ICAgIFdlYktpdEdMVmlkZW9TaW5rKiBzaW5rID0gV0VCS0lUX0dMX1ZJREVPX1NJTksob2JqZWN0 KTsKICAgICBXZWJLaXRHTFZpZGVvU2lua1ByaXZhdGUqIHByaXYgPSBzaW5rLT5wcml2OwpAQCAt MTMyLDkgKzEzMSw2IEBAIHZvaWQgd2ViS2l0R0xWaWRlb1NpbmtGaW5hbGl6ZShHT2JqZWN0KiBv YmplY3QpCiAgICAgaWYgKHByaXYtPm1lZGlhUGxheWVyUHJpdmF0ZSkKICAgICAgICAgZ19zaWdu YWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9kYXRhKHByaXYtPmFwcFNpbmsuZ2V0KCksIHByaXYt Pm1lZGlhUGxheWVyUHJpdmF0ZSk7CiAKLSAgICAvLyBXZSB1c2VkIGEgcGxhY2VtZW50IG5ldyBm b3IgY29uc3RydWN0aW9uLCB0aGUgZGVzdHJ1Y3RvciB3b24ndCBiZSBjYWxsZWQgYXV0b21hdGlj YWxseS4KLSAgICBwcml2LT5+X1dlYktpdEdMVmlkZW9TaW5rUHJpdmF0ZSgpOwotCiAgICAgR1NU X0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNTLCBmaW5hbGl6ZSwgKG9iamVjdCkpOwogfQogCkBA IC0yOTQsMTQgKzI5MCwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZ2xfdmlkZW9fc2lua19jbGFz c19pbml0KFdlYktpdEdMVmlkZW9TaW5rQ2xhc3MqIGtsYXNzKQogICAgIEdPYmplY3RDbGFzcyog b2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFTUyhrbGFzcyk7CiAgICAgR3N0RWxlbWVudENsYXNz KiBlbGVtZW50Q2xhc3MgPSBHU1RfRUxFTUVOVF9DTEFTUyhrbGFzcyk7CiAKKyAgICBvYmplY3RD bGFzcy0+Y29uc3RydWN0ZWQgPSB3ZWJLaXRHTFZpZGVvU2lua0NvbnN0cnVjdGVkOwogICAgIG9i amVjdENsYXNzLT5maW5hbGl6ZSA9IHdlYktpdEdMVmlkZW9TaW5rRmluYWxpemU7CiAKICAgICBn c3RfZWxlbWVudF9jbGFzc19hZGRfcGFkX3RlbXBsYXRlKGVsZW1lbnRDbGFzcywgZ3N0X3N0YXRp Y19wYWRfdGVtcGxhdGVfZ2V0KCZzaW5rVGVtcGxhdGUpKTsKLQogICAgIGdzdF9lbGVtZW50X2Ns YXNzX3NldF9zdGF0aWNfbWV0YWRhdGEoZWxlbWVudENsYXNzLCAiV2ViS2l0IEdMIHZpZGVvIHNp bmsiLCAiU2luay9WaWRlbyIsICJSZW5kZXJzIHZpZGVvIiwgIlBoaWxpcHBlIE5vcm1hbmQgPHBo aWxuQGlnYWxpYS5jb20+Iik7CiAKICAgICBlbGVtZW50Q2xhc3MtPmNoYW5nZV9zdGF0ZSA9IEdT VF9ERUJVR19GVU5DUFRSKHdlYktpdEdMVmlkZW9TaW5rQ2hhbmdlU3RhdGUpOwotICAgIGdfdHlw ZV9jbGFzc19hZGRfcHJpdmF0ZShrbGFzcywgc2l6ZW9mKFdlYktpdEdMVmlkZW9TaW5rUHJpdmF0 ZSkpOwogfQogCiB2b2lkIHdlYktpdEdMVmlkZW9TaW5rU2V0TWVkaWFQbGF5ZXJQcml2YXRlKFdl YktpdEdMVmlkZW9TaW5rKiBzaW5rLCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqIHBsYXll cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggYjBm ZTMxOTM3NWYyNmMxODg2ZDVhNDhkYjJlYTlkZDgzN2UxNjg0Mi4uMDRkNDVkMjE2MzU0YjZmNDQ0 ZTc1YzdmOWM5NjYzZDJmNzFmMzg2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJj ZUdTdHJlYW1lci5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlIDxjc3RkaW50PgogI2lu Y2x1ZGUgPHd0Zi9Db25kaXRpb24uaD4KICNpbmNsdWRlIDx3dGYvU2NvcGUuaD4KKyNpbmNsdWRl IDx3dGYvZ2xpYi9XVEZHVHlwZS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC05MCw3ICs5MSw2IEBAIGVudW0gTWFpblRocmVh ZFNvdXJjZU5vdGlmaWNhdGlvbiB7CiAgICAgRGlzcG9zZSA9IDEgPDwgMiwKIH07CiAKLSNkZWZp bmUgV0VCS0lUX1dFQl9TUkNfR0VUX1BSSVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNFX0dFVF9Q UklWQVRFKChvYmopLCBXRUJLSVRfVFlQRV9XRUJfU1JDLCBXZWJLaXRXZWJTcmNQcml2YXRlKSkK IHN0cnVjdCBfV2ViS2l0V2ViU3JjUHJpdmF0ZSB7CiAgICAgfl9XZWJLaXRXZWJTcmNQcml2YXRl KCkKICAgICB7CkBAIC0xNjQsNyArMTY0LDcgQEAgR1NUX0RFQlVHX0NBVEVHT1JZX1NUQVRJQyh3 ZWJraXRfd2ViX3NyY19kZWJ1Zyk7CiAKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY1VyaUhhbmRs ZXJJbml0KGdwb2ludGVyIGdJZmFjZSwgZ3BvaW50ZXIgaWZhY2VEYXRhKTsKIAotc3RhdGljIHZv aWQgd2ViS2l0V2ViU3JjRGlzcG9zZShHT2JqZWN0Kik7CitzdGF0aWMgdm9pZCB3ZWJLaXRXZWJT cmNDb25zdHJ1Y3RlZChHT2JqZWN0Kik7CiBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNTZXRQcm9w ZXJ0eShHT2JqZWN0KiwgZ3VpbnQgcHJvcGVydHlJRCwgY29uc3QgR1ZhbHVlKiwgR1BhcmFtU3Bl YyopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjR2V0UHJvcGVydHkoR09iamVjdCosIGd1aW50 IHByb3BlcnR5SUQsIEdWYWx1ZSosIEdQYXJhbVNwZWMqKTsKIHN0YXRpYyBHc3RTdGF0ZUNoYW5n ZVJldHVybiB3ZWJLaXRXZWJTcmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50KiwgR3N0U3RhdGVDaGFu Z2UpOwpAQCAtMTgxLDE3ICsxODEsMTYgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1Vu TG9ja1N0b3AoR3N0QmFzZVNyYyopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU2V0Q29udGV4 dChHc3RFbGVtZW50KiwgR3N0Q29udGV4dCopOwogCiAjZGVmaW5lIHdlYmtpdF93ZWJfc3JjX3Bh cmVudF9jbGFzcyBwYXJlbnRfY2xhc3MKLS8vIFdlIHNwbGl0IHRoaXMgb3V0IGludG8gYW5vdGhl ciBtYWNybyB0byBhdm9pZCBhIGNoZWNrLXdlYmtpdC1zdHlsZSBlcnJvci4KLSNkZWZpbmUgV0VC S0lUX1dFQl9TUkNfQ0FURUdPUllfSU5JVCBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRf d2ViX3NyY19kZWJ1ZywgIndlYmtpdHdlYnNyYyIsIDAsICJ3ZWJzcmMgZWxlbWVudCIpOwotR19E RUZJTkVfVFlQRV9XSVRIX0NPREUoV2ViS2l0V2ViU3JjLCB3ZWJraXRfd2ViX3NyYywgR1NUX1RZ UEVfUFVTSF9TUkMsCitXRUJLSVRfREVGSU5FX1RZUEVfV0lUSF9DT0RFKFdlYktpdFdlYlNyYywg d2Via2l0X3dlYl9zcmMsIEdTVF9UWVBFX1BVU0hfU1JDLAogICAgIEdfSU1QTEVNRU5UX0lOVEVS RkFDRShHU1RfVFlQRV9VUklfSEFORExFUiwgd2ViS2l0V2ViU3JjVXJpSGFuZGxlckluaXQpOwot ICAgIFdFQktJVF9XRUJfU1JDX0NBVEVHT1JZX0lOSVQpOworICAgIEdTVF9ERUJVR19DQVRFR09S WV9JTklUKHdlYmtpdF93ZWJfc3JjX2RlYnVnLCAid2Via2l0d2Vic3JjIiwgMCwgIndlYnNyYyBl bGVtZW50Iik7CispOwogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NyY19jbGFzc19pbml0KFdl YktpdFdlYlNyY0NsYXNzKiBrbGFzcykKIHsKICAgICBHT2JqZWN0Q2xhc3MqIG9rbGFzcyA9IEdf T0JKRUNUX0NMQVNTKGtsYXNzKTsKIAotICAgIG9rbGFzcy0+ZGlzcG9zZSA9IHdlYktpdFdlYlNy Y0Rpc3Bvc2U7CisgICAgb2tsYXNzLT5jb25zdHJ1Y3RlZCA9IHdlYktpdFdlYlNyY0NvbnN0cnVj dGVkOwogICAgIG9rbGFzcy0+c2V0X3Byb3BlcnR5ID0gd2ViS2l0V2ViU3JjU2V0UHJvcGVydHk7 CiAgICAgb2tsYXNzLT5nZXRfcHJvcGVydHkgPSB3ZWJLaXRXZWJTcmNHZXRQcm9wZXJ0eTsKIApA QCAtMjQyLDExICsyNDEsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NyY19jbGFzc19pbml0 KFdlYktpdFdlYlNyY0NsYXNzKiBrbGFzcykKIAogICAgIEdzdFB1c2hTcmNDbGFzcyogcHVzaFNy Y0NsYXNzID0gR1NUX1BVU0hfU1JDX0NMQVNTKGtsYXNzKTsKICAgICBwdXNoU3JjQ2xhc3MtPmNy ZWF0ZSA9IEdTVF9ERUJVR19GVU5DUFRSKHdlYktpdFdlYlNyY0NyZWF0ZSk7Ci0KLSAgICBnX3R5 cGVfY2xhc3NfYWRkX3ByaXZhdGUoa2xhc3MsIHNpemVvZihXZWJLaXRXZWJTcmNQcml2YXRlKSk7 CiB9CiAKLQogc3RhdGljIHZvaWQgd2Via2l0V2ViU3JjUmVzZXQoV2ViS2l0V2ViU3JjKiBzcmMp CiB7CiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfU1JDX0dFVF9Q UklWQVRFKHNyYyk7CkBAIC0yNjEsMTIgKzI1NywxMCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJT cmNSZXNldChXZWJLaXRXZWJTcmMqIHNyYykKICAgICBwcml2LT5zaXplID0gMDsKIH0KIAotc3Rh dGljIHZvaWQgd2Via2l0X3dlYl9zcmNfaW5pdChXZWJLaXRXZWJTcmMqIHNyYykKK3N0YXRpYyB2 b2lkIHdlYktpdFdlYlNyY0NvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKIHsKLSAgICBXZWJL aXRXZWJTcmNQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9TUkNfR0VUX1BSSVZBVEUoc3JjKTsK LQotICAgIHNyYy0+cHJpdiA9IHByaXY7Ci0gICAgbmV3IChwcml2KSBXZWJLaXRXZWJTcmNQcml2 YXRlKCk7CisgICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhvYmplY3QpOwor ICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7CiAKICAgICBwcml2LT5u b3RpZmllciA9IE1haW5UaHJlYWROb3RpZmllcjxNYWluVGhyZWFkU291cmNlTm90aWZpY2F0aW9u Pjo6Y3JlYXRlKCk7CiAgICAgcHJpdi0+YWRhcHRlciA9IGFkb3B0R1JlZihnc3RfYWRhcHRlcl9u ZXcoKSk7CkBAIC0yNzUsMTUgKzI2OSw4IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfc3JjX2lu aXQoV2ViS2l0V2ViU3JjKiBzcmMpCiAgICAgd2Via2l0V2ViU3JjUmVzZXQoc3JjKTsKICAgICBn c3RfYmFzZV9zcmNfc2V0X2F1dG9tYXRpY19lb3MoR1NUX0JBU0VfU1JDX0NBU1Qoc3JjKSwgRkFM U0UpOwogICAgIGdzdF9iYXNlX3NyY19zZXRfYXN5bmMoR1NUX0JBU0VfU1JDX0NBU1Qoc3JjKSwg VFJVRSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0Rpc3Bvc2UoR09iamVjdCogb2Jq ZWN0KQotewotICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBXRUJLSVRfV0VCX1NSQyhv YmplY3QpLT5wcml2OwotCi0gICAgcHJpdi0+fldlYktpdFdlYlNyY1ByaXZhdGUoKTsKIAotICAg IEdTVF9DQUxMX1BBUkVOVChHX09CSkVDVF9DTEFTUywgZGlzcG9zZSwgKG9iamVjdCkpOworICAg IEdTVF9DQUxMX1BBUkVOVChHX09CSkVDVF9DTEFTUywgY29uc3RydWN0ZWQsIChvYmplY3QpKTsK IH0KIAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0 LCBndWludCBwcm9wSUQsIGNvbnN0IEdWYWx1ZSogdmFsdWUsIEdQYXJhbVNwZWMqIHBzcGVjKQo= 384447 2019-11-28 03:52:41 -0800 2019-11-28 04:57:23 -0800 Patch bug-204674-20191128115240.patch text/plain 9194 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NmY2FlYjZhMzNjMzI2 MWU4MTUzODM0NTViYTMyMzBhMTAxZDdhYi4uZWQ5OGUzODlmODY0NjFlNTFhYWY4NThjYzU0YTQ0 MzM2ZTM3ZTIxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTExLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDb252ZXJ0IEdMVmlkZW9TaW5rIGFuZCBXZWJLaXRXZWJTcmMgdG8gV0VCS0lUX0RFRklORV9U WVBFCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ2 NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGlzIG1vc3RseSBhIHJlZmFjdG9yaW5nLCBzaW1wbGlmeWluZyB0aGUgY29kZS1iYXNlIGEgYml0 LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dMVmlkZW9TaW5rR1N0 cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYktpdEdMVmlkZW9TaW5rQ29uc3RydWN0ZWQpOgorICAg ICAgICAod2ViS2l0R0xWaWRlb1NpbmtGaW5hbGl6ZSk6CisgICAgICAgICh3ZWJraXRfZ2xfdmlk ZW9fc2lua19jbGFzc19pbml0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfc3Jj X2NsYXNzX2luaXQpOgorICAgICAgICAod2ViS2l0V2ViU3JjQ29uc3RydWN0ZWQpOgorCiAyMDE5 LTExLTI4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1N0cmVhbWVyXSBNb3ZlIEdMIHZpZGVvIHNpbmsgdG8gaXRzIG93biBHc3RCaW4gc3ViLWNs YXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvR0xWaWRlb1NpbmtHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL0dMVmlkZW9TaW5rR1N0cmVhbWVyLmNwcAppbmRleCA4YjAwMTYyMjM5 MDUyMjhjYTg5Y2VjMTczYjEwNGYxMTVjYTE2NGM4Li44YmNiOTFkZDI4N2RlZThlYzY2Y2NiNTNi ZmEyMmM5OWRkZDZlZWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvR0xWaWRlb1NpbmtHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HTFZpZGVvU2lua0dTdHJlYW1lci5jcHAK QEAgLTI1LDYgKzI1LDggQEAKICNpbmNsdWRlICJHTENvbnRleHQuaCIKICNpbmNsdWRlICJHU3Ry ZWFtZXJDb21tb24uaCIKICNpbmNsdWRlICJNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCIK KyNpbmNsdWRlIDxnc3QvYXBwL2dzdGFwcHNpbmsuaD4KKyNpbmNsdWRlIDx3dGYvZ2xpYi9XVEZH VHlwZS5oPgogCiAjaWYgVVNFKEdMWCkKICNpbmNsdWRlICJHTENvbnRleHRHTFguaCIKQEAgLTU0 LDggKzU2LDYgQEAKICN1bmRlZiBOb25lCiAjZW5kaWYgLy8gUExBVEZPUk0oWDExKSAmJiBHU1Rf R0xfSEFWRV9QTEFURk9STV9FR0wKIAotI2luY2x1ZGUgPGdzdC9hcHAvZ3N0YXBwc2luay5oPgot CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogc3RydWN0IF9XZWJLaXRHTFZpZGVvU2lua1By aXZhdGUgewpAQCAtNzMsMTYgKzczLDEzIEBAIEdTVF9ERUJVR19DQVRFR09SWV9TVEFUSUMod2Vi a2l0X2dsX3ZpZGVvX3NpbmtfZGVidWcpOwogI2RlZmluZSBHU1RfR0xfQ0FQU19GT1JNQVQgInsg UkdCeCwgUkdCQSwgSTQyMCwgWTQ0NCwgWVYxMiwgWTQxQiwgWTQyQiwgTlYxMiwgTlYyMSwgVlVZ QSB9Igogc3RhdGljIEdzdFN0YXRpY1BhZFRlbXBsYXRlIHNpbmtUZW1wbGF0ZSA9IEdTVF9TVEFU SUNfUEFEX1RFTVBMQVRFKCJzaW5rIiwgR1NUX1BBRF9TSU5LLCBHU1RfUEFEX0FMV0FZUywgR1NU X1NUQVRJQ19DQVBTX0FOWSk7CiAKLSNkZWZpbmUgV0VCS0lUX0dMX1ZJREVPX1NJTktfR0VUX1BS SVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQ RV9HTF9WSURFT19TSU5LLCBXZWJLaXRHTFZpZGVvU2lua1ByaXZhdGUpKQotCiAjZGVmaW5lIHdl YmtpdF9nbF92aWRlb19zaW5rX3BhcmVudF9jbGFzcyBwYXJlbnRfY2xhc3MKLSNkZWZpbmUgV0VC S0lUX0dMX1ZJREVPX1NJTktfQ0FURUdPUllfSU5JVCBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3 ZWJraXRfZ2xfdmlkZW9fc2lua19kZWJ1ZywgIndlYmtpdGdsdmlkZW9zaW5rIiwgMCwgIkdMIHZp ZGVvIHNpbmsgZWxlbWVudCIpOwotR19ERUZJTkVfVFlQRV9XSVRIX0NPREUoV2ViS2l0R0xWaWRl b1NpbmssIHdlYmtpdF9nbF92aWRlb19zaW5rLCBHU1RfVFlQRV9CSU4sIFdFQktJVF9HTF9WSURF T19TSU5LX0NBVEVHT1JZX0lOSVQpOworV0VCS0lUX0RFRklORV9UWVBFX1dJVEhfQ09ERShXZWJL aXRHTFZpZGVvU2luaywgd2Via2l0X2dsX3ZpZGVvX3NpbmssIEdTVF9UWVBFX0JJTiwKKyAgICBH U1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRfZ2xfdmlkZW9fc2lua19kZWJ1ZywgIndlYmtp dGdsdmlkZW9zaW5rIiwgMCwgIkdMIHZpZGVvIHNpbmsgZWxlbWVudCIpKTsKIAotc3RhdGljIHZv aWQgd2Via2l0X2dsX3ZpZGVvX3NpbmtfaW5pdChXZWJLaXRHTFZpZGVvU2luayogc2luaykKK3N0 YXRpYyB2b2lkIHdlYktpdEdMVmlkZW9TaW5rQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQog ewotICAgIHNpbmstPnByaXYgPSBXRUJLSVRfR0xfVklERU9fU0lOS19HRVRfUFJJVkFURShzaW5r KTsKLSAgICBuZXcgKHNpbmstPnByaXYpIFdlYktpdEdMVmlkZW9TaW5rUHJpdmF0ZSgpOworICAg IFdlYktpdEdMVmlkZW9TaW5rKiBzaW5rID0gV0VCS0lUX0dMX1ZJREVPX1NJTksob2JqZWN0KTsK IAogICAgIHNpbmstPnByaXYtPmFwcFNpbmsgPSBnc3RfZWxlbWVudF9mYWN0b3J5X21ha2UoImFw cHNpbmsiLCAid2Via2l0LWdsLXZpZGVvLWFwcHNpbmsiKTsKICAgICBBU1NFUlQoc2luay0+cHJp di0+YXBwU2luayk7CkBAIC0xMjAsMTEgKzExNywxMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZ2xf dmlkZW9fc2lua19pbml0KFdlYktpdEdMVmlkZW9TaW5rKiBzaW5rKQogCiAgICAgR1JlZlB0cjxH c3RQYWQ+IHBhZCA9IGFkb3B0R1JlZihnc3RfZWxlbWVudF9nZXRfc3RhdGljX3BhZCh1cGxvYWQs ICJzaW5rIikpOwogICAgIGdzdF9lbGVtZW50X2FkZF9wYWQoR1NUX0VMRU1FTlRfQ0FTVChzaW5r KSwgZ3N0X2dob3N0X3BhZF9uZXcoInNpbmsiLCBwYWQuZ2V0KCkpKTsKKworICAgIEdTVF9DQUxM X1BBUkVOVChHX09CSkVDVF9DTEFTUywgY29uc3RydWN0ZWQsIChvYmplY3QpKTsKIH0KIAogdm9p ZCB3ZWJLaXRHTFZpZGVvU2lua0ZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKIHsKLSAgICBBU1NF UlQoV1RGOjppc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKIAog ICAgIFdlYktpdEdMVmlkZW9TaW5rKiBzaW5rID0gV0VCS0lUX0dMX1ZJREVPX1NJTksob2JqZWN0 KTsKICAgICBXZWJLaXRHTFZpZGVvU2lua1ByaXZhdGUqIHByaXYgPSBzaW5rLT5wcml2OwpAQCAt MTMyLDkgKzEzMSw2IEBAIHZvaWQgd2ViS2l0R0xWaWRlb1NpbmtGaW5hbGl6ZShHT2JqZWN0KiBv YmplY3QpCiAgICAgaWYgKHByaXYtPm1lZGlhUGxheWVyUHJpdmF0ZSkKICAgICAgICAgZ19zaWdu YWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9kYXRhKHByaXYtPmFwcFNpbmsuZ2V0KCksIHByaXYt Pm1lZGlhUGxheWVyUHJpdmF0ZSk7CiAKLSAgICAvLyBXZSB1c2VkIGEgcGxhY2VtZW50IG5ldyBm b3IgY29uc3RydWN0aW9uLCB0aGUgZGVzdHJ1Y3RvciB3b24ndCBiZSBjYWxsZWQgYXV0b21hdGlj YWxseS4KLSAgICBwcml2LT5+X1dlYktpdEdMVmlkZW9TaW5rUHJpdmF0ZSgpOwotCiAgICAgR1NU X0NBTExfUEFSRU5UKEdfT0JKRUNUX0NMQVNTLCBmaW5hbGl6ZSwgKG9iamVjdCkpOwogfQogCkBA IC0yOTQsMTQgKzI5MCwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfZ2xfdmlkZW9fc2lua19jbGFz c19pbml0KFdlYktpdEdMVmlkZW9TaW5rQ2xhc3MqIGtsYXNzKQogICAgIEdPYmplY3RDbGFzcyog b2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFTUyhrbGFzcyk7CiAgICAgR3N0RWxlbWVudENsYXNz KiBlbGVtZW50Q2xhc3MgPSBHU1RfRUxFTUVOVF9DTEFTUyhrbGFzcyk7CiAKKyAgICBvYmplY3RD bGFzcy0+Y29uc3RydWN0ZWQgPSB3ZWJLaXRHTFZpZGVvU2lua0NvbnN0cnVjdGVkOwogICAgIG9i amVjdENsYXNzLT5maW5hbGl6ZSA9IHdlYktpdEdMVmlkZW9TaW5rRmluYWxpemU7CiAKICAgICBn c3RfZWxlbWVudF9jbGFzc19hZGRfcGFkX3RlbXBsYXRlKGVsZW1lbnRDbGFzcywgZ3N0X3N0YXRp Y19wYWRfdGVtcGxhdGVfZ2V0KCZzaW5rVGVtcGxhdGUpKTsKLQogICAgIGdzdF9lbGVtZW50X2Ns YXNzX3NldF9zdGF0aWNfbWV0YWRhdGEoZWxlbWVudENsYXNzLCAiV2ViS2l0IEdMIHZpZGVvIHNp bmsiLCAiU2luay9WaWRlbyIsICJSZW5kZXJzIHZpZGVvIiwgIlBoaWxpcHBlIE5vcm1hbmQgPHBo aWxuQGlnYWxpYS5jb20+Iik7CiAKICAgICBlbGVtZW50Q2xhc3MtPmNoYW5nZV9zdGF0ZSA9IEdT VF9ERUJVR19GVU5DUFRSKHdlYktpdEdMVmlkZW9TaW5rQ2hhbmdlU3RhdGUpOwotICAgIGdfdHlw ZV9jbGFzc19hZGRfcHJpdmF0ZShrbGFzcywgc2l6ZW9mKFdlYktpdEdMVmlkZW9TaW5rUHJpdmF0 ZSkpOwogfQogCiB2b2lkIHdlYktpdEdMVmlkZW9TaW5rU2V0TWVkaWFQbGF5ZXJQcml2YXRlKFdl YktpdEdMVmlkZW9TaW5rKiBzaW5rLCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIqIHBsYXll cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggYjBm ZTMxOTM3NWYyNmMxODg2ZDVhNDhkYjJlYTlkZDgzN2UxNjg0Mi4uYzYzMDIzYjJiZTNkZDJiY2Ex MzFlY2VhOWQ4NjBjYjQ1MDFlZDNjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJj ZUdTdHJlYW1lci5jcHAKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRlIDxjc3RkaW50PgogI2lu Y2x1ZGUgPHd0Zi9Db25kaXRpb24uaD4KICNpbmNsdWRlIDx3dGYvU2NvcGUuaD4KKyNpbmNsdWRl IDx3dGYvZ2xpYi9XVEZHVHlwZS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC05MCw3ICs5MSw2IEBAIGVudW0gTWFpblRocmVh ZFNvdXJjZU5vdGlmaWNhdGlvbiB7CiAgICAgRGlzcG9zZSA9IDEgPDwgMiwKIH07CiAKLSNkZWZp bmUgV0VCS0lUX1dFQl9TUkNfR0VUX1BSSVZBVEUob2JqKSAoR19UWVBFX0lOU1RBTkNFX0dFVF9Q UklWQVRFKChvYmopLCBXRUJLSVRfVFlQRV9XRUJfU1JDLCBXZWJLaXRXZWJTcmNQcml2YXRlKSkK IHN0cnVjdCBfV2ViS2l0V2ViU3JjUHJpdmF0ZSB7CiAgICAgfl9XZWJLaXRXZWJTcmNQcml2YXRl KCkKICAgICB7CkBAIC0xNjQsNyArMTY0LDcgQEAgR1NUX0RFQlVHX0NBVEVHT1JZX1NUQVRJQyh3 ZWJraXRfd2ViX3NyY19kZWJ1Zyk7CiAKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY1VyaUhhbmRs ZXJJbml0KGdwb2ludGVyIGdJZmFjZSwgZ3BvaW50ZXIgaWZhY2VEYXRhKTsKIAotc3RhdGljIHZv aWQgd2ViS2l0V2ViU3JjRGlzcG9zZShHT2JqZWN0Kik7CitzdGF0aWMgdm9pZCB3ZWJLaXRXZWJT cmNDb25zdHJ1Y3RlZChHT2JqZWN0Kik7CiBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJTcmNTZXRQcm9w ZXJ0eShHT2JqZWN0KiwgZ3VpbnQgcHJvcGVydHlJRCwgY29uc3QgR1ZhbHVlKiwgR1BhcmFtU3Bl YyopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjR2V0UHJvcGVydHkoR09iamVjdCosIGd1aW50 IHByb3BlcnR5SUQsIEdWYWx1ZSosIEdQYXJhbVNwZWMqKTsKIHN0YXRpYyBHc3RTdGF0ZUNoYW5n ZVJldHVybiB3ZWJLaXRXZWJTcmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50KiwgR3N0U3RhdGVDaGFu Z2UpOwpAQCAtMTgxLDE3ICsxODEsMTYgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1Vu TG9ja1N0b3AoR3N0QmFzZVNyYyopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU2V0Q29udGV4 dChHc3RFbGVtZW50KiwgR3N0Q29udGV4dCopOwogCiAjZGVmaW5lIHdlYmtpdF93ZWJfc3JjX3Bh cmVudF9jbGFzcyBwYXJlbnRfY2xhc3MKLS8vIFdlIHNwbGl0IHRoaXMgb3V0IGludG8gYW5vdGhl ciBtYWNybyB0byBhdm9pZCBhIGNoZWNrLXdlYmtpdC1zdHlsZSBlcnJvci4KLSNkZWZpbmUgV0VC S0lUX1dFQl9TUkNfQ0FURUdPUllfSU5JVCBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRf d2ViX3NyY19kZWJ1ZywgIndlYmtpdHdlYnNyYyIsIDAsICJ3ZWJzcmMgZWxlbWVudCIpOwotR19E RUZJTkVfVFlQRV9XSVRIX0NPREUoV2ViS2l0V2ViU3JjLCB3ZWJraXRfd2ViX3NyYywgR1NUX1RZ UEVfUFVTSF9TUkMsCitXRUJLSVRfREVGSU5FX1RZUEVfV0lUSF9DT0RFKFdlYktpdFdlYlNyYywg d2Via2l0X3dlYl9zcmMsIEdTVF9UWVBFX1BVU0hfU1JDLAogICAgIEdfSU1QTEVNRU5UX0lOVEVS RkFDRShHU1RfVFlQRV9VUklfSEFORExFUiwgd2ViS2l0V2ViU3JjVXJpSGFuZGxlckluaXQpOwot ICAgIFdFQktJVF9XRUJfU1JDX0NBVEVHT1JZX0lOSVQpOworICAgIEdTVF9ERUJVR19DQVRFR09S WV9JTklUKHdlYmtpdF93ZWJfc3JjX2RlYnVnLCAid2Via2l0d2Vic3JjIiwgMCwgIndlYnNyYyBl bGVtZW50Iik7CispOwogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NyY19jbGFzc19pbml0KFdl YktpdFdlYlNyY0NsYXNzKiBrbGFzcykKIHsKICAgICBHT2JqZWN0Q2xhc3MqIG9rbGFzcyA9IEdf T0JKRUNUX0NMQVNTKGtsYXNzKTsKIAotICAgIG9rbGFzcy0+ZGlzcG9zZSA9IHdlYktpdFdlYlNy Y0Rpc3Bvc2U7CisgICAgb2tsYXNzLT5jb25zdHJ1Y3RlZCA9IHdlYktpdFdlYlNyY0NvbnN0cnVj dGVkOwogICAgIG9rbGFzcy0+c2V0X3Byb3BlcnR5ID0gd2ViS2l0V2ViU3JjU2V0UHJvcGVydHk7 CiAgICAgb2tsYXNzLT5nZXRfcHJvcGVydHkgPSB3ZWJLaXRXZWJTcmNHZXRQcm9wZXJ0eTsKIApA QCAtMjQyLDE0ICsyNDEsMTEgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfY2xhc3NfaW5p dChXZWJLaXRXZWJTcmNDbGFzcyoga2xhc3MpCiAKICAgICBHc3RQdXNoU3JjQ2xhc3MqIHB1c2hT cmNDbGFzcyA9IEdTVF9QVVNIX1NSQ19DTEFTUyhrbGFzcyk7CiAgICAgcHVzaFNyY0NsYXNzLT5j cmVhdGUgPSBHU1RfREVCVUdfRlVOQ1BUUih3ZWJLaXRXZWJTcmNDcmVhdGUpOwotCi0gICAgZ190 eXBlX2NsYXNzX2FkZF9wcml2YXRlKGtsYXNzLCBzaXplb2YoV2ViS2l0V2ViU3JjUHJpdmF0ZSkp OwogfQogCi0KIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlNyY1Jlc2V0KFdlYktpdFdlYlNyYyogc3Jj KQogewotICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBXRUJLSVRfV0VCX1NSQ19HRVRf UFJJVkFURShzcmMpOworICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7 CiAKICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIlJlc2V0dGluZyBpbnRlcm5hbCBzdGF0ZSIp OwogICAgIHByaXYtPmhhdmVTaXplID0gZmFsc2U7CkBAIC0yNjEsMTIgKzI1NywxMCBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRXZWJTcmNSZXNldChXZWJLaXRXZWJTcmMqIHNyYykKICAgICBwcml2LT5z aXplID0gMDsKIH0KIAotc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfaW5pdChXZWJLaXRXZWJT cmMqIHNyYykKK3N0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0NvbnN0cnVjdGVkKEdPYmplY3QqIG9i amVjdCkKIHsKLSAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9TUkNf R0VUX1BSSVZBVEUoc3JjKTsKLQotICAgIHNyYy0+cHJpdiA9IHByaXY7Ci0gICAgbmV3IChwcml2 KSBXZWJLaXRXZWJTcmNQcml2YXRlKCk7CisgICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRf V0VCX1NSQyhvYmplY3QpOworICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnBy aXY7CiAKICAgICBwcml2LT5ub3RpZmllciA9IE1haW5UaHJlYWROb3RpZmllcjxNYWluVGhyZWFk U291cmNlTm90aWZpY2F0aW9uPjo6Y3JlYXRlKCk7CiAgICAgcHJpdi0+YWRhcHRlciA9IGFkb3B0 R1JlZihnc3RfYWRhcHRlcl9uZXcoKSk7CkBAIC0yNzUsMTUgKzI2OSw4IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfc3JjX2luaXQoV2ViS2l0V2ViU3JjKiBzcmMpCiAgICAgd2Via2l0V2ViU3Jj UmVzZXQoc3JjKTsKICAgICBnc3RfYmFzZV9zcmNfc2V0X2F1dG9tYXRpY19lb3MoR1NUX0JBU0Vf U1JDX0NBU1Qoc3JjKSwgRkFMU0UpOwogICAgIGdzdF9iYXNlX3NyY19zZXRfYXN5bmMoR1NUX0JB U0VfU1JDX0NBU1Qoc3JjKSwgVFJVRSk7Ci19Ci0KLXN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0Rp c3Bvc2UoR09iamVjdCogb2JqZWN0KQotewotICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYg PSBXRUJLSVRfV0VCX1NSQyhvYmplY3QpLT5wcml2OwotCi0gICAgcHJpdi0+fldlYktpdFdlYlNy Y1ByaXZhdGUoKTsKIAotICAgIEdTVF9DQUxMX1BBUkVOVChHX09CSkVDVF9DTEFTUywgZGlzcG9z ZSwgKG9iamVjdCkpOworICAgIEdTVF9DQUxMX1BBUkVOVChHX09CSkVDVF9DTEFTUywgY29uc3Ry dWN0ZWQsIChvYmplY3QpKTsKIH0KIAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU2V0UHJvcGVy dHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSUQsIGNvbnN0IEdWYWx1ZSogdmFsdWUsIEdQ YXJhbVNwZWMqIHBzcGVjKQo=