226463 2021-05-31 02:26:31 -0700 [css-flexbox] Do not compute the min-max sizes of flex items twice 2021-06-15 02:19:33 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 svillar svillar changseok dino esprehn+autocc ews-watchlist glenn kondapallykalyan pdr rbuis rego simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1765364 0 svillar 2021-05-31 02:26:31 -0700 [css-flexbox] Do not compute the min-max sizes of flex items twice 1765370 1 430190 svillar 2021-05-31 02:49:17 -0700 Created attachment 430190 Patch 1765373 2 430193 svillar 2021-05-31 03:09:31 -0700 Created attachment 430193 Patch 1767381 3 webkit-bug-importer 2021-06-07 02:27:17 -0700 <rdar://problem/78939997> 1769728 4 svillar 2021-06-15 02:19:33 -0700 Committed r278865 (238809@main): <https://commits.webkit.org/238809@main> 430190 2021-05-31 02:49:17 -0700 2021-05-31 03:09:26 -0700 Patch bug-226463-20210531114916.patch text/plain 10420 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM5ODA0MzRmOWQzOTIw YTI4Y2ZiMmJkYmFkNWMzZjkyOTI2NDQ2MS4uMjljNjEzOGFiMDg1NjM3NWQ4YTg5MGMzYmZjODA1 ZGUwZTA3NmJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA1LTMxICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl eGJveF0gRG8gbm90IGNvbXB1dGUgdGhlIG1pbi1tYXggc2l6ZXMgb2YgZmxleCBpdGVtcyB0d2lj ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NDYz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBk ZXRlcm1pbmluZyB0aGUgZmxleCBiYXNlIHNpemUsIHRoZSBpdGVt4oCZcyBtaW4gYW5kIG1heCBt YWluIHNpemVzIGFyZSBpZ25vcmVkIChubyBjbGFtcGluZyBvY2N1cnMpLgorICAgICAgICBUaG9z ZSBsaW1pdHMgYXJlIHVzZWQgdG8gY29tcHV0ZSB0aGUgaXRlbSdzIGh5cG90aGV0aWNhbCBtYWlu IHNpemUgYW5kIGFsc28gbGF0ZXIgd2hlbiB0aGUgZmxleGlibGUKKyAgICAgICAgbGVuZ3RocyBh cmUgcmVzb2x2ZWQuIFRoZSB0aGluZyBpcyB0aGF0IHdlIHdlcmUgcnVubmluZyB0aGUgY29kZSB0 aGF0IGNsYW1wcyB0aGUgZmxleCBpdGVtIHNpemUgdHdpY2UgaW5zdGVhZAorICAgICAgICBvZiBj b21wdXRpbmcgdGhvc2UgbGltaXRzIG9uY2UgYW5kIGFwcGx5IHRoZW0gdHdpY2UuCisKKyAgICAg ICAgRnJvbSBub3cgb25lLCB3ZSBqdXN0IGNvbXB1dGUgdGhlbSBvbmNlIGFuZCBzdG9yZSB0aGUg bGltaXRzIGluIGEgc3RkOjpwYWlyIGluIHRoZSBGbGV4SXRlbSBjbGFzcy4gVGhpcyBtZWFucwor ICAgICAgICB0aGF0IHRoZSBGbGV4SXRlbSBpcyBhYmxlIHRvIGNvbXB1dGUgdGhlIGh5cG90aGV0 aWNhbCBtYWluIHNpemUgb24gaXRzIG93biBhbmQgZG9lcyBub3QgbmVlZCBpdCB0byBiZSBwYXNz ZWQKKyAgICAgICAgYXMgYW4gYXJndW1lbnQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRo aXMgaXMgYWxyZWFkeSBiZWluZyB0ZXN0ZWQgYnkgZG96ZW5zIG9mIHRlc3RzLgorCisgICAgICAg ICogcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZsZXhJdGVtOjpGbGV4SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpGbGV4SXRlbTo6Y29uc3Ry YWluU2l6ZUJ5TWluTWF4IGNvbnN0KTogQ2xhbXAgdGhlIHBhc3NlZCBpbiBzaXplIGJ5IHRoZSBz dG9yZWQgbWluICYgbWF4IHNpemVzLgorICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJsZUJveEFs Z29yaXRobS5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhJdGVtTWluTWF4 U2l6ZXMpOiBSZW5hbWVkIGZyb20gYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4IGFuZAorICAg ICAgICB3aXRob3V0IHRoZSBjaGlsZFNpemUgYXJndW1lbnQgd2hpY2ggaXMgbm8gbG9uZ2VyIG5l ZWRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4 SXRlbSk6IFVzZSBjb25zdHJhaW5TaXplQnlNaW5NYXguCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJGbGV4aWJsZUJveDo6cmVzb2x2ZUZsZXhpYmxlTGVuZ3Rocyk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIw MjEtMDUtMjcgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFN1 cHBvcnQgSDI2NCBwcm9maWxlcyBpbiBNZWRpYVJlY29yZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcAppbmRleCA4NDQ2NjcyYzI4Njdm OWZjMTQzZTk1NjJkZDZkZWNmOWNmZTYzODM4Li4zMzA2MTJlMTA0ZjU2M2M4ZWNjZWQ5MDk2MmZk OWViZWRhOGQxMmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGli bGVCb3hBbGdvcml0aG0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJs ZUJveEFsZ29yaXRobS5jcHAKQEAgLTM1LDEyICszNSwxMyBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLUZsZXhJdGVtOjpGbGV4SXRlbShSZW5kZXJCb3gmIGJveCwgTGF5b3V0VW5pdCBmbGV4 QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZSwg TGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91dFVuaXQgbWFpbkF4aXNN YXJnaW4pCitGbGV4SXRlbTo6RmxleEl0ZW0oUmVuZGVyQm94JiBib3gsIExheW91dFVuaXQgZmxl eEJhc2VDb250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExh eW91dFVuaXQgbWFpbkF4aXNNYXJnaW4sIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0 PiBtaW5NYXhTaXplcykKICAgICA6IGJveChib3gpCiAgICAgLCBmbGV4QmFzZUNvbnRlbnRTaXpl KGZsZXhCYXNlQ29udGVudFNpemUpCi0gICAgLCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUo aHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplKQogICAgICwgbWFpbkF4aXNCb3JkZXJBbmRQYWRk aW5nKG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZykKICAgICAsIG1haW5BeGlzTWFyZ2luKG1haW5B eGlzTWFyZ2luKQorICAgICwgbWluTWF4U2l6ZXMobWluTWF4U2l6ZXMpCisgICAgLCBoeXBvdGhl dGljYWxNYWluQ29udGVudFNpemUoY29uc3RyYWluU2l6ZUJ5TWluTWF4KGZsZXhCYXNlQ29udGVu dFNpemUpKQogICAgICwgZnJvemVuKGZhbHNlKQogewogICAgIEFTU0VSVCghYm94LmlzT3V0T2ZG bG93UG9zaXRpb25lZCgpKTsKQEAgLTg2LDQgKzg3LDkgQEAgYm9vbCBGbGV4TGF5b3V0QWxnb3Jp dGhtOjpjb21wdXRlTmV4dEZsZXhMaW5lKHNpemVfdCYgbmV4dEluZGV4LCBWZWN0b3I8RmxleEl0 ZW0KICAgICByZXR1cm4gbGluZUl0ZW1zLnNpemUoKSA+IDA7CiB9CiAKK0xheW91dFVuaXQgRmxl eEl0ZW06OmNvbnN0cmFpblNpemVCeU1pbk1heChjb25zdCBMYXlvdXRVbml0IHNpemUpIGNvbnN0 Cit7CisgICAgcmV0dXJuIHN0ZDo6bWF4KG1pbk1heFNpemVzLmZpcnN0LCBzdGQ6Om1pbihzaXpl LCBtaW5NYXhTaXplcy5zZWNvbmQpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uaAppbmRleCA0 MDBhZmM5MzA1ZDBjYzE0YjE5NTcwMzcwYzBjMjEzNDkwNjY1YjM5Li4zYmI5MDk0NmI5YWMxYTM5 ZDgyZjJjNzU5NDY2YTU5MmIzNzBjNmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvRmxleGlibGVCb3hBbGdvcml0aG0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvRmxleGlibGVCb3hBbGdvcml0aG0uaApAQCAtNDEsNyArNDEsNyBAQCBjbGFzcyBSZW5kZXJC b3g7CiAKIGNsYXNzIEZsZXhJdGVtIHsKIHB1YmxpYzoKLSAgICBGbGV4SXRlbShSZW5kZXJCb3gm LCBMYXlvdXRVbml0IGZsZXhCYXNlQ29udGVudFNpemUsIExheW91dFVuaXQgaHlwb3RoZXRpY2Fs TWFpbkNvbnRlbnRTaXplLCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZywgTGF5 b3V0VW5pdCBtYWluQXhpc01hcmdpbik7CisgICAgRmxleEl0ZW0oUmVuZGVyQm94JiwgTGF5b3V0 VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFk ZGluZywgTGF5b3V0VW5pdCBtYWluQXhpc01hcmdpbiwgc3RkOjpwYWlyPExheW91dFVuaXQsIExh eW91dFVuaXQ+IG1pbk1heFNpemVzKTsKIAogICAgIExheW91dFVuaXQgaHlwb3RoZXRpY2FsTWFp bkF4aXNNYXJnaW5Cb3hTaXplKCkgY29uc3QKICAgICB7CkBAIC01OCwxMSArNTgsMTQgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gZmxleGVkQ29udGVudFNpemUgKyBtYWluQXhpc0JvcmRlckFu ZFBhZGRpbmcgKyBtYWluQXhpc01hcmdpbjsKICAgICB9CiAKKyAgICBMYXlvdXRVbml0IGNvbnN0 cmFpblNpemVCeU1pbk1heChjb25zdCBMYXlvdXRVbml0KSBjb25zdDsKKwogICAgIFJlbmRlckJv eCYgYm94OwogICAgIGNvbnN0IExheW91dFVuaXQgZmxleEJhc2VDb250ZW50U2l6ZTsKLSAgICBj b25zdCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5Db250ZW50U2l6ZTsKICAgICBjb25zdCBM YXlvdXRVbml0IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZzsKICAgICBjb25zdCBMYXlvdXRVbml0 IG1haW5BeGlzTWFyZ2luOworICAgIGNvbnN0IHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRV bml0PiBtaW5NYXhTaXplczsKKyAgICBjb25zdCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5D b250ZW50U2l6ZTsKICAgICBMYXlvdXRVbml0IGZsZXhlZENvbnRlbnRTaXplOwogICAgIGJvb2wg ZnJvemVuOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guY3BwCmluZGV4IGU5MGRjMWE4YWQyYzEyNDA4ZDgwMjY0ZmZkMTdiY2E5MGQyYTkyMzkuLjgw N2Y3M2U2OTQ2MzMxNjY2Yjc0ZGM0ZjQ0YTM2MjdlMjI5NDVjNTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMTIwNiwxOSArMTIwNiwx NyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpwcmVwYXJlT3JkZXJJdGVyYXRvckFuZE1hcmdp bnMoKQogICAgIH0KIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hp bGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgY2hpbGRTaXpl KQorc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlRmxleEl0ZW1NaW5NYXhTaXplcyhSZW5kZXJCb3gmIGNoaWxkKQogewogICAgIExlbmd0 aCBtYXggPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1heFNpemUsIGNoaWxkKTsKICAgICBPcHRp b25hbDxMYXlvdXRVbml0PiBtYXhFeHRlbnQgPSBXVEY6Om51bGxvcHQ7Ci0gICAgaWYgKG1heC5p c1NwZWNpZmllZE9ySW50cmluc2ljKCkpIHsKKyAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRy aW5zaWMoKSkKICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hp bGQoY2hpbGQsIE1heFNpemUsIG1heCk7Ci0gICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNo aWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlT3IoY2hpbGRTaXplKSk7Ci0gICAgfQogCiAgICAgTGVu Z3RoIG1pbiA9IG1haW5TaXplTGVuZ3RoRm9yQ2hpbGQoTWluU2l6ZSwgY2hpbGQpOwogICAgIC8v IEludHJpbnNpYyBzaXplcyBpbiBjaGlsZCdzIGJsb2NrIGF4aXMgYXJlIGhhbmRsZWQgYnkgdGhl IG1pbi1zaXplOmF1dG8gY29kZSBwYXRoLgogICAgIGlmIChtaW4uaXNTcGVjaWZpZWQoKSB8fCAo bWluLmlzSW50cmluc2ljKCkgJiYgbWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpKQot ICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1heCgwX2x1LCBjb21wdXRl TWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWluU2l6ZSwgbWluKS52YWx1ZU9yKGNoaWxk U2l6ZSkpKTsKKyAgICAgICAgcmV0dXJuIHsgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQo Y2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVPcigwX2x1KSwgbWF4RXh0ZW50LnZhbHVlX29yKExh eW91dFVuaXQ6Om1heCgpKSB9OwogICAgIAogICAgIGlmIChzaG91bGRBcHBseU1pblNpemVBdXRv Rm9yQ2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgbWluIHZhbHVlIGlz IGV4cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1cCB3aXRoIGEgbm9u IG9wdGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgYW5kCkBA IC0xMjM5LDE5ICsxMjM3LDE5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVz dENoaWxkU2l6ZUZvck1pbkFuZE1heChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvCiAgICAgICAgICAg ICBMYXlvdXRVbml0IHJlc29sdmVkTWFpblNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JD aGlsZChjaGlsZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgbWFpblNpemUpLnZhbHVlT3IoMCk7CiAg ICAgICAgICAgICBBU1NFUlQocmVzb2x2ZWRNYWluU2l6ZSA+PSAwKTsKICAgICAgICAgICAgIExh eW91dFVuaXQgc3BlY2lmaWVkU2l6ZSA9IHN0ZDo6bWluKHJlc29sdmVkTWFpblNpemUsIG1heEV4 dGVudC52YWx1ZU9yKHJlc29sdmVkTWFpblNpemUpKTsKLSAgICAgICAgICAgIHJldHVybiBzdGQ6 Om1heChjaGlsZFNpemUsIHN0ZDo6bWluKHNwZWNpZmllZFNpemUsIGNvbnRlbnRTaXplKSk7Cisg ICAgICAgICAgICByZXR1cm4geyBzdGQ6Om1pbihzcGVjaWZpZWRTaXplLCBjb250ZW50U2l6ZSks IG1heEV4dGVudC52YWx1ZV9vcihMYXlvdXRVbml0OjptYXgoKSkgfTsKICAgICAgICAgfQogCiAg ICAgICAgIGlmIChjaGlsZC5pc1JlbmRlclJlcGxhY2VkKCkgJiYgKHVzZUNoaWxkQXNwZWN0UmF0 aW8oY2hpbGQpIHx8IGNoaWxkQ3Jvc3NTaXplU2hvdWxkVXNlQ29udGFpbmVyQ3Jvc3NTaXplKGNo aWxkKSkpIHsKICAgICAgICAgICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRTaXplID0gY29tcHV0 ZU1haW5TaXplRnJvbUFzcGVjdFJhdGlvVXNpbmcoY2hpbGQsIGNoaWxkQ3Jvc3NTaXplTGVuZ3Ro KTsKICAgICAgICAgICAgIHRyYW5zZmVycmVkU2l6ZSA9IGFkanVzdENoaWxkU2l6ZUZvckFzcGVj dFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNoaWxkLCB0cmFuc2ZlcnJlZFNpemUpOwotICAgICAg ICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4odHJhbnNmZXJyZWRTaXpl LCBjb250ZW50U2l6ZSkpOworICAgICAgICAgICAgcmV0dXJuIHsgc3RkOjptaW4odHJhbnNmZXJy ZWRTaXplLCBjb250ZW50U2l6ZSksIG1heEV4dGVudC52YWx1ZV9vcihMYXlvdXRVbml0OjptYXgo KSkgfTsKICAgICAgICAgfQogCi0gICAgICAgIHJldHVybiBzdGQ6Om1heChjaGlsZFNpemUsIGNv bnRlbnRTaXplKTsKKyAgICAgICAgcmV0dXJuIHsgY29udGVudFNpemUsIG1heEV4dGVudC52YWx1 ZV9vcihMYXlvdXRVbml0OjptYXgoKSkgfTsKICAgICB9CiAKLSAgICByZXR1cm4gc3RkOjptYXgo MF9sdSwgY2hpbGRTaXplKTsKKyAgICByZXR1cm4geyAwX2x1LCBtYXhFeHRlbnQudmFsdWVfb3Io TGF5b3V0VW5pdDo6bWF4KCkpIH07CiB9CiAgICAgCiBib29sIFJlbmRlckZsZXhpYmxlQm94Ojp1 c2VDaGlsZE92ZXJyaWRpbmdDcm9zc1NpemVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjb25zdCBS ZW5kZXJCb3gmIGNoaWxkKQpAQCAtMTMzOCw5ICsxMzM2LDggQEAgRmxleEl0ZW0gUmVuZGVyRmxl eGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtKFJlbmRlckJveCYgY2hpbGQsIGJvb2wgcmVsYXlv dXRDaGkKICAgICAKICAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250 YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hp bGQudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CiAgICAgTGF5b3V0VW5pdCBjaGls ZElubmVyRmxleEJhc2VTaXplID0gY29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoY2hp bGQsIGJvcmRlckFuZFBhZGRpbmcpOwotICAgIExheW91dFVuaXQgY2hpbGRNaW5NYXhBcHBsaWVk TWFpbkF4aXNFeHRlbnQgPSBhZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY2hpbGQsIGNoaWxk SW5uZXJGbGV4QmFzZVNpemUpOwogICAgIExheW91dFVuaXQgbWFyZ2luID0gaXNIb3Jpem9udGFs RmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbE1hcmdpbkV4dGVudCgpIDogY2hpbGQudmVydGljYWxN YXJnaW5FeHRlbnQoKTsKLSAgICByZXR1cm4gRmxleEl0ZW0oY2hpbGQsIGNoaWxkSW5uZXJGbGV4 QmFzZVNpemUsIGNoaWxkTWluTWF4QXBwbGllZE1haW5BeGlzRXh0ZW50LCBib3JkZXJBbmRQYWRk aW5nLCBtYXJnaW4pOworICAgIHJldHVybiBGbGV4SXRlbShjaGlsZCwgY2hpbGRJbm5lckZsZXhC YXNlU2l6ZSwgYm9yZGVyQW5kUGFkZGluZywgbWFyZ2luLCBjb21wdXRlRmxleEl0ZW1NaW5NYXhT aXplcyhjaGlsZCkpOwogfQogICAgIAogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6ZnJlZXplVmlv bGF0aW9ucyhWZWN0b3I8RmxleEl0ZW0qPiYgdmlvbGF0aW9ucywgTGF5b3V0VW5pdCYgYXZhaWxh YmxlRnJlZVNwYWNlLCBkb3VibGUmIHRvdGFsRmxleEdyb3csIGRvdWJsZSYgdG90YWxGbGV4U2hy aW5rLCBkb3VibGUmIHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5rKQpAQCAtMTQxNCw4ICsxNDExLDgg QEAgYm9vbCBSZW5kZXJGbGV4aWJsZUJveDo6cmVzb2x2ZUZsZXhpYmxlTGVuZ3RocyhGbGV4U2ln biBmbGV4U2lnbiwgVmVjdG9yPEZsZXhJdGUKICAgICAgICAgICAgIGV4dHJhU3BhY2UgPSByZW1h aW5pbmdGcmVlU3BhY2UgKiBjaGlsZC5zdHlsZSgpLmZsZXhTaHJpbmsoKSAqIGZsZXhJdGVtLmZs ZXhCYXNlQ29udGVudFNpemUgLyB0b3RhbFdlaWdodGVkRmxleFNocmluazsKICAgICAgICAgaWYg KHN0ZDo6aXNmaW5pdGUoZXh0cmFTcGFjZSkpCiAgICAgICAgICAgICBjaGlsZFNpemUgKz0gTGF5 b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQoZXh0cmFTcGFjZSk7Ci0gICAgICAgIAotICAgICAgICBM YXlvdXRVbml0IGFkanVzdGVkQ2hpbGRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4 KGNoaWxkLCBjaGlsZFNpemUpOworCisgICAgICAgIExheW91dFVuaXQgYWRqdXN0ZWRDaGlsZFNp emUgPSBmbGV4SXRlbS5jb25zdHJhaW5TaXplQnlNaW5NYXgoY2hpbGRTaXplKTsKICAgICAgICAg QVNTRVJUKGFkanVzdGVkQ2hpbGRTaXplID49IDApOwogICAgICAgICBmbGV4SXRlbS5mbGV4ZWRD b250ZW50U2l6ZSA9IGFkanVzdGVkQ2hpbGRTaXplOwogICAgICAgICB1c2VkRnJlZVNwYWNlICs9 IGFkanVzdGVkQ2hpbGRTaXplIC0gZmxleEl0ZW0uZmxleEJhc2VDb250ZW50U2l6ZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggNjRiYTg2Nzky ZWEyYjk2Mzc5NDcwZTE1MTUwMGUzMTYxODkyOWJkMC4uNDE2MDhiNDZhZTVhYjU0OGRhZWIyNTVl YTNmYzczZGIwYWMxYmY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmgKQEAgLTE3Myw3ICsxNzMsNyBAQCBwcml2YXRlOgogICAgIAogICAgIExheW91 dFVuaXQgY29tcHV0ZUNoaWxkTWFyZ2luVmFsdWUoTGVuZ3RoIG1hcmdpbik7CiAgICAgdm9pZCBw cmVwYXJlT3JkZXJJdGVyYXRvckFuZE1hcmdpbnMoKTsKLSAgICBMYXlvdXRVbml0IGFkanVzdENo aWxkU2l6ZUZvck1pbkFuZE1heChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6 ZSk7CisgICAgc3RkOjpwYWlyPExheW91dFVuaXQsIExheW91dFVuaXQ+IGNvbXB1dGVGbGV4SXRl bU1pbk1heFNpemVzKFJlbmRlckJveCYgY2hpbGQpOwogICAgIExheW91dFVuaXQgYWRqdXN0Q2hp bGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY29uc3QgUmVuZGVyQm94JiBj aGlsZCwgTGF5b3V0VW5pdCBjaGlsZFNpemUpOwogICAgIEZsZXhJdGVtIGNvbnN0cnVjdEZsZXhJ dGVtKFJlbmRlckJveCYsIGJvb2wgcmVsYXlvdXRDaGlsZHJlbik7CiAgICAgCg== 430193 2021-05-31 03:09:31 -0700 2021-06-14 13:50:39 -0700 Patch bug-226463-20210531120930.patch text/plain 10425 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4Mjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQzOWUyY2Y2MWUwMGZj MDVkZjAxZTczZDBkZDJmMjRhNTdiOWRmZS4uZDg4Y2IyMGE4NThkZjY3ZTA2OWM3Mzk0MTg2YTVi ZmE3ZTI0MWU3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIxLTA1LTMxICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl eGJveF0gRG8gbm90IGNvbXB1dGUgdGhlIG1pbi1tYXggc2l6ZXMgb2YgZmxleCBpdGVtcyB0d2lj ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2NDYz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBk ZXRlcm1pbmluZyB0aGUgZmxleCBiYXNlIHNpemUsIHRoZSBpdGVt4oCZcyBtaW4gYW5kIG1heCBt YWluIHNpemVzIGFyZSBpZ25vcmVkIChubyBjbGFtcGluZyBvY2N1cnMpLgorICAgICAgICBUaG9z ZSBsaW1pdHMgYXJlIHVzZWQgdG8gY29tcHV0ZSB0aGUgaXRlbSdzIGh5cG90aGV0aWNhbCBtYWlu IHNpemUgYW5kIGFsc28gbGF0ZXIgd2hlbiB0aGUgZmxleGlibGUKKyAgICAgICAgbGVuZ3RocyBh cmUgcmVzb2x2ZWQuIFRoZSB0aGluZyBpcyB0aGF0IHdlIHdlcmUgcnVubmluZyB0aGUgY29kZSB0 aGF0IGNsYW1wcyB0aGUgZmxleCBpdGVtIHNpemUgdHdpY2UgaW5zdGVhZAorICAgICAgICBvZiBj b21wdXRpbmcgdGhvc2UgbGltaXRzIG9uY2UgYW5kIGFwcGx5IHRoZW0gdHdpY2UuCisKKyAgICAg ICAgRnJvbSBub3cgb25lLCB3ZSBqdXN0IGNvbXB1dGUgdGhlbSBvbmNlIGFuZCBzdG9yZSB0aGUg bGltaXRzIGluIGEgc3RkOjpwYWlyIGluIHRoZSBGbGV4SXRlbSBjbGFzcy4gVGhpcyBtZWFucwor ICAgICAgICB0aGF0IHRoZSBGbGV4SXRlbSBpcyBhYmxlIHRvIGNvbXB1dGUgdGhlIGh5cG90aGV0 aWNhbCBtYWluIHNpemUgb24gaXRzIG93biBhbmQgZG9lcyBub3QgbmVlZCBpdCB0byBiZSBwYXNz ZWQKKyAgICAgICAgYXMgYW4gYXJndW1lbnQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRo aXMgaXMgYWxyZWFkeSBiZWluZyB0ZXN0ZWQgYnkgZG96ZW5zIG9mIHRlc3RzLgorCisgICAgICAg ICogcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZsZXhJdGVtOjpGbGV4SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpGbGV4SXRlbTo6Y29uc3Ry YWluU2l6ZUJ5TWluTWF4IGNvbnN0KTogQ2xhbXAgdGhlIHBhc3NlZCBpbiBzaXplIGJ5IHRoZSBz dG9yZWQgbWluICYgbWF4IHNpemVzLgorICAgICAgICAqIHJlbmRlcmluZy9GbGV4aWJsZUJveEFs Z29yaXRobS5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhJdGVtTWluTWF4 U2l6ZXMpOiBSZW5hbWVkIGZyb20gYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4IGFuZAorICAg ICAgICB3aXRob3V0IHRoZSBjaGlsZFNpemUgYXJndW1lbnQgd2hpY2ggaXMgbm8gbG9uZ2VyIG5l ZWRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4 SXRlbSk6IFVzZSBjb25zdHJhaW5TaXplQnlNaW5NYXguCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJGbGV4aWJsZUJveDo6cmVzb2x2ZUZsZXhpYmxlTGVuZ3Rocyk6IERpdHRvLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heCk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisKIDIw MjEtMDUtMzEgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBUcmVhdCB3 aWR0aDogaW50cmluc2ljIGFzIG5vbiBkZWZpbml0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5jcHAKaW5kZXggODQ0NjY3MmMyODY3ZjlmYzE0 M2U5NTYyZGQ2ZGVjZjljZmU2MzgzOC4uMzMwNjEyZTEwNGY1NjNjOGVjY2VkOTA5NjJmZDllYmVk YThkMTJlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94 QWxnb3JpdGhtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxleGlibGVCb3hB bGdvcml0aG0uY3BwCkBAIC0zNSwxMiArMzUsMTMgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1GbGV4SXRlbTo6RmxleEl0ZW0oUmVuZGVyQm94JiBib3gsIExheW91dFVuaXQgZmxleEJhc2VD b250ZW50U2l6ZSwgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemUsIExheW91 dFVuaXQgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nLCBMYXlvdXRVbml0IG1haW5BeGlzTWFyZ2lu KQorRmxleEl0ZW06OkZsZXhJdGVtKFJlbmRlckJveCYgYm94LCBMYXlvdXRVbml0IGZsZXhCYXNl Q29udGVudFNpemUsIExheW91dFVuaXQgbWFpbkF4aXNCb3JkZXJBbmRQYWRkaW5nLCBMYXlvdXRV bml0IG1haW5BeGlzTWFyZ2luLCBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gbWlu TWF4U2l6ZXMpCiAgICAgOiBib3goYm94KQogICAgICwgZmxleEJhc2VDb250ZW50U2l6ZShmbGV4 QmFzZUNvbnRlbnRTaXplKQotICAgICwgaHlwb3RoZXRpY2FsTWFpbkNvbnRlbnRTaXplKGh5cG90 aGV0aWNhbE1haW5Db250ZW50U2l6ZSkKICAgICAsIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZyht YWluQXhpc0JvcmRlckFuZFBhZGRpbmcpCiAgICAgLCBtYWluQXhpc01hcmdpbihtYWluQXhpc01h cmdpbikKKyAgICAsIG1pbk1heFNpemVzKG1pbk1heFNpemVzKQorICAgICwgaHlwb3RoZXRpY2Fs TWFpbkNvbnRlbnRTaXplKGNvbnN0cmFpblNpemVCeU1pbk1heChmbGV4QmFzZUNvbnRlbnRTaXpl KSkKICAgICAsIGZyb3plbihmYWxzZSkKIHsKICAgICBBU1NFUlQoIWJveC5pc091dE9mRmxvd1Bv c2l0aW9uZWQoKSk7CkBAIC04Niw0ICs4Nyw5IEBAIGJvb2wgRmxleExheW91dEFsZ29yaXRobTo6 Y29tcHV0ZU5leHRGbGV4TGluZShzaXplX3QmIG5leHRJbmRleCwgVmVjdG9yPEZsZXhJdGVtCiAg ICAgcmV0dXJuIGxpbmVJdGVtcy5zaXplKCkgPiAwOwogfQogCitMYXlvdXRVbml0IEZsZXhJdGVt Ojpjb25zdHJhaW5TaXplQnlNaW5NYXgoY29uc3QgTGF5b3V0VW5pdCBzaXplKSBjb25zdAorewor ICAgIHJldHVybiBzdGQ6Om1heChtaW5NYXhTaXplcy5maXJzdCwgc3RkOjptaW4oc2l6ZSwgbWlu TWF4U2l6ZXMuc2Vjb25kKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbGV4aWJsZUJveEFsZ29yaXRobS5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgKaW5kZXggNDAwYWZj OTMwNWQwY2MxNGIxOTU3MDM3MGMwYzIxMzQ5MDY2NWIzOS4uM2JiOTA5NDZiOWFjMWEzOWQ4MmYy Yzc1OTQ2NmE1OTJiMzcwYzZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0ZsZXhpYmxlQm94QWxnb3JpdGhtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zs ZXhpYmxlQm94QWxnb3JpdGhtLmgKQEAgLTQxLDcgKzQxLDcgQEAgY2xhc3MgUmVuZGVyQm94Owog CiBjbGFzcyBGbGV4SXRlbSB7CiBwdWJsaWM6Ci0gICAgRmxleEl0ZW0oUmVuZGVyQm94JiwgTGF5 b3V0VW5pdCBmbGV4QmFzZUNvbnRlbnRTaXplLCBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5D b250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcsIExheW91dFVu aXQgbWFpbkF4aXNNYXJnaW4pOworICAgIEZsZXhJdGVtKFJlbmRlckJveCYsIExheW91dFVuaXQg ZmxleEJhc2VDb250ZW50U2l6ZSwgTGF5b3V0VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmcs IExheW91dFVuaXQgbWFpbkF4aXNNYXJnaW4sIHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRV bml0PiBtaW5NYXhTaXplcyk7CiAKICAgICBMYXlvdXRVbml0IGh5cG90aGV0aWNhbE1haW5BeGlz TWFyZ2luQm94U2l6ZSgpIGNvbnN0CiAgICAgewpAQCAtNTgsMTEgKzU4LDE0IEBAIHB1YmxpYzoK ICAgICAgICAgcmV0dXJuIGZsZXhlZENvbnRlbnRTaXplICsgbWFpbkF4aXNCb3JkZXJBbmRQYWRk aW5nICsgbWFpbkF4aXNNYXJnaW47CiAgICAgfQogCisgICAgTGF5b3V0VW5pdCBjb25zdHJhaW5T aXplQnlNaW5NYXgoY29uc3QgTGF5b3V0VW5pdCkgY29uc3Q7CisKICAgICBSZW5kZXJCb3gmIGJv eDsKICAgICBjb25zdCBMYXlvdXRVbml0IGZsZXhCYXNlQ29udGVudFNpemU7Ci0gICAgY29uc3Qg TGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQ29udGVudFNpemU7CiAgICAgY29uc3QgTGF5b3V0 VW5pdCBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmc7CiAgICAgY29uc3QgTGF5b3V0VW5pdCBtYWlu QXhpc01hcmdpbjsKKyAgICBjb25zdCBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4g bWluTWF4U2l6ZXM7CisgICAgY29uc3QgTGF5b3V0VW5pdCBoeXBvdGhldGljYWxNYWluQ29udGVu dFNpemU7CiAgICAgTGF5b3V0VW5pdCBmbGV4ZWRDb250ZW50U2l6ZTsKICAgICBib29sIGZyb3pl bjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cAppbmRleCA4NzU5M2Q2ODZjMWZkM2FkZjllNDg4OGEyNGJiOWU5YjIwMjFjZWQ2Li4wYTc1ZWNj MzU2NTE4MzJhMGJhOWVmZjZkYjBkOGM5ODE4NTQyZTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEyMDYsMTkgKzEyMDYsMTcgQEAg dm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6cHJlcGFyZU9yZGVySXRlcmF0b3JBbmRNYXJnaW5zKCkK ICAgICB9CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6 ZUZvck1pbkFuZE1heChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSkKK3N0 ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0 ZUZsZXhJdGVtTWluTWF4U2l6ZXMoUmVuZGVyQm94JiBjaGlsZCkKIHsKICAgICBMZW5ndGggbWF4 ID0gbWFpblNpemVMZW5ndGhGb3JDaGlsZChNYXhTaXplLCBjaGlsZCk7CiAgICAgc3RkOjpvcHRp b25hbDxMYXlvdXRVbml0PiBtYXhFeHRlbnQgPSBzdGQ6Om51bGxvcHQ7Ci0gICAgaWYgKG1heC5p c1NwZWNpZmllZE9ySW50cmluc2ljKCkpIHsKKyAgICBpZiAobWF4LmlzU3BlY2lmaWVkT3JJbnRy aW5zaWMoKSkKICAgICAgICAgbWF4RXh0ZW50ID0gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hp bGQoY2hpbGQsIE1heFNpemUsIG1heCk7Ci0gICAgICAgIGNoaWxkU2l6ZSA9IHN0ZDo6bWluKGNo aWxkU2l6ZSwgbWF4RXh0ZW50LnZhbHVlX29yKGNoaWxkU2l6ZSkpOwotICAgIH0KIAogICAgIExl bmd0aCBtaW4gPSBtYWluU2l6ZUxlbmd0aEZvckNoaWxkKE1pblNpemUsIGNoaWxkKTsKICAgICAv LyBJbnRyaW5zaWMgc2l6ZXMgaW4gY2hpbGQncyBibG9jayBheGlzIGFyZSBoYW5kbGVkIGJ5IHRo ZSBtaW4tc2l6ZTphdXRvIGNvZGUgcGF0aC4KICAgICBpZiAobWluLmlzU3BlY2lmaWVkKCkgfHwg KG1pbi5pc0ludHJpbnNpYygpICYmIG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMoY2hpbGQpKSkK LSAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptYXgoMF9sdSwgY29tcHV0 ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQoY2hpbGQsIE1pblNpemUsIG1pbikudmFsdWVfb3IoY2hp bGRTaXplKSkpOworICAgICAgICByZXR1cm4geyBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGls ZChjaGlsZCwgTWluU2l6ZSwgbWluKS52YWx1ZV9vcigwX2x1KSwgbWF4RXh0ZW50LnZhbHVlX29y KExheW91dFVuaXQ6Om1heCgpKSB9OwogICAgIAogICAgIGlmIChzaG91bGRBcHBseU1pblNpemVB dXRvRm9yQ2hpbGQoY2hpbGQpKSB7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgbWluIHZhbHVl IGlzIGV4cGVjdGVkIHRvIGJlIHZhbGlkIGhlcmUsIHdlIG5lZWQgdG8gY29tZSB1cCB3aXRoIGEg bm9uIG9wdGlvbmFsIHZlcnNpb24gb2YgY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgYW5k CkBAIC0xMjM5LDE5ICsxMjM3LDE5IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFk anVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChSZW5kZXJCb3gmIGNoaWxkLCBMYXlvCiAgICAgICAg ICAgICBMYXlvdXRVbml0IHJlc29sdmVkTWFpblNpemUgPSBjb21wdXRlTWFpbkF4aXNFeHRlbnRG b3JDaGlsZChjaGlsZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgbWFpblNpemUpLnZhbHVlX29yKDAp OwogICAgICAgICAgICAgQVNTRVJUKHJlc29sdmVkTWFpblNpemUgPj0gMCk7CiAgICAgICAgICAg ICBMYXlvdXRVbml0IHNwZWNpZmllZFNpemUgPSBzdGQ6Om1pbihyZXNvbHZlZE1haW5TaXplLCBt YXhFeHRlbnQudmFsdWVfb3IocmVzb2x2ZWRNYWluU2l6ZSkpOwotICAgICAgICAgICAgcmV0dXJu IHN0ZDo6bWF4KGNoaWxkU2l6ZSwgc3RkOjptaW4oc3BlY2lmaWVkU2l6ZSwgY29udGVudFNpemUp KTsKKyAgICAgICAgICAgIHJldHVybiB7IHN0ZDo6bWluKHNwZWNpZmllZFNpemUsIGNvbnRlbnRT aXplKSwgbWF4RXh0ZW50LnZhbHVlX29yKExheW91dFVuaXQ6Om1heCgpKSB9OwogICAgICAgICB9 CiAKICAgICAgICAgaWYgKGNoaWxkLmlzUmVuZGVyUmVwbGFjZWQoKSAmJiAodXNlQ2hpbGRBc3Bl Y3RSYXRpbyhjaGlsZCkgfHwgY2hpbGRDcm9zc1NpemVTaG91bGRVc2VDb250YWluZXJDcm9zc1Np emUoY2hpbGQpKSkgewogICAgICAgICAgICAgTGF5b3V0VW5pdCB0cmFuc2ZlcnJlZFNpemUgPSBj b21wdXRlTWFpblNpemVGcm9tQXNwZWN0UmF0aW9Vc2luZyhjaGlsZCwgY2hpbGRDcm9zc1NpemVM ZW5ndGgpOwogICAgICAgICAgICAgdHJhbnNmZXJyZWRTaXplID0gYWRqdXN0Q2hpbGRTaXplRm9y QXNwZWN0UmF0aW9Dcm9zc0F4aXNNaW5BbmRNYXgoY2hpbGQsIHRyYW5zZmVycmVkU2l6ZSk7Ci0g ICAgICAgICAgICByZXR1cm4gc3RkOjptYXgoY2hpbGRTaXplLCBzdGQ6Om1pbih0cmFuc2ZlcnJl ZFNpemUsIGNvbnRlbnRTaXplKSk7CisgICAgICAgICAgICByZXR1cm4geyBzdGQ6Om1pbih0cmFu c2ZlcnJlZFNpemUsIGNvbnRlbnRTaXplKSwgbWF4RXh0ZW50LnZhbHVlX29yKExheW91dFVuaXQ6 Om1heCgpKSB9OwogICAgICAgICB9CiAKLSAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGNoaWxkU2l6 ZSwgY29udGVudFNpemUpOworICAgICAgICByZXR1cm4geyBjb250ZW50U2l6ZSwgbWF4RXh0ZW50 LnZhbHVlX29yKExheW91dFVuaXQ6Om1heCgpKSB9OwogICAgIH0KIAotICAgIHJldHVybiBzdGQ6 Om1heCgwX2x1LCBjaGlsZFNpemUpOworICAgIHJldHVybiB7IDBfbHUsIG1heEV4dGVudC52YWx1 ZV9vcihMYXlvdXRVbml0OjptYXgoKSkgfTsKIH0KICAgICAKIGJvb2wgUmVuZGVyRmxleGlibGVC b3g6OnVzZUNoaWxkT3ZlcnJpZGluZ0Nyb3NzU2l6ZUZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNv bnN0IFJlbmRlckJveCYgY2hpbGQpCkBAIC0xMzM4LDkgKzEzMzYsOCBAQCBGbGV4SXRlbSBSZW5k ZXJGbGV4aWJsZUJveDo6Y29uc3RydWN0RmxleEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9vbCBy ZWxheW91dENoaQogICAgIAogICAgIExheW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZyA9IGlzSG9y aXpvbnRhbEZsb3coKSA/IGNoaWxkLmhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCkg OiBjaGlsZC52ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKTsKICAgICBMYXlvdXRVbml0 IGNoaWxkSW5uZXJGbGV4QmFzZVNpemUgPSBjb21wdXRlSW5uZXJGbGV4QmFzZVNpemVGb3JDaGls ZChjaGlsZCwgYm9yZGVyQW5kUGFkZGluZyk7Ci0gICAgTGF5b3V0VW5pdCBjaGlsZE1pbk1heEFw cGxpZWRNYWluQXhpc0V4dGVudCA9IGFkanVzdENoaWxkU2l6ZUZvck1pbkFuZE1heChjaGlsZCwg Y2hpbGRJbm5lckZsZXhCYXNlU2l6ZSk7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBpc0hvcml6 b250YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCkgOiBjaGlsZC52ZXJ0 aWNhbE1hcmdpbkV4dGVudCgpOwotICAgIHJldHVybiBGbGV4SXRlbShjaGlsZCwgY2hpbGRJbm5l ckZsZXhCYXNlU2l6ZSwgY2hpbGRNaW5NYXhBcHBsaWVkTWFpbkF4aXNFeHRlbnQsIGJvcmRlckFu ZFBhZGRpbmcsIG1hcmdpbik7CisgICAgcmV0dXJuIEZsZXhJdGVtKGNoaWxkLCBjaGlsZElubmVy RmxleEJhc2VTaXplLCBib3JkZXJBbmRQYWRkaW5nLCBtYXJnaW4sIGNvbXB1dGVGbGV4SXRlbU1p bk1heFNpemVzKGNoaWxkKSk7CiB9CiAgICAgCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpmcmVl emVWaW9sYXRpb25zKFZlY3RvcjxGbGV4SXRlbSo+JiB2aW9sYXRpb25zLCBMYXlvdXRVbml0JiBh dmFpbGFibGVGcmVlU3BhY2UsIGRvdWJsZSYgdG90YWxGbGV4R3JvdywgZG91YmxlJiB0b3RhbEZs ZXhTaHJpbmssIGRvdWJsZSYgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmspCkBAIC0xNDE0LDggKzE0 MTEsOCBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpyZXNvbHZlRmxleGlibGVMZW5ndGhzKEZs ZXhTaWduIGZsZXhTaWduLCBWZWN0b3I8RmxleEl0ZQogICAgICAgICAgICAgZXh0cmFTcGFjZSA9 IHJlbWFpbmluZ0ZyZWVTcGFjZSAqIGNoaWxkLnN0eWxlKCkuZmxleFNocmluaygpICogZmxleEl0 ZW0uZmxleEJhc2VDb250ZW50U2l6ZSAvIHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5rOwogICAgICAg ICBpZiAoc3RkOjppc2Zpbml0ZShleHRyYVNwYWNlKSkKICAgICAgICAgICAgIGNoaWxkU2l6ZSAr PSBMYXlvdXRVbml0Ojpmcm9tRmxvYXRSb3VuZChleHRyYVNwYWNlKTsKLSAgICAgICAgCi0gICAg ICAgIExheW91dFVuaXQgYWRqdXN0ZWRDaGlsZFNpemUgPSBhZGp1c3RDaGlsZFNpemVGb3JNaW5B bmRNYXgoY2hpbGQsIGNoaWxkU2l6ZSk7CisKKyAgICAgICAgTGF5b3V0VW5pdCBhZGp1c3RlZENo aWxkU2l6ZSA9IGZsZXhJdGVtLmNvbnN0cmFpblNpemVCeU1pbk1heChjaGlsZFNpemUpOwogICAg ICAgICBBU1NFUlQoYWRqdXN0ZWRDaGlsZFNpemUgPj0gMCk7CiAgICAgICAgIGZsZXhJdGVtLmZs ZXhlZENvbnRlbnRTaXplID0gYWRqdXN0ZWRDaGlsZFNpemU7CiAgICAgICAgIHVzZWRGcmVlU3Bh Y2UgKz0gYWRqdXN0ZWRDaGlsZFNpemUgLSBmbGV4SXRlbS5mbGV4QmFzZUNvbnRlbnRTaXplOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCBmY2Ni NDA3YjcxMTQ0ZWEwNDRmZmNlNGVjZmMxODIwMzFjNzYzZmUwLi4zZTE0YTk4OTRiMmU5NTkyZTMx MTc2NzE1NGQxZjQ0ZWI3MTlmMzJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guaApAQCAtMTczLDcgKzE3Myw3IEBAIHByaXZhdGU6CiAgICAgCiAgICAg TGF5b3V0VW5pdCBjb21wdXRlQ2hpbGRNYXJnaW5WYWx1ZShMZW5ndGggbWFyZ2luKTsKICAgICB2 b2lkIHByZXBhcmVPcmRlckl0ZXJhdG9yQW5kTWFyZ2lucygpOwotICAgIExheW91dFVuaXQgYWRq dXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCYgY2hpbGQsIExheW91dFVuaXQgY2hp bGRTaXplKTsKKyAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4gY29tcHV0ZUZs ZXhJdGVtTWluTWF4U2l6ZXMoUmVuZGVyQm94JiBjaGlsZCk7CiAgICAgTGF5b3V0VW5pdCBhZGp1 c3RDaGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjb25zdCBSZW5kZXJC b3gmIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSk7CiAgICAgRmxleEl0ZW0gY29uc3RydWN0 RmxleEl0ZW0oUmVuZGVyQm94JiwgYm9vbCByZWxheW91dENoaWxkcmVuKTsKICAgICAK