187890 2018-07-22 09:28:24 -0700 [LFC][IFC] Add center/right/justify line alignment support. 2018-07-22 12:49:18 -0700 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 1444139 0 zalan 2018-07-22 09:28:24 -0700 ssia. 1444143 1 345539 zalan 2018-07-22 09:39:39 -0700 Created attachment 345539 Patch 1444165 2 345539 commit-queue 2018-07-22 12:48:28 -0700 Comment on attachment 345539 Patch Clearing flags on attachment: 345539 Committed r234091: <https://trac.webkit.org/changeset/234091> 1444166 3 commit-queue 2018-07-22 12:48:30 -0700 All reviewed patches have been landed. Closing bug. 1444167 4 webkit-bug-importer 2018-07-22 12:49:18 -0700 <rdar://problem/42481844> 345539 2018-07-22 09:39:39 -0700 2018-07-22 12:48:28 -0700 Patch bug-187890-20180722093938.patch text/plain 17391 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjA2M2Q0MWI0OTYxOGQ1 YzAwNzY2YzVkMDQzZjMwNzNiMTQyZTM3ZS4uNmY0MzQ2YWNkZTBmNjA2NjljY2MzMjQ2MGM2ZjM2 NDM4YjBjZjA1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE4LTA3LTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgY2Vu dGVyL3JpZ2h0L2p1c3RpZnkgbGluZSBhbGlnbm1lbnQgc3VwcG9ydC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Nzg5MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgb3ZlciBzb21lIG1vcmUgY29k ZSBmcm9tIHNpbXBsZSBsaW5lIGxheW91dC4KKyAgICAgICAgKHRob3VnaCB0ZXh0LWFsaWduOiBq dXN0aWZ5IGlzIG1vcmUgcHJlZm9ybWFudCBhcyBub3cgZXhwYW5zaW9uIG9wcG9ydHVuaXRpZXMg YXJlIGFkZGVkIGFzIHdlIHByb2Nlc3MgdGhlIHRleHQgcnVucworICAgICAgICAtYXMgb3Bwb3Nl ZCB0byBpdGVydGluZyB0aHJvdWdoIHRoZSBydW5zIGFnYWluIHdoZW4gd2UgcmVhY2ggdGhlIGVu ZCBvZiB0aGUgbGluZS4pIAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4 dGxheW91dC9SdW5zLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFJ1bjo6c2V0 TGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFJ1bjo6c2V0RXhwYW5zaW9u KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0bGF5b3V0L3NpbXBsZS9T aW1wbGVMaW5lQnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlNpbXBsZUxp bmVCcmVha2VyOjpMaW5lOjpMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxl TGluZUJyZWFrZXI6OkxpbmU6OnNldFRleHRBbGlnbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OlNpbXBsZUxpbmVCcmVha2VyOjpMaW5lOjphZGp1c3RlZExlZnRGb3JUZXh0QWxpZ24gY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1wbGVMaW5lQnJlYWtlcjo6TGluZTo6 anVzdGlmeVJ1bnMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1wbGVMaW5lQnJlYWtl cjo6TGluZTo6YWRqdXN0UnVuc0ZvclRleHRBbGlnbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6ZXhw YW5zaW9uQmVoYXZpb3IpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1wbGVMaW5lQnJl YWtlcjo6TGluZTo6Y29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRpZXMpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpTaW1wbGVMaW5lQnJlYWtlcjo6TGluZTo6Y2xvc2VMYXN0UnVuKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6U2ltcGxlTGluZUJyZWFrZXI6OkxpbmU6OmFwcGVuZCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlNpbXBsZUxpbmVCcmVha2VyOjpMaW5lOjpjb2xs YXBzZVRyYWlsaW5nV2hpdGVzcGFjZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlNpbXBs ZUxpbmVCcmVha2VyOjpMaW5lOjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlNp bXBsZUxpbmVCcmVha2VyOjpTdHlsZTo6U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpTaW1wbGVMaW5lQnJlYWtlcjo6aGFuZGxlTGluZUVuZCk6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OlNpbXBsZUxpbmVCcmVha2VyOjpoYW5kbGVMaW5lU3RhcnQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0Ojppc1RleHRBbGlnblJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6U2ltcGxlTGluZUJyZWFrZXI6OmNyZWF0ZVJ1bnNGb3JMaW5lKToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy90ZXh0bGF5b3V0L3NpbXBsZS9TaW1wbGVMaW5lQnJlYWtlci5o OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1wbGVMaW5lQnJlYWtlcjo6TGluZTo6c2V0 QXZhaWxhYmxlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpTaW1wbGVMaW5lQnJl YWtlcjo6TGluZTo6c2V0Q29sbGFwc2VXaGl0ZXNwYWNlKToKKwogMjAxOC0wNy0yMSAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHZlcmlm aWNhdGlvbiBmb3IgaW5saW5lIHRleHQgcnVucy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHRsYXlvdXQvUnVucy5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9SdW5zLmgKaW5kZXggZDg3ZmMx MDRhNGM5NzRmMjdkZDBiOWY2YWY1NjViYmFkY2U1OGZhYy4uNGVhNzQzMzA0MDAxZDRkMGE3MTQ5 MDU1YmI3MzRiZGY4OTE4NzdkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9SdW5zLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9SdW5zLmgKQEAgLTI3LDYgKzI3LDggQEAK IAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCisjaW5jbHVkZSAiVGV4 dEZsYWdzLmgiCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCkBA IC05MSwxNSArOTMsMjAgQEAgcHVibGljOgogICAgIGJvb2wgaXNFbmRPZkxpbmUoKSBjb25zdCB7 IHJldHVybiBtX2lzRW5kT2ZMaW5lOyB9CiAKICAgICB2b2lkIHNldEVuZChDb250ZW50UG9zaXRp b24gZW5kKSB7IG1fZW5kID0gZW5kOyB9CisgICAgdm9pZCBzZXRMZWZ0KGZsb2F0IGxlZnQpIHsg bV9sZWZ0ID0gbGVmdDsgfQogICAgIHZvaWQgc2V0UmlnaHQoZmxvYXQgcmlnaHQpIHsgbV9yaWdo dCA9IHJpZ2h0OyB9CiAgICAgdm9pZCBzZXRJc0VuZE9mTGluZSgpIHsgbV9pc0VuZE9mTGluZSA9 IHRydWU7IH0KIAorICAgIHZvaWQgc2V0RXhwYW5zaW9uKEV4cGFuc2lvbkJlaGF2aW9yLCBmbG9h dCBleHBhbnNpb24pOworCiBwcml2YXRlOgogICAgIENvbnRlbnRQb3NpdGlvbiBtX3N0YXJ0IHsg MCB9OwogICAgIENvbnRlbnRQb3NpdGlvbiBtX2VuZCB7IDAgfTsKICAgICBmbG9hdCBtX2xlZnQg eyAwIH07CiAgICAgZmxvYXQgbV9yaWdodCB7IDAgfTsKICAgICBib29sIG1faXNFbmRPZkxpbmUg eyBmYWxzZSB9OworICAgIGZsb2F0IG1fZXhwYW5zaW9uIHsgMCB9OworICAgIEV4cGFuc2lvbkJl aGF2aW9yIG1fZXhwYW5zaW9uQmVoYXZpb3IgeyBGb3JiaWRMZWFkaW5nRXhwYW5zaW9uIHwgRm9y YmlkVHJhaWxpbmdFeHBhbnNpb24gfTsKIH07CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CkBAIC0x NDUsNiArMTUyLDEyIEBAIGlubGluZSBMYXlvdXRSdW46OkxheW91dFJ1bihDb250ZW50UG9zaXRp b24gc3RhcnQsIENvbnRlbnRQb3NpdGlvbiBlbmQsIGZsb2F0IGxlCiB7CiB9CiAKK2lubGluZSB2 b2lkIExheW91dFJ1bjo6c2V0RXhwYW5zaW9uKEV4cGFuc2lvbkJlaGF2aW9yIGV4cGFuc2lvbkJl aGF2aW9yLCBmbG9hdCBleHBhbnNpb24pCit7CisgICAgbV9leHBhbnNpb25CZWhhdmlvciA9IGV4 cGFuc2lvbkJlaGF2aW9yOworICAgIG1fZXhwYW5zaW9uID0gZXhwYW5zaW9uOworfQorCiBpbmxp bmUgVGV4dFJ1biBUZXh0UnVuOjpjcmVhdGVXaGl0ZXNwYWNlUnVuKENvbnRlbnRQb3NpdGlvbiBz dGFydCwgQ29udGVudFBvc2l0aW9uIGVuZCwgZmxvYXQgd2lkdGgsIGJvb2wgaXNDb2xsYXBzZWQp CiB7CiAgICAgcmV0dXJuIHsgc3RhcnQsIGVuZCwgVHlwZTo6V2hpdGVzcGFjZSwgd2lkdGgsIGlz Q29sbGFwc2VkIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy90ZXh0bGF5b3V0L3NpbXBsZS9TaW1wbGVMaW5lQnJlYWtlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0bGF5b3V0L3NpbXBsZS9TaW1wbGVM aW5lQnJlYWtlci5jcHAKaW5kZXggZmNmNTcyY2Q1OGU0MTJhYzJjN2JmMjc1NDcyMWE1NTUyYmQx ZTMwNi4uNDY2ZTRiMGI4Y2MyMzUxZDNlMTJlYjIwNzQyZjAyOTVmNmJhZGZhNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9zaW1w bGUvU2ltcGxlTGluZUJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL3RleHRsYXlvdXQvc2ltcGxlL1NpbXBsZUxpbmVCcmVha2VyLmNwcApAQCAt MzEsNyArMzEsNiBAQAogI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAjaW5jbHVkZSAiSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuaCIKICNpbmNsdWRlICJMYXlvdXRDb250ZXh0LmgiCi0jaW5jbHVk ZSAiTGF5b3V0VW5pdC5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxlLmgiCiAjaW5jbHVkZSAiVGV4 dENvbnRlbnRQcm92aWRlci5oIgogI2luY2x1ZGUgPHd0Zi9Jc29NYWxsb2NJbmxpbmVzLmg+CkBA IC01Myw2ICs1Miw3IEBAIFNpbXBsZUxpbmVCcmVha2VyOjpUZXh0UnVuTGlzdDo6VGV4dFJ1bkxp c3QoY29uc3QgVmVjdG9yPFRleHRSdW4+JiB0ZXh0UnVucykKIAogU2ltcGxlTGluZUJyZWFrZXI6 OkxpbmU6OkxpbmUoVmVjdG9yPExheW91dFJ1bj4mIGxheW91dFJ1bnMpCiAgICAgOiBtX2xheW91 dFJ1bnMobGF5b3V0UnVucykKKyAgICAsIG1fZmlyc3RSdW5JbmRleChtX2xheW91dFJ1bnMuc2l6 ZSgpKQogewogfQogCkBAIC02MywxMSArNjMsMTQ1IEBAIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQg YWRqdXN0ZWRFbmRQb3NpdGlvbihjb25zdCBUZXh0UnVuJiB0ZXh0UnVuKQogICAgIHJldHVybiB0 ZXh0UnVuLmVuZCgpOwogfQogCit2b2lkIFNpbXBsZUxpbmVCcmVha2VyOjpMaW5lOjpzZXRUZXh0 QWxpZ24oVGV4dEFsaWduTW9kZSB0ZXh0QWxpZ24pCit7CisgICAgbV9zdHlsZS50ZXh0QWxpZ24g PSB0ZXh0QWxpZ247CisgICAgbV9jb2xsZWN0RXhwYW5zaW9uT3Bwb3J0dW5pdGllcyA9IHRleHRB bGlnbiA9PSBUZXh0QWxpZ25Nb2RlOjpKdXN0aWZ5OyAKK30KKworZmxvYXQgU2ltcGxlTGluZUJy ZWFrZXI6OkxpbmU6OmFkanVzdGVkTGVmdEZvclRleHRBbGlnbihUZXh0QWxpZ25Nb2RlIHRleHRB bGlnbikgY29uc3QKK3sKKyAgICBmbG9hdCByZW1haW5pbmdXaWR0aCA9IGF2YWlsYWJsZVdpZHRo KCk7CisgICAgZmxvYXQgbGVmdCA9IG1fbGVmdDsKKyAgICBzd2l0Y2ggKHRleHRBbGlnbikgewor ICAgIGNhc2UgVGV4dEFsaWduTW9kZTo6TGVmdDoKKyAgICBjYXNlIFRleHRBbGlnbk1vZGU6Oldl YktpdExlZnQ6CisgICAgY2FzZSBUZXh0QWxpZ25Nb2RlOjpTdGFydDoKKyAgICAgICAgcmV0dXJu IGxlZnQ7CisgICAgY2FzZSBUZXh0QWxpZ25Nb2RlOjpSaWdodDoKKyAgICBjYXNlIFRleHRBbGln bk1vZGU6OldlYktpdFJpZ2h0OgorICAgIGNhc2UgVGV4dEFsaWduTW9kZTo6RW5kOgorICAgICAg ICByZXR1cm4gbGVmdCArIHN0ZDo6bWF4PGZsb2F0PihyZW1haW5pbmdXaWR0aCwgMCk7CisgICAg Y2FzZSBUZXh0QWxpZ25Nb2RlOjpDZW50ZXI6CisgICAgY2FzZSBUZXh0QWxpZ25Nb2RlOjpXZWJL aXRDZW50ZXI6CisgICAgICAgIHJldHVybiBsZWZ0ICsgc3RkOjptYXg8ZmxvYXQ+KHJlbWFpbmlu Z1dpZHRoIC8gMiwgMCk7CisgICAgY2FzZSBUZXh0QWxpZ25Nb2RlOjpKdXN0aWZ5OgorICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBsZWZ0OworfQorCit2b2lkIFNpbXBsZUxpbmVC cmVha2VyOjpMaW5lOjpqdXN0aWZ5UnVucygpCit7CisgICAgYXV0byB3aWR0aFRvRGlzdHJpYnV0 ZSA9IGF2YWlsYWJsZVdpZHRoKCk7CisgICAgaWYgKHdpZHRoVG9EaXN0cmlidXRlIDw9IDApCisg ICAgICAgIHJldHVybjsKKworICAgIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXRpZXMgPSAw OworICAgIGZvciAoYXV0byYgZXhwYW5zaW9uRW50cnkgOiBtX2V4cGFuc2lvbk9wcG9ydHVuaXR5 TGlzdCkKKyAgICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdGllcyArPSBleHBhbnNpb25FbnRyeS5j b3VudDsKKworICAgIGlmICghZXhwYW5zaW9uT3Bwb3J0dW5pdGllcykKKyAgICAgICAgcmV0dXJu OworCisgICAgYXV0byBleHBhbnNpb24gPSB3aWR0aFRvRGlzdHJpYnV0ZSAvIGV4cGFuc2lvbk9w cG9ydHVuaXRpZXM7CisgICAgZmxvYXQgYWNjdW11bGF0ZWRFeHBhbnNpb24gPSAwOworICAgIHVu c2lnbmVkIHJ1bkluZGV4ID0gbV9maXJzdFJ1bkluZGV4OworICAgIGZvciAoYXV0byYgZXhwYW5z aW9uRW50cnkgOiBtX2V4cGFuc2lvbk9wcG9ydHVuaXR5TGlzdCkgeworICAgICAgICBpZiAocnVu SW5kZXggPj0gbV9sYXlvdXRSdW5zLnNpemUoKSkgeworICAgICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgYXV0byYg bGF5b3V0UnVuID0gbV9sYXlvdXRSdW5zLmF0KHJ1bkluZGV4KyspOworICAgICAgICBhdXRvIGV4 cGFuc2lvbkZvclJ1biA9IGV4cGFuc2lvbkVudHJ5LmNvdW50ICogZXhwYW5zaW9uOyAKKworICAg ICAgICBsYXlvdXRSdW4uc2V0RXhwYW5zaW9uKGV4cGFuc2lvbkVudHJ5LmJlaGF2aW9yLCBleHBh bnNpb25Gb3JSdW4pOworICAgICAgICBsYXlvdXRSdW4uc2V0TGVmdChsYXlvdXRSdW4ubGVmdCgp ICsgYWNjdW11bGF0ZWRFeHBhbnNpb24pOworICAgICAgICBsYXlvdXRSdW4uc2V0UmlnaHQobGF5 b3V0UnVuLnJpZ2h0KCkgKyBhY2N1bXVsYXRlZEV4cGFuc2lvbiArIGV4cGFuc2lvbkZvclJ1bik7 CisgICAgICAgIGFjY3VtdWxhdGVkRXhwYW5zaW9uICs9IGV4cGFuc2lvbkZvclJ1bjsKKyAgICB9 Cit9CisKK3ZvaWQgU2ltcGxlTGluZUJyZWFrZXI6OkxpbmU6OmFkanVzdFJ1bnNGb3JUZXh0QWxp Z24oYm9vbCBsYXN0TGluZSkKK3sKKyAgICAvLyBGYWxsYmFjayB0byBUZXh0QWxpZ25Nb2RlOjpM ZWZ0IChTVEFSVCkgYWxpZ25tZW50IGZvciBub24tY29sbGFwc2FibGUgY29udGVudCBvciBmb3Ig dGhlIGxhc3QgbGluZSBiZWZvcmUgYSBmb3JjZWQgYnJlYWsvdGhlIGVuZCBvZiB0aGUgYmxvY2su CisgICAgYXV0byB0ZXh0QWxpZ24gPSBtX3N0eWxlLnRleHRBbGlnbjsKKyAgICBpZiAodGV4dEFs aWduID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgKCFtX3N0eWxlLmNvbGxhcHNlV2hpdGVz cGFjZSB8fCBsYXN0TGluZSkpCisgICAgICAgIHRleHRBbGlnbiA9IFRleHRBbGlnbk1vZGU6Okxl ZnQ7CisKKyAgICBpZiAodGV4dEFsaWduID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkpIHsKKyAg ICAgICAganVzdGlmeVJ1bnMoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBhdXRvIGFk anVzdGVkTGVmdCA9IGFkanVzdGVkTGVmdEZvclRleHRBbGlnbih0ZXh0QWxpZ24pOworICAgIGlm IChhZGp1c3RlZExlZnQgPT0gbV9sZWZ0KQorICAgICAgICByZXR1cm47CisKKyAgICBmb3IgKGF1 dG8gaSA9IG1fZmlyc3RSdW5JbmRleDsgaSA8IG1fbGF5b3V0UnVucy5zaXplKCk7ICsraSkgewor ICAgICAgICBhdXRvJiBsYXlvdXRSdW4gPSBtX2xheW91dFJ1bnMuYXQoaSk7CisgICAgICAgIGxh eW91dFJ1bi5zZXRMZWZ0KGxheW91dFJ1bi5sZWZ0KCkgKyBhZGp1c3RlZExlZnQpOworICAgICAg ICBsYXlvdXRSdW4uc2V0UmlnaHQobGF5b3V0UnVuLnJpZ2h0KCkgKyBhZGp1c3RlZExlZnQpOwor ICAgIH0KK30KKworc3RhdGljIGJvb2wgZXhwYW5zaW9uT3Bwb3J0dW5pdHkoVGV4dFJ1bjo6VHlw ZSBjdXJyZW50LCBUZXh0UnVuOjpUeXBlIHByZXZpb3VzKQoreworICAgIHJldHVybiBjdXJyZW50 ID09IFRleHRSdW46OlR5cGU6OldoaXRlc3BhY2UgfHwgKGN1cnJlbnQgPT0gVGV4dFJ1bjo6VHlw ZTo6Tm9uV2hpdGVzcGFjZSAmJiBwcmV2aW91cyA9PSBUZXh0UnVuOjpUeXBlOjpOb25XaGl0ZXNw YWNlKTsKK30KKworc3RhdGljIEV4cGFuc2lvbkJlaGF2aW9yIGV4cGFuc2lvbkJlaGF2aW9yKGJv b2wgaXNBdEV4cGFuc2lvbk9wcG9ydHVuaXR5KQoreworICAgIEV4cGFuc2lvbkJlaGF2aW9yIGV4 cGFuc2lvbkJlaGF2aW9yID0gQWxsb3dUcmFpbGluZ0V4cGFuc2lvbjsKKyAgICBleHBhbnNpb25C ZWhhdmlvciB8PSBpc0F0RXhwYW5zaW9uT3Bwb3J0dW5pdHkgPyBGb3JiaWRMZWFkaW5nRXhwYW5z aW9uIDogQWxsb3dMZWFkaW5nRXhwYW5zaW9uOworICAgIHJldHVybiBleHBhbnNpb25CZWhhdmlv cjsKK30KKwordm9pZCBTaW1wbGVMaW5lQnJlYWtlcjo6TGluZTo6Y29sbGVjdEV4cGFuc2lvbk9w cG9ydHVuaXRpZXMoY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgYm9vbCB0ZXh0UnVuQ3JlYXRlc05l d0xheW91dFJ1bikKK3sKKyAgICBpZiAodGV4dFJ1bkNyZWF0ZXNOZXdMYXlvdXRSdW4pIHsKKyAg ICAgICAgLy8gQ3JlYXRlIGFuIGVudHJ5IGZvciB0aGlzIG5ldyBsYXlvdXQgcnVuLgorICAgICAg ICBtX2V4cGFuc2lvbk9wcG9ydHVuaXR5TGlzdC5hcHBlbmQoeyB9KTsKKyAgICB9CisgICAgCisg ICAgaWYgKCF0ZXh0UnVuLmxlbmd0aCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRvIGlz QXRFeHBhbnNpb25PcHBvcnR1bml0eSA9IGV4cGFuc2lvbk9wcG9ydHVuaXR5KHRleHRSdW4udHlw ZSgpLCBtX2xhc3RUZXh0UnVuID8gbV9sYXN0VGV4dFJ1bi0+dHlwZSgpIDogVGV4dFJ1bjo6VHlw ZTo6SW52YWxpZCk7CisgICAgbV9leHBhbnNpb25PcHBvcnR1bml0eUxpc3QubGFzdCgpLmJlaGF2 aW9yID0gZXhwYW5zaW9uQmVoYXZpb3IoaXNBdEV4cGFuc2lvbk9wcG9ydHVuaXR5KTsKKyAgICBp ZiAoaXNBdEV4cGFuc2lvbk9wcG9ydHVuaXR5KQorICAgICAgICArK21fZXhwYW5zaW9uT3Bwb3J0 dW5pdHlMaXN0Lmxhc3QoKS5jb3VudDsKKworICAgIGlmICh0ZXh0UnVuLmlzTm9uV2hpdGVzcGFj ZSgpKQorICAgICAgICBtX2xhc3ROb25XaGl0ZXNwYWNlRXhwYW5zaW9uT3BwcG9ydHVuaXR5ID0g bV9leHBhbnNpb25PcHBvcnR1bml0eUxpc3QubGFzdCgpOyAKK30KKwordm9pZCBTaW1wbGVMaW5l QnJlYWtlcjo6TGluZTo6Y2xvc2VMYXN0UnVuKCkKK3sKKyAgICBpZiAoIW1fbGF5b3V0UnVucy5z aXplKCkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbGF5b3V0UnVucy5sYXN0KCkuc2V0SXNF bmRPZkxpbmUoKTsKKyAgICAKKyAgICAvLyBGb3JiaWQgdHJhaWxpbmcgZXhwYW5zaW9uIGZvciB0 aGUgbGFzdCBydW4gb24gbGluZS4KKyAgICBpZiAoIW1fY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVu aXRpZXMgfHwgbV9leHBhbnNpb25PcHBvcnR1bml0eUxpc3QuaXNFbXB0eSgpKQorICAgICAgICBy ZXR1cm47CisgICAgCisgICAgYXV0byYgbGFzdEV4cGFuc2lvbkVudHJ5ID0gbV9leHBhbnNpb25P cHBvcnR1bml0eUxpc3QubGFzdCgpOyAKKyAgICBhdXRvIGV4cGFuc2lvbkJlaGF2aW9yID0gbGFz dEV4cGFuc2lvbkVudHJ5LmJlaGF2aW9yOworICAgIC8vIFJlbW92ZSBhbGxvdyBhbmQgYWRkIGZv cmJpZC4KKyAgICBleHBhbnNpb25CZWhhdmlvciBePSBBbGxvd1RyYWlsaW5nRXhwYW5zaW9uOwor ICAgIGV4cGFuc2lvbkJlaGF2aW9yIHw9IEZvcmJpZFRyYWlsaW5nRXhwYW5zaW9uOworICAgIGxh c3RFeHBhbnNpb25FbnRyeS5iZWhhdmlvciA9IGV4cGFuc2lvbkJlaGF2aW9yOworfQorCiB2b2lk IFNpbXBsZUxpbmVCcmVha2VyOjpMaW5lOjphcHBlbmQoY29uc3QgVGV4dFJ1biYgdGV4dFJ1bikK IHsKICAgICBhdXRvIHN0YXJ0ID0gdGV4dFJ1bi5zdGFydCgpOwogICAgIGF1dG8gZW5kID0gYWRq dXN0ZWRFbmRQb3NpdGlvbih0ZXh0UnVuKTsKICAgICBhdXRvIHByZXZpb3VzTG9naWNhbFJpZ2h0 ID0gbV9sZWZ0ICsgbV9ydW5zV2lkdGg7CisgICAgYm9vbCB0ZXh0UnVuQ3JlYXRlc05ld0xheW91 dFJ1biA9ICFtX2xhc3RUZXh0UnVuIHx8IG1fbGFzdFRleHRSdW4tPmlzQ29sbGFwc2VkKCk7CiAK ICAgICBtX3J1bnNXaWR0aCArPSB0ZXh0UnVuLndpZHRoKCk7CiAgICAgaWYgKHRleHRSdW4uaXNO b25XaGl0ZXNwYWNlKCkpIHsKQEAgLTc2LDggKzIxMCwxMSBAQCB2b2lkIFNpbXBsZUxpbmVCcmVh a2VyOjpMaW5lOjphcHBlbmQoY29uc3QgVGV4dFJ1biYgdGV4dFJ1bikKICAgICB9IGVsc2UgaWYg KHRleHRSdW4uaXNXaGl0ZXNwYWNlKCkpCiAgICAgICAgIG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lk dGggKz0gdGV4dFJ1bi53aWR0aCgpOwogCisgICAgaWYgKG1fY29sbGVjdEV4cGFuc2lvbk9wcG9y dHVuaXRpZXMpCisgICAgICAgIGNvbGxlY3RFeHBhbnNpb25PcHBvcnR1bml0aWVzKHRleHRSdW4s IHRleHRSdW5DcmVhdGVzTmV3TGF5b3V0UnVuKTsKKwogICAgIC8vIE5ldyBsaW5lIG5lZWRzIG5l dyBydW4uCi0gICAgaWYgKCFtX2xhc3RUZXh0UnVuIHx8IG1fbGFzdFRleHRSdW4tPmlzQ29sbGFw c2VkKCkpCisgICAgaWYgKHRleHRSdW5DcmVhdGVzTmV3TGF5b3V0UnVuKQogICAgICAgICBtX2xh eW91dFJ1bnMuYXBwZW5kKHsgc3RhcnQsIGVuZCwgcHJldmlvdXNMb2dpY2FsUmlnaHQsIHByZXZp b3VzTG9naWNhbFJpZ2h0ICsgdGV4dFJ1bi53aWR0aCgpIH0pOwogICAgIGVsc2UgewogICAgICAg ICBhdXRvJiBsYXN0UnVuID0gbV9sYXlvdXRSdW5zLmxhc3QoKTsKQEAgLTk0LDYgKzIzMSw3IEBA IHZvaWQgU2ltcGxlTGluZUJyZWFrZXI6OkxpbmU6OmNvbGxhcHNlVHJhaWxpbmdXaGl0ZXNwYWNl KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFtX2xhc3ROb25XaGl0ZXNwYWNlVGV4dFJ1 bikgeworICAgICAgICAvLyBUaGlzIGVzc2VudGlhbGx5IGJlY29tZXMgYW4gZW1wdHkgbGluZS4K ICAgICAgICAgcmVzZXQoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTExOCwxMyArMjU2 LDIyIEBAIHZvaWQgU2ltcGxlTGluZUJyZWFrZXI6OkxpbmU6OmNvbGxhcHNlVHJhaWxpbmdXaGl0 ZXNwYWNlKCkKICAgICAgICAgbGFzdExheW91dFJ1bi5zZXRFbmQobV9sYXN0Tm9uV2hpdGVzcGFj ZVRleHRSdW4tPmVuZCgpKTsKICAgICAgICAgbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aCA9IDA7 CiAgICAgfQorCisgICAgaWYgKG1fY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRpZXMpIHsKKyAg ICAgICAgQVNTRVJUKG1fbGFzdE5vbldoaXRlc3BhY2VFeHBhbnNpb25PcHBwb3J0dW5pdHkpOwor ICAgICAgICBBU1NFUlQoIW1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlMaXN0LmlzRW1wdHkoKSk7Cisg ICAgICAgIG1fZXhwYW5zaW9uT3Bwb3J0dW5pdHlMaXN0Lmxhc3QoKSA9ICptX2xhc3ROb25XaGl0 ZXNwYWNlRXhwYW5zaW9uT3BwcG9ydHVuaXR5OworICAgIH0KIH0KIAogdm9pZCBTaW1wbGVMaW5l QnJlYWtlcjo6TGluZTo6cmVzZXQoKQogewogICAgIG1fcnVuc1dpZHRoID0gMDsKKyAgICBtX2Zp cnN0UnVuSW5kZXggPSBtX2xheW91dFJ1bnMuc2l6ZSgpOyAKICAgICBtX2F2YWlsYWJsZVdpZHRo ID0gMDsKICAgICBtX3RyYWlsaW5nV2hpdGVzcGFjZVdpZHRoICA9IDA7CisgICAgbV9leHBhbnNp b25PcHBvcnR1bml0eUxpc3QuY2xlYXIoKTsKKyAgICBtX2xhc3ROb25XaGl0ZXNwYWNlRXhwYW5z aW9uT3BwcG9ydHVuaXR5ID0geyB9OwogICAgIG1fbGFzdFRleHRSdW4gPSBzdGQ6Om51bGxvcHQ7 CiAgICAgbV9sYXN0Tm9uV2hpdGVzcGFjZVRleHRSdW4gPSBzdGQ6Om51bGxvcHQ7CiB9CkBAIC0x MzcsNyArMjg0LDcgQEAgU2ltcGxlTGluZUJyZWFrZXI6OlN0eWxlOjpTdHlsZShjb25zdCBSZW5k ZXJTdHlsZSYgc3R5bGUpCiAgICAgLCBjb2xsYXBzZVdoaXRlc3BhY2Uoc3R5bGUuY29sbGFwc2VX aGl0ZVNwYWNlKCkpCiAgICAgLCBwcmVXcmFwKHdyYXBMaW5lcyAmJiAhY29sbGFwc2VXaGl0ZXNw YWNlKQogICAgICwgcHJlc2VydmVOZXdsaW5lKHN0eWxlLnByZXNlcnZlTmV3bGluZSgpKQotICAg ICwgdGV4dEFsaWduSXNSaWdodChzdHlsZS50ZXh0QWxpZ24oKSA9PSBUZXh0QWxpZ25Nb2RlOjpS aWdodCB8fCBzdHlsZS50ZXh0QWxpZ24oKSA9PSBUZXh0QWxpZ25Nb2RlOjpXZWJLaXRSaWdodCkK KyAgICAsIHRleHRBbGlnbihzdHlsZS50ZXh0QWxpZ24oKSkKIHsKIH0KIApAQCAtMTY3LDEwICsz MTQsMTYgQEAgVmVjdG9yPExheW91dFJ1bj4gU2ltcGxlTGluZUJyZWFrZXI6OnJ1bnMoKQogCiB2 b2lkIFNpbXBsZUxpbmVCcmVha2VyOjpoYW5kbGVMaW5lRW5kKCkKIHsKLSAgICBpZiAoIW1fbGF5 b3V0UnVucy5pc0VtcHR5KCkpCi0gICAgICAgIG1fbGF5b3V0UnVucy5sYXN0KCkuc2V0SXNFbmRP ZkxpbmUoKTsKLSAgICArK21fbnVtYmVyT2ZMaW5lczsKLSAgICBtX3ByZXZpb3VzTGluZUhhc05v bkZvcmNlZENvbnRlbnQgPSBtX2N1cnJlbnRMaW5lLmhhc0NvbnRlbnQoKSAmJiBtX2N1cnJlbnRM aW5lLmF2YWlsYWJsZVdpZHRoKCkgPj0gMDsKKyAgICBhdXRvIGxpbmVIYXNDb250ZW50ID0gbV9j dXJyZW50TGluZS5oYXNDb250ZW50KCk7IAorICAgIGlmIChsaW5lSGFzQ29udGVudCkgeworICAg ICAgICBBU1NFUlQobV9sYXlvdXRSdW5zLnNpemUoKSk7CisgICAgICAgICsrbV9udW1iZXJPZkxp bmVzOworICAgICAgICBtX2N1cnJlbnRMaW5lLmNsb3NlTGFzdFJ1bigpOworCisgICAgICAgIGF1 dG8gbGFzdExpbmUgPSAhbV90ZXh0UnVuTGlzdC5jdXJyZW50KCk7IAorICAgICAgICBtX2N1cnJl bnRMaW5lLmFkanVzdFJ1bnNGb3JUZXh0QWxpZ24obGFzdExpbmUpOworICAgIH0KKyAgICBtX3By ZXZpb3VzTGluZUhhc05vbkZvcmNlZENvbnRlbnQgPSBsaW5lSGFzQ29udGVudCAmJiBtX2N1cnJl bnRMaW5lLmF2YWlsYWJsZVdpZHRoKCkgPj0gMDsKICAgICBtX2N1cnJlbnRMaW5lLnJlc2V0KCk7 CiB9CiAKQEAgLTE3OCw5ICszMzEsMTYgQEAgdm9pZCBTaW1wbGVMaW5lQnJlYWtlcjo6aGFuZGxl TGluZVN0YXJ0KCkKIHsKICAgICBhdXRvIGxpbmVDb25zdHJhaW50ID0gdGhpcy0+bGluZUNvbnN0 cmFpbnQodmVydGljYWxQb3NpdGlvbigpKTsKICAgICBtX2N1cnJlbnRMaW5lLnNldExlZnQobGlu ZUNvbnN0cmFpbnQubGVmdCk7CisgICAgbV9jdXJyZW50TGluZS5zZXRUZXh0QWxpZ24obV9zdHls ZS50ZXh0QWxpZ24pOworICAgIG1fY3VycmVudExpbmUuc2V0Q29sbGFwc2VXaGl0ZXNwYWNlKG1f c3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlKTsKICAgICBtX2N1cnJlbnRMaW5lLnNldEF2YWlsYWJs ZVdpZHRoKGxpbmVDb25zdHJhaW50LnJpZ2h0IC0gbGluZUNvbnN0cmFpbnQubGVmdCk7CiB9CiAK K3N0YXRpYyBib29sIGlzVGV4dEFsaWduUmlnaHQoVGV4dEFsaWduTW9kZSB0ZXh0QWxpZ24pCit7 CisgICAgcmV0dXJuIHRleHRBbGlnbiA9PSBUZXh0QWxpZ25Nb2RlOjpSaWdodCB8fCB0ZXh0QWxp Z24gPT0gVGV4dEFsaWduTW9kZTo6V2ViS2l0UmlnaHQ7Cit9CisKIHZvaWQgU2ltcGxlTGluZUJy ZWFrZXI6OmNyZWF0ZVJ1bnNGb3JMaW5lKCkKIHsKICAgICBjb2xsYXBzZUxlYWRpbmdXaGl0ZXNw YWNlKCk7CkBAIC0xOTcsNyArMzU3LDcgQEAgdm9pZCBTaW1wbGVMaW5lQnJlYWtlcjo6Y3JlYXRl UnVuc0ZvckxpbmUoKQogICAgICAgICBpZiAodGV4dFJ1bi0+aXNMaW5lQnJlYWsoKSkgewogICAg ICAgICAgICAgLy8gQWRkIHRoZSBuZXcgbGluZSBvbmx5IGlmIHRoZXJlJ3Mgbm90aGluZyBvbiB0 aGUgbGluZS4gKG90aGVyd2lzZSB0aGUgZXh0cmEgbmV3IGxpbmUgY2hhcmFjdGVyIHdvdWxkIHNo b3cgdXAgYXQgdGhlIGVuZCBvZiB0aGUgY29udGVudC4pCiAgICAgICAgICAgICBpZiAodGV4dFJ1 bi0+aXNIYXJkTGluZUJyZWFrKCkgfHwgIW1fY3VycmVudExpbmUuaGFzQ29udGVudCgpKSB7Ci0g ICAgICAgICAgICAgICAgaWYgKG1fc3R5bGUudGV4dEFsaWduSXNSaWdodCkKKyAgICAgICAgICAg ICAgICBpZiAoaXNUZXh0QWxpZ25SaWdodChtX3N0eWxlLnRleHRBbGlnbikpCiAgICAgICAgICAg ICAgICAgICAgIG1fY3VycmVudExpbmUuY29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoKTsKICAg ICAgICAgICAgICAgICBtX2N1cnJlbnRMaW5lLmFwcGVuZCgqdGV4dFJ1bik7CiAgICAgICAgICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90 ZXh0bGF5b3V0L3NpbXBsZS9TaW1wbGVMaW5lQnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9zaW1wbGUvU2ltcGxlTGluZUJyZWFrZXIu aAppbmRleCBlMjBkNTQ5YzI2ZTI2ZGIzNTA0ZDg5ZjM4MTk4YTcyNDQ5OGYwNmRjLi40NjQzNWRh ZTMyMTFiZmQ2MTdhMmMxN2QyNjZhNjY5YjhiNjhiNzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0bGF5b3V0L3NpbXBsZS9TaW1wbGVMaW5l QnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3Rl eHRsYXlvdXQvc2ltcGxlL1NpbXBsZUxpbmVCcmVha2VyLmgKQEAgLTI3LDEyICsyNywxMiBAQAog CiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCiAKKyNpbmNsdWRlICJSZW5k ZXJTdHlsZUNvbnN0YW50cy5oIgogI2luY2x1ZGUgIlJ1bnMuaCIKICNpbmNsdWRlIDx3dGYvSXNv TWFsbG9jLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotY2xhc3MgTGF5b3V0VW5pdDsKIGNs YXNzIFJlbmRlclN0eWxlOwogCiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAgLTY4LDcgKzY4LDcgQEAg cHJpdmF0ZToKICAgICAgICAgYm9vbCBjb2xsYXBzZVdoaXRlc3BhY2UgeyBmYWxzZSB9OwogICAg ICAgICBib29sIHByZVdyYXAgeyBmYWxzZSB9OwogICAgICAgICBib29sIHByZXNlcnZlTmV3bGlu ZSB7IGZhbHNlIH07Ci0gICAgICAgIGJvb2wgdGV4dEFsaWduSXNSaWdodCB7IGZhbHNlIH07Cisg ICAgICAgIFRleHRBbGlnbk1vZGUgdGV4dEFsaWduIHsgVGV4dEFsaWduTW9kZTo6TGVmdCB9Owog ICAgIH07CiAKICAgICBjbGFzcyBUZXh0UnVuTGlzdCB7CkBAIC05NiwyMSArOTYsNDQgQEAgcHJp dmF0ZToKICAgICAgICAgYm9vbCBoYXNDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV9ydW5zV2lk dGg7IH0KIAogICAgICAgICB2b2lkIHJlc2V0KCk7Ci0gICAgICAgIHZvaWQgc2V0QXZhaWxhYmxl V2lkdGgoZmxvYXQgYXZhaWxhYmxlV2lkdGgpIHsgbV9hdmFpbGFibGVXaWR0aCA9IGF2YWlsYWJs ZVdpZHRoOyB9CiAgICAgICAgIGJvb2wgaGFzVHJhaWxpbmdXaGl0ZXNwYWNlKCkgY29uc3QgeyBy ZXR1cm4gbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aDsgfQogICAgICAgICBib29sIGlzV2hpdGVz cGFjZU9ubHkoKSBjb25zdCB7IHJldHVybiBtX3J1bnNXaWR0aCA9PSBtX3RyYWlsaW5nV2hpdGVz cGFjZVdpZHRoOyB9CiAgICAgICAgIHZvaWQgY29sbGFwc2VUcmFpbGluZ1doaXRlc3BhY2UoKTsK IAorICAgICAgICB2b2lkIHNldEF2YWlsYWJsZVdpZHRoKGZsb2F0IGF2YWlsYWJsZVdpZHRoKSB7 IG1fYXZhaWxhYmxlV2lkdGggPSBhdmFpbGFibGVXaWR0aDsgfQogICAgICAgICB2b2lkIHNldExl ZnQoZmxvYXQgbGVmdCkgeyBtX2xlZnQgPSBsZWZ0OyB9CisgICAgICAgIHZvaWQgc2V0VGV4dEFs aWduKFRleHRBbGlnbk1vZGUpOworICAgICAgICB2b2lkIHNldENvbGxhcHNlV2hpdGVzcGFjZShi b29sIGNvbGxhcHNlV2hpdGVzcGFjZSkgeyBtX3N0eWxlLmNvbGxhcHNlV2hpdGVzcGFjZSA9IGNv bGxhcHNlV2hpdGVzcGFjZTsgfQorCisgICAgICAgIHZvaWQgY2xvc2VMYXN0UnVuKCk7CisgICAg ICAgIHZvaWQgYWRqdXN0UnVuc0ZvclRleHRBbGlnbihib29sIGxhc3RMaW5lKTsKIAogICAgIHBy aXZhdGU6CisgICAgICAgIHN0cnVjdCBTdHlsZSB7CisgICAgICAgICAgICBib29sIGNvbGxhcHNl V2hpdGVzcGFjZSB7IGZhbHNlIH07CisgICAgICAgICAgICBUZXh0QWxpZ25Nb2RlIHRleHRBbGln biB7IFRleHRBbGlnbk1vZGU6OkxlZnQgfTsKKyAgICAgICAgfTsKKyAgICAgICAgZmxvYXQgYWRq dXN0ZWRMZWZ0Rm9yVGV4dEFsaWduKFRleHRBbGlnbk1vZGUpIGNvbnN0OworICAgICAgICB2b2lk IGp1c3RpZnlSdW5zKCk7CisgICAgICAgIHZvaWQgY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRp ZXMoY29uc3QgVGV4dFJ1biYsIGJvb2wgdGV4dFJ1bkNyZWF0ZXNOZXdMYXlvdXRSdW4pOworCiAg ICAgICAgIFZlY3RvcjxMYXlvdXRSdW4+JiBtX2xheW91dFJ1bnM7CisgICAgICAgIFN0eWxlIG1f c3R5bGU7CisgICAgCiAgICAgICAgIGZsb2F0IG1fcnVuc1dpZHRoIHsgMCB9OwogICAgICAgICBm bG9hdCBtX2F2YWlsYWJsZVdpZHRoIHsgMCB9OwogICAgICAgICBmbG9hdCBtX2xlZnQgeyAwIH07 CiAgICAgICAgIGZsb2F0IG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGggeyAwIH07CisgICAgICAg IHVuc2lnbmVkIG1fZmlyc3RSdW5JbmRleCB7IDAgfTsKICAgICAgICAgc3RkOjpvcHRpb25hbDxU ZXh0UnVuPiBtX2xhc3RUZXh0UnVuOwogICAgICAgICBzdGQ6Om9wdGlvbmFsPFRleHRSdW4+IG1f bGFzdE5vbldoaXRlc3BhY2VUZXh0UnVuOworICAgICAgICBib29sIG1fY29sbGVjdEV4cGFuc2lv bk9wcG9ydHVuaXRpZXMgeyBmYWxzZSB9OworICAgICAgICBzdHJ1Y3QgRXhwYW5zaW9uT3Bwb3J0 dW5pdHkgeworICAgICAgICAgICAgdW5zaWduZWQgY291bnQgeyAwIH07CisgICAgICAgICAgICBF eHBhbnNpb25CZWhhdmlvciBiZWhhdmlvciB7IERlZmF1bHRFeHBhbnNpb24gfTsKKyAgICAgICAg fTsKKyAgICAgICAgVmVjdG9yPEV4cGFuc2lvbk9wcG9ydHVuaXR5PiBtX2V4cGFuc2lvbk9wcG9y dHVuaXR5TGlzdDsKKyAgICAgICAgc3RkOjpvcHRpb25hbDxFeHBhbnNpb25PcHBvcnR1bml0eT4g bV9sYXN0Tm9uV2hpdGVzcGFjZUV4cGFuc2lvbk9wcHBvcnR1bml0eTsKICAgICB9OwogCiAgICAg dm9pZCBoYW5kbGVMaW5lU3RhcnQoKTsKQEAgLTEzMSw4ICsxNTQsOCBAQCBwcml2YXRlOgogCiAg ICAgVGV4dFJ1bkxpc3QgbV90ZXh0UnVuTGlzdDsKIAotICAgIExpbmUgbV9jdXJyZW50TGluZTsK ICAgICBWZWN0b3I8TGF5b3V0UnVuPiBtX2xheW91dFJ1bnM7CisgICAgTGluZSBtX2N1cnJlbnRM aW5lOwogCiAgICAgTGluZUNvbnN0cmFpbnRMaXN0IG1fbGluZUNvbnN0cmFpbnRMaXN0OwogICAg IENvbnN0VmVjdG9ySXRlcmF0b3I8TGluZUNvbnN0cmFpbnQ+IG1fbGluZUNvbnN0cmFpbnRJdGVy YXRvcjsK