230440 2021-09-17 23:37:48 -0700 [Cocoa] Add "Shaping" log channel 2021-09-18 21:26:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield darin webkit-bug-importer oldest_to_newest 1794745 0 mmaxfield 2021-09-17 23:37:48 -0700 [Cocoa] Add "Shaping" log channel 1794746 1 438548 mmaxfield 2021-09-17 23:39:19 -0700 Created attachment 438548 Patch 1794838 2 ews-feeder 2021-09-18 21:25:32 -0700 Committed r282734 (241871@main): <https://commits.webkit.org/241871@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438548. 1794839 3 webkit-bug-importer 2021-09-18 21:26:16 -0700 <rdar://problem/83277437> 438548 2021-09-17 23:39:19 -0700 2021-09-18 21:25:32 -0700 Patch bug-230440-20210917233918.patch text/plain 10293 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjdiMmE0ZjBmNGEzNjIz MmRhOTYzYzQxOTQwZTAzZDNmYjRjN2ZmOC4uMjdkN2ExN2MxMjY2YmI2NzlkNTE1Y2NhZThhMjNj YWEzNjg5OGQ2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTA5LTE3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBB ZGQgIlNoYXBpbmciIGxvZyBjaGFubmVsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzA0NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIGxvZ2dpbmcgaGFzIGJlZW4gdXNlZnVsIHRvIG1lIGJlZm9y ZSwgc28gSSBmaWd1cmUgaXQgbWlnaHQgYmUgdXNlZnVsIHRvIG90aGVyIHBlb3BsZS4KKworICAg ICAgICBUaGlzIG5ldyBjaGFubmVsIGlzIG9mZiBieSBkZWZhdWx0LgorCisgICAgICAgIE5vIG5l dyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAq IHBsYXRmb3JtL0xvZ2dpbmcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4 dC9Gb250Q29yZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6YXBwbHlUcmFuc2Zv cm1zIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRD b250cm9sbGVyQ29yZVRleHQubW06CisgICAgICAgIChXZWJDb3JlOjpDb21wbGV4VGV4dENvbnRy b2xsZXI6OkNvbXBsZXhUZXh0UnVuOjpDb21wbGV4VGV4dFJ1bik6CisgICAgICAgIChXZWJDb3Jl OjpDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1bnNGb3JDaGFyYWN0 ZXJzKToKKwogMjAyMS0wOS0xNyAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUu Y29tPgogCiAgICAgICAgIEZpeCB0aGUgWGNvZGUgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dp bmcuaAppbmRleCA3NjRlZWY3YmIyZTFmNDc3ZmM0OGFlM2FhN2RhODgzYzZlOWNjMTQzLi44Zjcx ODBkZjAyMGJhMWRiYjA4NzdmNDc1NDJkNzhlMjJmODlkMDg2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v TG9nZ2luZy5oCkBAIC0xMDcsNiArMTA3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIE0o U2VsZWN0aW9uKSBcCiAgICAgTShTZXJ2aWNlcykgXAogICAgIE0oU2VydmljZVdvcmtlcikgXAor ICAgIE0oU2hhcGluZykgXAogICAgIE0oU3BlbGxpbmdBbmRHcmFtbWFyKSBcCiAgICAgTShTUUxE YXRhYmFzZSkgXAogICAgIE0oU3RvcmFnZSkgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENvcmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvcmV0ZXh0L0ZvbnRDb3JlVGV4dC5jcHAKaW5kZXggZTYw NjRlYzEwODAwOTY4Mzk4OWI4Y2VkMzI0Y2Q1YjkwMGE5NmY0NS4uZWUyNzhiNTE4MmUyNWU4OGIy N2U2OTkxNWE3YzAxMGNlNGMyNTZhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29yZXRleHQvRm9udENvcmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb3JldGV4dC9Gb250Q29yZVRleHQuY3BwCkBAIC0zMiw2ICsz Miw3IEBACiAjaW5jbHVkZSAiRm9udENhY2hlLmgiCiAjaW5jbHVkZSAiRm9udENhc2NhZGUuaCIK ICNpbmNsdWRlICJGb250RGVzY3JpcHRpb24uaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5j bHVkZSAiT3BlblR5cGVDRy5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2luY2x1ZGUg PENvcmVUZXh0L0NvcmVUZXh0Lmg+CkBAIC02MDQsOCArNjA1LDExIEBAIEdseXBoQnVmZmVyQWR2 YW5jZSBGb250OjphcHBseVRyYW5zZm9ybXMoR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCB1bnNp Z25lZCBiZWdpCiAgICAgICAgICAgICByYW5nZS5sZW5ndGggPSBzdGQ6Om1pbihyYW5nZS5sb2Nh dGlvbiwgLXJhbmdlLmxlbmd0aCk7CiAgICAgICAgICAgICByYW5nZS5sb2NhdGlvbiA9IHJhbmdl LmxvY2F0aW9uIC0gcmFuZ2UubGVuZ3RoOwogICAgICAgICAgICAgZ2x5cGhCdWZmZXIucmVtb3Zl KGJlZ2lubmluZ0dseXBoSW5kZXggKyByYW5nZS5sb2NhdGlvbiwgcmFuZ2UubGVuZ3RoKTsKLSAg ICAgICAgfSBlbHNlCisgICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2hhcGluZywgc3RyZWFt IDw8ICJDYWxsYmFjayBjYWxsZWQgdG8gcmVtb3ZlIGF0IGxvY2F0aW9uICIgPDwgcmFuZ2UubG9j YXRpb24gPDwgIiBhbmQgbGVuZ3RoICIgPDwgcmFuZ2UubGVuZ3RoKTsKKyAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgIGdseXBoQnVmZmVyLm1ha2VIb2xlKGJlZ2lubmluZ0dseXBoSW5kZXgg KyByYW5nZS5sb2NhdGlvbiwgcmFuZ2UubGVuZ3RoLCB0aGlzKTsKKyAgICAgICAgICAgIExPR19X SVRIX1NUUkVBTShTaGFwaW5nLCBzdHJlYW0gPDwgIkNhbGxiYWNrIGNhbGxlZCB0byBpbnNlcnQg aG9sZSBhdCBsb2NhdGlvbiAiIDw8IHJhbmdlLmxvY2F0aW9uIDw8ICIgYW5kIGxlbmd0aCAiIDw8 IHJhbmdlLmxlbmd0aCk7CisgICAgICAgIH0KIAogICAgICAgICAqbmV3R2x5cGhzUG9pbnRlciA9 IGdseXBoQnVmZmVyLmdseXBocyhiZWdpbm5pbmdHbHlwaEluZGV4KTsKICAgICAgICAgKm5ld0Fk dmFuY2VzUG9pbnRlciA9IGdseXBoQnVmZmVyLmFkdmFuY2VzKGJlZ2lubmluZ0dseXBoSW5kZXgp OwpAQCAtNjI1LDYgKzYyOSwzNCBAQCBHbHlwaEJ1ZmZlckFkdmFuY2UgRm9udDo6YXBwbHlUcmFu c2Zvcm1zKEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwgdW5zaWduZWQgYmVnaQogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBnbHlwaEJ1ZmZlci5zaXplKCkgLSBiZWdpbm5pbmdHbHlwaElu ZGV4OyArK2kpCiAgICAgICAgIGdseXBoQnVmZmVyLm9mZnNldHNJblN0cmluZyhiZWdpbm5pbmdH bHlwaEluZGV4KVtpXSAtPSBiZWdpbm5pbmdTdHJpbmdJbmRleDsKIAorICAgIExPR19XSVRIX1NU UkVBTShTaGFwaW5nLAorICAgICAgICBzdHJlYW0gPDwgIlNpbXBsZSBzaGFwaW5nICIgPDwgbnVt YmVyT2ZJbnB1dEdseXBocyA8PCAiIGdseXBocyBpbiBmb250ICIgPDwgU3RyaW5nKGFkb3B0Q0Yo Q1RGb250Q29weVBvc3RTY3JpcHROYW1lKG1fcGxhdGZvcm1EYXRhLmN0Rm9udCgpKSkuZ2V0KCkp IDw8ICIuXG4iOworICAgICAgICBjb25zdCBhdXRvKiBnbHlwaHMgPSBnbHlwaEJ1ZmZlci5nbHlw aHMoYmVnaW5uaW5nR2x5cGhJbmRleCk7CisgICAgICAgIHN0cmVhbSA8PCAiR2x5cGhzOiI7Cisg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1iZXJPZklucHV0R2x5cGhzOyArK2kp CisgICAgICAgICAgICBzdHJlYW0gPDwgIiAiIDw8IGdseXBoc1tpXTsKKyAgICAgICAgc3RyZWFt IDw8ICJcbiI7CisgICAgICAgIGNvbnN0IGF1dG8qIGFkdmFuY2VzID0gZ2x5cGhCdWZmZXIuYWR2 YW5jZXMoYmVnaW5uaW5nR2x5cGhJbmRleCk7CisgICAgICAgIHN0cmVhbSA8PCAiQWR2YW5jZXM6 IjsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bWJlck9mSW5wdXRHbHlwaHM7 ICsraSkKKyAgICAgICAgICAgIHN0cmVhbSA8PCAiICIgPDwgRmxvYXRTaXplKGFkdmFuY2VzW2ld KTsKKyAgICAgICAgc3RyZWFtIDw8ICJcbiI7CisgICAgICAgIGNvbnN0IGF1dG8qIG9yaWdpbnMg PSBnbHlwaEJ1ZmZlci5vcmlnaW5zKGJlZ2lubmluZ0dseXBoSW5kZXgpOworICAgICAgICBzdHJl YW0gPDwgIk9yaWdpbnM6IjsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG51bWJl ck9mSW5wdXRHbHlwaHM7ICsraSkKKyAgICAgICAgICAgIHN0cmVhbSA8PCAiICIgPDwgb3JpZ2lu c1tpXTsKKyAgICAgICAgc3RyZWFtIDw8ICJcbiI7CisgICAgICAgIGNvbnN0IGF1dG8qIG9mZnNl dHMgPSBnbHlwaEJ1ZmZlci5vZmZzZXRzSW5TdHJpbmcoYmVnaW5uaW5nR2x5cGhJbmRleCk7Cisg ICAgICAgIHN0cmVhbSA8PCAiT2Zmc2V0czoiOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgbnVtYmVyT2ZJbnB1dEdseXBoczsgKytpKQorICAgICAgICAgICAgc3RyZWFtIDw8ICIg IiA8PCBvZmZzZXRzW2ldOworICAgICAgICBzdHJlYW0gPDwgIlxuIjsKKyAgICAgICAgY29uc3Qg VUNoYXIqIGNvZGVVbml0cyA9IHVwY29udmVydGVkQ2hhcmFjdGVycy5nZXQoKTsKKyAgICAgICAg c3RyZWFtIDw8ICJDb2RlIFVuaXRzOiI7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBudW1iZXJPZklucHV0R2x5cGhzOyArK2kpCisgICAgICAgICAgICBzdHJlYW0gPDwgIiAiIDw8 IGNvZGVVbml0c1tpXTsKKyAgICApOworCiAgICAgYXV0byBpbml0aWFsQWR2YW5jZSA9IENURm9u dFNoYXBlR2x5cGhzKAogICAgICAgICBtX3BsYXRmb3JtRGF0YS5jdEZvbnQoKSwKICAgICAgICAg Z2x5cGhCdWZmZXIuZ2x5cGhzKGJlZ2lubmluZ0dseXBoSW5kZXgpLApAQCAtNjM3LDYgKzY2OSwz NiBAQCBHbHlwaEJ1ZmZlckFkdmFuY2UgRm9udDo6YXBwbHlUcmFuc2Zvcm1zKEdseXBoQnVmZmVy JiBnbHlwaEJ1ZmZlciwgdW5zaWduZWQgYmVnaQogICAgICAgICBsb2NhbGVTdHJpbmcuZ2V0KCks CiAgICAgICAgIGhhbmRsZXIpOwogCisgICAgTE9HX1dJVEhfU1RSRUFNKFNoYXBpbmcsCisgICAg ICAgIHN0cmVhbSA8PCAiU2hhcGluZyByZXN1bHQ6ICIgPDwgZ2x5cGhCdWZmZXIuc2l6ZSgpIC0g YmVnaW5uaW5nR2x5cGhJbmRleCA8PCAiIGdseXBocy5cbiI7CisgICAgICAgIGNvbnN0IGF1dG8q IGdseXBocyA9IGdseXBoQnVmZmVyLmdseXBocyhiZWdpbm5pbmdHbHlwaEluZGV4KTsKKyAgICAg ICAgc3RyZWFtIDw8ICJHbHlwaHM6IjsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IGdseXBoQnVmZmVyLnNpemUoKSAtIGJlZ2lubmluZ0dseXBoSW5kZXg7ICsraSkKKyAgICAgICAg ICAgIHN0cmVhbSA8PCAiICIgPDwgZ2x5cGhzW2ldOworICAgICAgICBzdHJlYW0gPDwgIlxuIjsK KyAgICAgICAgY29uc3QgYXV0byogYWR2YW5jZXMgPSBnbHlwaEJ1ZmZlci5hZHZhbmNlcyhiZWdp bm5pbmdHbHlwaEluZGV4KTsKKyAgICAgICAgc3RyZWFtIDw8ICJBZHZhbmNlczoiOworICAgICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZ2x5cGhCdWZmZXIuc2l6ZSgpIC0gYmVnaW5uaW5n R2x5cGhJbmRleDsgKytpKQorICAgICAgICAgICAgc3RyZWFtIDw8ICIgIiA8PCBGbG9hdFNpemUo YWR2YW5jZXNbaV0pOworICAgICAgICBzdHJlYW0gPDwgIlxuIjsKKyAgICAgICAgY29uc3QgYXV0 byogb3JpZ2lucyA9IGdseXBoQnVmZmVyLm9yaWdpbnMoYmVnaW5uaW5nR2x5cGhJbmRleCk7Cisg ICAgICAgIHN0cmVhbSA8PCAiT3JpZ2luczoiOworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAw OyBpIDwgZ2x5cGhCdWZmZXIuc2l6ZSgpIC0gYmVnaW5uaW5nR2x5cGhJbmRleDsgKytpKQorICAg ICAgICAgICAgc3RyZWFtIDw8ICIgIiA8PCBvcmlnaW5zW2ldOworICAgICAgICBzdHJlYW0gPDwg IlxuIjsKKyAgICAgICAgY29uc3QgYXV0byogb2Zmc2V0cyA9IGdseXBoQnVmZmVyLm9mZnNldHNJ blN0cmluZyhiZWdpbm5pbmdHbHlwaEluZGV4KTsKKyAgICAgICAgc3RyZWFtIDw8ICJPZmZzZXRz OiI7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBnbHlwaEJ1ZmZlci5zaXplKCkg LSBiZWdpbm5pbmdHbHlwaEluZGV4OyArK2kpCisgICAgICAgICAgICBzdHJlYW0gPDwgIiAiIDw8 IG9mZnNldHNbaV07CisgICAgICAgIHN0cmVhbSA8PCAiXG4iOworICAgICAgICBjb25zdCBVQ2hh ciogY29kZVVuaXRzID0gdXBjb252ZXJ0ZWRDaGFyYWN0ZXJzLmdldCgpOworICAgICAgICBzdHJl YW0gPDwgIkNvZGUgVW5pdHM6IjsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGds eXBoQnVmZmVyLnNpemUoKSAtIGJlZ2lubmluZ0dseXBoSW5kZXg7ICsraSkKKyAgICAgICAgICAg IHN0cmVhbSA8PCAiICIgPDwgY29kZVVuaXRzW2ldOworICAgICAgICBzdHJlYW0gPDwgIlxuIjsK KyAgICAgICAgc3RyZWFtIDw8ICJJbml0aWFsIGFkdmFuY2U6ICIgPDwgRmxvYXRTaXplKGluaXRp YWxBZHZhbmNlKTsKKyAgICApOworCiAgICAgQVNTRVJUKG51bWJlck9mSW5wdXRHbHlwaHMgfHwg Z2x5cGhCdWZmZXIuc2l6ZSgpID09IGJlZ2lubmluZ0dseXBoSW5kZXgpOwogICAgIEFTU0VSVChu dW1iZXJPZklucHV0R2x5cGhzIHx8ICghaW5pdGlhbEFkdmFuY2Uud2lkdGggJiYgIWluaXRpYWxB ZHZhbmNlLmhlaWdodCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQ29yZVRleHQubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyQ29yZVRleHQu bW0KaW5kZXggZTkwMTc0YmVmNDMwMzEwYTNiOWU1ZDQ1ODFiZmExYWRlZWVlMDdkZi4uZjg5ZjM1 ZGMzNmNkNGRkOWZmZjEzZThiZTcyOTU0YTAzNjc2ZTQ2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlckNvcmVUZXh0 Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4 dENvbnRyb2xsZXJDb3JlVGV4dC5tbQpAQCAtODksNiArODksMzEgQEAgQ29tcGxleFRleHRDb250 cm9sbGVyOjpDb21wbGV4VGV4dFJ1bjo6Q29tcGxleFRleHRSdW4oQ1RSdW5SZWYgY3RSdW4sIGNv bnN0IEZvbnQKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZ2x5cGhDb3VudDsg KytpKQogICAgICAgICAgICAgbV9iYXNlQWR2YW5jZXMudW5jaGVja2VkQXBwZW5kKGJhc2VBZHZh bmNlc1tpXSk7CiAgICAgfQorCisgICAgTE9HX1dJVEhfU1RSRUFNKFNoYXBpbmcsCisgICAgICAg IHN0cmVhbSA8PCAiU2hhcGluZyByZXN1bHQ6ICIgPDwgbV9nbHlwaENvdW50IDw8ICIgZ2x5cGhz LlxuIjsKKyAgICAgICAgc3RyZWFtIDw8ICJHbHlwaHM6IjsKKyAgICAgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IG1fZ2x5cGhDb3VudDsgKytpKQorICAgICAgICAgICAgc3RyZWFtIDw8ICIg IiA8PCBtX2dseXBoc1tpXTsKKyAgICAgICAgc3RyZWFtIDw8ICJcbiI7CisgICAgICAgIHN0cmVh bSA8PCAiQWR2YW5jZXM6IjsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZ2x5 cGhDb3VudDsgKytpKQorICAgICAgICAgICAgc3RyZWFtIDw8ICIgIiA8PCBtX2Jhc2VBZHZhbmNl c1tpXTsKKyAgICAgICAgc3RyZWFtIDw8ICJcbiI7CisgICAgICAgIHN0cmVhbSA8PCAiT3JpZ2lu czoiOworICAgICAgICBpZiAobV9nbHlwaE9yaWdpbnMuaXNFbXB0eSgpKQorICAgICAgICAgICAg c3RyZWFtIDw8ICIgZW1wdHkiOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBtX2dseXBoQ291bnQ7ICsraSkKKyAgICAgICAgICAgICAgICBzdHJl YW0gPDwgIiAiIDw8IG1fZ2x5cGhzW2ldOworICAgICAgICB9CisgICAgICAgIHN0cmVhbSA8PCAi XG4iOworICAgICAgICBzdHJlYW0gPDwgIk9mZnNldHM6IjsKKyAgICAgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IG1fZ2x5cGhDb3VudDsgKytpKQorICAgICAgICAgICAgc3RyZWFtIDw8ICIg IiA8PCBtX2NvcmVUZXh0SW5kaWNlc1tpXTsKKyAgICAgICAgc3RyZWFtIDw8ICJcbiI7CisgICAg ICAgIHN0cmVhbSA8PCAiSW5pdGlhbCBhZHZhbmNlOiAiIDw8IEZsb2F0U2l6ZShtX2luaXRpYWxB ZHZhbmNlKTsKKyAgICApOwogfQogCiBzdHJ1Y3QgUHJvdmlkZXJJbmZvIHsKQEAgLTEzNiw2ICsx NjEsMTQgQEAgdm9pZCBDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNvbGxlY3RDb21wbGV4VGV4dFJ1 bnNGb3JDaGFyYWN0ZXJzKGNvbnN0IFVDaGFyKiBjcCwKIAogICAgIFJldGFpblB0cjxDVExpbmVS ZWY+IGxpbmU7CiAKKyAgICBMT0dfV0lUSF9TVFJFQU0oU2hhcGluZywKKyAgICAgICAgc3RyZWFt IDw8ICJDb21wbGV4IHNoYXBpbmcgIiA8PCBsZW5ndGggPDwgIiBjb2RlIHVuaXRzIHdpdGggaW5m byAiIDw8IFN0cmluZyhhZG9wdENGKENGQ29weURlc2NyaXB0aW9uKHN0cmluZ0F0dHJpYnV0ZXMu Z2V0KCkpKS5nZXQoKSkgPDwgIi5cbiI7CisgICAgICAgIHN0cmVhbSA8PCAiQ29kZSBVbml0czoi OworICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCisgICAgICAg ICAgICBzdHJlYW0gPDwgIiAiIDw8IGNwW2ldOworICAgICAgICBzdHJlYW0gPDwgIlxuIjsKKyAg ICApOworCiAgICAgaWYgKCFtX21heVVzZU5hdHVyYWxXcml0aW5nRGlyZWN0aW9uIHx8IG1fcnVu LmRpcmVjdGlvbmFsT3ZlcnJpZGUoKSkgewogICAgICAgICBjb25zdCBzaG9ydCBsdHJGb3JjZWRF bWJlZGRpbmdMZXZlbFZhbHVlID0gMDsKICAgICAgICAgY29uc3Qgc2hvcnQgcnRsRm9yY2VkRW1i ZWRkaW5nTGV2ZWxWYWx1ZSA9IDE7CkBAIC0xNTQsOCArMTg3LDEyIEBAIHZvaWQgQ29tcGxleFRl eHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGxleFRleHRSdW5zRm9yQ2hhcmFjdGVycyhjb25zdCBV Q2hhciogY3AsCiAgICAgICAgIGlmICghdHlwZXNldHRlcikKICAgICAgICAgICAgIHJldHVybjsK IAorICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2hhcGluZywgc3RyZWFtIDw8ICJGb3JjaW5nICIg PDwgKG1fcnVuLmx0cigpID8gImx0ciIgOiAicnRsIikpOworCiAgICAgICAgIGxpbmUgPSBhZG9w dENGKENUVHlwZXNldHRlckNyZWF0ZUxpbmUodHlwZXNldHRlci5nZXQoKSwgQ0ZSYW5nZU1ha2Uo MCwgMCkpKTsKICAgICB9IGVsc2UgeworICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2hhcGluZywg c3RyZWFtIDw8ICJOb3QgZm9yY2luZyBkaXJlY3Rpb24iKTsKKwogICAgICAgICBQcm92aWRlcklu Zm8gaW5mbyA9IHsgY3AsIGxlbmd0aCwgc3RyaW5nQXR0cmlidXRlcy5nZXQoKSB9OwogCiAgICAg ICAgIGxpbmUgPSBhZG9wdENGKENUTGluZUNyZWF0ZVdpdGhVbmlDaGFyUHJvdmlkZXIoJnByb3Zp ZGVTdHJpbmdBbmRBdHRyaWJ1dGVzLCBudWxscHRyLCAmaW5mbykpOwpAQCAtMTczLDYgKzIxMCw4 IEBAIHZvaWQgQ29tcGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGxleFRleHRSdW5zRm9y Q2hhcmFjdGVycyhjb25zdCBVQ2hhciogY3AsCiAKICAgICBDRkluZGV4IHJ1bkNvdW50ID0gQ0ZB cnJheUdldENvdW50KHJ1bkFycmF5KTsKIAorICAgIExPR19XSVRIX1NUUkVBTShTaGFwaW5nLCBz dHJlYW0gPDwgIlJlc3VsdDogIiA8PCBydW5Db3VudCA8PCAiIHJ1bnMuIik7CisKICAgICBmb3Ig KENGSW5kZXggciA9IDA7IHIgPCBydW5Db3VudDsgcisrKSB7CiAgICAgICAgIENUUnVuUmVmIGN0 UnVuID0gc3RhdGljX2Nhc3Q8Q1RSdW5SZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgocnVuQXJy YXksIG1fcnVuLmx0cigpID8gciA6IHJ1bkNvdW50IC0gMSAtIHIpKTsKICAgICAgICAgQVNTRVJU KENGR2V0VHlwZUlEKGN0UnVuKSA9PSBDVFJ1bkdldFR5cGVJRCgpKTsKQEAgLTIxMSw2ICsyNTAs OCBAQCB2b2lkIENvbXBsZXhUZXh0Q29udHJvbGxlcjo6Y29sbGVjdENvbXBsZXhUZXh0UnVuc0Zv ckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqIGNwLAogICAgICAgICBpZiAobV9mYWxsYmFja0ZvbnRz ICYmIHJ1bkZvbnQgIT0gJm1fZm9udC5wcmltYXJ5Rm9udCgpKQogICAgICAgICAgICAgbV9mYWxs YmFja0ZvbnRzLT5hZGQoZm9udCk7CiAKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFNoYXBpbmcs IHN0cmVhbSA8PCAiUnVuICIgPDwgciA8PCAiOiIpOworCiAgICAgICAgIG1fY29tcGxleFRleHRS dW5zLmFwcGVuZChDb21wbGV4VGV4dFJ1bjo6Y3JlYXRlKGN0UnVuLCAqcnVuRm9udCwgY3AsIHN0 cmluZ0xvY2F0aW9uLCBsZW5ndGgsIHJ1blJhbmdlLmxvY2F0aW9uLCBydW5SYW5nZS5sb2NhdGlv biArIHJ1blJhbmdlLmxlbmd0aCkpOwogICAgIH0KIH0K