182819 2018-02-14 20:00:16 -0800 [RenderTreeBuilder] Move RenderInline/RenderGrid::addChild() to RenderTreeBuilder 2018-02-15 10:25:12 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1399373 0 zalan 2018-02-14 20:00:16 -0800 ssia 1399374 1 webkit-bug-importer 2018-02-14 20:01:24 -0800 <rdar://problem/37558187> 1399375 2 333871 zalan 2018-02-14 20:04:51 -0800 Created attachment 333871 Patch 1399377 3 333872 zalan 2018-02-14 20:16:49 -0800 Created attachment 333872 Patch 1399505 4 333872 commit-queue 2018-02-15 10:25:10 -0800 Comment on attachment 333872 Patch Clearing flags on attachment: 333872 Committed r228520: <https://trac.webkit.org/changeset/228520> 1399506 5 commit-queue 2018-02-15 10:25:12 -0800 All reviewed patches have been landed. Closing bug. 333871 2018-02-14 20:04:51 -0800 2018-02-14 20:14:55 -0800 Patch bug-182819-20180214200450.patch text/plain 12400 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5YzM4MmIyZjAwMTJj MjQxZjQwNDM2NTIzMzY5NDM5NjYxNmJhMC4uMzBlNmNmZjIzYzdmYzY1ZDhiOWRmNzBkMGY0ZGUx OGVjYzE0NGVkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlcklubGluZS9SZW5kZXJHcmlkOjphZGRDaGlsZCgpIHRvIFJlbmRlclRyZWVC dWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODI4MTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3NTU4MTg3PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFs aXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyR3JpZDo6YWRkQ2hpbGQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJHcmlkLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmFkZENoaWxkKTogRGVsZXRlZC4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmg6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVC dWlsZGVyOjppbnNlcnRDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRl cjo6dGFrZUNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJSdWJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpS dWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyU1ZHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRyZWVCdWlsZGVyOjpTVkc6Omluc2VydENoaWxkKToKKwogMjAxOC0wMi0xNCAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92 ZSBSZW5kZXJNYXRoTUxGZW5jZWQ6OmFkZENoaWxkKCkgdG8gUmVuZGVyVHJlZUJ1aWxkZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCA5MWJiMTBjOGQxYTI5OTE1 ODM1ZmQ1YmYwYTFjZTRiNGZkZTZiMDEzLi4xMjBlOTdjZjBhZDk4ZTFjZmYwNWQwOTcxZTlmNDAw NTA3ZGM3NWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC03 MCwyMSArNzAsNiBAQCBSZW5kZXJHcmlkOjpSZW5kZXJHcmlkKEVsZW1lbnQmIGVsZW1lbnQsIFJl bmRlclN0eWxlJiYgc3R5bGUpCiAKIFJlbmRlckdyaWQ6On5SZW5kZXJHcmlkKCkgPSBkZWZhdWx0 OwogCi12b2lkIFJlbmRlckdyaWQ6OmFkZENoaWxkKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVy LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVD aGlsZCkKLXsKLSAgICBhdXRvJiBjaGlsZCA9ICpuZXdDaGlsZDsKLSAgICBidWlsZGVyLmluc2Vy dENoaWxkVG9SZW5kZXJCbG9jaygqdGhpcywgV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNoaWxk KTsKLQotICAgIC8vIFBvc2l0aW9uZWQgZ3JpZCBpdGVtcyBkbyBub3QgdGFrZSB1cCBzcGFjZSBv ciBvdGhlcndpc2UgcGFydGljaXBhdGUgaW4gdGhlIGxheW91dCBvZiB0aGUgZ3JpZCwKLSAgICAv LyBmb3IgdGhhdCByZWFzb24gd2UgZG9uJ3QgbmVlZCB0byBtYXJrIHRoZSBncmlkIGFzIGRpcnR5 IHdoZW4gdGhleSBhcmUgYWRkZWQuCi0gICAgaWYgKGNoaWxkLmlzT3V0T2ZGbG93UG9zaXRpb25l ZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBUaGUgZ3JpZCBuZWVkcyB0byBiZSByZWNv bXB1dGVkIGFzIGl0IG1pZ2h0IGNvbnRhaW4gYXV0by1wbGFjZWQgaXRlbXMgdGhhdAotICAgIC8v IHdpbGwgY2hhbmdlIHRoZWlyIHBvc2l0aW9uLgotICAgIGRpcnR5R3JpZCgpOwotfQotCiBTdHls ZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6OnNlbGZBbGlnbm1lbnRGb3JDaGlsZChHcmlk QXhpcyBheGlzLCBjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBSZW5kZXJTdHlsZSogZ3Jp ZFN0eWxlKSBjb25zdAogewogICAgIHJldHVybiBheGlzID09IEdyaWRSb3dBeGlzID8ganVzdGlm eVNlbGZGb3JDaGlsZChjaGlsZCwgZ3JpZFN0eWxlKSA6IGFsaWduU2VsZkZvckNoaWxkKGNoaWxk LCBncmlkU3R5bGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5kZXggNTc5 NzZkMTE2ODViNTBhNjNmNTlhY2JiMTI1MDhjZDRmOTBlNjBhYi4uOTk1NzAwZmEwZDhjOTEyZjc5 MjM0MjQ2YmJlYTlkNDkwZjcxYWZmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5oCkBAIC03OSw4ICs3OSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc1JlbmRlckdyaWQoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAgdm9pZCBjb21wdXRlSW50cmluc2lj TG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1h eExvZ2ljYWxXaWR0aCkgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIGFkZENoaWxkKFJlbmRl clRyZWVCdWlsZGVyJiwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQsIFJlbmRlck9i amVjdCogYmVmb3JlQ2hpbGQpIGZpbmFsOwotCiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBz ZWxmQWxpZ25tZW50Rm9yQ2hpbGQoR3JpZEF4aXMsIGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFJl bmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIGJvb2wgc2VsZkFsaWdubWVudENoYW5n ZWRUb1N0cmV0Y2goR3JpZEF4aXMsIGNvbnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSwgY29uc3Qg UmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBib29s IHNlbGZBbGlnbm1lbnRDaGFuZ2VkRnJvbVN0cmV0Y2goR3JpZEF4aXMsIGNvbnN0IFJlbmRlclN0 eWxlJiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJC b3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKaW5k ZXggMDc1NDc0NWE4ODM2NTU2NjYyMDUwODBiZmQwMWYyZTMwZjMxNjk0Ny4uYTRhMTUyZWVjZDRh MzhkM2E5Yzg0MTU4YzFjMTVhZDJlZDQzMDBmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAKQEAgLTI1NSwxMSArMjU1LDYgQEAgTGF5b3V0UmVjdCBSZW5kZXJJ bmxpbmU6OmxvY2FsQ2FyZXRSZWN0KElubGluZUJveCogaW5saW5lQm94LCB1bnNpZ25lZCwgTGF5 b3V0VW4KICAgICByZXR1cm4gY2FyZXRSZWN0OwogfQogCi12b2lkIFJlbmRlcklubGluZTo6YWRk Q2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+ IG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQotewotICAgIGJ1aWxkZXIuaW5z ZXJ0Q2hpbGRUb1JlbmRlcklubGluZSgqdGhpcywgV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNo aWxkKTsKLX0KLQogdm9pZCBSZW5kZXJJbmxpbmU6OmFkZENoaWxkSWdub3JpbmdDb250aW51YXRp b24oUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IG5l d0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIGJ1aWxkZXIuaW5zZXJ0 Q2hpbGRUb1JlbmRlcklubGluZUlnbm9yaW5nQ29udGludWF0aW9uKCp0aGlzLCBXVEZNb3ZlKG5l d0NoaWxkKSwgYmVmb3JlQ2hpbGQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlcklubGluZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGlu ZS5oCmluZGV4IDZmNGY5ZmE5NzQxNTkxYzFhZDI0NGVlNmJkOWY0YjE5MDBiYTQ2ZjIuLjU4ZGI5 NjM3ZTE0ZGM2YjM3OTA1ODA3MzAxM2NmYTJkMjNkM2JkNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmgKQEAgLTM3LDggKzM3LDYgQEAgcHVibGljOgogICAgIFJlbmRl cklubGluZShFbGVtZW50JiwgUmVuZGVyU3R5bGUmJik7CiAgICAgUmVuZGVySW5saW5lKERvY3Vt ZW50JiwgUmVuZGVyU3R5bGUmJik7CiAKLSAgICB2b2lkIGFkZENoaWxkKFJlbmRlclRyZWVCdWls ZGVyJiwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQsIFJlbmRlck9iamVjdCogYmVm b3JlQ2hpbGQgPSAwKSBvdmVycmlkZTsKLQogICAgIExheW91dFVuaXQgbWFyZ2luTGVmdCgpIGNv bnN0IGZpbmFsOwogICAgIExheW91dFVuaXQgbWFyZ2luUmlnaHQoKSBjb25zdCBmaW5hbDsKICAg ICBMYXlvdXRVbml0IG1hcmdpblRvcCgpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKaW5kZXgg NmMyYzA4NDJiNGM1NzI3ZDEwY2JkZmI5ZjFjMjA4N2E2NTg5NjA4Ni4uOGIwOThmNDI0NDFlOGU4 NzYyNTZlNjc3ODU4NTFkNWM5MDgyOGQ0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCkBAIC0yMTcsNiArMjE3 LDE0IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKFJlbmRlckVsZW1lbnQm IHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjCiAKICAgICBpZiAoaXM8UmVuZGVyTWF0aE1M RmVuY2VkPihwYXJlbnQpKSB7CiAgICAgICAgIG1hdGhNTEJ1aWxkZXIoKS5pbnNlcnRDaGlsZChk b3duY2FzdDxSZW5kZXJNYXRoTUxGZW5jZWQ+KHBhcmVudCksIFdURk1vdmUoY2hpbGQpLCBiZWZv cmVDaGlsZCk7CisKKyAgICBpZiAoaXM8UmVuZGVyR3JpZD4ocGFyZW50KSkgeworICAgICAgICBp bnNlcnRDaGlsZFRvUmVuZGVyR3JpZChkb3duY2FzdDxSZW5kZXJHcmlkPihwYXJlbnQpLCBXVEZN b3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg aWYgKGlzPFJlbmRlcklubGluZT4ocGFyZW50KSkgeworICAgICAgICBpbmxpbmVCdWlsZGVyKCku aW5zZXJ0Q2hpbGQoZG93bmNhc3Q8UmVuZGVySW5saW5lPihwYXJlbnQpLCBXVEZNb3ZlKGNoaWxk KSwgYmVmb3JlQ2hpbGQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00ODMsMTEgKzQ5 MSw2IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95 Q2xlYW5pbmdVcEFub255bW91c1dyYXBwZXJzKFJlCiAgICAgLy8gV0FSTklORzogY2hpbGQgaXMg ZGVsZXRlZCBoZXJlLgogfQogCi12b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRv UmVuZGVySW5saW5lKFJlbmRlcklubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0 PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKLXsKLSAgICBpbmxpbmVCdWlsZGVy KCkuaW5zZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwotfQot CiB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lSWdub3Jp bmdDb250aW51YXRpb24oUmVuZGVySW5saW5lJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIGlubGluZUJ1aWxk ZXIoKS5pbnNlcnRDaGlsZElnbm9yaW5nQ29udGludWF0aW9uKHBhcmVudCwgV1RGTW92ZShjaGls ZCksIGJlZm9yZUNoaWxkKTsKQEAgLTYxMyw1ICs2MTYsMTkgQEAgUmVuZGVyUHRyPFJlbmRlck9i amVjdD4gUmVuZGVyVHJlZUJ1aWxkZXI6OnRha2VDaGlsZEZyb21SZW5kZXJFbGVtZW50KFJlbmRl ckVsZW0KICAgICByZXR1cm4gY2hpbGRUb1Rha2U7CiB9CiAKK3ZvaWQgUmVuZGVyVHJlZUJ1aWxk ZXI6Omluc2VydENoaWxkVG9SZW5kZXJHcmlkKFJlbmRlckdyaWQmIHBhcmVudCwgUmVuZGVyUHRy PFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCit7CisgICAg YXV0byYgbmV3Q2hpbGQgPSAqY2hpbGQ7CisgICAgYmxvY2tCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQo cGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworCisgICAgLy8gUG9zaXRpb25l ZCBncmlkIGl0ZW1zIGRvIG5vdCB0YWtlIHVwIHNwYWNlIG9yIG90aGVyd2lzZSBwYXJ0aWNpcGF0 ZSBpbiB0aGUgbGF5b3V0IG9mIHRoZSBncmlkLAorICAgIC8vIGZvciB0aGF0IHJlYXNvbiB3ZSBk b24ndCBuZWVkIHRvIG1hcmsgdGhlIGdyaWQgYXMgZGlydHkgd2hlbiB0aGV5IGFyZSBhZGRlZC4K KyAgICBpZiAobmV3Q2hpbGQuaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVy bjsKKworICAgIC8vIFRoZSBncmlkIG5lZWRzIHRvIGJlIHJlY29tcHV0ZWQgYXMgaXQgbWlnaHQg Y29udGFpbiBhdXRvLXBsYWNlZCBpdGVtcyB0aGF0CisgICAgLy8gd2lsbCBjaGFuZ2UgdGhlaXIg cG9zaXRpb24uCisgICAgcGFyZW50LmRpcnR5R3JpZCgpOworfQogCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCmluZGV4 IDk2ZTYzYjA0ZTRjMDJmNjUwM2E1ZDQ0YWRhMWFmZGIxNDUzMDEyYzcuLjY2Njg3NzZjMDc5YjQx YzhlNDdmNDEwYzgyMTQ3ZDJhOTBhOTc1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCkBAIC02Nyw3ICs2Nyw2IEBA IHB1YmxpYzoKICAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJCbG9jayhSZW5kZXJCbG9jayYg cGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGls ZCA9IG51bGxwdHIpOwogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2NrSWdub3JpbmdD b250aW51YXRpb24oUmVuZGVyQmxvY2smIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4s IFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGluc2VydENo aWxkVG9SZW5kZXJCbG9ja0Zsb3coUmVuZGVyQmxvY2tGbG93JiBwYXJlbnQsIFJlbmRlclB0cjxS ZW5kZXJPYmplY3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7Ci0gICAg dm9pZCBpbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKFJlbmRlcklubGluZSYgcGFyZW50LCBSZW5k ZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIp OwogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlcklubGluZUlnbm9yaW5nQ29udGludWF0aW9u KFJlbmRlcklubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVyT2Jq ZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOwogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRl clRhYmxlKFJlbmRlclRhYmxlJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxk LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAgICAgdm9pZCBpbnNlcnRD aGlsZFRvUmVuZGVyVGFibGVTZWN0aW9uKFJlbmRlclRhYmxlU2VjdGlvbiYgcGFyZW50LCBSZW5k ZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51 bGxwdHIpOwpAQCAtMTAwLDYgKzk5LDggQEAgcHJpdmF0ZToKICAgICBSZW5kZXJQdHI8UmVuZGVy T2JqZWN0PiB0YWtlQ2hpbGRGcm9tUmVuZGVyQnV0dG9uKFJlbmRlckJ1dHRvbiYgcGFyZW50LCBS ZW5kZXJPYmplY3QmIGNoaWxkKTsKICAgICBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiB0YWtlQ2hp bGRGcm9tUmVuZGVyR3JpZChSZW5kZXJHcmlkJiBwYXJlbnQsIFJlbmRlck9iamVjdCYgY2hpbGQp OwogCisgICAgdm9pZCBpbnNlcnRDaGlsZFRvUmVuZGVyR3JpZChSZW5kZXJHcmlkJiBwYXJlbnQs IFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxk ID0gbnVsbHB0cik7CisKICAgICBGaXJzdExldHRlciYgZmlyc3RMZXR0ZXJCdWlsZGVyKCkgeyBy ZXR1cm4gKm1fZmlyc3RMZXR0ZXJCdWlsZGVyOyB9CiAgICAgTGlzdCYgbGlzdEJ1aWxkZXIoKSB7 IHJldHVybiAqbV9saXN0QnVpbGRlcjsgfQogICAgIE11bHRpQ29sdW1uJiBtdWx0aUNvbHVtbkJ1 aWxkZXIoKSB7IHJldHVybiAqbV9tdWx0aUNvbHVtbkJ1aWxkZXI7IH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVi eS5jcHAKaW5kZXggYWFjYjMzOGRiOTFmNDNhMmQ3YTgyODJhMmI2MTBkZGJhNzk0OTBjMC4uZTc4 OTRhZTIzMTBjNTQyOTAyNzgxYTM4ZTk3M2UzYjM1OGY5NDUxNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVi eS5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJSZW5kZXJSdWJ5UnVuLmgiCiAjaW5j bHVkZSAiUmVuZGVyVHJlZUJ1aWxkZXIuaCIKICNpbmNsdWRlICJSZW5kZXJUcmVlQnVpbGRlckJs b2NrLmgiCisjaW5jbHVkZSAiUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuaCIKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCkBAIC0zMTMsNyArMzE0LDcgQEAgUmVuZGVyRWxlbWVudCYgUmVuZGVyVHJl ZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0kK ICAgICAgICAgaWYgKCFiZWZvcmVCbG9jaykgewogICAgICAgICAgICAgYXV0byBuZXdCbG9jayA9 IGNyZWF0ZUFub255bW91c1J1YnlJbmxpbmVCbG9jayhwYXJlbnQpOwogICAgICAgICAgICAgYmVm b3JlQmxvY2sgPSBuZXdCbG9jay5nZXQoKTsKLSAgICAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRD aGlsZFRvUmVuZGVySW5saW5lKHBhcmVudCwgV1RGTW92ZShuZXdCbG9jayksIHBhcmVudC5maXJz dENoaWxkKCkpOworICAgICAgICAgICAgbV9idWlsZGVyLmlubGluZUJ1aWxkZXIoKS5pbnNlcnRD aGlsZChwYXJlbnQsIFdURk1vdmUobmV3QmxvY2spLCBwYXJlbnQuZmlyc3RDaGlsZCgpKTsKICAg ICAgICAgfQogICAgICAgICBiZWZvcmVDaGlsZCA9IG51bGxwdHI7CiAgICAgICAgIHJldHVybiAq YmVmb3JlQmxvY2s7CkBAIC0zMjgsNyArMzI5LDcgQEAgUmVuZGVyRWxlbWVudCYgUmVuZGVyVHJl ZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0kK ICAgICAgICAgaWYgKCFhZnRlckJsb2NrKSB7CiAgICAgICAgICAgICBhdXRvIG5ld0Jsb2NrID0g Y3JlYXRlQW5vbnltb3VzUnVieUlubGluZUJsb2NrKHBhcmVudCk7CiAgICAgICAgICAgICBhZnRl ckJsb2NrID0gbmV3QmxvY2suZ2V0KCk7Ci0gICAgICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hp bGRUb1JlbmRlcklubGluZShwYXJlbnQsIFdURk1vdmUobmV3QmxvY2spKTsKKyAgICAgICAgICAg IG1fYnVpbGRlci5pbmxpbmVCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKG5l d0Jsb2NrKSwgbnVsbHB0cik7CiAgICAgICAgIH0KICAgICAgICAgYmVmb3JlQ2hpbGQgPSBudWxs cHRyOwogICAgICAgICByZXR1cm4gKmFmdGVyQmxvY2s7CkBAIC0zNTcsNyArMzU4LDcgQEAgUmVu ZGVyRWxlbWVudCYgUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZv ckNoaWxkKFJlbmRlclJ1YnlBc0kKICAgICBpZiAoIWxhc3RSdW4gfHwgbGFzdFJ1bi0+aGFzUnVi eVRleHQoKSkgewogICAgICAgICBhdXRvIG5ld1J1biA9IFJlbmRlclJ1YnlSdW46OnN0YXRpY0Ny ZWF0ZVJ1YnlSdW4oJnBhcmVudCk7CiAgICAgICAgIGxhc3RSdW4gPSBuZXdSdW4uZ2V0KCk7Ci0g ICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKHBhcmVudCwgV1RGTW92 ZShuZXdSdW4pLCBiZWZvcmVDaGlsZCk7CisgICAgICAgIG1fYnVpbGRlci5pbmxpbmVCdWlsZGVy KCkuaW5zZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKG5ld1J1biksIGJlZm9yZUNoaWxkKTsKICAg ICB9CiAgICAgYmVmb3JlQ2hpbGQgPSBudWxscHRyOwogICAgIHJldHVybiAqbGFzdFJ1bjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlclNWRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJTVkcuY3BwCmluZGV4IGM2N2NmZGRjMmI0MzQ2NTY4YWQ1NWYzZTNjNWI3ODc4OTgz YTk1MDMuLmU2MDU4ZGM2MWE0NGY0YTRiMzU4Njk0M2JhNjQwNDc4OTA2Y2UyNzQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclNW Ry5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVC dWlsZGVyU1ZHLmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIlJlbmRlclNWR0lubGlu ZS5oIgogI2luY2x1ZGUgIlJlbmRlclNWR1Jvb3QuaCIKICNpbmNsdWRlICJSZW5kZXJTVkdUZXh0 LmgiCisjaW5jbHVkZSAiUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuaCIKICNpbmNsdWRlICJTVkdS ZXNvdXJjZXNDYWNoZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00OSw3ICs1MCw3IEBA IHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OlNWRzo6aW5zZXJ0Q2hpbGQoUmVuZGVyU1ZHQ29udGFp bmVyJiBwYXJlbnQsIFJlbmRlclB0cjxSCiB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpTVkc6Omlu c2VydENoaWxkKFJlbmRlclNWR0lubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0 PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsKICAgICBhdXRvJiBjaGlsZFRv QWRkID0gKmNoaWxkOwotICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKHBh cmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICBtX2J1aWxkZXIuaW5saW5l QnVpbGRlcigpLmluc2VydENoaWxkKHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxk KTsKICAgICBTVkdSZXNvdXJjZXNDYWNoZTo6Y2xpZW50V2FzQWRkZWRUb1RyZWUoY2hpbGRUb0Fk ZCk7CiAKICAgICBpZiAoYXV0byogdGV4dEFuY2VzdG9yID0gUmVuZGVyU1ZHVGV4dDo6bG9jYXRl UmVuZGVyU1ZHVGV4dEFuY2VzdG9yKHBhcmVudCkpCg== 333872 2018-02-14 20:16:49 -0800 2018-02-15 10:25:10 -0800 Patch bug-182819-20180214201648.patch text/plain 12337 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ5YzM4MmIyZjAwMTJj MjQxZjQwNDM2NTIzMzY5NDM5NjYxNmJhMC4uMzBlNmNmZjIzYzdmYzY1ZDhiOWRmNzBkMGY0ZGUx OGVjYzE0NGVkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlcklubGluZS9SZW5kZXJHcmlkOjphZGRDaGlsZCgpIHRvIFJlbmRlclRyZWVC dWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODI4MTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3NTU4MTg3PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFs aXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyR3JpZDo6YWRkQ2hpbGQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJHcmlkLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmFkZENoaWxkKTogRGVsZXRlZC4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVySW5saW5lLmg6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVC dWlsZGVyOjppbnNlcnRDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRl cjo6dGFrZUNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXJSdWJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpS dWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyU1ZHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRyZWVCdWlsZGVyOjpTVkc6Omluc2VydENoaWxkKToKKwogMjAxOC0wMi0xNCAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92 ZSBSZW5kZXJNYXRoTUxGZW5jZWQ6OmFkZENoaWxkKCkgdG8gUmVuZGVyVHJlZUJ1aWxkZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCA5MWJiMTBjOGQxYTI5OTE1 ODM1ZmQ1YmYwYTFjZTRiNGZkZTZiMDEzLi4xMjBlOTdjZjBhZDk4ZTFjZmYwNWQwOTcxZTlmNDAw NTA3ZGM3NWJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC03 MCwyMSArNzAsNiBAQCBSZW5kZXJHcmlkOjpSZW5kZXJHcmlkKEVsZW1lbnQmIGVsZW1lbnQsIFJl bmRlclN0eWxlJiYgc3R5bGUpCiAKIFJlbmRlckdyaWQ6On5SZW5kZXJHcmlkKCkgPSBkZWZhdWx0 OwogCi12b2lkIFJlbmRlckdyaWQ6OmFkZENoaWxkKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVy LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVD aGlsZCkKLXsKLSAgICBhdXRvJiBjaGlsZCA9ICpuZXdDaGlsZDsKLSAgICBidWlsZGVyLmluc2Vy dENoaWxkVG9SZW5kZXJCbG9jaygqdGhpcywgV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNoaWxk KTsKLQotICAgIC8vIFBvc2l0aW9uZWQgZ3JpZCBpdGVtcyBkbyBub3QgdGFrZSB1cCBzcGFjZSBv ciBvdGhlcndpc2UgcGFydGljaXBhdGUgaW4gdGhlIGxheW91dCBvZiB0aGUgZ3JpZCwKLSAgICAv LyBmb3IgdGhhdCByZWFzb24gd2UgZG9uJ3QgbmVlZCB0byBtYXJrIHRoZSBncmlkIGFzIGRpcnR5 IHdoZW4gdGhleSBhcmUgYWRkZWQuCi0gICAgaWYgKGNoaWxkLmlzT3V0T2ZGbG93UG9zaXRpb25l ZCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBUaGUgZ3JpZCBuZWVkcyB0byBiZSByZWNv bXB1dGVkIGFzIGl0IG1pZ2h0IGNvbnRhaW4gYXV0by1wbGFjZWQgaXRlbXMgdGhhdAotICAgIC8v IHdpbGwgY2hhbmdlIHRoZWlyIHBvc2l0aW9uLgotICAgIGRpcnR5R3JpZCgpOwotfQotCiBTdHls ZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6OnNlbGZBbGlnbm1lbnRGb3JDaGlsZChHcmlk QXhpcyBheGlzLCBjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBjb25zdCBSZW5kZXJTdHlsZSogZ3Jp ZFN0eWxlKSBjb25zdAogewogICAgIHJldHVybiBheGlzID09IEdyaWRSb3dBeGlzID8ganVzdGlm eVNlbGZGb3JDaGlsZChjaGlsZCwgZ3JpZFN0eWxlKSA6IGFsaWduU2VsZkZvckNoaWxkKGNoaWxk LCBncmlkU3R5bGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5kZXggNTc5 NzZkMTE2ODViNTBhNjNmNTlhY2JiMTI1MDhjZDRmOTBlNjBhYi4uOTk1NzAwZmEwZDhjOTEyZjc5 MjM0MjQ2YmJlYTlkNDkwZjcxYWZmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5oCkBAIC03OSw4ICs3OSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc1JlbmRlckdyaWQoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAgdm9pZCBjb21wdXRlSW50cmluc2lj TG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1h eExvZ2ljYWxXaWR0aCkgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICB2b2lkIGFkZENoaWxkKFJlbmRl clRyZWVCdWlsZGVyJiwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQsIFJlbmRlck9i amVjdCogYmVmb3JlQ2hpbGQpIGZpbmFsOwotCiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBz ZWxmQWxpZ25tZW50Rm9yQ2hpbGQoR3JpZEF4aXMsIGNvbnN0IFJlbmRlckJveCYsIGNvbnN0IFJl bmRlclN0eWxlKiA9IG51bGxwdHIpIGNvbnN0OwogICAgIGJvb2wgc2VsZkFsaWdubWVudENoYW5n ZWRUb1N0cmV0Y2goR3JpZEF4aXMsIGNvbnN0IFJlbmRlclN0eWxlJiBvbGRTdHlsZSwgY29uc3Qg UmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBib29s IHNlbGZBbGlnbm1lbnRDaGFuZ2VkRnJvbVN0cmV0Y2goR3JpZEF4aXMsIGNvbnN0IFJlbmRlclN0 eWxlJiBvbGRTdHlsZSwgY29uc3QgUmVuZGVyU3R5bGUmIG5ld1N0eWxlLCBjb25zdCBSZW5kZXJC b3gmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKaW5k ZXggMDc1NDc0NWE4ODM2NTU2NjYyMDUwODBiZmQwMWYyZTMwZjMxNjk0Ny4uYTRhMTUyZWVjZDRh MzhkM2E5Yzg0MTU4YzFjMTVhZDJlZDQzMDBmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAKQEAgLTI1NSwxMSArMjU1LDYgQEAgTGF5b3V0UmVjdCBSZW5kZXJJ bmxpbmU6OmxvY2FsQ2FyZXRSZWN0KElubGluZUJveCogaW5saW5lQm94LCB1bnNpZ25lZCwgTGF5 b3V0VW4KICAgICByZXR1cm4gY2FyZXRSZWN0OwogfQogCi12b2lkIFJlbmRlcklubGluZTo6YWRk Q2hpbGQoUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+ IG5ld0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQotewotICAgIGJ1aWxkZXIuaW5z ZXJ0Q2hpbGRUb1JlbmRlcklubGluZSgqdGhpcywgV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNo aWxkKTsKLX0KLQogdm9pZCBSZW5kZXJJbmxpbmU6OmFkZENoaWxkSWdub3JpbmdDb250aW51YXRp b24oUmVuZGVyVHJlZUJ1aWxkZXImIGJ1aWxkZXIsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IG5l d0NoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIGJ1aWxkZXIuaW5zZXJ0 Q2hpbGRUb1JlbmRlcklubGluZUlnbm9yaW5nQ29udGludWF0aW9uKCp0aGlzLCBXVEZNb3ZlKG5l d0NoaWxkKSwgYmVmb3JlQ2hpbGQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlcklubGluZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGlu ZS5oCmluZGV4IDZmNGY5ZmE5NzQxNTkxYzFhZDI0NGVlNmJkOWY0YjE5MDBiYTQ2ZjIuLjU4ZGI5 NjM3ZTE0ZGM2YjM3OTA1ODA3MzAxM2NmYTJkMjNkM2JkNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmgKQEAgLTM3LDggKzM3LDYgQEAgcHVibGljOgogICAgIFJlbmRl cklubGluZShFbGVtZW50JiwgUmVuZGVyU3R5bGUmJik7CiAgICAgUmVuZGVySW5saW5lKERvY3Vt ZW50JiwgUmVuZGVyU3R5bGUmJik7CiAKLSAgICB2b2lkIGFkZENoaWxkKFJlbmRlclRyZWVCdWls ZGVyJiwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gbmV3Q2hpbGQsIFJlbmRlck9iamVjdCogYmVm b3JlQ2hpbGQgPSAwKSBvdmVycmlkZTsKLQogICAgIExheW91dFVuaXQgbWFyZ2luTGVmdCgpIGNv bnN0IGZpbmFsOwogICAgIExheW91dFVuaXQgbWFyZ2luUmlnaHQoKSBjb25zdCBmaW5hbDsKICAg ICBMYXlvdXRVbml0IG1hcmdpblRvcCgpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKaW5kZXgg NmMyYzA4NDJiNGM1NzI3ZDEwY2JkZmI5ZjFjMjA4N2E2NTg5NjA4Ni4uNzIyZDdkNDAyMDdiYjBj MTliNTJiYzU0YTdhZjU3N2U4ZmE0MGEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCkBAIC0yMjAsNiArMjIw LDE2IEBAIHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKFJlbmRlckVsZW1lbnQm IHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK KyAgICBpZiAoaXM8UmVuZGVyR3JpZD4ocGFyZW50KSkgeworICAgICAgICBpbnNlcnRDaGlsZFRv UmVuZGVyR3JpZChkb3duY2FzdDxSZW5kZXJHcmlkPihwYXJlbnQpLCBXVEZNb3ZlKGNoaWxkKSwg YmVmb3JlQ2hpbGQpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGlzPFJlbmRl cklubGluZT4ocGFyZW50KSkgeworICAgICAgICBpbmxpbmVCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQo ZG93bmNhc3Q8UmVuZGVySW5saW5lPihwYXJlbnQpLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hp bGQpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgcGFyZW50LmFkZENoaWxkKCp0aGlz LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogfQogCkBAIC00ODMsMTEgKzQ5Myw2IEBA IHZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6OnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95Q2xlYW5p bmdVcEFub255bW91c1dyYXBwZXJzKFJlCiAgICAgLy8gV0FSTklORzogY2hpbGQgaXMgZGVsZXRl ZCBoZXJlLgogfQogCi12b2lkIFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvUmVuZGVy SW5saW5lKFJlbmRlcklubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGls ZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKLXsKLSAgICBpbmxpbmVCdWlsZGVyKCkuaW5z ZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwotfQotCiB2b2lk IFJlbmRlclRyZWVCdWlsZGVyOjppbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lSWdub3JpbmdDb250 aW51YXRpb24oUmVuZGVySW5saW5lJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNo aWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIGlubGluZUJ1aWxkZXIoKS5p bnNlcnRDaGlsZElnbm9yaW5nQ29udGludWF0aW9uKHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJl Zm9yZUNoaWxkKTsKQEAgLTYxMyw1ICs2MTgsMTkgQEAgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4g UmVuZGVyVHJlZUJ1aWxkZXI6OnRha2VDaGlsZEZyb21SZW5kZXJFbGVtZW50KFJlbmRlckVsZW0K ICAgICByZXR1cm4gY2hpbGRUb1Rha2U7CiB9CiAKK3ZvaWQgUmVuZGVyVHJlZUJ1aWxkZXI6Omlu c2VydENoaWxkVG9SZW5kZXJHcmlkKFJlbmRlckdyaWQmIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRl ck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCit7CisgICAgYXV0byYg bmV3Q2hpbGQgPSAqY2hpbGQ7CisgICAgYmxvY2tCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50 LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOworCisgICAgLy8gUG9zaXRpb25lZCBncmlk IGl0ZW1zIGRvIG5vdCB0YWtlIHVwIHNwYWNlIG9yIG90aGVyd2lzZSBwYXJ0aWNpcGF0ZSBpbiB0 aGUgbGF5b3V0IG9mIHRoZSBncmlkLAorICAgIC8vIGZvciB0aGF0IHJlYXNvbiB3ZSBkb24ndCBu ZWVkIHRvIG1hcmsgdGhlIGdyaWQgYXMgZGlydHkgd2hlbiB0aGV5IGFyZSBhZGRlZC4KKyAgICBp ZiAobmV3Q2hpbGQuaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisgICAgICAgIHJldHVybjsKKwor ICAgIC8vIFRoZSBncmlkIG5lZWRzIHRvIGJlIHJlY29tcHV0ZWQgYXMgaXQgbWlnaHQgY29udGFp biBhdXRvLXBsYWNlZCBpdGVtcyB0aGF0CisgICAgLy8gd2lsbCBjaGFuZ2UgdGhlaXIgcG9zaXRp b24uCisgICAgcGFyZW50LmRpcnR5R3JpZCgpOworfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCmluZGV4IDk2ZTYz YjA0ZTRjMDJmNjUwM2E1ZDQ0YWRhMWFmZGIxNDUzMDEyYzcuLjY2Njg3NzZjMDc5YjQxYzhlNDdm NDEwYzgyMTQ3ZDJhOTBhOTc1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCkBAIC02Nyw3ICs2Nyw2IEBAIHB1Ymxp YzoKICAgICB2b2lkIGluc2VydENoaWxkVG9SZW5kZXJCbG9jayhSZW5kZXJCbG9jayYgcGFyZW50 LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51 bGxwdHIpOwogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2NrSWdub3JpbmdDb250aW51 YXRpb24oUmVuZGVyQmxvY2smIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4sIFJlbmRl ck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKICAgICB2b2lkIGluc2VydENoaWxkVG9S ZW5kZXJCbG9ja0Zsb3coUmVuZGVyQmxvY2tGbG93JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJP YmplY3Q+LCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7Ci0gICAgdm9pZCBp bnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKFJlbmRlcklubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8 UmVuZGVyT2JqZWN0PiwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOwogICAg IHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlcklubGluZUlnbm9yaW5nQ29udGludWF0aW9uKFJlbmRl cklubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiwgUmVuZGVyT2JqZWN0KiBi ZWZvcmVDaGlsZCA9IG51bGxwdHIpOwogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlclRhYmxl KFJlbmRlclRhYmxlJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5k ZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAgICAgdm9pZCBpbnNlcnRDaGlsZFRv UmVuZGVyVGFibGVTZWN0aW9uKFJlbmRlclRhYmxlU2VjdGlvbiYgcGFyZW50LCBSZW5kZXJQdHI8 UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxwdHIp OwpAQCAtMTAwLDYgKzk5LDggQEAgcHJpdmF0ZToKICAgICBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0 PiB0YWtlQ2hpbGRGcm9tUmVuZGVyQnV0dG9uKFJlbmRlckJ1dHRvbiYgcGFyZW50LCBSZW5kZXJP YmplY3QmIGNoaWxkKTsKICAgICBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiB0YWtlQ2hpbGRGcm9t UmVuZGVyR3JpZChSZW5kZXJHcmlkJiBwYXJlbnQsIFJlbmRlck9iamVjdCYgY2hpbGQpOwogCisg ICAgdm9pZCBpbnNlcnRDaGlsZFRvUmVuZGVyR3JpZChSZW5kZXJHcmlkJiBwYXJlbnQsIFJlbmRl clB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVs bHB0cik7CisKICAgICBGaXJzdExldHRlciYgZmlyc3RMZXR0ZXJCdWlsZGVyKCkgeyByZXR1cm4g Km1fZmlyc3RMZXR0ZXJCdWlsZGVyOyB9CiAgICAgTGlzdCYgbGlzdEJ1aWxkZXIoKSB7IHJldHVy biAqbV9saXN0QnVpbGRlcjsgfQogICAgIE11bHRpQ29sdW1uJiBtdWx0aUNvbHVtbkJ1aWxkZXIo KSB7IHJldHVybiAqbV9tdWx0aUNvbHVtbkJ1aWxkZXI7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAK aW5kZXggYWFjYjMzOGRiOTFmNDNhMmQ3YTgyODJhMmI2MTBkZGJhNzk0OTBjMC4uZTc4OTRhZTIz MTBjNTQyOTAyNzgxYTM4ZTk3M2UzYjM1OGY5NDUxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAK QEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJSZW5kZXJSdWJ5UnVuLmgiCiAjaW5jbHVkZSAi UmVuZGVyVHJlZUJ1aWxkZXIuaCIKICNpbmNsdWRlICJSZW5kZXJUcmVlQnVpbGRlckJsb2NrLmgi CisjaW5jbHVkZSAiUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuaCIKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCkBAIC0zMTMsNyArMzE0LDcgQEAgUmVuZGVyRWxlbWVudCYgUmVuZGVyVHJlZUJ1aWxk ZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0kKICAgICAg ICAgaWYgKCFiZWZvcmVCbG9jaykgewogICAgICAgICAgICAgYXV0byBuZXdCbG9jayA9IGNyZWF0 ZUFub255bW91c1J1YnlJbmxpbmVCbG9jayhwYXJlbnQpOwogICAgICAgICAgICAgYmVmb3JlQmxv Y2sgPSBuZXdCbG9jay5nZXQoKTsKLSAgICAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRv UmVuZGVySW5saW5lKHBhcmVudCwgV1RGTW92ZShuZXdCbG9jayksIHBhcmVudC5maXJzdENoaWxk KCkpOworICAgICAgICAgICAgbV9idWlsZGVyLmlubGluZUJ1aWxkZXIoKS5pbnNlcnRDaGlsZChw YXJlbnQsIFdURk1vdmUobmV3QmxvY2spLCBwYXJlbnQuZmlyc3RDaGlsZCgpKTsKICAgICAgICAg fQogICAgICAgICBiZWZvcmVDaGlsZCA9IG51bGxwdHI7CiAgICAgICAgIHJldHVybiAqYmVmb3Jl QmxvY2s7CkBAIC0zMjgsNyArMzI5LDcgQEAgUmVuZGVyRWxlbWVudCYgUmVuZGVyVHJlZUJ1aWxk ZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0kKICAgICAg ICAgaWYgKCFhZnRlckJsb2NrKSB7CiAgICAgICAgICAgICBhdXRvIG5ld0Jsb2NrID0gY3JlYXRl QW5vbnltb3VzUnVieUlubGluZUJsb2NrKHBhcmVudCk7CiAgICAgICAgICAgICBhZnRlckJsb2Nr ID0gbmV3QmxvY2suZ2V0KCk7Ci0gICAgICAgICAgICBtX2J1aWxkZXIuaW5zZXJ0Q2hpbGRUb1Jl bmRlcklubGluZShwYXJlbnQsIFdURk1vdmUobmV3QmxvY2spKTsKKyAgICAgICAgICAgIG1fYnVp bGRlci5pbmxpbmVCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKG5ld0Jsb2Nr KSwgbnVsbHB0cik7CiAgICAgICAgIH0KICAgICAgICAgYmVmb3JlQ2hpbGQgPSBudWxscHRyOwog ICAgICAgICByZXR1cm4gKmFmdGVyQmxvY2s7CkBAIC0zNTcsNyArMzU4LDcgQEAgUmVuZGVyRWxl bWVudCYgUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxk KFJlbmRlclJ1YnlBc0kKICAgICBpZiAoIWxhc3RSdW4gfHwgbGFzdFJ1bi0+aGFzUnVieVRleHQo KSkgewogICAgICAgICBhdXRvIG5ld1J1biA9IFJlbmRlclJ1YnlSdW46OnN0YXRpY0NyZWF0ZVJ1 YnlSdW4oJnBhcmVudCk7CiAgICAgICAgIGxhc3RSdW4gPSBuZXdSdW4uZ2V0KCk7Ci0gICAgICAg IG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKHBhcmVudCwgV1RGTW92ZShuZXdS dW4pLCBiZWZvcmVDaGlsZCk7CisgICAgICAgIG1fYnVpbGRlci5pbmxpbmVCdWlsZGVyKCkuaW5z ZXJ0Q2hpbGQocGFyZW50LCBXVEZNb3ZlKG5ld1J1biksIGJlZm9yZUNoaWxkKTsKICAgICB9CiAg ICAgYmVmb3JlQ2hpbGQgPSBudWxscHRyOwogICAgIHJldHVybiAqbGFzdFJ1bjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclNW Ry5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJTVkcuY3BwCmluZGV4IGM2N2NmZGRjMmI0MzQ2NTY4YWQ1NWYzZTNjNWI3ODc4OTgzYTk1MDMu LmU2MDU4ZGM2MWE0NGY0YTRiMzU4Njk0M2JhNjQwNDc4OTA2Y2UyNzQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclNWRy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy U1ZHLmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIlJlbmRlclNWR0lubGluZS5oIgog I2luY2x1ZGUgIlJlbmRlclNWR1Jvb3QuaCIKICNpbmNsdWRlICJSZW5kZXJTVkdUZXh0LmgiCisj aW5jbHVkZSAiUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuaCIKICNpbmNsdWRlICJTVkdSZXNvdXJj ZXNDYWNoZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC00OSw3ICs1MCw3IEBAIHZvaWQg UmVuZGVyVHJlZUJ1aWxkZXI6OlNWRzo6aW5zZXJ0Q2hpbGQoUmVuZGVyU1ZHQ29udGFpbmVyJiBw YXJlbnQsIFJlbmRlclB0cjxSCiB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpTVkc6Omluc2VydENo aWxkKFJlbmRlclNWR0lubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGls ZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsKICAgICBhdXRvJiBjaGlsZFRvQWRkID0g KmNoaWxkOwotICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVySW5saW5lKHBhcmVudCwg V1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKKyAgICBtX2J1aWxkZXIuaW5saW5lQnVpbGRl cigpLmluc2VydENoaWxkKHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKICAg ICBTVkdSZXNvdXJjZXNDYWNoZTo6Y2xpZW50V2FzQWRkZWRUb1RyZWUoY2hpbGRUb0FkZCk7CiAK ICAgICBpZiAoYXV0byogdGV4dEFuY2VzdG9yID0gUmVuZGVyU1ZHVGV4dDo6bG9jYXRlUmVuZGVy U1ZHVGV4dEFuY2VzdG9yKHBhcmVudCkpCg==