241772 2022-06-19 19:23:06 -0700 TextureMapper: mask should be applied after filter is applied 2022-06-21 20:10:14 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii cmarcelo don.olmstead ews-watchlist kondapallykalyan luiz magomez webkit-bug-importer zdobersek oldest_to_newest 1876715 0 460343 fujii 2022-06-19 19:23:06 -0700 Created attachment 460343 test case TextureMapper: mask and clip should be applied after filter is applied 1876717 1 460344 fujii 2022-06-19 20:11:35 -0700 Created attachment 460344 mask and filter 1876732 2 460347 fujii 2022-06-19 23:11:20 -0700 Created attachment 460347 Patch 1876734 3 460348 fujii 2022-06-19 23:13:23 -0700 Created attachment 460348 Patch 1877198 4 ews-feeder 2022-06-21 20:09:35 -0700 Committed r295717 (251722@main): <https://commits.webkit.org/251722@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460348. 1877199 5 webkit-bug-importer 2022-06-21 20:10:14 -0700 <rdar://problem/95656758> 460343 2022-06-19 19:23:06 -0700 2022-06-19 22:56:06 -0700 test case a.html text/html 295 fujii PCFET0NUWVBFIGh0bWw+DQo8c3R5bGU+DQogZGl2IHsNCiAgICAgd2lkdGg6IDIwMHB4Ow0KICAg ICBoZWlnaHQ6IDIwMHB4Ow0KICAgICBiYWNrZ3JvdW5kOiBncmVlbjsNCiAgICAgZmlsdGVyOiBk cm9wLXNoYWRvdyg1MHB4IDUwcHggMHB4IHJlZCk7DQogICAgIHdpbGwtY2hhbmdlOiB0cmFuc2Zv cm07DQogICAgIGNsaXA6IHJlY3QoMCwgMTAwcHgsIDEwMHB4LCAwKTsNCiAgICAgcG9zaXRpb246 IGFic29sdXRlOw0KIH0NCjwvc3R5bGU+DQoNCllvdSBzaG91bGQgc2VlIG5vIHJlZC4NCg0KPGRp dj48L2Rpdj4NCg== 460344 2022-06-19 20:11:35 -0700 2022-06-19 20:11:35 -0700 mask and filter a.html text/html 327 fujii PCFET0NUWVBFIGh0bWw+DQo8c3R5bGU+DQogZGl2IHsNCiAgICAgd2lkdGg6IDIwMHB4Ow0KICAg ICBoZWlnaHQ6IDIwMHB4Ow0KICAgICBiYWNrZ3JvdW5kOiBncmVlbjsNCiAgICAgZmlsdGVyOiBk cm9wLXNoYWRvdyg1MHB4IDUwcHggMHB4IHJlZCk7DQogICAgIHdpbGwtY2hhbmdlOiB0cmFuc2Zv cm07DQogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsNCiAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiBs aW5lYXItZ3JhZGllbnQoNDVkZWcsIGJsYWNrLCB0cmFuc3BhcmVudCk7DQogfQ0KPC9zdHlsZT4N Cg0KWW91IHNob3VsZCBzZWUgbm8gcmVkLg0KDQo8ZGl2PjwvZGl2Pg0K 460347 2022-06-19 23:11:20 -0700 2022-06-19 23:12:21 -0700 Patch bug-241772-20220620151119.patch text/plain 8782 fujii RnJvbSA2NDBjYTU1MDg0Y2NmNzRjZjkyMWVhNTlkYTczMmY1M2M0YWNkZjAxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBIaXJvbm9yaSA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CkRhdGU6IE1vbiwgMjAgSnVuIDIwMjIgMTU6MDE6MzkgKzA5MDAKU3ViamVjdDogW1BBVENI XSBUZXh0dXJlTWFwcGVyOiBtYXNrIHNob3VsZCBiZSBhcHBsaWVkIGFmdGVyIGZpbHRlciBpcyBh cHBsaWVkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNzcyCgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCklmIGFuIGVsZW1lbnQgaGFzIGJvdGggYSBtYXNr LWltYWdlIGFuZCBmaWx0ZXJzLCB0aGUgbWFzayBzaG91bGQgYmUKYXBwbGllZCBiZWZvcmUgdGhl IGZpbHRlcnMuCgpCaXRtYXBUZXh0dXJlR0w6OmFwcGx5RmlsdGVycyBkaWRuJ3QgYWN0dWFsbHkg YXBwbHkgdGhlIGxhc3QgZmlsdGVyLgpJdCBzdG9yZWQgdGhlIGxhc3QgZmlsdGVyIGluZm9ybWF0 aW9uIGluIGl0LCBhbmQgYXBwbGllZCB0aGUgbGFzdApmaWx0ZXIgd2hlbiBibGl0dGluZyBvbnRv IHRoZSB0YXJnZXQuIElmIHRoZSBlbGVtZW50IGhhcyBhIG1hc2ssCmFwcGx5RmlsdGVycyBzaG91 bGQgYXBwbHkgYWxsIGZpbHRlcnMgYmVmb3JlIGFwcGx5aW5nIHRoZSBtYXNrLgoKKiBMYXlvdXRU ZXN0cy9jb21wb3NpdGluZy9tYXNrcy9tYXNrLWFuZC1kcm9wLXNoYWRvdy1leHBlY3RlZC5odG1s OiBBZGRlZC4KKiBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9tYXNrcy9tYXNrLWFuZC1kcm9wLXNo YWRvdy5odG1sOiBBZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvQml0bWFwVGV4dHVyZS5oOgooV2ViQ29yZTo6Qml0bWFwVGV4dHVyZTo6YXBwbHlGaWx0ZXJz KToKKiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVy ZUdMLmNwcDoKKFdlYkNvcmU6OkJpdG1hcFRleHR1cmVHTDo6YXBwbHlGaWx0ZXJzKToKKiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmg6Ciog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXll ci5jcHA6CihXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9u cyk6CihXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50SW50b1N1cmZhY2UpOgotLS0K IC4uLi9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZS5oICAgfCAgMiArLQog Li4uL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlR0wuY3BwICAgICAgICB8IDEzICsrKysr LS0tLS0tLS0KIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmgg fCAgMiArLQogLi4uL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwICAgICB8 IDE4ICsrKysrKysrKystLS0tLS0tLQogLi4uL21hc2tzL21hc2stYW5kLWRyb3Atc2hhZG93LWV4 cGVjdGVkLmh0bWwgICB8IDE1ICsrKysrKysrKysrKysrKwogLi4uL21hc2tzL21hc2stYW5kLWRy b3Atc2hhZG93Lmh0bWwgICAgICAgICAgICB8IDE2ICsrKysrKysrKysrKysrKysKIDYgZmlsZXMg Y2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAx MDA2NDQgTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvbWFza3MvbWFzay1hbmQtZHJvcC1zaGFkb3ct ZXhwZWN0ZWQuaHRtbAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2NvbXBvc2l0aW5n L21hc2tzL21hc2stYW5kLWRyb3Atc2hhZG93Lmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZS5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmUuaAppbmRleCAwMWQ2 YTZjM2JmNmUuLjM2YmU5NDA0OWY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZS5oCkBAIC03OCw3ICs3OCw3IEBA IHB1YmxpYzoKICAgICBpbmxpbmUgaW50IG51bWJlck9mQnl0ZXMoKSBjb25zdCB7IHJldHVybiBz aXplKCkud2lkdGgoKSAqIHNpemUoKS5oZWlnaHQoKSAqIGJwcCgpID4+IDM7IH0KICAgICBpbmxp bmUgYm9vbCBpc09wYXF1ZSgpIGNvbnN0IHsgcmV0dXJuICEobV9mbGFncyAmIFN1cHBvcnRzQWxw aGEpOyB9CiAKLSAgICB2aXJ0dWFsIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiBhcHBseUZpbHRlcnMo VGV4dHVyZU1hcHBlciYsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmKSB7IHJldHVybiB0aGlzOyB9 CisgICAgdmlydHVhbCBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gYXBwbHlGaWx0ZXJzKFRleHR1cmVN YXBwZXImLCBjb25zdCBGaWx0ZXJPcGVyYXRpb25zJiwgYm9vbCkgeyByZXR1cm4gdGhpczsgfQog CiBwcm90ZWN0ZWQ6CiAgICAgSW50U2l6ZSBtX2NvbnRlbnRTaXplOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdM LmNwcAppbmRleCA5MWU4ZWE4MDE0YjcuLjdiNjlmOGFkOTNmMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVH TC5jcHAKQEAgLTIwMiw3ICsyMDIsNyBAQCBzdGF0aWMgdW5zaWduZWQgZ2V0UGFzc2VzUmVxdWly ZWRGb3JGaWx0ZXIoRmlsdGVyT3BlcmF0aW9uOjpPcGVyYXRpb25UeXBlIHR5cGUpCiAgICAgfQog fQogCi1SZWZQdHI8Qml0bWFwVGV4dHVyZT4gQml0bWFwVGV4dHVyZUdMOjphcHBseUZpbHRlcnMo VGV4dHVyZU1hcHBlciYgdGV4dHVyZU1hcHBlciwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYgZmls dGVycykKK1JlZlB0cjxCaXRtYXBUZXh0dXJlPiBCaXRtYXBUZXh0dXJlR0w6OmFwcGx5RmlsdGVy cyhUZXh0dXJlTWFwcGVyJiB0ZXh0dXJlTWFwcGVyLCBjb25zdCBGaWx0ZXJPcGVyYXRpb25zJiBm aWx0ZXJzLCBib29sIGRlZmVyc0xhc3RGaWx0ZXIpCiB7CiAgICAgaWYgKGZpbHRlcnMuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm4gdGhpczsKQEAgLTIyMiwxNyArMjIyLDE0IEBAIFJlZlB0cjxC aXRtYXBUZXh0dXJlPiBCaXRtYXBUZXh0dXJlR0w6OmFwcGx5RmlsdGVycyhUZXh0dXJlTWFwcGVy JiB0ZXh0dXJlTWFwcGVyCiAgICAgICAgIGludCBudW1QYXNzZXMgPSBnZXRQYXNzZXNSZXF1aXJl ZEZvckZpbHRlcihmaWx0ZXItPnR5cGUoKSk7CiAgICAgICAgIGZvciAoaW50IGogPSAwOyBqIDwg bnVtUGFzc2VzOyArK2opIHsKICAgICAgICAgICAgIGJvb2wgbGFzdCA9IChpID09IGZpbHRlcnMu c2l6ZSgpIC0gMSkgJiYgKGogPT0gbnVtUGFzc2VzIC0gMSk7Ci0gICAgICAgICAgICBpZiAoIWxh c3QpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWludGVybWVkaWF0ZVN1cmZhY2UpCi0gICAgICAg ICAgICAgICAgICAgIGludGVybWVkaWF0ZVN1cmZhY2UgPSB0ZXhtYXBHTC5hY3F1aXJlVGV4dHVy ZUZyb21Qb29sKGNvbnRlbnRTaXplKCksIEJpdG1hcFRleHR1cmU6OlN1cHBvcnRzQWxwaGEpOwot ICAgICAgICAgICAgICAgIHRleG1hcEdMLmJpbmRTdXJmYWNlKGludGVybWVkaWF0ZVN1cmZhY2Uu Z2V0KCkpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBpZiAobGFzdCkgeworICAgICAg ICAgICAgaWYgKGRlZmVyc0xhc3RGaWx0ZXIgJiYgbGFzdCkgewogICAgICAgICAgICAgICAgIHRv Qml0bWFwVGV4dHVyZUdMKHJlc3VsdFN1cmZhY2UuZ2V0KCkpLT5tX2ZpbHRlckluZm8gPSBCaXRt YXBUZXh0dXJlR0w6OkZpbHRlckluZm8oZmlsdGVyLmNvcHlSZWYoKSwgaiwgc3BhcmVTdXJmYWNl LmNvcHlSZWYoKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAKKyAg ICAgICAgICAgIGlmICghaW50ZXJtZWRpYXRlU3VyZmFjZSkKKyAgICAgICAgICAgICAgICBpbnRl cm1lZGlhdGVTdXJmYWNlID0gdGV4bWFwR0wuYWNxdWlyZVRleHR1cmVGcm9tUG9vbChjb250ZW50 U2l6ZSgpLCBCaXRtYXBUZXh0dXJlOjpTdXBwb3J0c0FscGhhKTsKKyAgICAgICAgICAgIHRleG1h cEdMLmJpbmRTdXJmYWNlKGludGVybWVkaWF0ZVN1cmZhY2UuZ2V0KCkpOwogICAgICAgICAgICAg dGV4bWFwR0wuZHJhd0ZpbHRlcmVkKCpyZXN1bHRTdXJmYWNlLmdldCgpLCBzcGFyZVN1cmZhY2Uu Z2V0KCksICpmaWx0ZXIsIGopOwogICAgICAgICAgICAgaWYgKCFqICYmIGZpbHRlci0+dHlwZSgp ID09IEZpbHRlck9wZXJhdGlvbjo6RFJPUF9TSEFET1cpIHsKICAgICAgICAgICAgICAgICBzcGFy ZVN1cmZhY2UgPSByZXN1bHRTdXJmYWNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5oCmluZGV4IDViMTYzZjYw ZjFmZC4uYjJhOTE4MjAwYTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5oCkBAIC02MCw3ICs2MCw3IEBA IHB1YmxpYzoKICAgICB2b2lkIHVwZGF0ZUNvbnRlbnRzKGNvbnN0IHZvaWQqLCBjb25zdCBJbnRS ZWN0JiB0YXJnZXQsIGNvbnN0IEludFBvaW50JiBzb3VyY2VPZmZzZXQsIGludCBieXRlc1Blckxp bmUpIG92ZXJyaWRlOwogICAgIGJvb2wgaXNCYWNrZWRCeU9wZW5HTCgpIGNvbnN0IG92ZXJyaWRl IHsgcmV0dXJuIHRydWU7IH0KIAotICAgIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiBhcHBseUZpbHRl cnMoVGV4dHVyZU1hcHBlciYsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmKSBvdmVycmlkZTsKKyAg ICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4gYXBwbHlGaWx0ZXJzKFRleHR1cmVNYXBwZXImLCBjb25z dCBGaWx0ZXJPcGVyYXRpb25zJiwgYm9vbCBkZWZlcnNMYXN0RmlsdGVyKSBvdmVycmlkZTsKICAg ICBzdHJ1Y3QgRmlsdGVySW5mbyB7CiAgICAgICAgIFJlZlB0cjxGaWx0ZXJPcGVyYXRpb24+IGZp bHRlcjsKICAgICAgICAgdW5zaWduZWQgcGFzczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAK aW5kZXggZmQ1YjJkZWM1YWIyLi45OGEyNWRhNThmODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5 ZXIuY3BwCkBAIC0zNDMsNyArMzQzLDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1 dGVPdmVybGFwUmVnaW9ucyhDb21wdXRlT3ZlcmxhcFJlZ2lvbkRhdGEmIGRhdGEsIGMKICAgICBl bHNlIGlmIChtX2NvbnRlbnRzTGF5ZXIgfHwgbV9zdGF0ZS5zb2xpZENvbG9yLmlzVmlzaWJsZSgp KQogICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdCA9IG1fc3RhdGUuY29udGVudHNSZWN0OwogCi0g ICAgaWYgKG1fY3VycmVudEZpbHRlcnMuaGFzT3V0c2V0cygpICYmICFtX3N0YXRlLmJhY2tkcm9w TGF5ZXIpIHsKKyAgICBpZiAobV9jdXJyZW50RmlsdGVycy5oYXNPdXRzZXRzKCkgJiYgIW1fc3Rh dGUuYmFja2Ryb3BMYXllciAmJiAhbV9zdGF0ZS5tYXNrc1RvQm91bmRzICYmICFtX3N0YXRlLm1h c2tMYXllcikgewogICAgICAgICBhdXRvIG91dHNldHMgPSBtX2N1cnJlbnRGaWx0ZXJzLm91dHNl dHMoKTsKICAgICAgICAgbG9jYWxCb3VuZGluZ1JlY3QubW92ZSgtb3V0c2V0cy5sZWZ0KCksIC1v dXRzZXRzLnRvcCgpKTsKICAgICAgICAgbG9jYWxCb3VuZGluZ1JlY3QuZXhwYW5kKG91dHNldHMu bGVmdCgpICsgb3V0c2V0cy5yaWdodCgpLCBvdXRzZXRzLnRvcCgpICsgb3V0c2V0cy5ib3R0b20o KSk7CkBAIC00ODUsMTQgKzQ4NSwxNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRJ bnRvU3VyZmFjZShUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogICAgICAgICBy b290TGF5ZXIoKS5wYWludFNlbGZBbmRDaGlsZHJlbihvcHRpb25zKTsKICAgICB9IGVsc2UKICAg ICAgICAgcGFpbnRTZWxmQW5kQ2hpbGRyZW4ob3B0aW9ucyk7Ci0gICAgaWYgKG9wdGlvbnMucmVw bGljYUxheWVyID09IHRoaXMpIHsKLSAgICAgICAgaWYgKG1fc3RhdGUucmVwbGljYUxheWVyLT5t X3N0YXRlLm1hc2tMYXllcikKLSAgICAgICAgICAgIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0 YXRlLm1hc2tMYXllci0+YXBwbHlNYXNrKG9wdGlvbnMpOwotICAgIH0KLSAgICBpZiAobV9zdGF0 ZS5tYXNrTGF5ZXIpCi0gICAgICAgIG1fc3RhdGUubWFza0xheWVyLT5hcHBseU1hc2sob3B0aW9u cyk7Ci0gICAgb3B0aW9ucy5zdXJmYWNlID0gb3B0aW9ucy5zdXJmYWNlLT5hcHBseUZpbHRlcnMo b3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX2N1cnJlbnRGaWx0ZXJzKTsKKworICAgIGJvb2wgaGFz TWFzayA9ICEhbV9zdGF0ZS5tYXNrTGF5ZXI7CisgICAgYm9vbCBoYXNSZXBsaWNhTWFzayA9IG9w dGlvbnMucmVwbGljYUxheWVyID09IHRoaXMgJiYgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3Rh dGUubWFza0xheWVyOworICAgIGJvb2wgZGVmZXJzTGFzdEZpbHRlciA9ICFoYXNNYXNrICYmICFo YXNSZXBsaWNhTWFzazsKKyAgICBvcHRpb25zLnN1cmZhY2UgPSBvcHRpb25zLnN1cmZhY2UtPmFw cGx5RmlsdGVycyhvcHRpb25zLnRleHR1cmVNYXBwZXIsIG1fY3VycmVudEZpbHRlcnMsIGRlZmVy c0xhc3RGaWx0ZXIpOwogICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci5iaW5kU3VyZmFjZShvcHRp b25zLnN1cmZhY2UuZ2V0KCkpOworICAgIGlmIChoYXNNYXNrKQorICAgICAgICBtX3N0YXRlLm1h c2tMYXllci0+YXBwbHlNYXNrKG9wdGlvbnMpOworICAgIGlmIChoYXNSZXBsaWNhTWFzaykKKyAg ICAgICAgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3RhdGUubWFza0xheWVyLT5hcHBseU1hc2so b3B0aW9ucyk7CiB9CiAKIHN0YXRpYyB2b2lkIGNvbW1pdFN1cmZhY2UoVGV4dHVyZU1hcHBlclBh aW50T3B0aW9ucyYgb3B0aW9ucywgQml0bWFwVGV4dHVyZSYgc3VyZmFjZSwgY29uc3QgSW50UmVj dCYgcmVjdCwgZmxvYXQgb3BhY2l0eSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL21hc2tzL21hc2stYW5kLWRyb3Atc2hhZG93LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0 cy9jb21wb3NpdGluZy9tYXNrcy9tYXNrLWFuZC1kcm9wLXNoYWRvdy1leHBlY3RlZC5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uMjE5NzhlZTU2ODg2Ci0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvbWFza3MvbWFzay1hbmQtZHJv cC1zaGFkb3ctZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE1IEBACis8IURPQ1RZUEUgaHRtbD4K KzxzdHlsZT4KKyAgICBkaXYgeworICAgICAgICB3aWR0aDogMjAwcHg7CisgICAgICAgIGhlaWdo dDogMjAwcHg7CisgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgICB3aWxsLWNoYW5n ZTogdHJhbnNmb3JtOworICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgIC13ZWJr aXQtbWFzay1pbWFnZTogbGluZWFyLWdyYWRpZW50KDQ1ZGVnLCBibGFjaywgdHJhbnNwYXJlbnQp OworICAgIH0KKzwvc3R5bGU+CisKK1lvdSBzaG91bGQgc2VlIG5vIHJlZC4KKworPGRpdj48L2Rp dj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL21hc2tzL21hc2stYW5kLWRy b3Atc2hhZG93Lmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9tYXNrcy9tYXNrLWFuZC1k cm9wLXNoYWRvdy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4u OTI4ZWVjMzA1OGM5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv bWFza3MvbWFzay1hbmQtZHJvcC1zaGFkb3cuaHRtbApAQCAtMCwwICsxLDE2IEBACis8IURPQ1RZ UEUgaHRtbD4KKzxzdHlsZT4KKyAgICBkaXYgeworICAgICAgICB3aWR0aDogMjAwcHg7CisgICAg ICAgIGhlaWdodDogMjAwcHg7CisgICAgICAgIGJhY2tncm91bmQ6IGdyZWVuOworICAgICAgICBm aWx0ZXI6IGRyb3Atc2hhZG93KDUwcHggNTBweCAwcHggcmVkKTsKKyAgICAgICAgd2lsbC1jaGFu Z2U6IHRyYW5zZm9ybTsKKyAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICAtd2Vi a2l0LW1hc2staW1hZ2U6IGxpbmVhci1ncmFkaWVudCg0NWRlZywgYmxhY2ssIHRyYW5zcGFyZW50 KTsKKyAgICB9Cis8L3N0eWxlPgorCitZb3Ugc2hvdWxkIHNlZSBubyByZWQuCisKKzxkaXY+PC9k aXY+Cg== 460348 2022-06-19 23:13:23 -0700 2022-06-21 20:09:36 -0700 Patch bug-241772-20220620151321.patch text/plain 8781 fujii RnJvbSAwZWMzYzg0NjU5OGZmZGFhYzk3MDMxNDk1ZmVmMTM3ZTA5Njk2MWM5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGdWppaSBIaXJvbm9yaSA8SGlyb25vcmkuRnVqaWlAc29ueS5j b20+CkRhdGU6IE1vbiwgMjAgSnVuIDIwMjIgMTU6MDE6MzkgKzA5MDAKU3ViamVjdDogW1BBVENI XSBUZXh0dXJlTWFwcGVyOiBtYXNrIHNob3VsZCBiZSBhcHBsaWVkIGFmdGVyIGZpbHRlciBpcyBh cHBsaWVkCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNzcyCgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCklmIGFuIGVsZW1lbnQgaGFzIGJvdGggYSBtYXNr LWltYWdlIGFuZCBmaWx0ZXJzLCB0aGUgbWFzayBzaG91bGQgYmUKYXBwbGllZCBhZnRlciB0aGUg ZmlsdGVycy4KCkJpdG1hcFRleHR1cmVHTDo6YXBwbHlGaWx0ZXJzIGRpZG4ndCBhY3R1YWxseSBh cHBseSB0aGUgbGFzdCBmaWx0ZXIuCkl0IHN0b3JlZCB0aGUgbGFzdCBmaWx0ZXIgaW5mb3JtYXRp b24gaW4gaXQsIGFuZCBhcHBsaWVkIHRoZSBsYXN0CmZpbHRlciB3aGVuIGJsaXR0aW5nIG9udG8g dGhlIHRhcmdldC4gSWYgdGhlIGVsZW1lbnQgaGFzIGEgbWFzaywKYXBwbHlGaWx0ZXJzIHNob3Vs ZCBhcHBseSBhbGwgZmlsdGVycyBiZWZvcmUgYXBwbHlpbmcgdGhlIG1hc2suCgoqIExheW91dFRl c3RzL2NvbXBvc2l0aW5nL21hc2tzL21hc2stYW5kLWRyb3Atc2hhZG93LWV4cGVjdGVkLmh0bWw6 IEFkZGVkLgoqIExheW91dFRlc3RzL2NvbXBvc2l0aW5nL21hc2tzL21hc2stYW5kLWRyb3Atc2hh ZG93Lmh0bWw6IEFkZGVkLgoqIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9CaXRtYXBUZXh0dXJlLmg6CihXZWJDb3JlOjpCaXRtYXBUZXh0dXJlOjphcHBseUZpbHRlcnMp OgoqIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJl R0wuY3BwOgooV2ViQ29yZTo6Qml0bWFwVGV4dHVyZUdMOjphcHBseUZpbHRlcnMpOgoqIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlR0wuaDoKKiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy LmNwcDoKKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJsYXBSZWdpb25z KToKKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRJbnRvU3VyZmFjZSk6Ci0tLQog Li4uL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlLmggICB8ICAyICstCiAu Li4vZ3JhcGhpY3MvdGV4bWFwL0JpdG1hcFRleHR1cmVHTC5jcHAgICAgICAgIHwgMTMgKysrKyst LS0tLS0tLQogLi4uL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlR0wuaCB8 ICAyICstCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAgICAgIHwg MTggKysrKysrKysrKy0tLS0tLS0tCiAuLi4vbWFza3MvbWFzay1hbmQtZHJvcC1zaGFkb3ctZXhw ZWN0ZWQuaHRtbCAgIHwgMTUgKysrKysrKysrKysrKysrCiAuLi4vbWFza3MvbWFzay1hbmQtZHJv cC1zaGFkb3cuaHRtbCAgICAgICAgICAgIHwgMTYgKysrKysrKysrKysrKysrKwogNiBmaWxlcyBj aGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEw MDY0NCBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9tYXNrcy9tYXNrLWFuZC1kcm9wLXNoYWRvdy1l eHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv bWFza3MvbWFzay1hbmQtZHJvcC1zaGFkb3cuaHRtbAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZS5oCmluZGV4IDAxZDZh NmMzYmY2ZS4uMzZiZTk0MDQ5ZjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlLmgKQEAgLTc4LDcgKzc4LDcgQEAg cHVibGljOgogICAgIGlubGluZSBpbnQgbnVtYmVyT2ZCeXRlcygpIGNvbnN0IHsgcmV0dXJuIHNp emUoKS53aWR0aCgpICogc2l6ZSgpLmhlaWdodCgpICogYnBwKCkgPj4gMzsgfQogICAgIGlubGlu ZSBib29sIGlzT3BhcXVlKCkgY29uc3QgeyByZXR1cm4gIShtX2ZsYWdzICYgU3VwcG9ydHNBbHBo YSk7IH0KIAotICAgIHZpcnR1YWwgUmVmUHRyPEJpdG1hcFRleHR1cmU+IGFwcGx5RmlsdGVycyhU ZXh0dXJlTWFwcGVyJiwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYpIHsgcmV0dXJuIHRoaXM7IH0K KyAgICB2aXJ0dWFsIFJlZlB0cjxCaXRtYXBUZXh0dXJlPiBhcHBseUZpbHRlcnMoVGV4dHVyZU1h cHBlciYsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmLCBib29sKSB7IHJldHVybiB0aGlzOyB9CiAK IHByb3RlY3RlZDoKICAgICBJbnRTaXplIG1fY29udGVudFNpemU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlR0wu Y3BwCmluZGV4IDkxZThlYTgwMTRiNy4uN2I2OWY4YWQ5M2YxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdM LmNwcApAQCAtMjAyLDcgKzIwMiw3IEBAIHN0YXRpYyB1bnNpZ25lZCBnZXRQYXNzZXNSZXF1aXJl ZEZvckZpbHRlcihGaWx0ZXJPcGVyYXRpb246Ok9wZXJhdGlvblR5cGUgdHlwZSkKICAgICB9CiB9 CiAKLVJlZlB0cjxCaXRtYXBUZXh0dXJlPiBCaXRtYXBUZXh0dXJlR0w6OmFwcGx5RmlsdGVycyhU ZXh0dXJlTWFwcGVyJiB0ZXh0dXJlTWFwcGVyLCBjb25zdCBGaWx0ZXJPcGVyYXRpb25zJiBmaWx0 ZXJzKQorUmVmUHRyPEJpdG1hcFRleHR1cmU+IEJpdG1hcFRleHR1cmVHTDo6YXBwbHlGaWx0ZXJz KFRleHR1cmVNYXBwZXImIHRleHR1cmVNYXBwZXIsIGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZp bHRlcnMsIGJvb2wgZGVmZXJzTGFzdEZpbHRlcikKIHsKICAgICBpZiAoZmlsdGVycy5pc0VtcHR5 KCkpCiAgICAgICAgIHJldHVybiB0aGlzOwpAQCAtMjIyLDE3ICsyMjIsMTQgQEAgUmVmUHRyPEJp dG1hcFRleHR1cmU+IEJpdG1hcFRleHR1cmVHTDo6YXBwbHlGaWx0ZXJzKFRleHR1cmVNYXBwZXIm IHRleHR1cmVNYXBwZXIKICAgICAgICAgaW50IG51bVBhc3NlcyA9IGdldFBhc3Nlc1JlcXVpcmVk Rm9yRmlsdGVyKGZpbHRlci0+dHlwZSgpKTsKICAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCBu dW1QYXNzZXM7ICsraikgewogICAgICAgICAgICAgYm9vbCBsYXN0ID0gKGkgPT0gZmlsdGVycy5z aXplKCkgLSAxKSAmJiAoaiA9PSBudW1QYXNzZXMgLSAxKTsKLSAgICAgICAgICAgIGlmICghbGFz dCkgewotICAgICAgICAgICAgICAgIGlmICghaW50ZXJtZWRpYXRlU3VyZmFjZSkKLSAgICAgICAg ICAgICAgICAgICAgaW50ZXJtZWRpYXRlU3VyZmFjZSA9IHRleG1hcEdMLmFjcXVpcmVUZXh0dXJl RnJvbVBvb2woY29udGVudFNpemUoKSwgQml0bWFwVGV4dHVyZTo6U3VwcG9ydHNBbHBoYSk7Ci0g ICAgICAgICAgICAgICAgdGV4bWFwR0wuYmluZFN1cmZhY2UoaW50ZXJtZWRpYXRlU3VyZmFjZS5n ZXQoKSk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmIChsYXN0KSB7CisgICAgICAg ICAgICBpZiAoZGVmZXJzTGFzdEZpbHRlciAmJiBsYXN0KSB7CiAgICAgICAgICAgICAgICAgdG9C aXRtYXBUZXh0dXJlR0wocmVzdWx0U3VyZmFjZS5nZXQoKSktPm1fZmlsdGVySW5mbyA9IEJpdG1h cFRleHR1cmVHTDo6RmlsdGVySW5mbyhmaWx0ZXIuY29weVJlZigpLCBqLCBzcGFyZVN1cmZhY2Uu Y29weVJlZigpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KIAorICAg ICAgICAgICAgaWYgKCFpbnRlcm1lZGlhdGVTdXJmYWNlKQorICAgICAgICAgICAgICAgIGludGVy bWVkaWF0ZVN1cmZhY2UgPSB0ZXhtYXBHTC5hY3F1aXJlVGV4dHVyZUZyb21Qb29sKGNvbnRlbnRT aXplKCksIEJpdG1hcFRleHR1cmU6OlN1cHBvcnRzQWxwaGEpOworICAgICAgICAgICAgdGV4bWFw R0wuYmluZFN1cmZhY2UoaW50ZXJtZWRpYXRlU3VyZmFjZS5nZXQoKSk7CiAgICAgICAgICAgICB0 ZXhtYXBHTC5kcmF3RmlsdGVyZWQoKnJlc3VsdFN1cmZhY2UuZ2V0KCksIHNwYXJlU3VyZmFjZS5n ZXQoKSwgKmZpbHRlciwgaik7CiAgICAgICAgICAgICBpZiAoIWogJiYgZmlsdGVyLT50eXBlKCkg PT0gRmlsdGVyT3BlcmF0aW9uOjpEUk9QX1NIQURPVykgewogICAgICAgICAgICAgICAgIHNwYXJl U3VyZmFjZSA9IHJlc3VsdFN1cmZhY2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmgKaW5kZXggNWIxNjNmNjBm MWZkLi5iMmE5MTgyMDBhNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9CaXRtYXBUZXh0dXJlR0wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvQml0bWFwVGV4dHVyZUdMLmgKQEAgLTYwLDcgKzYwLDcgQEAg cHVibGljOgogICAgIHZvaWQgdXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCosIGNvbnN0IEludFJl Y3QmIHRhcmdldCwgY29uc3QgSW50UG9pbnQmIHNvdXJjZU9mZnNldCwgaW50IGJ5dGVzUGVyTGlu ZSkgb3ZlcnJpZGU7CiAgICAgYm9vbCBpc0JhY2tlZEJ5T3BlbkdMKCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgUmVmUHRyPEJpdG1hcFRleHR1cmU+IGFwcGx5RmlsdGVy cyhUZXh0dXJlTWFwcGVyJiwgY29uc3QgRmlsdGVyT3BlcmF0aW9ucyYpIG92ZXJyaWRlOworICAg IFJlZlB0cjxCaXRtYXBUZXh0dXJlPiBhcHBseUZpbHRlcnMoVGV4dHVyZU1hcHBlciYsIGNvbnN0 IEZpbHRlck9wZXJhdGlvbnMmLCBib29sIGRlZmVyc0xhc3RGaWx0ZXIpIG92ZXJyaWRlOwogICAg IHN0cnVjdCBGaWx0ZXJJbmZvIHsKICAgICAgICAgUmVmUHRyPEZpbHRlck9wZXJhdGlvbj4gZmls dGVyOwogICAgICAgICB1bnNpZ25lZCBwYXNzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcApp bmRleCBmZDViMmRlYzVhYjIuLjk4YTI1ZGE1OGY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXll ci5jcHAKQEAgLTM0Myw3ICszNDMsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0 ZU92ZXJsYXBSZWdpb25zKENvbXB1dGVPdmVybGFwUmVnaW9uRGF0YSYgZGF0YSwgYwogICAgIGVs c2UgaWYgKG1fY29udGVudHNMYXllciB8fCBtX3N0YXRlLnNvbGlkQ29sb3IuaXNWaXNpYmxlKCkp CiAgICAgICAgIGxvY2FsQm91bmRpbmdSZWN0ID0gbV9zdGF0ZS5jb250ZW50c1JlY3Q7CiAKLSAg ICBpZiAobV9jdXJyZW50RmlsdGVycy5oYXNPdXRzZXRzKCkgJiYgIW1fc3RhdGUuYmFja2Ryb3BM YXllcikgeworICAgIGlmIChtX2N1cnJlbnRGaWx0ZXJzLmhhc091dHNldHMoKSAmJiAhbV9zdGF0 ZS5iYWNrZHJvcExheWVyICYmICFtX3N0YXRlLm1hc2tzVG9Cb3VuZHMgJiYgIW1fc3RhdGUubWFz a0xheWVyKSB7CiAgICAgICAgIGF1dG8gb3V0c2V0cyA9IG1fY3VycmVudEZpbHRlcnMub3V0c2V0 cygpOwogICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdC5tb3ZlKC1vdXRzZXRzLmxlZnQoKSwgLW91 dHNldHMudG9wKCkpOwogICAgICAgICBsb2NhbEJvdW5kaW5nUmVjdC5leHBhbmQob3V0c2V0cy5s ZWZ0KCkgKyBvdXRzZXRzLnJpZ2h0KCksIG91dHNldHMudG9wKCkgKyBvdXRzZXRzLmJvdHRvbSgp KTsKQEAgLTQ4NSwxNCArNDg1LDE2IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWludElu dG9TdXJmYWNlKFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMpCiAgICAgICAgIHJv b3RMYXllcigpLnBhaW50U2VsZkFuZENoaWxkcmVuKG9wdGlvbnMpOwogICAgIH0gZWxzZQogICAg ICAgICBwYWludFNlbGZBbmRDaGlsZHJlbihvcHRpb25zKTsKLSAgICBpZiAob3B0aW9ucy5yZXBs aWNhTGF5ZXIgPT0gdGhpcykgewotICAgICAgICBpZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1f c3RhdGUubWFza0xheWVyKQotICAgICAgICAgICAgbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fc3Rh dGUubWFza0xheWVyLT5hcHBseU1hc2sob3B0aW9ucyk7Ci0gICAgfQotICAgIGlmIChtX3N0YXRl Lm1hc2tMYXllcikKLSAgICAgICAgbV9zdGF0ZS5tYXNrTGF5ZXItPmFwcGx5TWFzayhvcHRpb25z KTsKLSAgICBvcHRpb25zLnN1cmZhY2UgPSBvcHRpb25zLnN1cmZhY2UtPmFwcGx5RmlsdGVycyhv cHRpb25zLnRleHR1cmVNYXBwZXIsIG1fY3VycmVudEZpbHRlcnMpOworCisgICAgYm9vbCBoYXNN YXNrID0gISFtX3N0YXRlLm1hc2tMYXllcjsKKyAgICBib29sIGhhc1JlcGxpY2FNYXNrID0gb3B0 aW9ucy5yZXBsaWNhTGF5ZXIgPT0gdGhpcyAmJiBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9zdGF0 ZS5tYXNrTGF5ZXI7CisgICAgYm9vbCBkZWZlcnNMYXN0RmlsdGVyID0gIWhhc01hc2sgJiYgIWhh c1JlcGxpY2FNYXNrOworICAgIG9wdGlvbnMuc3VyZmFjZSA9IG9wdGlvbnMuc3VyZmFjZS0+YXBw bHlGaWx0ZXJzKG9wdGlvbnMudGV4dHVyZU1hcHBlciwgbV9jdXJyZW50RmlsdGVycywgZGVmZXJz TGFzdEZpbHRlcik7CiAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLmJpbmRTdXJmYWNlKG9wdGlv bnMuc3VyZmFjZS5nZXQoKSk7CisgICAgaWYgKGhhc01hc2spCisgICAgICAgIG1fc3RhdGUubWFz a0xheWVyLT5hcHBseU1hc2sob3B0aW9ucyk7CisgICAgaWYgKGhhc1JlcGxpY2FNYXNrKQorICAg ICAgICBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9zdGF0ZS5tYXNrTGF5ZXItPmFwcGx5TWFzayhv cHRpb25zKTsKIH0KIAogc3RhdGljIHZvaWQgY29tbWl0U3VyZmFjZShUZXh0dXJlTWFwcGVyUGFp bnRPcHRpb25zJiBvcHRpb25zLCBCaXRtYXBUZXh0dXJlJiBzdXJmYWNlLCBjb25zdCBJbnRSZWN0 JiByZWN0LCBmbG9hdCBvcGFjaXR5KQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRp bmcvbWFza3MvbWFzay1hbmQtZHJvcC1zaGFkb3ctZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3Rz L2NvbXBvc2l0aW5nL21hc2tzL21hc2stYW5kLWRyb3Atc2hhZG93LWV4cGVjdGVkLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4yMTk3OGVlNTY4ODYKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9tYXNrcy9tYXNrLWFuZC1kcm9w LXNoYWRvdy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPgor PHN0eWxlPgorICAgIGRpdiB7CisgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgaGVpZ2h0 OiAyMDBweDsKKyAgICAgICAgYmFja2dyb3VuZDogZ3JlZW47CisgICAgICAgIHdpbGwtY2hhbmdl OiB0cmFuc2Zvcm07CisgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgLXdlYmtp dC1tYXNrLWltYWdlOiBsaW5lYXItZ3JhZGllbnQoNDVkZWcsIGJsYWNrLCB0cmFuc3BhcmVudCk7 CisgICAgfQorPC9zdHlsZT4KKworWW91IHNob3VsZCBzZWUgbm8gcmVkLgorCis8ZGl2PjwvZGl2 PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvbWFza3MvbWFzay1hbmQtZHJv cC1zaGFkb3cuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL21hc2tzL21hc2stYW5kLWRy b3Atc2hhZG93Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi45 MjhlZWMzMDU4YzkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9t YXNrcy9tYXNrLWFuZC1kcm9wLXNoYWRvdy5odG1sCkBAIC0wLDAgKzEsMTYgQEAKKzwhRE9DVFlQ RSBodG1sPgorPHN0eWxlPgorICAgIGRpdiB7CisgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAg ICAgaGVpZ2h0OiAyMDBweDsKKyAgICAgICAgYmFja2dyb3VuZDogZ3JlZW47CisgICAgICAgIGZp bHRlcjogZHJvcC1zaGFkb3coNTBweCA1MHB4IDBweCByZWQpOworICAgICAgICB3aWxsLWNoYW5n ZTogdHJhbnNmb3JtOworICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgIC13ZWJr aXQtbWFzay1pbWFnZTogbGluZWFyLWdyYWRpZW50KDQ1ZGVnLCBibGFjaywgdHJhbnNwYXJlbnQp OworICAgIH0KKzwvc3R5bGU+CisKK1lvdSBzaG91bGQgc2VlIG5vIHJlZC4KKworPGRpdj48L2Rp dj4K