219301 2020-11-26 23:52:41 -0800 [LFC][Integration] Initial display:inline support 2020-11-27 08:54:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1710224 0 koivisto 2020-11-26 23:52:41 -0800 <span> and pals 1710240 1 414924 koivisto 2020-11-27 01:15:04 -0800 Created attachment 414924 patch 1710310 2 ews-feeder 2020-11-27 08:53:11 -0800 Committed r270195: <https://trac.webkit.org/changeset/270195> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414924. 1710311 3 webkit-bug-importer 2020-11-27 08:54:16 -0800 <rdar://problem/71765813> 414924 2020-11-27 01:15:04 -0800 2020-11-27 08:53:12 -0800 patch lfc-inline.patch text/plain 23420 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzMjNhYjZiNGU2YzQuLmE3MjQ5NzQyYTRjZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDQzIEBACisyMDIwLTExLTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gSW5pdGlhbCBkaXNwbGF5OmlubGluZSBz dXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTkzMDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICA8 c3Bhbj4gZXRjLgorCisgICAgICAgIE5vdCBlbmFibGVkIHlldC4KKworICAgICAgICAqIGxheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveFRyZWU6OmJ1aWxkVHJlZSk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6Qm94VHJlZTo6dXBkYXRlU3R5bGUpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkJveFRyZWU6OmxheW91dEJveEZvclJlbmRl cmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpCb3hUcmVlOjpyZW5k ZXJlckZvckxheW91dEJveCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQ292ZXJhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OmNhblVzZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjpjYW5Vc2VGb3JMaW5lTGF5b3V0V2l0aFJlYXNvbik6CisgICAgICAgICogbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnQ6OklubGluZUJveDo6SW5saW5lQm94 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50OjpJ bmxpbmVCb3g6OmxheW91dEJveCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRl Z3JhdGlvbjo6SW5saW5lQ29udGVudDo6SW5saW5lQm94OjpsaW5lSW5kZXggY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnQ6OklubGluZUJv eDo6cmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5s aW5lQ29udGVudDo6c2hyaW5rVG9GaXQpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpJbmxpbmVDb250ZW50QnVpbGRlcjo6YnVpbGQgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OklubGluZUNvbnRlbnRCdWls ZGVyOjpjcmVhdGVEaXNwbGF5SW5saW5lQm94ZXMgY29uc3QpOgorICAgICAgICAqIGxheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmg6CisgICAg ICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6Y29udGFp bmluZyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6 ZW5jbG9zaW5nQm9yZGVyQm94UmVjdEZvciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6cGFpbnQpOgorICAgICAgICAqIGxheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxv dzo6bGF5b3V0TW9kZXJuTGluZXMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpzdHlsZURpZENoYW5nZSk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmxpbmVzQm91bmRpbmdCb3ggY29uc3QpOgor CiAyMDIwLTExLTIyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJbnRlZ3JhdGlvbl0gQ29udmVydCBzb21lIHJlbWFpbmluZyBJbmxpbmVCb3ggYWNj ZXNzIHRvIHVzZSBpbmxpbmUgaXRlcmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKaW5k ZXggZjQzMzA3ZGNjNmJjLi41ZGM4ZGQ2NGExNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUu Y3BwCkBAIC0yOCw2ICsyOCw4IEBACiAKICNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09O VEVYVCkKIAorI2luY2x1ZGUgIklubGluZUl0ZXJhdG9yLmgiCisjaW5jbHVkZSAiTGF5b3V0Q29u dGFpbmVyQm94LmgiCiAjaW5jbHVkZSAiTGF5b3V0SW5saW5lVGV4dEJveC5oIgogI2luY2x1ZGUg IkxheW91dExpbmVCcmVha0JveC5oIgogI2luY2x1ZGUgIkxheW91dFJlcGxhY2VkQm94LmgiCkBA IC02MCwyOCArNjIsNTQgQEAgQm94VHJlZTo6Qm94VHJlZShSZW5kZXJCbG9ja0Zsb3cmIGZsb3cp CiAKIHZvaWQgQm94VHJlZTo6YnVpbGRUcmVlKCkKIHsKLSAgICBmb3IgKGF1dG8mIGNoaWxkUmVu ZGVyZXIgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KG1fZmxvdykpIHsKLSAgICAgICAg c3RkOjp1bmlxdWVfcHRyPExheW91dDo6Qm94PiBjaGlsZEJveDsKKyAgICBhdXRvIGNyZWF0ZUNo aWxkQm94ID0gWyZdKFJlbmRlck9iamVjdCYgY2hpbGRSZW5kZXJlcikgLT4gc3RkOjp1bmlxdWVf cHRyPExheW91dDo6Qm94PiB7CiAgICAgICAgIGlmIChpczxSZW5kZXJUZXh0PihjaGlsZFJlbmRl cmVyKSkgewogICAgICAgICAgICAgYXV0byYgdGV4dFJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVy VGV4dD4oY2hpbGRSZW5kZXJlcik7Ci0gICAgICAgICAgICBjaGlsZEJveCA9IG1ha2VVbmlxdWU8 TGF5b3V0OjpJbmxpbmVUZXh0Qm94Pih0ZXh0UmVuZGVyZXIudGV4dCgpLCB0ZXh0UmVuZGVyZXIu Y2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoKSwgUmVuZGVyU3R5bGU6OmNyZWF0ZUFub255 bW91c1N0eWxlV2l0aERpc3BsYXkobV9yb290LnN0eWxlKCksIERpc3BsYXlUeXBlOjpJbmxpbmUp KTsKLSAgICAgICAgfSBlbHNlIGlmIChjaGlsZFJlbmRlcmVyLmlzTGluZUJyZWFrKCkpIHsKLSAg ICAgICAgICAgIGF1dG8gY2xvbmVkU3R5bGUgPSBSZW5kZXJTdHlsZTo6Y2xvbmUoY2hpbGRSZW5k ZXJlci5zdHlsZSgpKTsKLSAgICAgICAgICAgIGNsb25lZFN0eWxlLnNldERpc3BsYXkoRGlzcGxh eVR5cGU6OklubGluZSk7Ci0gICAgICAgICAgICBjbG9uZWRTdHlsZS5zZXRGbG9hdGluZyhGbG9h dDo6Tm8pOwotICAgICAgICAgICAgY2xvbmVkU3R5bGUuc2V0UG9zaXRpb24oUG9zaXRpb25UeXBl OjpTdGF0aWMpOwotICAgICAgICAgICAgY2hpbGRCb3ggPSBtYWtlVW5pcXVlPExheW91dDo6TGlu ZUJyZWFrQm94Pihkb3duY2FzdDxSZW5kZXJMaW5lQnJlYWs+KGNoaWxkUmVuZGVyZXIpLmlzV0JS KCksIFdURk1vdmUoY2xvbmVkU3R5bGUpKTsKLSAgICAgICAgfSBlbHNlIGlmIChpczxSZW5kZXJS ZXBsYWNlZD4oY2hpbGRSZW5kZXJlcikpIHsKLSAgICAgICAgICAgIGF1dG8gY2xvbmVkU3R5bGUg PSBSZW5kZXJTdHlsZTo6Y2xvbmUoY2hpbGRSZW5kZXJlci5zdHlsZSgpKTsKLSAgICAgICAgICAg IGNoaWxkQm94ID0gbWFrZVVuaXF1ZTxMYXlvdXQ6OlJlcGxhY2VkQm94PihMYXlvdXQ6OkJveDo6 RWxlbWVudEF0dHJpYnV0ZXMgeyBpczxSZW5kZXJJbWFnZT4oY2hpbGRSZW5kZXJlcikgPyBMYXlv dXQ6OkJveDo6RWxlbWVudFR5cGU6OkltYWdlIDogTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpH ZW5lcmljRWxlbWVudCB9LCBXVEZNb3ZlKGNsb25lZFN0eWxlKSk7Ci0gICAgICAgIH0gZWxzZSBp ZiAoaXM8UmVuZGVyQmxvY2s+KGNoaWxkUmVuZGVyZXIpKSB7Ci0gICAgICAgICAgICBhdXRvIGNs b25lZFN0eWxlID0gUmVuZGVyU3R5bGU6OmNsb25lKGNoaWxkUmVuZGVyZXIuc3R5bGUoKSk7Ci0g ICAgICAgICAgICBjaGlsZEJveCA9IG1ha2VVbmlxdWU8TGF5b3V0OjpSZXBsYWNlZEJveD4oTGF5 b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpH ZW5lcmljRWxlbWVudCB9LCBXVEZNb3ZlKGNsb25lZFN0eWxlKSk7CisgICAgICAgICAgICBhdXRv IHN0eWxlID0gUmVuZGVyU3R5bGU6OmNyZWF0ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkodGV4 dFJlbmRlcmVyLnN0eWxlKCksIERpc3BsYXlUeXBlOjpJbmxpbmUpOworICAgICAgICAgICAgcmV0 dXJuIG1ha2VVbmlxdWU8TGF5b3V0OjpJbmxpbmVUZXh0Qm94Pih0ZXh0UmVuZGVyZXIudGV4dCgp LCB0ZXh0UmVuZGVyZXIuY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcoKSwgV1RGTW92ZShz dHlsZSkpOwogICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChjaGlsZEJveCk7CiAKLSAgICAgICAg bV9yb290LmFwcGVuZENoaWxkKCpjaGlsZEJveCk7Ci0gICAgICAgIG1fYm94ZXMuYXBwZW5kKHsg V1RGTW92ZShjaGlsZEJveCksICZjaGlsZFJlbmRlcmVyIH0pOworICAgICAgICBhdXRvIHN0eWxl ID0gUmVuZGVyU3R5bGU6OmNsb25lKGNoaWxkUmVuZGVyZXIuc3R5bGUoKSk7CisgICAgICAgIGlm IChjaGlsZFJlbmRlcmVyLmlzTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgIHN0eWxlLnNldERp c3BsYXkoRGlzcGxheVR5cGU6OklubGluZSk7CisgICAgICAgICAgICBzdHlsZS5zZXRGbG9hdGlu ZyhGbG9hdDo6Tm8pOworICAgICAgICAgICAgc3R5bGUuc2V0UG9zaXRpb24oUG9zaXRpb25UeXBl OjpTdGF0aWMpOworICAgICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGF5b3V0OjpMaW5lQnJl YWtCb3g+KGRvd25jYXN0PFJlbmRlckxpbmVCcmVhaz4oY2hpbGRSZW5kZXJlcikuaXNXQlIoKSwg V1RGTW92ZShzdHlsZSkpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGlzPFJlbmRlclJlcGxh Y2VkPihjaGlsZFJlbmRlcmVyKSkKKyAgICAgICAgICAgIHJldHVybiBtYWtlVW5pcXVlPExheW91 dDo6UmVwbGFjZWRCb3g+KExheW91dDo6Qm94OjpFbGVtZW50QXR0cmlidXRlcyB7IGlzPFJlbmRl ckltYWdlPihjaGlsZFJlbmRlcmVyKSA/IExheW91dDo6Qm94OjpFbGVtZW50VHlwZTo6SW1hZ2Ug OiBMYXlvdXQ6OkJveDo6RWxlbWVudFR5cGU6OkdlbmVyaWNFbGVtZW50IH0sIFdURk1vdmUoc3R5 bGUpKTsKKworICAgICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KGNoaWxkUmVuZGVyZXIpKQorICAg ICAgICAgICAgcmV0dXJuIG1ha2VVbmlxdWU8TGF5b3V0OjpSZXBsYWNlZEJveD4oTGF5b3V0OjpC b3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmlj RWxlbWVudCB9LCBXVEZNb3ZlKHN0eWxlKSk7CisKKyAgICAgICAgaWYgKGlzPFJlbmRlcklubGlu ZT4oY2hpbGRSZW5kZXJlcikpCisgICAgICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxMYXlvdXQ6 OkNvbnRhaW5lckJveD4oTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0OjpC b3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCBXVEZNb3ZlKHN0eWxlKSk7CisKKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAg IH07CisKKyAgICBmb3IgKGF1dG8gd2Fsa2VyID0gSW5saW5lV2Fsa2VyKG1fZmxvdyk7ICF3YWxr ZXIuYXRFbmQoKTsgd2Fsa2VyLmFkdmFuY2UoKSkgeworICAgICAgICBhdXRvJiBjaGlsZFJlbmRl cmVyID0gKndhbGtlci5jdXJyZW50KCk7CisgICAgICAgIGF1dG8gY2hpbGRCb3ggPSBjcmVhdGVD aGlsZEJveChjaGlsZFJlbmRlcmVyKTsKKyAgICAgICAgYXBwZW5kQ2hpbGQoV1RGTW92ZShjaGls ZEJveCksIGNoaWxkUmVuZGVyZXIpOworICAgIH0KK30KKwordm9pZCBCb3hUcmVlOjphcHBlbmRD aGlsZChzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0OjpCb3g+IGNoaWxkQm94LCBSZW5kZXJPYmplY3Qm IGNoaWxkUmVuZGVyZXIpCit7CisgICAgYXV0byYgcGFyZW50Qm94ID0gZG93bmNhc3Q8TGF5b3V0 OjpDb250YWluZXJCb3g+KGxheW91dEJveEZvclJlbmRlcmVyKCpjaGlsZFJlbmRlcmVyLnBhcmVu dCgpKSk7CisgICAgcGFyZW50Qm94LmFwcGVuZENoaWxkKCpjaGlsZEJveCk7CisKKyAgICBtX2Jv eGVzLmFwcGVuZCh7IFdURk1vdmUoY2hpbGRCb3gpLCAmY2hpbGRSZW5kZXJlciB9KTsKKworICAg IGlmIChtX2JveGVzLnNpemUoKSA+IHNtYWxsVHJlZVRocmVzaG9sZCkgeworICAgICAgICBpZiAo bV9yZW5kZXJlclRvQm94TWFwLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgZm9yIChhdXRvJiBl bnRyeSA6IG1fYm94ZXMpCisgICAgICAgICAgICAgICAgbV9yZW5kZXJlclRvQm94TWFwLmFkZChl bnRyeS5yZW5kZXJlciwgZW50cnkuYm94LmdldCgpKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAg ICAgICBtX3JlbmRlcmVyVG9Cb3hNYXAuYWRkKCZjaGlsZFJlbmRlcmVyLCBtX2JveGVzLmxhc3Qo KS5ib3guZ2V0KCkpOwogICAgIH0KIH0KIApAQCAtOTIsOSArMTIwLDkgQEAgdm9pZCBCb3hUcmVl Ojp1cGRhdGVTdHlsZShjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYgcmVuZGVyZXIpCiAKICAg ICBsYXlvdXRCb3gudXBkYXRlU3R5bGUoc3R5bGUpOwogCi0gICAgaWYgKCZsYXlvdXRCb3ggPT0g Jm1fcm9vdCkgewotICAgICAgICBmb3IgKGF1dG8qIGNoaWxkID0gbV9yb290LmZpcnN0Q2hpbGQo KTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgIGlm IChjaGlsZC0+aXNBbm9ueW1vdXMoKSkKKyAgICBpZiAoaXM8TGF5b3V0OjpDb250YWluZXJCb3g+ KGxheW91dEJveCkpIHsKKyAgICAgICAgZm9yIChhdXRvKiBjaGlsZCA9IGRvd25jYXN0PExheW91 dDo6Q29udGFpbmVyQm94PihsYXlvdXRCb3gpLmZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0g Y2hpbGQtPm5leHRTaWJsaW5nKCkpIHsKKyAgICAgICAgICAgIGlmIChjaGlsZC0+aXNJbmxpbmVU ZXh0Qm94KCkpCiAgICAgICAgICAgICAgICAgY2hpbGQtPnVwZGF0ZVN0eWxlKFJlbmRlclN0eWxl OjpjcmVhdGVBbm9ueW1vdXNTdHlsZVdpdGhEaXNwbGF5KHN0eWxlLCBEaXNwbGF5VHlwZTo6SW5s aW5lKSk7CiAgICAgICAgIH0KICAgICB9CkBAIC0xMDksMTQgKzEzNywxMCBAQCBMYXlvdXQ6OkJv eCYgQm94VHJlZTo6bGF5b3V0Qm94Rm9yUmVuZGVyZXIoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5k ZXJlcikKICAgICAgICAgYXV0byBpbmRleCA9IG1fYm94ZXMuZmluZE1hdGNoaW5nKFsmXShhdXRv JiBlbnRyeSkgewogICAgICAgICAgICAgcmV0dXJuIGVudHJ5LnJlbmRlcmVyID09ICZyZW5kZXJl cjsKICAgICAgICAgfSk7Ci0gICAgICAgIEFTU0VSVChpbmRleCAhPSBub3RGb3VuZCk7CisgICAg ICAgIFJFTEVBU0VfQVNTRVJUKGluZGV4ICE9IG5vdEZvdW5kKTsKICAgICAgICAgcmV0dXJuICpt X2JveGVzW2luZGV4XS5ib3g7CiAgICAgfQogCi0gICAgaWYgKG1fcmVuZGVyZXJUb0JveE1hcC5p c0VtcHR5KCkpIHsKLSAgICAgICAgZm9yIChhdXRvJiBlbnRyeSA6IG1fYm94ZXMpCi0gICAgICAg ICAgICBtX3JlbmRlcmVyVG9Cb3hNYXAuYWRkKGVudHJ5LnJlbmRlcmVyLCBlbnRyeS5ib3guZ2V0 KCkpOwotICAgIH0KICAgICByZXR1cm4gKm1fcmVuZGVyZXJUb0JveE1hcC5nZXQoJnJlbmRlcmVy KTsKIH0KIApAQCAtMTM0LDcgKzE1OCw3IEBAIFJlbmRlck9iamVjdCYgQm94VHJlZTo6cmVuZGVy ZXJGb3JMYXlvdXRCb3goY29uc3QgTGF5b3V0OjpCb3gmIGJveCkKICAgICAgICAgYXV0byBpbmRl eCA9IG1fYm94ZXMuZmluZE1hdGNoaW5nKFsmXShhdXRvJiBlbnRyeSkgewogICAgICAgICAgICAg cmV0dXJuIGVudHJ5LmJveC5nZXQoKSA9PSAmYm94OwogICAgICAgICB9KTsKLSAgICAgICAgQVNT RVJUKGluZGV4ICE9IG5vdEZvdW5kKTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoaW5kZXggIT0g bm90Rm91bmQpOwogICAgICAgICByZXR1cm4gKm1fYm94ZXNbaW5kZXhdLnJlbmRlcmVyOwogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uQm94VHJlZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5oCmluZGV4IGU1NmM3NDFiMzkyMS4uOGE1MjI1MzE3 NGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25Cb3hUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5oCkBAIC01OCw2ICs1OCw3IEBAIHB1YmxpYzoK IAogcHJpdmF0ZToKICAgICB2b2lkIGJ1aWxkVHJlZSgpOworICAgIHZvaWQgYXBwZW5kQ2hpbGQo c3RkOjp1bmlxdWVfcHRyPExheW91dDo6Qm94PiwgUmVuZGVyT2JqZWN0Jik7CiAKICAgICBSZW5k ZXJCbG9ja0Zsb3cmIG1fZmxvdzsKICAgICBMYXlvdXQ6OkluaXRpYWxDb250YWluaW5nQmxvY2sg bV9yb290OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCmluZGV4IGY1NmQ0ODBhNTExNi4u OTgyNzJjMWNiYjk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCkBAIC0yOCwxMCAr MjgsMTIgQEAKIAogI2luY2x1ZGUgIkRvY3VtZW50TWFya2VyQ29udHJvbGxlci5oIgogI2luY2x1 ZGUgIkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgiCisjaW5jbHVkZSAiSW5saW5lSXRlcmF0 b3IuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUmVuZGVyQmxvY2tGbG93Lmgi CiAjaW5jbHVkZSAiUmVuZGVyQ2hpbGRJdGVyYXRvci5oIgogI2luY2x1ZGUgIlJlbmRlckltYWdl LmgiCisjaW5jbHVkZSAiUmVuZGVySW5saW5lLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGluZUJyZWFr LmgiCiAjaW5jbHVkZSAiUmVuZGVyTXVsdGlDb2x1bW5GbG93LmgiCiAjaW5jbHVkZSAiUmVuZGVy VGV4dENvbnRyb2wuaCIKQEAgLTQ2LDYgKzQ4LDcgQEAKICNkZWZpbmUgQUxMT1dfSU1BR0VTIDEK ICNkZWZpbmUgQUxMT1dfQUxMX1JFUExBQ0VEIDEKICNkZWZpbmUgQUxMT1dfSU5MSU5FX0JMT0NL IDEKKyNkZWZpbmUgQUxMT1dfSU5MSU5FUyAwCiAKICNpZm5kZWYgTkRFQlVHCiAjZGVmaW5lIFNF VF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQocmVhc29uLCByZWFzb25zLCBpbmNsdWRlUmVh c29ucykgeyBcCkBAIC02MzcsNiArNjQwLDI4IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRhbmNl UmVhc29uPiBjYW5Vc2VGb3JDaGlsZChjb25zdCBSZW5kZXJPYmplY3QmIGNoaWxkLCBJbmNsCiAg ICAgfQogI2VuZGlmCiAKKyNpZiBBTExPV19JTkxJTkVTCisgICAgaWYgKGlzPFJlbmRlcklubGlu ZT4oY2hpbGQpKSB7CisgICAgICAgIGF1dG8mIHJlbmRlcklubGluZSA9IGRvd25jYXN0PFJlbmRl cklubGluZT4oY2hpbGQpOworICAgICAgICBpZiAocmVuZGVySW5saW5lLmlzUnVieUlubGluZSgp IHx8IHJlbmRlcklubGluZS5pc1F1b3RlKCkgfHwgcmVuZGVySW5saW5lLmlzU1ZHSW5saW5lKCkp CisgICAgICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNOb25T dXBwb3J0ZWRDaGlsZCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOworCisgICAgICAgIGF1dG8m IHN0eWxlID0gcmVuZGVySW5saW5lLnN0eWxlKCk7CisgICAgICAgIGlmICghaXNTdXBwb3J0ZWRT dHlsZShzdHlsZSkpCisgICAgICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVE KEZsb3dIYXNOb25TdXBwb3J0ZWRDaGlsZCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpCisgICAg ICAgIGlmIChzdHlsZS5oYXNCb3JkZXIoKSkKKyAgICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JF VFVSTl9JRl9ORUVERUQoRmxvd0hhc05vblN1cHBvcnRlZENoaWxkLCByZWFzb25zLCBpbmNsdWRl UmVhc29ucyk7CisgICAgICAgIGlmIChzdHlsZS5oYXNCYWNrZ3JvdW5kKCkpCisgICAgICAgICAg ICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNOb25TdXBwb3J0ZWRDaGls ZCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOworICAgICAgICBpZiAocmVuZGVySW5saW5lLm1h cmdpbkxlZnQoKSA8IDAgfHwgcmVuZGVySW5saW5lLm1hcmdpblJpZ2h0KCkgPCAwIHx8IHJlbmRl cklubGluZS5tYXJnaW5Ub3AoKSA8IDAgfHwgcmVuZGVySW5saW5lLm1hcmdpbkJvdHRvbSgpIDwg MCkKKyAgICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0hhc05v blN1cHBvcnRlZENoaWxkLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CisgICAgICAgIGlmIChy ZW5kZXJJbmxpbmUucGFkZGluZ0xlZnQoKSA8IDAgfHwgcmVuZGVySW5saW5lLnBhZGRpbmdSaWdo dCgpIDwgMCB8fCByZW5kZXJJbmxpbmUucGFkZGluZ1RvcCgpIDwgMCB8fCByZW5kZXJJbmxpbmUu cGFkZGluZ0JvdHRvbSgpIDwgMCkKKyAgICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9J Rl9ORUVERUQoRmxvd0hhc05vblN1cHBvcnRlZENoaWxkLCByZWFzb25zLCBpbmNsdWRlUmVhc29u cyk7CisKKyAgICAgICAgcmV0dXJuIHJlYXNvbnM7CisgICAgfQorI2VuZGlmCisKICAgICBTRVRf UkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNOb25TdXBwb3J0ZWRDaGlsZCwgcmVh c29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIHJldHVybiByZWFzb25zOwogfQpAQCAtNzExLDEy ICs3MzYsMTMgQEAgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yTGluZUxheW91 dFdpdGhSZWFzb24oY29uc3QgUmVuZGVyQmxvY2tGbG93JgogICAgICAgICBTRVRfUkVBU09OX0FO RF9SRVRVUk5fSUZfTkVFREVEKEZsb3dQYXJlbnRJc1RleHRBcmVhV2l0aFdyYXBwaW5nLCByZWFz b25zLCBpbmNsdWRlUmVhc29ucyk7CiAgICAgLy8gVGhpcyBjdXJyZW50bHkgY292ZXJzIDxibG9j a2Zsb3c+I3RleHQ8L2Jsb2NrZmxvdz4sIDxibG9ja2Zsb3c+I3RleHQ8YnI+PC9ibG9ja2Zsb3c+ IGFuZCBtdXRpcGxlIChzaWJsaW5nKSBSZW5kZXJUZXh0IGNhc2VzLgogICAgIC8vIFRoZSA8Ymxv Y2tmbG93PjxpbmxpbmU+I3RleHQ8L2lubGluZT48L2Jsb2NrZmxvdz4gY2FzZSBpcyBhbHNvIHBv cHVsYXIgYW5kIHNob3VsZCBiZSByZWxhdGl2ZWx5IGVhc3kgdG8gY292ZXIuCi0gICAgZm9yIChj b25zdCBhdXRvKiBjaGlsZCA9IGZsb3cuZmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+bmV4dFNpYmxpbmcoKSkgewotICAgICAgICBpZiAoIWlzPFJlbmRlclRleHQ+KCpjaGlsZCkg JiYgZmxvdy5jb250YWluc0Zsb2F0cygpKSB7CisgICAgZm9yIChhdXRvIHdhbGtlciA9IElubGlu ZVdhbGtlcihjb25zdF9jYXN0PFJlbmRlckJsb2NrRmxvdyY+KGZsb3cpKTsgIXdhbGtlci5hdEVu ZCgpOyB3YWxrZXIuYWR2YW5jZSgpKSB7CisgICAgICAgIGF1dG8mIGNoaWxkID0gKndhbGtlci5j dXJyZW50KCk7CisgICAgICAgIGlmICghaXM8UmVuZGVyVGV4dD4oY2hpbGQpICYmIGZsb3cuY29u dGFpbnNGbG9hdHMoKSkgewogICAgICAgICAgICAgLy8gTm9uLXRleHQgY29udGVudCBtYXkgc3Ry ZXRjaCB0aGUgbGluZSBhbmQgd2UgZG9uJ3QgeWV0IGhhdmUgc3VwcG9ydCBmb3IgZHluYW1pYyBm bG9hdCBhdm9pZGluZyAoYXMgdGhlIGxpbmUgZ3Jvd3MpLgogICAgICAgICAgICAgU0VUX1JFQVNP Tl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFzVW5zdXBwb3J0ZWRGbG9hdCwgcmVhc29ucywg aW5jbHVkZVJlYXNvbnMpOwogICAgICAgICB9Ci0gICAgICAgIGF1dG8gY2hpbGRSZWFzb25zID0g Y2FuVXNlRm9yQ2hpbGQoKmNoaWxkLCBpbmNsdWRlUmVhc29ucyk7CisgICAgICAgIGF1dG8gY2hp bGRSZWFzb25zID0gY2FuVXNlRm9yQ2hpbGQoY2hpbGQsIGluY2x1ZGVSZWFzb25zKTsKICAgICAg ICAgaWYgKGNoaWxkUmVhc29ucykKICAgICAgICAgICAgIEFERF9SRUFTT05TX0FORF9SRVRVUk5f SUZfTkVFREVEKGNoaWxkUmVhc29ucywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbklubGluZUNvbnRlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuaAppbmRleCA2MDJmZTRlZGM5MDguLjkx Y2NmZDRhNWQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnQuaApAQCAtNTAs MTEgKzUwLDMyIEBAIHN0cnVjdCBJbmxpbmVDb250ZW50IDogcHVibGljIFJlZkNvdW50ZWQ8SW5s aW5lQ29udGVudD4gewogICAgIHN0YXRpYyBSZWY8SW5saW5lQ29udGVudD4gY3JlYXRlKGNvbnN0 IExpbmVMYXlvdXQmIGxpbmVMYXlvdXQpIHsgcmV0dXJuIGFkb3B0UmVmKCpuZXcgSW5saW5lQ29u dGVudChsaW5lTGF5b3V0KSk7IH0KICAgICB+SW5saW5lQ29udGVudCgpOwogCisgICAgY2xhc3Mg SW5saW5lQm94IHsKKyAgICBwdWJsaWM6CisgICAgICAgIElubGluZUJveChjb25zdCBMYXlvdXQ6 OkJveCYgbGF5b3V0Qm94LCBzaXplX3QgbGluZUluZGV4LCBjb25zdCBGbG9hdFJlY3QmIHJlY3Qp CisgICAgICAgICAgICA6IG1fbGF5b3V0Qm94KG1ha2VXZWFrUHRyKGxheW91dEJveCkpCisgICAg ICAgICAgICAsIG1fbGluZUluZGV4KGxpbmVJbmRleCkKKyAgICAgICAgICAgICwgbV9yZWN0KHJl Y3QpCisgICAgICAgIHsKKyAgICAgICAgfQorICAgICAgICBjb25zdCBMYXlvdXQ6OkJveCYgbGF5 b3V0Qm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0Qm94OyB9CisKKyAgICAgICAgc2l6ZV90 IGxpbmVJbmRleCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUluZGV4OyB9CisgICAgICAgIGNvbnN0 IEZsb2F0UmVjdCYgcmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVjdDsgfQorCisgICAgcHJpdmF0 ZToKKyAgICAgICAgV2Vha1B0cjxjb25zdCBMYXlvdXQ6OkJveD4gbV9sYXlvdXRCb3g7CisgICAg ICAgIHNpemVfdCBtX2xpbmVJbmRleDsKKyAgICAgICAgRmxvYXRSZWN0IG1fcmVjdDsKKyAgICB9 OworCiAgICAgdXNpbmcgUnVucyA9IFZlY3RvcjxSdW4sIDQ+OwogICAgIHVzaW5nIExpbmVzID0g VmVjdG9yPExpbmUsIDQ+OwogCiAgICAgUnVucyBydW5zOwogICAgIExpbmVzIGxpbmVzOworICAg IFZlY3RvcjxJbmxpbmVCb3g+IGlubGluZUJveGVzOworCiAgICAgZmxvYXQgY2xlYXJHYXBBZnRl ckxhc3RMaW5lIHsgMCB9OwogCiAgICAgY29uc3QgTGluZSYgbGluZUZvclJ1bihjb25zdCBSdW4m IHJ1bikgY29uc3QgeyByZXR1cm4gbGluZXNbcnVuLmxpbmVJbmRleCgpXTsgfQpAQCAtNzUsNiAr OTYsNyBAQCBpbmxpbmUgdm9pZCBJbmxpbmVDb250ZW50OjpzaHJpbmtUb0ZpdCgpCiB7CiAgICAg cnVucy5zaHJpbmtUb0ZpdCgpOwogICAgIGxpbmVzLnNocmlua1RvRml0KCk7CisgICAgaW5saW5l Qm94ZXMuc2hyaW5rVG9GaXQoKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u SW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGFjOWVjNzEzODBlOC4uMTlmNjI0OTc2NTEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3Bw CkBAIC0xNTcsNiArMTU3LDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6YnVpbGQoY29u c3QgTGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGluZUZvcm0KICAgICBhdXRvIGxp bmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVucyA9IGNvbXB1dGVMaW5lTGV2ZWxWaXN1YWxB ZGp1c3RtZW50c0ZvclJ1bnMoaW5saW5lRm9ybWF0dGluZ1N0YXRlKTsKICAgICBjcmVhdGVEaXNw bGF5TGluZVJ1bnMoaW5saW5lRm9ybWF0dGluZ1N0YXRlLCBpbmxpbmVDb250ZW50LCBsaW5lTGV2 ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnMpOwogICAgIGNyZWF0ZURpc3BsYXlMaW5lcyhpbmxp bmVGb3JtYXR0aW5nU3RhdGUsIGlubGluZUNvbnRlbnQsIGxpbmVMZXZlbFZpc3VhbEFkanVzdG1l bnRzRm9yUnVucyk7CisgICAgY3JlYXRlRGlzcGxheUlubGluZUJveGVzKGlubGluZUZvcm1hdHRp bmdTdGF0ZSwgaW5saW5lQ29udGVudCk7CiB9CiAKIElubGluZUNvbnRlbnRCdWlsZGVyOjpMaW5l TGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNMaXN0IElubGluZUNvbnRlbnRCdWlsZGVyOjpj b21wdXRlTGluZUxldmVsVmlzdWFsQWRqdXN0bWVudHNGb3JSdW5zKGNvbnN0IExheW91dDo6SW5s aW5lRm9ybWF0dGluZ1N0YXRlJiBpbmxpbmVGb3JtYXR0aW5nU3RhdGUpIGNvbnN0CkBAIC0zNDgs NiArMzQ5LDMyIEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5l cyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0CiAgICAgfQogfQogCit2b2lkIElu bGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGlubGluZUZvcm1hdHRpbmdTdGF0ZSwgSW5saW5lQ29u dGVudCYgaW5saW5lQ29udGVudCkgY29uc3QKK3sKKyAgICBhdXRvJiBsaW5lcyA9IGlubGluZUZv cm1hdHRpbmdTdGF0ZS5saW5lcygpOworICAgIGF1dG8mIGxpbmVCb3hlcyA9IGlubGluZUZvcm1h dHRpbmdTdGF0ZS5saW5lQm94ZXMoKTsKKyAgICBmb3IgKHNpemVfdCBsaW5lSW5kZXggPSAwOyBs aW5lSW5kZXggPCBsaW5lQm94ZXMuc2l6ZSgpOyArK2xpbmVJbmRleCkgeworICAgICAgICBhdXRv JiBsaW5lQm94ID0gbGluZUJveGVzW2xpbmVJbmRleF07CisgICAgICAgIGF1dG8mIGxpbmUgPSBs aW5lc1tsaW5lSW5kZXhdOworCisgICAgICAgIGF1dG8mIGxpbmVCb3hMb2dpY2FsUmVjdCA9IGxp bmUubGluZUJveExvZ2ljYWxSZWN0KCk7CisKKyAgICAgICAgZm9yIChhdXRvJiBpbmxpbmVMZXZl bEJveCA6IGxpbmVCb3guaW5saW5lTGV2ZWxCb3hMaXN0KCkpIHsKKyAgICAgICAgICAgIGlmICgh aW5saW5lTGV2ZWxCb3gtPmlzSW5saW5lQm94KCkgfHwgaW5saW5lTGV2ZWxCb3gtPmlzUm9vdElu bGluZUJveCgpKQorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgYXV0byYg bGF5b3V0Qm94ID0gaW5saW5lTGV2ZWxCb3gtPmxheW91dEJveCgpOworICAgICAgICAgICAgYXV0 byBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZv cklubGluZUxldmVsQm94KGxheW91dEJveCk7CisgICAgICAgICAgICAvLyBpbmxpbmVMZXZlbEJv eExvZ2ljYWxSZWN0IGVuY2xvc2VzIHRoZSBtYXJnaW4gYm94LCBidXQgd2UgbmVlZCBib3JkZXIg Ym94IGZvciB0aGUgZGlzcGxheSBsaW5lLgorICAgICAgICAgICAgYXV0byYgZ2VvbWV0cnkgPSBt X2xheW91dFN0YXRlLmdlb21ldHJ5Rm9yQm94KGxheW91dEJveCk7CisgICAgICAgICAgICBpbmxp bmVMZXZlbEJveExvZ2ljYWxSZWN0LmV4cGFuZFZlcnRpY2FsbHkoLXN0ZDo6bWF4KDBfbHUsIGdl b21ldHJ5Lm1hcmdpbkJlZm9yZSgpICsgZ2VvbWV0cnkubWFyZ2luQWZ0ZXIoKSkpOworICAgICAg ICAgICAgaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdC5tb3ZlVmVydGljYWxseShzdGQ6Om1heCgw X2x1LCBnZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSkpOworICAgICAgICAgICAgaW5saW5lTGV2ZWxC b3hMb2dpY2FsUmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSk7CisKKyAg ICAgICAgICAgIGlubGluZUNvbnRlbnQuaW5saW5lQm94ZXMuYXBwZW5kKHsgbGF5b3V0Qm94LCBs aW5lSW5kZXgsIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QgfSk7CisgICAgICAgIH0KKyAgICB9 Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWls ZGVyLmgKaW5kZXggODEwN2EyMTgxMDE0Li41OGUxMjg1MzliOWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRl bnRCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuaApAQCAtNTUsNiArNTUsNyBAQCBwcml2 YXRlOgogICAgIExpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVuc0xpc3QgY29tcHV0ZUxp bmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVucyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdTdGF0ZSYpIGNvbnN0OwogICAgIHZvaWQgY3JlYXRlRGlzcGxheUxpbmVSdW5zKGNvbnN0 IExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXRlJiwgSW5saW5lQ29udGVudCYsIGNvbnN0IExp bmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVuc0xpc3QmKSBjb25zdDsKICAgICB2b2lkIGNy ZWF0ZURpc3BsYXlMaW5lcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZSYsIElu bGluZUNvbnRlbnQmLCBjb25zdCBMaW5lTGV2ZWxWaXN1YWxBZGp1c3RtZW50c0ZvclJ1bnNMaXN0 JikgY29uc3Q7CisgICAgdm9pZCBjcmVhdGVEaXNwbGF5SW5saW5lQm94ZXMoY29uc3QgTGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGUmLCBJbmxpbmVDb250ZW50JikgY29uc3Q7CiAKICAgICBj b25zdCBMYXlvdXQ6OkxheW91dFN0YXRlJiBtX2xheW91dFN0YXRlOwogICAgIGNvbnN0IFJlbmRl ckJsb2NrRmxvdyYgbV9ibG9ja0Zsb3c7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3Bw CmluZGV4IDJmNmIzMDE3YmMzZi4uN2U5ZGNiOGM3ZWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lTGF5b3V0LmNwcApAQCAtNzYsOSArNzYsMTEgQEAgTGluZUxheW91dCogTGluZUxheW91dDo6 Y29udGFpbmluZyhSZW5kZXJPYmplY3QmIHJlbmRlcmVyKQogICAgIGlmIChyZW5kZXJlci5pc1Jl cGxpY2EoKSB8fCByZW5kZXJlci5pc1JlbmRlclNjcm9sbGJhclBhcnQoKSkKICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAgICAgCi0gICAgaWYgKGF1dG8qIHBhcmVudCA9IHJlbmRlcmVyLnBhcmVu dCgpKSB7CisgICAgZm9yIChhdXRvKiBwYXJlbnQgPSByZW5kZXJlci5wYXJlbnQoKTsgcGFyZW50 OyBwYXJlbnQgPSBwYXJlbnQtPnBhcmVudCgpKSB7CiAgICAgICAgIGlmIChpczxSZW5kZXJCbG9j a0Zsb3c+KCpwYXJlbnQpKQogICAgICAgICAgICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlckJsb2Nr Rmxvdz4oKnBhcmVudCkubW9kZXJuTGluZUxheW91dCgpOworICAgICAgICBpZiAoIWlzPFJlbmRl cklubGluZT4oKnBhcmVudCkpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAK ICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTM0OCw2ICszNTAsMjIgQEAgTGluZUl0ZXJhdG9yIExp bmVMYXlvdXQ6Omxhc3RMaW5lKCkgY29uc3QKICAgICByZXR1cm4geyBMaW5lSXRlcmF0b3JNb2Rl cm5QYXRoKCptX2lubGluZUNvbnRlbnQsIG1faW5saW5lQ29udGVudC0+bGluZXMuaXNFbXB0eSgp ID8gMCA6IG1faW5saW5lQ29udGVudC0+bGluZXMuc2l6ZSgpIC0gMSkgfTsKIH0KIAorTGF5b3V0 UmVjdCBMaW5lTGF5b3V0OjplbmNsb3NpbmdCb3JkZXJCb3hSZWN0Rm9yKGNvbnN0IFJlbmRlcklu bGluZSYgcmVuZGVySW5saW5lKSBjb25zdAoreworICAgIGlmICghbV9pbmxpbmVDb250ZW50KQor ICAgICAgICByZXR1cm4geyB9OworCisgICAgYXV0byYgbGF5b3V0Qm94ID0gbV9ib3hUcmVlLmxh eW91dEJveEZvclJlbmRlcmVyKHJlbmRlcklubGluZSk7CisKKyAgICBMYXlvdXRSZWN0IHJlY3Q7 CisgICAgZm9yIChhdXRvJiBpbmxpbmVCb3ggOiBtX2lubGluZUNvbnRlbnQtPmlubGluZUJveGVz KSB7CisgICAgICAgIGlmICgmaW5saW5lQm94LmxheW91dEJveCgpID09ICZsYXlvdXRCb3gpCisg ICAgICAgICAgICByZWN0LnVuaXRlSWZOb25aZXJvKExheW91dFJlY3QoaW5saW5lQm94LnJlY3Qo KSkpOworICAgIH0KKworICAgIHJldHVybiByZWN0OworfQorCiBjb25zdCBSZW5kZXJPYmplY3Qm IExpbmVMYXlvdXQ6OnJlbmRlcmVyRm9yTGF5b3V0Qm94KGNvbnN0IExheW91dDo6Qm94JiBsYXlv dXRCb3gpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fYm94VHJlZS5yZW5kZXJlckZvckxheW91dEJv eChsYXlvdXRCb3gpOwpAQCAtNDI4LDEyICs0NDYsMTAgQEAgdm9pZCBMaW5lTGF5b3V0OjpwYWlu dChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQog ICAgICAgICB0ZXh0UGFpbnRlci5wYWludCh0ZXh0UnVuLCByZWN0LCB0ZXh0T3JpZ2luKTsKIAog ICAgICAgICBpZiAoIXN0eWxlLnRleHREZWNvcmF0aW9uc0luRWZmZWN0KCkuaXNFbXB0eSgpKSB7 Ci0gICAgICAgICAgICAvLyBGSVhNRTogVXNlIGNvcnJlY3QgUmVuZGVyVGV4dC4KLSAgICAgICAg ICAgIGlmIChhdXRvKiB0ZXh0UmVuZGVyZXIgPSBjaGlsZHJlbk9mVHlwZTxSZW5kZXJUZXh0Pihm bG93KCkpLmZpcnN0KCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIHBhaW50ZXIgPSBUZXh0RGVj b3JhdGlvblBhaW50ZXIgeyBwYWludEluZm8uY29udGV4dCgpLCBzdHlsZS50ZXh0RGVjb3JhdGlv bnNJbkVmZmVjdCgpLCAqdGV4dFJlbmRlcmVyLCBmYWxzZSwgc3R5bGUuZm9udENhc2NhZGUoKSB9 OwotICAgICAgICAgICAgICAgIHBhaW50ZXIuc2V0V2lkdGgocmVjdC53aWR0aCgpKTsKLSAgICAg ICAgICAgICAgICBwYWludGVyLnBhaW50VGV4dERlY29yYXRpb24odGV4dFJ1biwgdGV4dE9yaWdp biwgcmVjdC5sb2NhdGlvbigpICsgcGFpbnRPZmZzZXQpOwotICAgICAgICAgICAgfQorICAgICAg ICAgICAgYXV0byYgdGV4dFJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyVGV4dD4obV9ib3hUcmVl LnJlbmRlcmVyRm9yTGF5b3V0Qm94KHJ1bi5sYXlvdXRCb3goKSkpOworICAgICAgICAgICAgYXV0 byBwYWludGVyID0gVGV4dERlY29yYXRpb25QYWludGVyIHsgcGFpbnRJbmZvLmNvbnRleHQoKSwg c3R5bGUudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKSwgdGV4dFJlbmRlcmVyLCBmYWxzZSwgc3R5 bGUuZm9udENhc2NhZGUoKSB9OworICAgICAgICAgICAgcGFpbnRlci5zZXRXaWR0aChyZWN0Lndp ZHRoKCkpOworICAgICAgICAgICAgcGFpbnRlci5wYWludFRleHREZWNvcmF0aW9uKHRleHRSdW4s IHRleHRPcmlnaW4sIHJlY3QubG9jYXRpb24oKSArIHBhaW50T2Zmc2V0KTsKICAgICAgICAgfQog ICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAppbmRleCA2YWRmOGNjNWYxMDgu LmUzMjYyNmUyYmJkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaApAQCAtODgsNiAr ODgsOCBAQCBwdWJsaWM6CiAgICAgTGluZUl0ZXJhdG9yIGZpcnN0TGluZSgpIGNvbnN0OwogICAg IExpbmVJdGVyYXRvciBsYXN0TGluZSgpIGNvbnN0OwogCisgICAgTGF5b3V0UmVjdCBlbmNsb3Np bmdCb3JkZXJCb3hSZWN0Rm9yKGNvbnN0IFJlbmRlcklubGluZSYpIGNvbnN0OworCiAgICAgY29u c3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlckZvckxheW91dEJveChjb25zdCBMYXlvdXQ6OkJveCYp IGNvbnN0OwogICAgIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdygpIGNvbnN0IHsgcmV0dXJu IG1fYm94VHJlZS5mbG93KCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcAppbmRleCBiYjIyZjM0ZmQzZjMuLmI0OWRlOWY0Yzg4OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM2MDYsNyArMzYw Niw4IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRNb2Rlcm5MaW5lcyhib29sIHJlbGF5 b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlcGFpCiAKICAgICBhdXRvJiBsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dExpbmVMYXlvdXQgPSAqdGhpcy0+bW9kZXJuTGluZUxheW91dCgpOwogCi0gICAg Zm9yIChhdXRvJiByZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4oKnRoaXMp KSB7CisgICAgZm9yIChhdXRvIHdhbGtlciA9IElubGluZVdhbGtlcigqdGhpcyk7ICF3YWxrZXIu YXRFbmQoKTsgd2Fsa2VyLmFkdmFuY2UoKSkgeworICAgICAgICBhdXRvJiByZW5kZXJlciA9ICp3 YWxrZXIuY3VycmVudCgpOwogICAgICAgICBpZiAocmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAg ICAgIHJlbmRlcmVyLnNldE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7CiAgICAgICAgIGlmICgh cmVuZGVyZXIubmVlZHNMYXlvdXQoKSAmJiAhbmVlZHNVcGRhdGVSZXBsYWNlZERpbWVuc2lvbnMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwCmluZGV4IGJkNTI1ZTAx OGJkYy4uMzI3ZjNjZTE2Yjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW5saW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5s aW5lLmNwcApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKICNp bmNsdWRlICJJbmxpbmVFbGVtZW50Qm94LmgiCiAjaW5jbHVkZSAiSW5saW5lVGV4dEJveC5oIgor I2luY2x1ZGUgIkxheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIgogI2luY2x1ZGUgIlJlbmRl ckJsb2NrLmgiCiAjaW5jbHVkZSAiUmVuZGVyQ2hpbGRJdGVyYXRvci5oIgogI2luY2x1ZGUgIlJl bmRlckZyYWdtZW50ZWRGbG93LmgiCkBAIC0xOTMsNiArMTk0LDEzIEBAIHZvaWQgUmVuZGVySW5s aW5lOjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5 bGUqIG9sZFN0CiAgICAgICAgIH0KICAgICAgICAgc2V0UmVuZGVySW5saW5lQWx3YXlzQ3JlYXRl c0xpbmVCb3hlcyhhbHdheXNDcmVhdGVMaW5lQm94ZXMpOwogICAgIH0KKworI2lmIEVOQUJMRShM QVlPVVRfRk9STUFUVElOR19DT05URVhUKQorICAgIGlmIChkaWZmID49IFN0eWxlRGlmZmVyZW5j ZTo6UmVwYWludCkgeworICAgICAgICBpZiAoYXV0byogbGluZUxheW91dCA9IExheW91dEludGVn cmF0aW9uOjpMaW5lTGF5b3V0Ojpjb250YWluaW5nKCp0aGlzKSkKKyAgICAgICAgICAgIGxpbmVM YXlvdXQtPnVwZGF0ZVN0eWxlKCp0aGlzKTsKKyAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBSZW5k ZXJJbmxpbmU6OnVwZGF0ZUFsd2F5c0NyZWF0ZUxpbmVCb3hlcyhib29sIGZ1bGxMYXlvdXQpCkBA IC02MDIsNiArNjEwLDkgQEAgcHJpdmF0ZToKIAogSW50UmVjdCBSZW5kZXJJbmxpbmU6OmxpbmVz Qm91bmRpbmdCb3goKSBjb25zdAogeworICAgIGlmIChhdXRvKiBsYXlvdXQgPSBMYXlvdXRJbnRl Z3JhdGlvbjo6TGluZUxheW91dDo6Y29udGFpbmluZygqdGhpcykpCisgICAgICAgIHJldHVybiBl bmNsb3NpbmdJbnRSZWN0KGxheW91dC0+ZW5jbG9zaW5nQm9yZGVyQm94UmVjdEZvcigqdGhpcykp OworCiAgICAgaWYgKCFhbHdheXNDcmVhdGVMaW5lQm94ZXMoKSkgewogICAgICAgICBBU1NFUlQo IWZpcnN0TGluZUJveCgpKTsKICAgICAgICAgRmxvYXRSZWN0IGZsb2F0UmVzdWx0Owo=