187643 2018-07-13 08:17:54 -0700 [GStreamer] Implement bitrate modulation support in GStreamer based libwebrtc Encoders 2018-07-24 02:09:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 186932 1 tsaunier tsaunier alex commit-queue pnormand webkit-bug-importer oldest_to_newest 1441859 0 tsaunier 2018-07-13 08:17:54 -0700 [GStreamer] Implement bitrate modulation support in GStreamer based libwebrtc Encoders 1441869 1 344946 tsaunier 2018-07-13 08:35:04 -0700 Created attachment 344946 Patch 1442070 2 344995 tsaunier 2018-07-13 15:47:27 -0700 Created attachment 344995 Patch Fix small bitrate conversion issue 1443321 3 344995 pnormand 2018-07-19 02:12:40 -0700 Comment on attachment 344995 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344995&action=review LGTM! > Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp:389 > + if (caps && m_profile.get() && gst_caps_is_equal (m_restrictionCaps.get(), caps)) No space before ( 1444257 4 tsaunier 2018-07-23 07:57:24 -0700 (In reply to Philippe Normand from comment #3) > Comment on attachment 344995 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=344995&action=review > > LGTM! > > > Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp:389 > > + if (caps && m_profile.get() && gst_caps_is_equal (m_restrictionCaps.get(), caps)) > > No space before ( Fixed. 1444258 5 345572 tsaunier 2018-07-23 07:58:41 -0700 Created attachment 345572 Patch 1444597 6 345572 pnormand 2018-07-24 01:28:13 -0700 Comment on attachment 345572 Patch Let's see if this lands :) 1444607 7 345572 commit-queue 2018-07-24 02:08:18 -0700 Comment on attachment 345572 Patch Clearing flags on attachment: 345572 Committed r234141: <https://trac.webkit.org/changeset/234141> 1444608 8 commit-queue 2018-07-24 02:08:19 -0700 All reviewed patches have been landed. Closing bug. 1444609 9 webkit-bug-importer 2018-07-24 02:09:18 -0700 <rdar://problem/42533922> 344946 2018-07-13 08:35:04 -0700 2018-07-13 15:47:24 -0700 Patch bug-187643-20180713113503.patch text/plain 9146 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDVjMGRmMDlmNWNlYTNkYTY2YjU1ZWE5 NmEwNGE1MDZkZTdkNjdkYzMuLmZlOGM4ZDdlMWUyMzY3ZThmNWNjYTMxNjM0NDk4M2I5ZWI5ZDcw YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDctMTIgIFRoaWJhdWx0IFNhdW5pZXIgIDx0 c2F1bmllckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJdIEltcGxlbWVudCBiaXRy YXRlIG1vZHVsYXRpb24gc3VwcG9ydCBpbiBHU3RyZWFtZXIgYmFzZWQgbGlid2VicnRjIEVuY29k ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc2 NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRl ZCBzdXBwb3J0IGZvciBHUmVnZXggaW4gR1JlZlB0ci4KKworICAgICAgICBTb3VyY2UvV1RGOgor ICAgICAgICAqIHd0Zi9nbGliL0dSZWZQdHIuY3BwOgorICAgICAgICAoV1RGOjpyZWZHUHRyKToK KyAgICAgICAgKFdURjo6ZGVyZWZHUHRyKToKKyAgICAgICAgKiB3dGYvZ2xpYi9HUmVmUHRyLmg6 CisKIDIwMTgtMDctMDkgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQgZm9sbG93LXVwIHRvIHIyMzM2NjAuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Ni NWRiNWM4MDE5OTJjZjdiZmUzMDExNDMwZWM5NDYzZGVjYTA4YS4uNjEwMGMzNzBmNzIzN2VkZWYx NTJhMTIyMmQ0OWM1YzQ5MzQ0ZjNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4 LTA3LTEyICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1N0cmVhbWVyXSBJbXBsZW1lbnQgYml0cmF0ZSBtb2R1bGF0aW9uIHN1cHBvcnQgaW4gR1N0 cmVhbWVyIGJhc2VkIGxpYndlYnJ0YyBFbmNvZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NjQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvYmxlbSBiZWluZyB0aGF0IHdlIGRvIG5vdCBoYXZl IGEgcHJvcGVyIHVuaWZpZWQgZW5jb2RlciBBUEkgaW4gR1N0cmVhbWVyLCBzb21lIHdvcmsKKyAg ICAgICAgc3RhcnRlZCBhdCBodHRwczovL2J1Z3ppbGxhLmdub21lLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Nzk2NzE2IGJ1dCBpdCBpcyBxdWl0ZSBjb250cm92ZXJzaWFsCisgICAgICAgIGFuZCBtZWFu d2hpbGUgd2Ugc2hvdWxkIGp1c3QgbW92ZSBmb3J3YXJkIHdvcmtpbmcgYXJvdW5kIHRoYXQgbGlt aXRhdGlvbi4KKworICAgICAgICBTb3VyY2UvV2ViQ29yZToKKyAgICAgICAgKiBwbGF0Zm9ybS9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvR1N0cmVhbWVyVmlkZW9FbmNvZGVyRmFjdG9yeS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OkdTdHJlYW1lclZpZGVvRW5j b2Rlcik6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OkluaXRFbmNv ZGUpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9FbmNvZGVyOjpnZXRCaXRyYXRl U2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclZpZGVvRW5jb2Rlcjo6Y3JlYXRl RW5jb2Rlcik6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OkFkZENv ZGVjSWZTdXBwb3J0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9FbmNvZGVy OjpTZXRSZXN0cmljdGlvbkNhcHMpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9F bmNvZGVyOjpDcmVhdGVFbmNvZGVyKTogRGVsZXRlZC4KKwogMjAxOC0wNy0wMyAgVGhpYmF1bHQg U2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RLXSBJbXBs ZW1lbnQgUGVlckNvbm5lY3Rpb24gQVBJIG9uIHRvcCBvZiBsaWJ3ZWJydGMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dS ZWZQdHIuY3BwCmluZGV4IGM1MjIwOTVhZjM2NThmOTMxZDA0Nzk5YTUxYWM3MDgxMzMxMjFiOTYu LjBmNmYzYWVjZjMxZDg0ZDU0NDFjMjNjNTEwYzkzZmFmZGM3ZjAwODMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5jcHAKKysrIGIvU291cmNlL1dURi93dGYvZ2xpYi9H UmVmUHRyLmNwcApAQCAtMTU2LDYgKzE1NiwxOSBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGRlcmVmR1B0 cihHQ2xvc3VyZSogcHRyKQogICAgICAgICBnX2Nsb3N1cmVfdW5yZWYocHRyKTsKIH0KIAordGVt cGxhdGUgPD4gR1JlZ2V4KiByZWZHUHRyKEdSZWdleCogcHRyKQoreworICAgIGlmIChwdHIpCisg ICAgICAgIGdfcmVnZXhfcmVmKHB0cik7CisgICAgcmV0dXJuIHB0cjsKK30KKwordGVtcGxhdGUg PD4gdm9pZCBkZXJlZkdQdHIoR1JlZ2V4KiBwdHIpCit7CisgICAgaWYgKHB0cikKKyAgICAgICAg Z19yZWdleF91bnJlZihwdHIpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXVEYKIAogI2VuZGlmIC8v IFVTRShHTElCKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvZ2xpYi9HUmVmUHRyLmggYi9T b3VyY2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaAppbmRleCA3MzEzMDViZGEzYTg0MjM5MjgwY2E0 OTgzYjRiMWU1Y2I0MTAxZjMzLi5hYWExNmRlMmQ2YWRmMjFjMzkwMmUwZGRmOTYwOWFlMGZiN2Qx NzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaAorKysgYi9Tb3Vy Y2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8 d3RmL0hhc2hUcmFpdHMuaD4KICNpbmNsdWRlIDxhbGdvcml0aG0+CisjaW5jbHVkZSA8Z2xpYi5o PgogCiBleHRlcm4gIkMiIHZvaWQgZ19vYmplY3RfdW5yZWYoZ3BvaW50ZXIpOwogZXh0ZXJuICJD IiBncG9pbnRlciBnX29iamVjdF9yZWZfc2luayhncG9pbnRlcik7CkBAIC0yMzYsNiArMjM3LDgg QEAgdGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIEdCeXRlcyogcmVmR1B0cihHQnl0ZXMq KTsKIHRlbXBsYXRlIDw+IFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlcmVmR1B0cihHQnl0ZXMq KTsKIHRlbXBsYXRlIDw+IFdURl9FWFBPUlRfUFJJVkFURSBHQ2xvc3VyZSogcmVmR1B0cihHQ2xv c3VyZSopOwogdGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVyZWZHUHRyKEdD bG9zdXJlKik7Cit0ZW1wbGF0ZSA8PiBXVEZfRVhQT1JUX1BSSVZBVEUgR1JlZ2V4KiByZWZHUHRy KEdSZWdleCopOwordGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVyZWZHUHRy KEdSZWdleCopOwogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gaW5saW5lIFQqIHJlZkdQdHIoVCog cHRyKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v bGlid2VicnRjL0dTdHJlYW1lclZpZGVvRW5jb2RlckZhY3RvcnkuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbGlid2VicnRjL0dTdHJlYW1lclZpZGVvRW5jb2RlckZh Y3RvcnkuY3BwCmluZGV4IGY1ZjkwZmU4Njc1OGIxZWVmMDU3N2QwNWQyZGQ5MDA5ZDdlMjNmOWUu LmU4Yzk5NjFiMjk2OWU1NmUyZDZjYzdiODMyMmI0ZmIyZWUxNTY1MjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9HU3RyZWFtZXJWaWRl b0VuY29kZXJGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9saWJ3ZWJydGMvR1N0cmVhbWVyVmlkZW9FbmNvZGVyRmFjdG9yeS5jcHAKQEAgLTQ5LDIw ICs0OSwyOSBAQAogR1NUX0RFQlVHX0NBVEVHT1JZKHdlYmtpdF93ZWJydGNlbmNfZGVidWcpOwog I2RlZmluZSBHU1RfQ0FUX0RFRkFVTFQgd2Via2l0X3dlYnJ0Y2VuY19kZWJ1ZwogCisjZGVmaW5l IEtCSVRfVE9fQklUIDEwMjQKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCit0eXBlZGVmIHZvaWQg KCpCaXRyYXRlU2V0dGVyKShHc3RFbGVtZW50KiBlbmNvZGVyLCB1aW50MzJfdCBiaXRyYXRlKTsK K3N0YXRpYyBHUmVmUHRyPEdSZWdleD4gdGFyZ2V0Qml0cmF0ZUJpdFBlclNlYzsKK3N0YXRpYyBH UmVmUHRyPEdSZWdleD4gYml0cmF0ZUJpdFBlclNlYzsKK3N0YXRpYyBHUmVmUHRyPEdSZWdleD4g Yml0cmF0ZUtCaXRQZXJTZWM7CisKIGNsYXNzIEdTdHJlYW1lclZpZGVvRW5jb2RlciA6IHB1Ymxp YyB3ZWJydGM6OlZpZGVvRW5jb2RlciB7CiBwdWJsaWM6CiAgICAgR1N0cmVhbWVyVmlkZW9FbmNv ZGVyKGNvbnN0IHdlYnJ0Yzo6U2RwVmlkZW9Gb3JtYXQmKQogICAgICAgICA6IG1fcGljdHVyZUlk KDApCiAgICAgICAgICwgbV9maXJzdEZyYW1lUHRzKEdTVF9DTE9DS19USU1FX05PTkUpCiAgICAg ICAgICwgbV9yZXN0cmljdGlvbkNhcHMoYWRvcHRHUmVmKGdzdF9jYXBzX25ld19lbXB0eV9zaW1w bGUoInZpZGVvL3gtcmF3IikpKQorICAgICAgICAsIG1fYml0cmF0ZVNldHRlcihudWxscHRyKQog ICAgIHsKICAgICB9CiAgICAgR1N0cmVhbWVyVmlkZW9FbmNvZGVyKCkKICAgICAgICAgOiBtX3Bp Y3R1cmVJZCgwKQogICAgICAgICAsIG1fZmlyc3RGcmFtZVB0cyhHU1RfQ0xPQ0tfVElNRV9OT05F KQogICAgICAgICAsIG1fcmVzdHJpY3Rpb25DYXBzKGFkb3B0R1JlZihnc3RfY2Fwc19uZXdfZW1w dHlfc2ltcGxlKCJ2aWRlby94LXJhdyIpKSkKKyAgICAgICAgLCBtX2JpdHJhdGVTZXR0ZXIobnVs bHB0cikKICAgICB7CiAgICAgfQogCkBAIC03Niw2ICs4NSw5IEBAIHB1YmxpYzoKIAogICAgICAg ICBTZXRSZXN0cmljdGlvbkNhcHMoY2Fwcyk7CiAKKyAgICAgICAgaWYgKG1fYml0cmF0ZVNldHRl ciAmJiBtX2VuY29kZXIpCisgICAgICAgICAgICBtX2JpdHJhdGVTZXR0ZXIobV9lbmNvZGVyLCBu ZXdCaXRyYXRlKTsKKwogICAgICAgICByZXR1cm4gV0VCUlRDX1ZJREVPX0NPREVDX09LOwogICAg IH0KIApAQCAtMTAwLDggKzExMiw5IEBAIHB1YmxpYzoKICAgICAgICAgbV9waXBlbGluZSA9IG1h a2VFbGVtZW50KCJwaXBlbGluZSIpOwogCiAgICAgICAgIGNvbm5lY3RTaW1wbGVCdXNNZXNzYWdl Q2FsbGJhY2sobV9waXBlbGluZS5nZXQoKSk7Ci0gICAgICAgIGF1dG8gZW5jb2RlYmluID0gQ3Jl YXRlRW5jb2RlcigmbV9lbmNvZGVyKS5sZWFrUmVmKCk7CisgICAgICAgIGF1dG8gZW5jb2RlYmlu ID0gY3JlYXRlRW5jb2RlcigmbV9lbmNvZGVyKS5sZWFrUmVmKCk7CiAgICAgICAgIEFTU0VSVCht X2VuY29kZXIpOworICAgICAgICBtX2JpdHJhdGVTZXR0ZXIgPSBnZXRCaXRyYXRlU2V0dGVyKGdz dF9lbGVtZW50X2dldF9mYWN0b3J5KG1fZW5jb2RlcikpOwogCiAgICAgICAgIG1fc3JjID0gbWFr ZUVsZW1lbnQoImFwcHNyYyIpOwogICAgICAgICBnX29iamVjdF9zZXQobV9zcmMsICJpcy1saXZl IiwgdHJ1ZSwgImZvcm1hdCIsIEdTVF9GT1JNQVRfVElNRSwgbnVsbHB0cik7CkBAIC0yNDAsNyAr MjUzLDQwIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwogICAgIH0KIAot ICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gQ3JlYXRlRW5jb2RlcihHc3RFbGVtZW50KiogZW5jb2Rl cikKKyNkZWZpbmUgUkVUVVJOX0JJVFJBVEVfU0VUVEVSX0lGX01BVENIRVMocmVnZXgsIHByb3Bl cnR5TmFtZSwgYml0cmF0ZU11bHRpcGxpZXIsIHVuaXQpICAgICAgICAgICAgICAgICBcCisgICAg aWYgKGdfcmVnZXhfbWF0Y2gocmVnZXguZ2V0KCksIGZhY3RvcnlOYW1lLCBzdGF0aWNfY2FzdDxH UmVnZXhNYXRjaEZsYWdzPigwKSwgbnVsbHB0cikpIHsgICAgICAgICAgXAorICAgICAgICBHU1Rf SU5GT19PQkpFQ1QoZW5jb2RlckZhY3RvcnksICJEZXRlY3RlZCBhcyBoYXZpbmcgYSAiICNwcm9w ZXJ0eU5hbWUgIiBwcm9wZXJ0eSBpbiAiIHVuaXQpOyBcCisgICAgICAgIHJldHVybiBbXShHc3RF bGVtZW50KiBlbmNvZGVyLCB1aW50MzJfdCBiaXRyYXRlKSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgeyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICBnX29iamVjdF9zZXQoZW5jb2Rlciwg cHJvcGVydHlOYW1lLCBiaXRyYXRlICogYml0cmF0ZU11bHRpcGxpZXIsIG51bGxwdHIpOyAgICAg ICAgICAgIFwKKyAgICAgICAgICAgIH07ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisgICAgfQorCisgICAgLy8gR1N0cmVhbWVyIGRvZXNuJ3QgaGF2ZSBhIHVuaWZpZWQgZW5jb2Rl ciBBUEkgYW5kIHRoZSBlbmNvZGVycyBoYXZlIHRoZWlyCisgICAgLy8gb3duIHNlbWFudGljcyBh bmQgbmFtaW5nIHRvIHNldCB0aGUgYml0cmF0ZSwgdGhpcyBpcyBhIGJlc3QgZWZmb3J0IHRvIGhh bmRsZQorICAgIC8vIHNldHRpbmcgYml0cmF0ZSBmb3IgdGhlIHdlbGwga25vd24gZW5jb2RlcnMu CisgICAgLy8gU2VlIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03 OTY3MTYKKyAgICBCaXRyYXRlU2V0dGVyIGdldEJpdHJhdGVTZXR0ZXIoR3N0RWxlbWVudEZhY3Rv cnkqIGVuY29kZXJGYWN0b3J5KQorICAgIHsKKyAgICAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFn IHJlZ2V4UmVnaXN0ZXJlZEZsYWc7CisKKyAgICAgICAgc3RkOjpjYWxsX29uY2UocmVnZXhSZWdp c3RlcmVkRmxhZywgW10geworICAgICAgICAgICAgdGFyZ2V0Qml0cmF0ZUJpdFBlclNlYyA9IGdf cmVnZXhfbmV3KCJednAuZW5jJHxeb214LiplbmMkIiwgc3RhdGljX2Nhc3Q8R1JlZ2V4Q29tcGls ZUZsYWdzPigwKSwgc3RhdGljX2Nhc3Q8R1JlZ2V4TWF0Y2hGbGFncz4oMCksIG51bGxwdHIpOwor ICAgICAgICAgICAgYml0cmF0ZUJpdFBlclNlYyA9IGdfcmVnZXhfbmV3KCJeb3BlbmgyNjRlbmMk Iiwgc3RhdGljX2Nhc3Q8R1JlZ2V4Q29tcGlsZUZsYWdzPigwKSwgc3RhdGljX2Nhc3Q8R1JlZ2V4 TWF0Y2hGbGFncz4oMCksIG51bGxwdHIpOworICAgICAgICAgICAgYml0cmF0ZUtCaXRQZXJTZWMg PSBnX3JlZ2V4X25ldygiXngyNjRlbmMkfHZhYXBpLiplbmMkIiwgc3RhdGljX2Nhc3Q8R1JlZ2V4 Q29tcGlsZUZsYWdzPigwKSwgc3RhdGljX2Nhc3Q8R1JlZ2V4TWF0Y2hGbGFncz4oMCksIG51bGxw dHIpOworICAgICAgICAgICAgQVNTRVJUKHRhcmdldEJpdHJhdGVCaXRQZXJTZWMuZ2V0KCkgJiYg Yml0cmF0ZUJpdFBlclNlYy5nZXQoKSAmJiBiaXRyYXRlS0JpdFBlclNlYy5nZXQoKSk7CisgICAg ICAgIH0pOworCisgICAgICAgIGF1dG8gZmFjdG9yeU5hbWUgPSBHU1RfT0JKRUNUX05BTUUoZW5j b2RlckZhY3RvcnkpOworICAgICAgICBSRVRVUk5fQklUUkFURV9TRVRURVJfSUZfTUFUQ0hFUyh0 YXJnZXRCaXRyYXRlQml0UGVyU2VjLCAidGFyZ2V0LWJpdHJhdGUiLCBLQklUX1RPX0JJVCwgIkJp dHMgUGVyIFNlY29uZCIpCisgICAgICAgIFJFVFVSTl9CSVRSQVRFX1NFVFRFUl9JRl9NQVRDSEVT KGJpdHJhdGVCaXRQZXJTZWMsICJiaXRyYXRlIiwgS0JJVF9UT19CSVQsICJCaXRzIFBlciBTZWNv bmQiKQorICAgICAgICBSRVRVUk5fQklUUkFURV9TRVRURVJfSUZfTUFUQ0hFUyhiaXRyYXRlS0Jp dFBlclNlYywgImJpdHJhdGUiLCBLQklUX1RPX0JJVCwgIktCaXRzIFBlciBTZWNvbmQiKQorCisg ICAgICAgIEdTVF9XQVJOSU5HX09CSkVDVChlbmNvZGVyRmFjdG9yeSwgInVua29ud24gZW5jb2Rl ciwgY2FuJ3Qgc2V0IGJpdHJhdGVzIG9uIGl0Iik7CisgICAgICAgIHJldHVybiBudWxscHRyOwor ICAgIH0KKworICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gY3JlYXRlRW5jb2RlcihHc3RFbGVtZW50 KiogZW5jb2RlcikKICAgICB7CiAgICAgICAgIEdzdEVsZW1lbnQqIGVuYyA9IG51bGxwdHI7CiAK QEAgLTI4MSw3ICszMjcsNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBHc3RFbGVtZW50KiBl bmNvZGVyOwogCi0gICAgICAgIGlmIChDcmVhdGVFbmNvZGVyKCZlbmNvZGVyKS5nZXQoKSAhPSBu dWxscHRyKSB7CisgICAgICAgIGlmIChjcmVhdGVFbmNvZGVyKCZlbmNvZGVyKS5nZXQoKSAhPSBu dWxscHRyKSB7CiAgICAgICAgICAgICB3ZWJydGM6OlNkcFZpZGVvRm9ybWF0IGZvcm1hdCA9IENv bmZpZ3VyZVN1cHBvcnRlZENvZGVjKGVuY29kZXIpOwogCiAgICAgICAgICAgICBzdXBwb3J0ZWRG b3JtYXRzLT5wdXNoX2JhY2soZm9ybWF0KTsKQEAgLTMzOSw3ICszODUsNyBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIFNldFJlc3RyaWN0aW9uQ2FwcyhHc3RDYXBzKiBjYXBzKQogICAgIHsKLSAgICAg ICAgaWYgKGNhcHMgJiYgbV9wcm9maWxlLmdldCgpKQorICAgICAgICBpZiAoY2FwcyAmJiBtX3By b2ZpbGUuZ2V0KCkgJiYgZ3N0X2NhcHNfaXNfZXF1YWwgKG1fcmVzdHJpY3Rpb25DYXBzLmdldCgp LCBjYXBzKSkKICAgICAgICAgICAgIGdfb2JqZWN0X3NldChtX3Byb2ZpbGUuZ2V0KCksICJyZXN0 cmljdGlvbi1jYXBzIiwgY2FwcywgbnVsbHB0cik7CiAKICAgICAgICAgbV9yZXN0cmljdGlvbkNh cHMgPSBjYXBzOwpAQCAtMzYyLDYgKzQwOCw3IEBAIHByaXZhdGU6CiAgICAgR3N0Q2xvY2tUaW1l IG1fZmlyc3RGcmFtZVB0czsKICAgICBHUmVmUHRyPEdzdENhcHM+IG1fcmVzdHJpY3Rpb25DYXBz OwogICAgIEdSZWZQdHI8R3N0RW5jb2RpbmdQcm9maWxlPiBtX3Byb2ZpbGU7CisgICAgQml0cmF0 ZVNldHRlciBtX2JpdHJhdGVTZXR0ZXI7CiB9OwogCiBjbGFzcyBIMjY0RW5jb2RlciA6IHB1Ymxp YyBHU3RyZWFtZXJWaWRlb0VuY29kZXIgewo= 344995 2018-07-13 15:47:27 -0700 2018-07-23 07:58:36 -0700 Patch bug-187643-20180713184726.patch text/plain 9177 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDVjMGRmMDlmNWNlYTNkYTY2YjU1ZWE5 NmEwNGE1MDZkZTdkNjdkYzMuLmZlOGM4ZDdlMWUyMzY3ZThmNWNjYTMxNjM0NDk4M2I5ZWI5ZDcw YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDctMTIgIFRoaWJhdWx0IFNhdW5pZXIgIDx0 c2F1bmllckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJdIEltcGxlbWVudCBiaXRy YXRlIG1vZHVsYXRpb24gc3VwcG9ydCBpbiBHU3RyZWFtZXIgYmFzZWQgbGlid2VicnRjIEVuY29k ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc2 NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRl ZCBzdXBwb3J0IGZvciBHUmVnZXggaW4gR1JlZlB0ci4KKworICAgICAgICBTb3VyY2UvV1RGOgor ICAgICAgICAqIHd0Zi9nbGliL0dSZWZQdHIuY3BwOgorICAgICAgICAoV1RGOjpyZWZHUHRyKToK KyAgICAgICAgKFdURjo6ZGVyZWZHUHRyKToKKyAgICAgICAgKiB3dGYvZ2xpYi9HUmVmUHRyLmg6 CisKIDIwMTgtMDctMDkgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQgZm9sbG93LXVwIHRvIHIyMzM2NjAuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Ni NWRiNWM4MDE5OTJjZjdiZmUzMDExNDMwZWM5NDYzZGVjYTA4YS4uNjEwMGMzNzBmNzIzN2VkZWYx NTJhMTIyMmQ0OWM1YzQ5MzQ0ZjNkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4 LTA3LTEyICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1N0cmVhbWVyXSBJbXBsZW1lbnQgYml0cmF0ZSBtb2R1bGF0aW9uIHN1cHBvcnQgaW4gR1N0 cmVhbWVyIGJhc2VkIGxpYndlYnJ0YyBFbmNvZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NjQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUHJvYmxlbSBiZWluZyB0aGF0IHdlIGRvIG5vdCBoYXZl IGEgcHJvcGVyIHVuaWZpZWQgZW5jb2RlciBBUEkgaW4gR1N0cmVhbWVyLCBzb21lIHdvcmsKKyAg ICAgICAgc3RhcnRlZCBhdCBodHRwczovL2J1Z3ppbGxhLmdub21lLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Nzk2NzE2IGJ1dCBpdCBpcyBxdWl0ZSBjb250cm92ZXJzaWFsCisgICAgICAgIGFuZCBtZWFu d2hpbGUgd2Ugc2hvdWxkIGp1c3QgbW92ZSBmb3J3YXJkIHdvcmtpbmcgYXJvdW5kIHRoYXQgbGlt aXRhdGlvbi4KKworICAgICAgICBTb3VyY2UvV2ViQ29yZToKKyAgICAgICAgKiBwbGF0Zm9ybS9t ZWRpYXN0cmVhbS9saWJ3ZWJydGMvR1N0cmVhbWVyVmlkZW9FbmNvZGVyRmFjdG9yeS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OkdTdHJlYW1lclZpZGVvRW5j b2Rlcik6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OkluaXRFbmNv ZGUpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9FbmNvZGVyOjpnZXRCaXRyYXRl U2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclZpZGVvRW5jb2Rlcjo6Y3JlYXRl RW5jb2Rlcik6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OkFkZENv ZGVjSWZTdXBwb3J0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9FbmNvZGVy OjpTZXRSZXN0cmljdGlvbkNhcHMpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9F bmNvZGVyOjpDcmVhdGVFbmNvZGVyKTogRGVsZXRlZC4KKwogMjAxOC0wNy0wMyAgVGhpYmF1bHQg U2F1bmllciAgPHRzYXVuaWVyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RLXSBJbXBs ZW1lbnQgUGVlckNvbm5lY3Rpb24gQVBJIG9uIHRvcCBvZiBsaWJ3ZWJydGMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dS ZWZQdHIuY3BwCmluZGV4IGM1MjIwOTVhZjM2NThmOTMxZDA0Nzk5YTUxYWM3MDgxMzMxMjFiOTYu LjBmNmYzYWVjZjMxZDg0ZDU0NDFjMjNjNTEwYzkzZmFmZGM3ZjAwODMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5jcHAKKysrIGIvU291cmNlL1dURi93dGYvZ2xpYi9H UmVmUHRyLmNwcApAQCAtMTU2LDYgKzE1NiwxOSBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGRlcmVmR1B0 cihHQ2xvc3VyZSogcHRyKQogICAgICAgICBnX2Nsb3N1cmVfdW5yZWYocHRyKTsKIH0KIAordGVt cGxhdGUgPD4gR1JlZ2V4KiByZWZHUHRyKEdSZWdleCogcHRyKQoreworICAgIGlmIChwdHIpCisg ICAgICAgIGdfcmVnZXhfcmVmKHB0cik7CisgICAgcmV0dXJuIHB0cjsKK30KKwordGVtcGxhdGUg PD4gdm9pZCBkZXJlZkdQdHIoR1JlZ2V4KiBwdHIpCit7CisgICAgaWYgKHB0cikKKyAgICAgICAg Z19yZWdleF91bnJlZihwdHIpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXVEYKIAogI2VuZGlmIC8v IFVTRShHTElCKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvZ2xpYi9HUmVmUHRyLmggYi9T b3VyY2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaAppbmRleCA3MzEzMDViZGEzYTg0MjM5MjgwY2E0 OTgzYjRiMWU1Y2I0MTAxZjMzLi5hYWExNmRlMmQ2YWRmMjFjMzkwMmUwZGRmOTYwOWFlMGZiN2Qx NzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaAorKysgYi9Tb3Vy Y2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8 d3RmL0hhc2hUcmFpdHMuaD4KICNpbmNsdWRlIDxhbGdvcml0aG0+CisjaW5jbHVkZSA8Z2xpYi5o PgogCiBleHRlcm4gIkMiIHZvaWQgZ19vYmplY3RfdW5yZWYoZ3BvaW50ZXIpOwogZXh0ZXJuICJD IiBncG9pbnRlciBnX29iamVjdF9yZWZfc2luayhncG9pbnRlcik7CkBAIC0yMzYsNiArMjM3LDgg QEAgdGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIEdCeXRlcyogcmVmR1B0cihHQnl0ZXMq KTsKIHRlbXBsYXRlIDw+IFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlcmVmR1B0cihHQnl0ZXMq KTsKIHRlbXBsYXRlIDw+IFdURl9FWFBPUlRfUFJJVkFURSBHQ2xvc3VyZSogcmVmR1B0cihHQ2xv c3VyZSopOwogdGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVyZWZHUHRyKEdD bG9zdXJlKik7Cit0ZW1wbGF0ZSA8PiBXVEZfRVhQT1JUX1BSSVZBVEUgR1JlZ2V4KiByZWZHUHRy KEdSZWdleCopOwordGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVyZWZHUHRy KEdSZWdleCopOwogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gaW5saW5lIFQqIHJlZkdQdHIoVCog cHRyKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v bGlid2VicnRjL0dTdHJlYW1lclZpZGVvRW5jb2RlckZhY3RvcnkuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbGlid2VicnRjL0dTdHJlYW1lclZpZGVvRW5jb2RlckZh Y3RvcnkuY3BwCmluZGV4IGY1ZjkwZmU4Njc1OGIxZWVmMDU3N2QwNWQyZGQ5MDA5ZDdlMjNmOWUu LjBmY2VmMzdiMDM0Y2M1YTVhYjgyMzI1MjUzMzBlOTFiNDk0OTVhNmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9HU3RyZWFtZXJWaWRl b0VuY29kZXJGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9saWJ3ZWJydGMvR1N0cmVhbWVyVmlkZW9FbmNvZGVyRmFjdG9yeS5jcHAKQEAgLTQ5LDIw ICs0OSwyOSBAQAogR1NUX0RFQlVHX0NBVEVHT1JZKHdlYmtpdF93ZWJydGNlbmNfZGVidWcpOwog I2RlZmluZSBHU1RfQ0FUX0RFRkFVTFQgd2Via2l0X3dlYnJ0Y2VuY19kZWJ1ZwogCisjZGVmaW5l IEtCSVRfVE9fQklUIDEwMjQKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCit0eXBlZGVmIHZvaWQg KCpCaXRyYXRlU2V0dGVyKShHc3RFbGVtZW50KiBlbmNvZGVyLCB1aW50MzJfdCBiaXRyYXRlKTsK K3N0YXRpYyBHUmVmUHRyPEdSZWdleD4gdGFyZ2V0Qml0cmF0ZUJpdFBlclNlYzsKK3N0YXRpYyBH UmVmUHRyPEdSZWdleD4gYml0cmF0ZUJpdFBlclNlYzsKK3N0YXRpYyBHUmVmUHRyPEdSZWdleD4g Yml0cmF0ZUtCaXRQZXJTZWM7CisKIGNsYXNzIEdTdHJlYW1lclZpZGVvRW5jb2RlciA6IHB1Ymxp YyB3ZWJydGM6OlZpZGVvRW5jb2RlciB7CiBwdWJsaWM6CiAgICAgR1N0cmVhbWVyVmlkZW9FbmNv ZGVyKGNvbnN0IHdlYnJ0Yzo6U2RwVmlkZW9Gb3JtYXQmKQogICAgICAgICA6IG1fcGljdHVyZUlk KDApCiAgICAgICAgICwgbV9maXJzdEZyYW1lUHRzKEdTVF9DTE9DS19USU1FX05PTkUpCiAgICAg ICAgICwgbV9yZXN0cmljdGlvbkNhcHMoYWRvcHRHUmVmKGdzdF9jYXBzX25ld19lbXB0eV9zaW1w bGUoInZpZGVvL3gtcmF3IikpKQorICAgICAgICAsIG1fYml0cmF0ZVNldHRlcihudWxscHRyKQog ICAgIHsKICAgICB9CiAgICAgR1N0cmVhbWVyVmlkZW9FbmNvZGVyKCkKICAgICAgICAgOiBtX3Bp Y3R1cmVJZCgwKQogICAgICAgICAsIG1fZmlyc3RGcmFtZVB0cyhHU1RfQ0xPQ0tfVElNRV9OT05F KQogICAgICAgICAsIG1fcmVzdHJpY3Rpb25DYXBzKGFkb3B0R1JlZihnc3RfY2Fwc19uZXdfZW1w dHlfc2ltcGxlKCJ2aWRlby94LXJhdyIpKSkKKyAgICAgICAgLCBtX2JpdHJhdGVTZXR0ZXIobnVs bHB0cikKICAgICB7CiAgICAgfQogCkBAIC03Niw2ICs4NSw5IEBAIHB1YmxpYzoKIAogICAgICAg ICBTZXRSZXN0cmljdGlvbkNhcHMoY2Fwcyk7CiAKKyAgICAgICAgaWYgKG1fYml0cmF0ZVNldHRl ciAmJiBtX2VuY29kZXIpCisgICAgICAgICAgICBtX2JpdHJhdGVTZXR0ZXIobV9lbmNvZGVyLCBu ZXdCaXRyYXRlKTsKKwogICAgICAgICByZXR1cm4gV0VCUlRDX1ZJREVPX0NPREVDX09LOwogICAg IH0KIApAQCAtMTAwLDggKzExMiw5IEBAIHB1YmxpYzoKICAgICAgICAgbV9waXBlbGluZSA9IG1h a2VFbGVtZW50KCJwaXBlbGluZSIpOwogCiAgICAgICAgIGNvbm5lY3RTaW1wbGVCdXNNZXNzYWdl Q2FsbGJhY2sobV9waXBlbGluZS5nZXQoKSk7Ci0gICAgICAgIGF1dG8gZW5jb2RlYmluID0gQ3Jl YXRlRW5jb2RlcigmbV9lbmNvZGVyKS5sZWFrUmVmKCk7CisgICAgICAgIGF1dG8gZW5jb2RlYmlu ID0gY3JlYXRlRW5jb2RlcigmbV9lbmNvZGVyKS5sZWFrUmVmKCk7CiAgICAgICAgIEFTU0VSVCht X2VuY29kZXIpOworICAgICAgICBtX2JpdHJhdGVTZXR0ZXIgPSBnZXRCaXRyYXRlU2V0dGVyKGdz dF9lbGVtZW50X2dldF9mYWN0b3J5KG1fZW5jb2RlcikpOwogCiAgICAgICAgIG1fc3JjID0gbWFr ZUVsZW1lbnQoImFwcHNyYyIpOwogICAgICAgICBnX29iamVjdF9zZXQobV9zcmMsICJpcy1saXZl IiwgdHJ1ZSwgImZvcm1hdCIsIEdTVF9GT1JNQVRfVElNRSwgbnVsbHB0cik7CkBAIC0yNDAsNyAr MjUzLDQxIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwogICAgIH0KIAot ICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gQ3JlYXRlRW5jb2RlcihHc3RFbGVtZW50KiogZW5jb2Rl cikKKyNkZWZpbmUgUkVUVVJOX0JJVFJBVEVfU0VUVEVSX0lGX01BVENIRVMocmVnZXgsIHByb3Bl cnR5TmFtZSwgYml0cmF0ZU11bHRpcGxpZXIsIHVuaXQpICAgICAgICAgICAgICAgICBcCisgICAg aWYgKGdfcmVnZXhfbWF0Y2gocmVnZXguZ2V0KCksIGZhY3RvcnlOYW1lLCBzdGF0aWNfY2FzdDxH UmVnZXhNYXRjaEZsYWdzPigwKSwgbnVsbHB0cikpIHsgICAgICAgICAgXAorICAgICAgICBHU1Rf SU5GT19PQkpFQ1QoZW5jb2RlckZhY3RvcnksICJEZXRlY3RlZCBhcyBoYXZpbmcgYSAiICNwcm9w ZXJ0eU5hbWUgIiBwcm9wZXJ0eSBpbiAiIHVuaXQpOyBcCisgICAgICAgIHJldHVybiBbXShHc3RF bGVtZW50KiBlbmNvZGVyLCB1aW50MzJfdCBiaXRyYXRlKSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgeyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICBnX29iamVjdF9zZXQoZW5jb2Rlciwg cHJvcGVydHlOYW1lLCBiaXRyYXRlICogYml0cmF0ZU11bHRpcGxpZXIsIG51bGxwdHIpOyAgICAg ICAgICAgIFwKKyAgICAgICAgICAgIH07ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc CisgICAgfQorCisgICAgLy8gR1N0cmVhbWVyIGRvZXNuJ3QgaGF2ZSBhIHVuaWZpZWQgZW5jb2Rl ciBBUEkgYW5kIHRoZSBlbmNvZGVycyBoYXZlIHRoZWlyCisgICAgLy8gb3duIHNlbWFudGljcyBh bmQgbmFtaW5nIHRvIHNldCB0aGUgYml0cmF0ZSwgdGhpcyBpcyBhIGJlc3QgZWZmb3J0IHRvIGhh bmRsZQorICAgIC8vIHNldHRpbmcgYml0cmF0ZSBmb3IgdGhlIHdlbGwga25vd24gZW5jb2RlcnMu CisgICAgLy8gU2VlIGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNnaT9pZD03 OTY3MTYKKyAgICBCaXRyYXRlU2V0dGVyIGdldEJpdHJhdGVTZXR0ZXIoR3N0RWxlbWVudEZhY3Rv cnkqIGVuY29kZXJGYWN0b3J5KQorICAgIHsKKyAgICAgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFn IHJlZ2V4UmVnaXN0ZXJlZEZsYWc7CisKKyAgICAgICAgc3RkOjpjYWxsX29uY2UocmVnZXhSZWdp c3RlcmVkRmxhZywgW10geworICAgICAgICAgICAgdGFyZ2V0Qml0cmF0ZUJpdFBlclNlYyA9IGdf cmVnZXhfbmV3KCJednAuZW5jJHxeb214LiplbmMkIiwgc3RhdGljX2Nhc3Q8R1JlZ2V4Q29tcGls ZUZsYWdzPigwKSwgc3RhdGljX2Nhc3Q8R1JlZ2V4TWF0Y2hGbGFncz4oMCksIG51bGxwdHIpOwor ICAgICAgICAgICAgYml0cmF0ZUJpdFBlclNlYyA9IGdfcmVnZXhfbmV3KCJeb3BlbmgyNjRlbmMk Iiwgc3RhdGljX2Nhc3Q8R1JlZ2V4Q29tcGlsZUZsYWdzPigwKSwgc3RhdGljX2Nhc3Q8R1JlZ2V4 TWF0Y2hGbGFncz4oMCksIG51bGxwdHIpOworICAgICAgICAgICAgYml0cmF0ZUtCaXRQZXJTZWMg PSBnX3JlZ2V4X25ldygiXngyNjRlbmMkfHZhYXBpLiplbmMkIiwgc3RhdGljX2Nhc3Q8R1JlZ2V4 Q29tcGlsZUZsYWdzPigwKSwgc3RhdGljX2Nhc3Q8R1JlZ2V4TWF0Y2hGbGFncz4oMCksIG51bGxw dHIpOworICAgICAgICAgICAgQVNTRVJUKHRhcmdldEJpdHJhdGVCaXRQZXJTZWMuZ2V0KCkgJiYg Yml0cmF0ZUJpdFBlclNlYy5nZXQoKSAmJiBiaXRyYXRlS0JpdFBlclNlYy5nZXQoKSk7CisgICAg ICAgIH0pOworCisgICAgICAgIGF1dG8gZmFjdG9yeU5hbWUgPSBHU1RfT0JKRUNUX05BTUUoZW5j b2RlckZhY3RvcnkpOworICAgICAgICBSRVRVUk5fQklUUkFURV9TRVRURVJfSUZfTUFUQ0hFUyh0 YXJnZXRCaXRyYXRlQml0UGVyU2VjLCAidGFyZ2V0LWJpdHJhdGUiLCBLQklUX1RPX0JJVCwgIkJp dHMgUGVyIFNlY29uZCIpCisgICAgICAgIFJFVFVSTl9CSVRSQVRFX1NFVFRFUl9JRl9NQVRDSEVT KGJpdHJhdGVCaXRQZXJTZWMsICJiaXRyYXRlIiwgS0JJVF9UT19CSVQsICJCaXRzIFBlciBTZWNv bmQiKQorICAgICAgICBSRVRVUk5fQklUUkFURV9TRVRURVJfSUZfTUFUQ0hFUyhiaXRyYXRlS0Jp dFBlclNlYywgImJpdHJhdGUiLCAxLCAiS0JpdHMgUGVyIFNlY29uZCIpCisKKyAgICAgICAgR1NU X1dBUk5JTkdfT0JKRUNUKGVuY29kZXJGYWN0b3J5LCAidW5rb253biBlbmNvZGVyLCBjYW4ndCBz ZXQgYml0cmF0ZXMgb24gaXQiKTsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgfQorI3Vu ZGVmIFJFVFVSTl9CSVRSQVRFX1NFVFRFUl9JRl9NQVRDSEVTCisKKyAgICBHUmVmUHRyPEdzdEVs ZW1lbnQ+IGNyZWF0ZUVuY29kZXIoR3N0RWxlbWVudCoqIGVuY29kZXIpCiAgICAgewogICAgICAg ICBHc3RFbGVtZW50KiBlbmMgPSBudWxscHRyOwogCkBAIC0yODEsNyArMzI4LDcgQEAgcHVibGlj OgogICAgIHsKICAgICAgICAgR3N0RWxlbWVudCogZW5jb2RlcjsKIAotICAgICAgICBpZiAoQ3Jl YXRlRW5jb2RlcigmZW5jb2RlcikuZ2V0KCkgIT0gbnVsbHB0cikgeworICAgICAgICBpZiAoY3Jl YXRlRW5jb2RlcigmZW5jb2RlcikuZ2V0KCkgIT0gbnVsbHB0cikgewogICAgICAgICAgICAgd2Vi cnRjOjpTZHBWaWRlb0Zvcm1hdCBmb3JtYXQgPSBDb25maWd1cmVTdXBwb3J0ZWRDb2RlYyhlbmNv ZGVyKTsKIAogICAgICAgICAgICAgc3VwcG9ydGVkRm9ybWF0cy0+cHVzaF9iYWNrKGZvcm1hdCk7 CkBAIC0zMzksNyArMzg2LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBTZXRSZXN0cmljdGlvbkNh cHMoR3N0Q2FwcyogY2FwcykKICAgICB7Ci0gICAgICAgIGlmIChjYXBzICYmIG1fcHJvZmlsZS5n ZXQoKSkKKyAgICAgICAgaWYgKGNhcHMgJiYgbV9wcm9maWxlLmdldCgpICYmIGdzdF9jYXBzX2lz X2VxdWFsIChtX3Jlc3RyaWN0aW9uQ2Fwcy5nZXQoKSwgY2FwcykpCiAgICAgICAgICAgICBnX29i amVjdF9zZXQobV9wcm9maWxlLmdldCgpLCAicmVzdHJpY3Rpb24tY2FwcyIsIGNhcHMsIG51bGxw dHIpOwogCiAgICAgICAgIG1fcmVzdHJpY3Rpb25DYXBzID0gY2FwczsKQEAgLTM2Miw2ICs0MDks NyBAQCBwcml2YXRlOgogICAgIEdzdENsb2NrVGltZSBtX2ZpcnN0RnJhbWVQdHM7CiAgICAgR1Jl ZlB0cjxHc3RDYXBzPiBtX3Jlc3RyaWN0aW9uQ2FwczsKICAgICBHUmVmUHRyPEdzdEVuY29kaW5n UHJvZmlsZT4gbV9wcm9maWxlOworICAgIEJpdHJhdGVTZXR0ZXIgbV9iaXRyYXRlU2V0dGVyOwog fTsKIAogY2xhc3MgSDI2NEVuY29kZXIgOiBwdWJsaWMgR1N0cmVhbWVyVmlkZW9FbmNvZGVyIHsK 345572 2018-07-23 07:58:41 -0700 2018-07-24 02:08:18 -0700 Patch bug-187643-20180723105839.patch text/plain 9178 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNjZDZkNTNmOTY0OWUzZmZlNTI4ZGI4 OGMyY2U2ODMxNDM3NjJkNDMuLjY1YmIxNWNlZjliMGVlOThhMGI2MmQ5MDlhOWZlYmMyYzI5NWU5 YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDctMTIgIFRoaWJhdWx0IFNhdW5pZXIgIDx0 c2F1bmllckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHU3RyZWFtZXJdIEltcGxlbWVudCBiaXRy YXRlIG1vZHVsYXRpb24gc3VwcG9ydCBpbiBHU3RyZWFtZXIgYmFzZWQgbGlid2VicnRjIEVuY29k ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc2 NDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRl ZCBzdXBwb3J0IGZvciBHUmVnZXggaW4gR1JlZlB0ci4KKworICAgICAgICBTb3VyY2UvV1RGOgor ICAgICAgICAqIHd0Zi9nbGliL0dSZWZQdHIuY3BwOgorICAgICAgICAoV1RGOjpyZWZHUHRyKToK KyAgICAgICAgKFdURjo6ZGVyZWZHUHRyKToKKyAgICAgICAgKiB3dGYvZ2xpYi9HUmVmUHRyLmg6 CisKIDIwMTgtMDYtMDYgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAg ICBXZSBzaG91bGQgc3VwcG9ydCBDcmVhdGVUaGlzIGluIHRoZSBGVEwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5 MDg5M2I4OTFkZmNlMGZmM2RjZDhiNDliZmFmYjUxNmE3YzhmYzkxLi5hNWI2MmFlY2E5ZWJmZWI0 MmNlMTU0YjNhNTQwYzJmNTczMjk3Mzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIw MTgtMDctMTIgIFRoaWJhdWx0IFNhdW5pZXIgIDx0c2F1bmllckBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHU3RyZWFtZXJdIEltcGxlbWVudCBiaXRyYXRlIG1vZHVsYXRpb24gc3VwcG9ydCBpbiBH U3RyZWFtZXIgYmFzZWQgbGlid2VicnRjIEVuY29kZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc2NDMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9ibGVtIGJlaW5nIHRoYXQgd2UgZG8gbm90IGhh dmUgYSBwcm9wZXIgdW5pZmllZCBlbmNvZGVyIEFQSSBpbiBHU3RyZWFtZXIsIHNvbWUgd29yawor ICAgICAgICBzdGFydGVkIGF0IGh0dHBzOi8vYnVnemlsbGEuZ25vbWUub3JnL3Nob3dfYnVnLmNn aT9pZD03OTY3MTYgYnV0IGl0IGlzIHF1aXRlIGNvbnRyb3ZlcnNpYWwKKyAgICAgICAgYW5kIG1l YW53aGlsZSB3ZSBzaG91bGQganVzdCBtb3ZlIGZvcndhcmQgd29ya2luZyBhcm91bmQgdGhhdCBs aW1pdGF0aW9uLgorCisgICAgICAgIFNvdXJjZS9XZWJDb3JlOgorICAgICAgICAqIHBsYXRmb3Jt L21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9HU3RyZWFtZXJWaWRlb0VuY29kZXJGYWN0b3J5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclZpZGVvRW5jb2Rlcjo6R1N0cmVhbWVyVmlkZW9F bmNvZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclZpZGVvRW5jb2Rlcjo6SW5pdEVu Y29kZSk6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29kZXI6OmdldEJpdHJh dGVTZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyVmlkZW9FbmNvZGVyOjpjcmVh dGVFbmNvZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclZpZGVvRW5jb2Rlcjo6QWRk Q29kZWNJZlN1cHBvcnRlZCk6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRlb0VuY29k ZXI6OlNldFJlc3RyaWN0aW9uQ2Fwcyk6CisgICAgICAgIChXZWJDb3JlOjpHU3RyZWFtZXJWaWRl b0VuY29kZXI6OkNyZWF0ZUVuY29kZXIpOiBEZWxldGVkLgorCiAyMDE4LTA3LTAzICBUaGliYXVs dCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXVtHVEtdIElt cGxlbWVudCBQZWVyQ29ubmVjdGlvbiBBUEkgb24gdG9wIG9mIGxpYndlYnJ0YwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi93dGYvZ2xpYi9HUmVmUHRyLmNwcCBiL1NvdXJjZS9XVEYvd3RmL2dsaWIv R1JlZlB0ci5jcHAKaW5kZXggYzUyMjA5NWFmMzY1OGY5MzFkMDQ3OTlhNTFhYzcwODEzMzEyMWI5 Ni4uMGY2ZjNhZWNmMzFkODRkNTQ0MWMyM2M1MTBjOTNmYWZkYzdmMDA4MyAxMDA2NDQKLS0tIGEv U291cmNlL1dURi93dGYvZ2xpYi9HUmVmUHRyLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9nbGli L0dSZWZQdHIuY3BwCkBAIC0xNTYsNiArMTU2LDE5IEBAIHRlbXBsYXRlIDw+IHZvaWQgZGVyZWZH UHRyKEdDbG9zdXJlKiBwdHIpCiAgICAgICAgIGdfY2xvc3VyZV91bnJlZihwdHIpOwogfQogCit0 ZW1wbGF0ZSA8PiBHUmVnZXgqIHJlZkdQdHIoR1JlZ2V4KiBwdHIpCit7CisgICAgaWYgKHB0cikK KyAgICAgICAgZ19yZWdleF9yZWYocHRyKTsKKyAgICByZXR1cm4gcHRyOworfQorCit0ZW1wbGF0 ZSA8PiB2b2lkIGRlcmVmR1B0cihHUmVnZXgqIHB0cikKK3sKKyAgICBpZiAocHRyKQorICAgICAg ICBnX3JlZ2V4X3VucmVmKHB0cik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdURgogCiAjZW5kaWYg Ly8gVVNFKEdMSUIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dSZWZQdHIuaCBi L1NvdXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5oCmluZGV4IDczMTMwNWJkYTNhODQyMzkyODBj YTQ5ODNiNGIxZTVjYjQxMDFmMzMuLmFhYTE2ZGUyZDZhZGYyMWMzOTAyZTBkZGY5NjA5YWUwZmI3 ZDE3NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5oCisrKyBiL1Nv dXJjZS9XVEYvd3RmL2dsaWIvR1JlZlB0ci5oCkBAIC0yNyw2ICsyNyw3IEBACiAKICNpbmNsdWRl IDx3dGYvSGFzaFRyYWl0cy5oPgogI2luY2x1ZGUgPGFsZ29yaXRobT4KKyNpbmNsdWRlIDxnbGli Lmg+CiAKIGV4dGVybiAiQyIgdm9pZCBnX29iamVjdF91bnJlZihncG9pbnRlcik7CiBleHRlcm4g IkMiIGdwb2ludGVyIGdfb2JqZWN0X3JlZl9zaW5rKGdwb2ludGVyKTsKQEAgLTIzNiw2ICsyMzcs OCBAQCB0ZW1wbGF0ZSA8PiBXVEZfRVhQT1JUX1BSSVZBVEUgR0J5dGVzKiByZWZHUHRyKEdCeXRl cyopOwogdGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVyZWZHUHRyKEdCeXRl cyopOwogdGVtcGxhdGUgPD4gV1RGX0VYUE9SVF9QUklWQVRFIEdDbG9zdXJlKiByZWZHUHRyKEdD bG9zdXJlKik7CiB0ZW1wbGF0ZSA8PiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZXJlZkdQdHIo R0Nsb3N1cmUqKTsKK3RlbXBsYXRlIDw+IFdURl9FWFBPUlRfUFJJVkFURSBHUmVnZXgqIHJlZkdQ dHIoR1JlZ2V4Kik7Cit0ZW1wbGF0ZSA8PiBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZXJlZkdQ dHIoR1JlZ2V4Kik7CiAKIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgVCogcmVmR1B0cihU KiBwdHIpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9saWJ3ZWJydGMvR1N0cmVhbWVyVmlkZW9FbmNvZGVyRmFjdG9yeS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvR1N0cmVhbWVyVmlkZW9FbmNvZGVy RmFjdG9yeS5jcHAKaW5kZXggNzg0ZTkxNjljZjYzNjQ1YjUzOTg5NDlkY2NiNThjZWZmYzhmMGEx Yi4uMjE2NDljMjU2NjRiY2UwZDZjNzE4MDAzNmUyOGQxMTk4MDE5MTc4ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbGlid2VicnRjL0dTdHJlYW1lclZp ZGVvRW5jb2RlckZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL2xpYndlYnJ0Yy9HU3RyZWFtZXJWaWRlb0VuY29kZXJGYWN0b3J5LmNwcApAQCAtNDks MjAgKzQ5LDI5IEBACiBHU1RfREVCVUdfQ0FURUdPUlkod2Via2l0X3dlYnJ0Y2VuY19kZWJ1Zyk7 CiAjZGVmaW5lIEdTVF9DQVRfREVGQVVMVCB3ZWJraXRfd2VicnRjZW5jX2RlYnVnCiAKKyNkZWZp bmUgS0JJVF9UT19CSVQgMTAyNAorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3R5cGVkZWYgdm9p ZCAoKkJpdHJhdGVTZXR0ZXIpKEdzdEVsZW1lbnQqIGVuY29kZXIsIHVpbnQzMl90IGJpdHJhdGUp Oworc3RhdGljIEdSZWZQdHI8R1JlZ2V4PiB0YXJnZXRCaXRyYXRlQml0UGVyU2VjOworc3RhdGlj IEdSZWZQdHI8R1JlZ2V4PiBiaXRyYXRlQml0UGVyU2VjOworc3RhdGljIEdSZWZQdHI8R1JlZ2V4 PiBiaXRyYXRlS0JpdFBlclNlYzsKKwogY2xhc3MgR1N0cmVhbWVyVmlkZW9FbmNvZGVyIDogcHVi bGljIHdlYnJ0Yzo6VmlkZW9FbmNvZGVyIHsKIHB1YmxpYzoKICAgICBHU3RyZWFtZXJWaWRlb0Vu Y29kZXIoY29uc3Qgd2VicnRjOjpTZHBWaWRlb0Zvcm1hdCYpCiAgICAgICAgIDogbV9waWN0dXJl SWQoMCkKICAgICAgICAgLCBtX2ZpcnN0RnJhbWVQdHMoR1NUX0NMT0NLX1RJTUVfTk9ORSkKICAg ICAgICAgLCBtX3Jlc3RyaWN0aW9uQ2FwcyhhZG9wdEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3Np bXBsZSgidmlkZW8veC1yYXciKSkpCisgICAgICAgICwgbV9iaXRyYXRlU2V0dGVyKG51bGxwdHIp CiAgICAgewogICAgIH0KICAgICBHU3RyZWFtZXJWaWRlb0VuY29kZXIoKQogICAgICAgICA6IG1f cGljdHVyZUlkKDApCiAgICAgICAgICwgbV9maXJzdEZyYW1lUHRzKEdTVF9DTE9DS19USU1FX05P TkUpCiAgICAgICAgICwgbV9yZXN0cmljdGlvbkNhcHMoYWRvcHRHUmVmKGdzdF9jYXBzX25ld19l bXB0eV9zaW1wbGUoInZpZGVvL3gtcmF3IikpKQorICAgICAgICAsIG1fYml0cmF0ZVNldHRlcihu dWxscHRyKQogICAgIHsKICAgICB9CiAKQEAgLTc2LDYgKzg1LDkgQEAgcHVibGljOgogCiAgICAg ICAgIFNldFJlc3RyaWN0aW9uQ2FwcyhjYXBzKTsKIAorICAgICAgICBpZiAobV9iaXRyYXRlU2V0 dGVyICYmIG1fZW5jb2RlcikKKyAgICAgICAgICAgIG1fYml0cmF0ZVNldHRlcihtX2VuY29kZXIs IG5ld0JpdHJhdGUpOworCiAgICAgICAgIHJldHVybiBXRUJSVENfVklERU9fQ09ERUNfT0s7CiAg ICAgfQogCkBAIC0xMDAsOCArMTEyLDkgQEAgcHVibGljOgogICAgICAgICBtX3BpcGVsaW5lID0g bWFrZUVsZW1lbnQoInBpcGVsaW5lIik7CiAKICAgICAgICAgY29ubmVjdFNpbXBsZUJ1c01lc3Nh Z2VDYWxsYmFjayhtX3BpcGVsaW5lLmdldCgpKTsKLSAgICAgICAgYXV0byBlbmNvZGViaW4gPSBD cmVhdGVFbmNvZGVyKCZtX2VuY29kZXIpLmxlYWtSZWYoKTsKKyAgICAgICAgYXV0byBlbmNvZGVi aW4gPSBjcmVhdGVFbmNvZGVyKCZtX2VuY29kZXIpLmxlYWtSZWYoKTsKICAgICAgICAgQVNTRVJU KG1fZW5jb2Rlcik7CisgICAgICAgIG1fYml0cmF0ZVNldHRlciA9IGdldEJpdHJhdGVTZXR0ZXIo Z3N0X2VsZW1lbnRfZ2V0X2ZhY3RvcnkobV9lbmNvZGVyKSk7CiAKICAgICAgICAgbV9zcmMgPSBt YWtlRWxlbWVudCgiYXBwc3JjIik7CiAgICAgICAgIGdfb2JqZWN0X3NldChtX3NyYywgImlzLWxp dmUiLCB0cnVlLCAiZm9ybWF0IiwgR1NUX0ZPUk1BVF9USU1FLCBudWxscHRyKTsKQEAgLTIzOSw3 ICsyNTIsNDEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gR1NUX0ZMT1dfT0s7CiAgICAgfQog Ci0gICAgR1JlZlB0cjxHc3RFbGVtZW50PiBDcmVhdGVFbmNvZGVyKEdzdEVsZW1lbnQqKiBlbmNv ZGVyKQorI2RlZmluZSBSRVRVUk5fQklUUkFURV9TRVRURVJfSUZfTUFUQ0hFUyhyZWdleCwgcHJv cGVydHlOYW1lLCBiaXRyYXRlTXVsdGlwbGllciwgdW5pdCkgICAgICAgICAgICAgICAgIFwKKyAg ICBpZiAoZ19yZWdleF9tYXRjaChyZWdleC5nZXQoKSwgZmFjdG9yeU5hbWUsIHN0YXRpY19jYXN0 PEdSZWdleE1hdGNoRmxhZ3M+KDApLCBudWxscHRyKSkgeyAgICAgICAgICBcCisgICAgICAgIEdT VF9JTkZPX09CSkVDVChlbmNvZGVyRmFjdG9yeSwgIkRldGVjdGVkIGFzIGhhdmluZyBhICIgI3By b3BlcnR5TmFtZSAiIHByb3BlcnR5IGluICIgdW5pdCk7IFwKKyAgICAgICAgcmV0dXJuIFtdKEdz dEVsZW1lbnQqIGVuY29kZXIsIHVpbnQzMl90IGJpdHJhdGUpICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgICAgICAgICB7ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXAorICAgICAgICAgICAgICAgIGdfb2JqZWN0X3NldChlbmNvZGVy LCBwcm9wZXJ0eU5hbWUsIGJpdHJhdGUgKiBiaXRyYXRlTXVsdGlwbGllciwgbnVsbHB0cik7ICAg ICAgICAgICAgXAorICAgICAgICAgICAgfTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFwKKyAgICB9CisKKyAgICAvLyBHU3RyZWFtZXIgZG9lc24ndCBoYXZlIGEgdW5pZmllZCBlbmNv ZGVyIEFQSSBhbmQgdGhlIGVuY29kZXJzIGhhdmUgdGhlaXIKKyAgICAvLyBvd24gc2VtYW50aWNz IGFuZCBuYW1pbmcgdG8gc2V0IHRoZSBiaXRyYXRlLCB0aGlzIGlzIGEgYmVzdCBlZmZvcnQgdG8g aGFuZGxlCisgICAgLy8gc2V0dGluZyBiaXRyYXRlIGZvciB0aGUgd2VsbCBrbm93biBlbmNvZGVy cy4KKyAgICAvLyBTZWUgaHR0cHM6Ly9idWd6aWxsYS5nbm9tZS5vcmcvc2hvd19idWcuY2dpP2lk PTc5NjcxNgorICAgIEJpdHJhdGVTZXR0ZXIgZ2V0Qml0cmF0ZVNldHRlcihHc3RFbGVtZW50RmFj dG9yeSogZW5jb2RlckZhY3RvcnkpCisgICAgeworICAgICAgICBzdGF0aWMgc3RkOjpvbmNlX2Zs YWcgcmVnZXhSZWdpc3RlcmVkRmxhZzsKKworICAgICAgICBzdGQ6OmNhbGxfb25jZShyZWdleFJl Z2lzdGVyZWRGbGFnLCBbXSB7CisgICAgICAgICAgICB0YXJnZXRCaXRyYXRlQml0UGVyU2VjID0g Z19yZWdleF9uZXcoIl52cC5lbmMkfF5vbXguKmVuYyQiLCBzdGF0aWNfY2FzdDxHUmVnZXhDb21w aWxlRmxhZ3M+KDApLCBzdGF0aWNfY2FzdDxHUmVnZXhNYXRjaEZsYWdzPigwKSwgbnVsbHB0cik7 CisgICAgICAgICAgICBiaXRyYXRlQml0UGVyU2VjID0gZ19yZWdleF9uZXcoIl5vcGVuaDI2NGVu YyQiLCBzdGF0aWNfY2FzdDxHUmVnZXhDb21waWxlRmxhZ3M+KDApLCBzdGF0aWNfY2FzdDxHUmVn ZXhNYXRjaEZsYWdzPigwKSwgbnVsbHB0cik7CisgICAgICAgICAgICBiaXRyYXRlS0JpdFBlclNl YyA9IGdfcmVnZXhfbmV3KCJeeDI2NGVuYyR8dmFhcGkuKmVuYyQiLCBzdGF0aWNfY2FzdDxHUmVn ZXhDb21waWxlRmxhZ3M+KDApLCBzdGF0aWNfY2FzdDxHUmVnZXhNYXRjaEZsYWdzPigwKSwgbnVs bHB0cik7CisgICAgICAgICAgICBBU1NFUlQodGFyZ2V0Qml0cmF0ZUJpdFBlclNlYy5nZXQoKSAm JiBiaXRyYXRlQml0UGVyU2VjLmdldCgpICYmIGJpdHJhdGVLQml0UGVyU2VjLmdldCgpKTsKKyAg ICAgICAgfSk7CisKKyAgICAgICAgYXV0byBmYWN0b3J5TmFtZSA9IEdTVF9PQkpFQ1RfTkFNRShl bmNvZGVyRmFjdG9yeSk7CisgICAgICAgIFJFVFVSTl9CSVRSQVRFX1NFVFRFUl9JRl9NQVRDSEVT KHRhcmdldEJpdHJhdGVCaXRQZXJTZWMsICJ0YXJnZXQtYml0cmF0ZSIsIEtCSVRfVE9fQklULCAi Qml0cyBQZXIgU2Vjb25kIikKKyAgICAgICAgUkVUVVJOX0JJVFJBVEVfU0VUVEVSX0lGX01BVENI RVMoYml0cmF0ZUJpdFBlclNlYywgImJpdHJhdGUiLCBLQklUX1RPX0JJVCwgIkJpdHMgUGVyIFNl Y29uZCIpCisgICAgICAgIFJFVFVSTl9CSVRSQVRFX1NFVFRFUl9JRl9NQVRDSEVTKGJpdHJhdGVL Qml0UGVyU2VjLCAiYml0cmF0ZSIsIDEsICJLQml0cyBQZXIgU2Vjb25kIikKKworICAgICAgICBH U1RfV0FSTklOR19PQkpFQ1QoZW5jb2RlckZhY3RvcnksICJ1bmtvbnduIGVuY29kZXIsIGNhbid0 IHNldCBiaXRyYXRlcyBvbiBpdCIpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9Cisj dW5kZWYgUkVUVVJOX0JJVFJBVEVfU0VUVEVSX0lGX01BVENIRVMKKworICAgIEdSZWZQdHI8R3N0 RWxlbWVudD4gY3JlYXRlRW5jb2RlcihHc3RFbGVtZW50KiogZW5jb2RlcikKICAgICB7CiAgICAg ICAgIEdzdEVsZW1lbnQqIGVuYyA9IG51bGxwdHI7CiAKQEAgLTI4MCw3ICszMjcsNyBAQCBwdWJs aWM6CiAgICAgewogICAgICAgICBHc3RFbGVtZW50KiBlbmNvZGVyOwogCi0gICAgICAgIGlmIChD cmVhdGVFbmNvZGVyKCZlbmNvZGVyKS5nZXQoKSAhPSBudWxscHRyKSB7CisgICAgICAgIGlmIChj cmVhdGVFbmNvZGVyKCZlbmNvZGVyKS5nZXQoKSAhPSBudWxscHRyKSB7CiAgICAgICAgICAgICB3 ZWJydGM6OlNkcFZpZGVvRm9ybWF0IGZvcm1hdCA9IENvbmZpZ3VyZVN1cHBvcnRlZENvZGVjKGVu Y29kZXIpOwogCiAgICAgICAgICAgICBzdXBwb3J0ZWRGb3JtYXRzLT5wdXNoX2JhY2soZm9ybWF0 KTsKQEAgLTMzOCw3ICszODUsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIFNldFJlc3RyaWN0aW9u Q2FwcyhHc3RDYXBzKiBjYXBzKQogICAgIHsKLSAgICAgICAgaWYgKGNhcHMgJiYgbV9wcm9maWxl LmdldCgpKQorICAgICAgICBpZiAoY2FwcyAmJiBtX3Byb2ZpbGUuZ2V0KCkgJiYgZ3N0X2NhcHNf aXNfZXF1YWwobV9yZXN0cmljdGlvbkNhcHMuZ2V0KCksIGNhcHMpKQogICAgICAgICAgICAgZ19v YmplY3Rfc2V0KG1fcHJvZmlsZS5nZXQoKSwgInJlc3RyaWN0aW9uLWNhcHMiLCBjYXBzLCBudWxs cHRyKTsKIAogICAgICAgICBtX3Jlc3RyaWN0aW9uQ2FwcyA9IGNhcHM7CkBAIC0zNjEsNiArNDA4 LDcgQEAgcHJpdmF0ZToKICAgICBHc3RDbG9ja1RpbWUgbV9maXJzdEZyYW1lUHRzOwogICAgIEdS ZWZQdHI8R3N0Q2Fwcz4gbV9yZXN0cmljdGlvbkNhcHM7CiAgICAgR1JlZlB0cjxHc3RFbmNvZGlu Z1Byb2ZpbGU+IG1fcHJvZmlsZTsKKyAgICBCaXRyYXRlU2V0dGVyIG1fYml0cmF0ZVNldHRlcjsK IH07CiAKIGNsYXNzIEgyNjRFbmNvZGVyIDogcHVibGljIEdTdHJlYW1lclZpZGVvRW5jb2RlciB7 Cg==