285147 2024-12-25 06:17:34 -0800 [Cleanup] Decouple deprecated and regular flex box logic in RenderBox::computeLogicalHeight 2024-12-25 19:06:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan koivisto webkit-bug-importer oldest_to_newest 2083884 0 zalan 2024-12-25 06:17:34 -0800 ssia 2083885 1 473665 zalan 2024-12-25 06:19:57 -0800 Created attachment 473665 Patch 2083897 2 473668 zalan 2024-12-25 11:51:07 -0800 Created attachment 473668 Patch 2083916 3 473672 zalan 2024-12-25 15:25:33 -0800 Created attachment 473672 [fast-cq]Patch 2083937 4 ews-feeder 2024-12-25 19:05:43 -0800 Committed 288295@main (32c16b8797fd): <https://commits.webkit.org/288295@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 473672. 2083938 5 webkit-bug-importer 2024-12-25 19:06:15 -0800 <rdar://problem/142045095> 473665 2024-12-25 06:19:57 -0800 2024-12-25 11:51:05 -0800 Patch bug-285147-20241225061956.patch text/plain 5894 zalan RnJvbSAzZjk1Nzg4YmQ4MDVkNjExMDlmMjI0ZDYyZWE3MjRjMWU3MzNkMjc2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMjUgRGVjIDIwMjQgMDY6MTc6NDQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbQ2xlYW51 cF0gRGVjb3VwbGUgZGVwcmVjYXRlZCBhbmQgcmVndWxhciBmbGV4IGJveCBsb2dpYyBpbgogUmVu ZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI4NTE0NwoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgoxLiBNb3Zl IGFsbCBkZXByZWNhdGVkIGZsZXggYm94IGxvZ2ljIHVuZGVyICd1c2VkSGVpZ2h0JyBsYW1iZGEu CjIuIHRyZWF0QXNSZXBsYWNlZCBpcyBub3cganVzdCBpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMp IGZvciBhbGwgdGhlIG90aGVyIHR5cGVzIG9mIGJveGVzLgoKKiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHQgY29uc3QpOgotLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw IHwgNTAgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNl cnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCmluZGV4IDdiMzE5YzkyOTE2My4uMTJkMWU4OGYzMDJhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzE5NywxOCArMzE5NywxNCBAQCBSZW5kZXJCb3g6 OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp Z2h0KExheW91dFVuaQogICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVkVmFsdWVzOwogICAgICAg ICB9CiAKLSAgICAgICAgLy8gRklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGli bGUgYm94ZXMuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NjQxOAotICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9IHBhcmVudCgpLT5pc1Jl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJveE9yaWVu dCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbDsKLSAgICAgICAgYm9vbCBzdHJldGNoaW5nID0g cGFyZW50KCktPnN0eWxlKCkuYm94QWxpZ24oKSA9PSBCb3hBbGlnbm1lbnQ6OlN0cmV0Y2g7Ci0g ICAgICAgIGJvb2wgdHJlYXRBc1JlcGxhY2VkID0gaXM8UmVuZGVyUmVwbGFjZWQ+KCp0aGlzKSAm JiAoIWluSG9yaXpvbnRhbEJveCB8fCAhc3RyZXRjaGluZyk7CiAgICAgICAgIGJvb2wgY2hlY2tN aW5NYXhIZWlnaHQgPSBmYWxzZTsKLQogICAgICAgICAvLyBUaGUgcGFyZW50IGJveCBpcyBmbGV4 aW5nIHVzLCBzbyBpdCBoYXMgaW5jcmVhc2VkIG9yIGRlY3JlYXNlZCBvdXIgaGVpZ2h0LiBXZSBo YXZlIHRvIGdyYWIgb3VyIGNhY2hlZCBmbGV4aWJsZSBoZWlnaHQuCiAgICAgICAgIC8vIEZJWE1F OiBBY2NvdW50IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgogICAgICAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKICAgICAgICAgYXV0 byB1c2VkSGVpZ2h0ID0gWyZdKCkgLT4gTGVuZ3RoIHsKLSAgICAgICAgICAgIGlmIChpczxSZW5k ZXJGbGV4aWJsZUJveD4ocGFyZW50KCkpIHx8IGlzPFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eD4ocGFyZW50KCkpKSB7CisgICAgICAgICAgICBhdXRvJiBwYXJlbnQgPSAqdGhpcy0+cGFyZW50 KCk7CisKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJGbGV4aWJsZUJveD4ocGFyZW50KSkgewog ICAgICAgICAgICAgICAgIGlmIChhdXRvIG92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0ID0gb3ZlcnJp ZGluZ0xvZ2ljYWxIZWlnaHRGb3JGbGV4QmFzaXNDb21wdXRhdGlvbigpKSB7CiAgICAgICAgICAg ICAgICAgICAgIEFTU0VSVCghdGhpcy0+b3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSk7CiAgICAg ICAgICAgICAgICAgICAgIGNoZWNrTWluTWF4SGVpZ2h0ID0gdHJ1ZTsKQEAgLTMyMTgsMjUgKzMy MTQsNDggQEAgUmVuZGVyQm94OjpMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgUmVuZGVyQm94 Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbmkKICAgICAgICAgICAgICAgICBpZiAoYXV0 byBvdmVycmlkaW5nTG9naWNhbEhlaWdodCA9IHRoaXMtPm92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0 KCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ICpvdmVycmlkaW5nTG9naWNhbEhlaWdo dCwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKIAotICAgICAgICAgICAgICAgIGlmICh0cmVhdEFzUmVw bGFjZWQpCisgICAgICAgICAgICAgICAgaWYgKGlzPFJlbmRlclJlcGxhY2VkPigqdGhpcykpCisg ICAgICAgICAgICAgICAgICAgIHJldHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQo KSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07 CisKKyAgICAgICAgICAgICAgICBjaGVja01pbk1heEhlaWdodCA9IHRydWU7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBpZiAoQ2hlY2tlZFB0ciBkZXByZWNhdGVkRmxleEJveCA9IGR5bmFtaWNEb3du Y2FzdDxSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g+KHBhcmVudCkpIHsKKyAgICAgICAgICAg ICAgICBpZiAoYXV0byBvdmVycmlkaW5nTG9naWNhbEhlaWdodCA9IHRoaXMtPm92ZXJyaWRpbmdM b2dpY2FsSGVpZ2h0KCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ICpvdmVycmlkaW5n TG9naWNhbEhlaWdodCwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKKworICAgICAgICAgICAgICAgIGF1 dG8mIGZsZXhCb3hTdHlsZSA9IGRlcHJlY2F0ZWRGbGV4Qm94LT5zdHlsZSgpOworICAgICAgICAg ICAgICAgIGF1dG8gdHJlYXRBc1JlcGxhY2VkID0gWyZdIHsKKyAgICAgICAgICAgICAgICAgICAg aWYgKCFpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQorICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9 IGZsZXhCb3hTdHlsZS5ib3hPcmllbnQoKSA9PSBCb3hPcmllbnQ6Okhvcml6b250YWw7CisgICAg ICAgICAgICAgICAgICAgIGJvb2wgc3RyZXRjaGluZyA9IGZsZXhCb3hTdHlsZS5ib3hBbGlnbigp ID09IEJveEFsaWdubWVudDo6U3RyZXRjaDsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuICFp bkhvcml6b250YWxCb3ggfHwgIXN0cmV0Y2hpbmc7CisgICAgICAgICAgICAgICAgfTsKKyAgICAg ICAgICAgICAgICBpZiAodHJlYXRBc1JlcGxhY2VkKCkpCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFuZFBhZGRpbmdM b2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKKyAgICAgICAgICAgICAgICAv LyBCbG9jayBjaGlsZHJlbiBvZiBob3Jpem9udGFsIGZsZXhpYmxlIGJveGVzIGZpbGwgdGhlIGhl aWdodCBvZiB0aGUgYm94LgorICAgICAgICAgICAgICAgIGlmIChmbGV4Qm94U3R5bGUuYm94T3Jp ZW50KCkgPT0gQm94T3JpZW50OjpIb3Jpem9udGFsICYmIGRlcHJlY2F0ZWRGbGV4Qm94LT5pc1N0 cmV0Y2hpbmdDaGlsZHJlbigpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4geyBkZXByZWNh dGVkRmxleEJveC0+Y29udGVudExvZ2ljYWxIZWlnaHQoKSAtIG1hcmdpbkJlZm9yZSgpIC0gbWFy Z2luQWZ0ZXIoKSwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKKwogICAgICAgICAgICAgICAgIGNoZWNr TWluTWF4SGVpZ2h0ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dp Y2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmIChpczxSZW5kZXJH cmlkPihwYXJlbnQoKSkpIHsKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJHcmlkPihwYXJlbnQp KSB7CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8gb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQgPSB0 aGlzLT5vdmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4geyAqb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKLSAg ICAgICAgICAgICAgICBpZiAodHJlYXRBc1JlcGxhY2VkKQorICAgICAgICAgICAgICAgIGlmIChp czxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4geyBj b21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhl aWdodCgpLCBMZW5ndGhUeXBlOjpGaXhlZCB9OwogCiAgICAgICAgICAgICAgICAgY2hlY2tNaW5N YXhIZWlnaHQgPSB0cnVlOwogICAgICAgICAgICAgICAgIHJldHVybiBzdHlsZSgpLmxvZ2ljYWxI ZWlnaHQoKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKHRyZWF0QXNSZXBsYWNl ZCkKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQogICAgICAgICAg ICAgICAgIHJldHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFu ZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKICAgICAgICAg ICAgIGNoZWNrTWluTWF4SGVpZ2h0ID0gdHJ1ZTsKQEAgLTMyNDQsMTUgKzMyNjMsNiBAQCBSZW5k ZXJCb3g6OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dp Y2FsSGVpZ2h0KExheW91dFVuaQogICAgICAgICB9OwogICAgICAgICBoID0gdXNlZEhlaWdodCgp OwogCi0gICAgICAgIC8vIEJsb2NrIGNoaWxkcmVuIG9mIGhvcml6b250YWwgZmxleGlibGUgYm94 ZXMgZmlsbCB0aGUgaGVpZ2h0IG9mIHRoZSBib3guCi0gICAgICAgIC8vIEZJWE1FOiBBY2NvdW50 IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgotICAgICAgICAvLyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKLSAgICAgICAgaWYgKGguaXNBdXRv KCkgJiYgaXM8UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94PigqcGFyZW50KCkpICYmIHBhcmVu dCgpLT5zdHlsZSgpLmJveE9yaWVudCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbAotICAgICAg ICAgICAgICAgICYmIGRvd25jYXN0PFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveD4oKnBhcmVu dCgpKS5pc1N0cmV0Y2hpbmdDaGlsZHJlbigpKSB7Ci0gICAgICAgICAgICBoID0gTGVuZ3RoKHBh cmVudEJveCgpLT5jb250ZW50TG9naWNhbEhlaWdodCgpIC0gbWFyZ2luQmVmb3JlKCkgLSBtYXJn aW5BZnRlcigpLCBMZW5ndGhUeXBlOjpGaXhlZCk7Ci0gICAgICAgICAgICBjaGVja01pbk1heEhl aWdodCA9IGZhbHNlOwotICAgICAgICB9Ci0KICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHRSZXN1 bHQ7CiAgICAgICAgIGlmIChjaGVja01pbk1heEhlaWdodCkgewogICAgICAgICAgICAgLy8gQ2Fs bGVycyBwYXNzaW5nIExheW91dFVuaXQ6Om1heCgpIGZvciBsb2dpY2FsSGVpZ2h0IG1lYW5zIGFu IGluZGVmaW5pdGUgaGVpZ2h0LCBzbwo= 473668 2024-12-25 11:51:07 -0800 2024-12-25 15:25:31 -0800 Patch bug-285147-20241225115106.patch text/plain 5894 zalan RnJvbSBjODNjYzIwNmU1MWZhNTRkNGRlMWZiOGY0MmJlNjY4YjQ1Njk2OTMxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMjUgRGVjIDIwMjQgMDY6MTc6NDQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbQ2xlYW51 cF0gRGVjb3VwbGUgZGVwcmVjYXRlZCBhbmQgcmVndWxhciBmbGV4IGJveCBsb2dpYyBpbgogUmVu ZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI4NTE0NwoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgoxLiBNb3Zl IGFsbCBkZXByZWNhdGVkIGZsZXggYm94IGxvZ2ljIHVuZGVyICd1c2VkSGVpZ2h0JyBsYW1iZGEu CjIuIHRyZWF0QXNSZXBsYWNlZCBpcyBub3cganVzdCBpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMp IGZvciBhbGwgdGhlIG90aGVyIHR5cGVzIG9mIGJveGVzLgoKKiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHQgY29uc3QpOgotLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw IHwgNTAgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNl cnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCmluZGV4IDdiMzE5YzkyOTE2My4uMTJkMWU4OGYzMDJhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzE5NywxOCArMzE5NywxNCBAQCBSZW5kZXJCb3g6 OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp Z2h0KExheW91dFVuaQogICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVkVmFsdWVzOwogICAgICAg ICB9CiAKLSAgICAgICAgLy8gRklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGli bGUgYm94ZXMuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NjQxOAotICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9IHBhcmVudCgpLT5pc1Jl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJveE9yaWVu dCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbDsKLSAgICAgICAgYm9vbCBzdHJldGNoaW5nID0g cGFyZW50KCktPnN0eWxlKCkuYm94QWxpZ24oKSA9PSBCb3hBbGlnbm1lbnQ6OlN0cmV0Y2g7Ci0g ICAgICAgIGJvb2wgdHJlYXRBc1JlcGxhY2VkID0gaXM8UmVuZGVyUmVwbGFjZWQ+KCp0aGlzKSAm JiAoIWluSG9yaXpvbnRhbEJveCB8fCAhc3RyZXRjaGluZyk7CiAgICAgICAgIGJvb2wgY2hlY2tN aW5NYXhIZWlnaHQgPSBmYWxzZTsKLQogICAgICAgICAvLyBUaGUgcGFyZW50IGJveCBpcyBmbGV4 aW5nIHVzLCBzbyBpdCBoYXMgaW5jcmVhc2VkIG9yIGRlY3JlYXNlZCBvdXIgaGVpZ2h0LiBXZSBo YXZlIHRvIGdyYWIgb3VyIGNhY2hlZCBmbGV4aWJsZSBoZWlnaHQuCiAgICAgICAgIC8vIEZJWE1F OiBBY2NvdW50IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgogICAgICAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKICAgICAgICAgYXV0 byB1c2VkSGVpZ2h0ID0gWyZdKCkgLT4gTGVuZ3RoIHsKLSAgICAgICAgICAgIGlmIChpczxSZW5k ZXJGbGV4aWJsZUJveD4ocGFyZW50KCkpIHx8IGlzPFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eD4ocGFyZW50KCkpKSB7CisgICAgICAgICAgICBhdXRvJiBwYXJlbnQgPSAqdGhpcy0+cGFyZW50 KCk7CisKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJGbGV4aWJsZUJveD4ocGFyZW50KSkgewog ICAgICAgICAgICAgICAgIGlmIChhdXRvIG92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0ID0gb3ZlcnJp ZGluZ0xvZ2ljYWxIZWlnaHRGb3JGbGV4QmFzaXNDb21wdXRhdGlvbigpKSB7CiAgICAgICAgICAg ICAgICAgICAgIEFTU0VSVCghdGhpcy0+b3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSk7CiAgICAg ICAgICAgICAgICAgICAgIGNoZWNrTWluTWF4SGVpZ2h0ID0gdHJ1ZTsKQEAgLTMyMTgsMjUgKzMy MTQsNDggQEAgUmVuZGVyQm94OjpMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgUmVuZGVyQm94 Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbmkKICAgICAgICAgICAgICAgICBpZiAoYXV0 byBvdmVycmlkaW5nTG9naWNhbEhlaWdodCA9IHRoaXMtPm92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0 KCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ICpvdmVycmlkaW5nTG9naWNhbEhlaWdo dCwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKIAotICAgICAgICAgICAgICAgIGlmICh0cmVhdEFzUmVw bGFjZWQpCisgICAgICAgICAgICAgICAgaWYgKGlzPFJlbmRlclJlcGxhY2VkPigqdGhpcykpCisg ICAgICAgICAgICAgICAgICAgIHJldHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQo KSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07 CisKKyAgICAgICAgICAgICAgICBjaGVja01pbk1heEhlaWdodCA9IHRydWU7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBpZiAoQ2hlY2tlZFB0ciBkZXByZWNhdGVkRmxleEJveCA9IGR5bmFtaWNEb3du Y2FzdDxSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g+KHBhcmVudCkpIHsKKyAgICAgICAgICAg ICAgICBpZiAoYXV0byBvdmVycmlkaW5nTG9naWNhbEhlaWdodCA9IHRoaXMtPm92ZXJyaWRpbmdM b2dpY2FsSGVpZ2h0KCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ICpvdmVycmlkaW5n TG9naWNhbEhlaWdodCwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKKworICAgICAgICAgICAgICAgIGF1 dG8mIGZsZXhCb3hTdHlsZSA9IGRlcHJlY2F0ZWRGbGV4Qm94LT5zdHlsZSgpOworICAgICAgICAg ICAgICAgIGF1dG8gdHJlYXRBc1JlcGxhY2VkID0gWyZdIHsKKyAgICAgICAgICAgICAgICAgICAg aWYgKCFpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQorICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9 IGZsZXhCb3hTdHlsZS5ib3hPcmllbnQoKSA9PSBCb3hPcmllbnQ6Okhvcml6b250YWw7CisgICAg ICAgICAgICAgICAgICAgIGJvb2wgc3RyZXRjaGluZyA9IGZsZXhCb3hTdHlsZS5ib3hBbGlnbigp ID09IEJveEFsaWdubWVudDo6U3RyZXRjaDsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuICFp bkhvcml6b250YWxCb3ggfHwgIXN0cmV0Y2hpbmc7CisgICAgICAgICAgICAgICAgfTsKKyAgICAg ICAgICAgICAgICBpZiAodHJlYXRBc1JlcGxhY2VkKCkpCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFuZFBhZGRpbmdM b2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKKyAgICAgICAgICAgICAgICAv LyBCbG9jayBjaGlsZHJlbiBvZiBob3Jpem9udGFsIGZsZXhpYmxlIGJveGVzIGZpbGwgdGhlIGhl aWdodCBvZiB0aGUgYm94LgorICAgICAgICAgICAgICAgIGlmIChmbGV4Qm94U3R5bGUuYm94T3Jp ZW50KCkgPT0gQm94T3JpZW50OjpIb3Jpem9udGFsICYmIGRlcHJlY2F0ZWRGbGV4Qm94LT5pc1N0 cmV0Y2hpbmdDaGlsZHJlbigpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4geyBkZXByZWNh dGVkRmxleEJveC0+Y29udGVudExvZ2ljYWxIZWlnaHQoKSAtIG1hcmdpbkJlZm9yZSgpIC0gbWFy Z2luQWZ0ZXIoKSwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKKwogICAgICAgICAgICAgICAgIGNoZWNr TWluTWF4SGVpZ2h0ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dp Y2FsSGVpZ2h0KCk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmIChpczxSZW5kZXJH cmlkPihwYXJlbnQoKSkpIHsKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJHcmlkPihwYXJlbnQp KSB7CiAgICAgICAgICAgICAgICAgaWYgKGF1dG8gb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQgPSB0 aGlzLT5vdmVycmlkaW5nTG9naWNhbEhlaWdodCgpKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4geyAqb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKLSAg ICAgICAgICAgICAgICBpZiAodHJlYXRBc1JlcGxhY2VkKQorICAgICAgICAgICAgICAgIGlmIChp czxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4geyBj b21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhl aWdodCgpLCBMZW5ndGhUeXBlOjpGaXhlZCB9OwogCiAgICAgICAgICAgICAgICAgY2hlY2tNaW5N YXhIZWlnaHQgPSB0cnVlOwogICAgICAgICAgICAgICAgIHJldHVybiBzdHlsZSgpLmxvZ2ljYWxI ZWlnaHQoKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKHRyZWF0QXNSZXBsYWNl ZCkKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQogICAgICAgICAg ICAgICAgIHJldHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFu ZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKICAgICAgICAg ICAgIGNoZWNrTWluTWF4SGVpZ2h0ID0gdHJ1ZTsKQEAgLTMyNDQsMTUgKzMyNjMsNiBAQCBSZW5k ZXJCb3g6OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dp Y2FsSGVpZ2h0KExheW91dFVuaQogICAgICAgICB9OwogICAgICAgICBoID0gdXNlZEhlaWdodCgp OwogCi0gICAgICAgIC8vIEJsb2NrIGNoaWxkcmVuIG9mIGhvcml6b250YWwgZmxleGlibGUgYm94 ZXMgZmlsbCB0aGUgaGVpZ2h0IG9mIHRoZSBib3guCi0gICAgICAgIC8vIEZJWE1FOiBBY2NvdW50 IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgotICAgICAgICAvLyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKLSAgICAgICAgaWYgKGguaXNBdXRv KCkgJiYgaXM8UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94PigqcGFyZW50KCkpICYmIHBhcmVu dCgpLT5zdHlsZSgpLmJveE9yaWVudCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbAotICAgICAg ICAgICAgICAgICYmIGRvd25jYXN0PFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveD4oKnBhcmVu dCgpKS5pc1N0cmV0Y2hpbmdDaGlsZHJlbigpKSB7Ci0gICAgICAgICAgICBoID0gTGVuZ3RoKHBh cmVudEJveCgpLT5jb250ZW50TG9naWNhbEhlaWdodCgpIC0gbWFyZ2luQmVmb3JlKCkgLSBtYXJn aW5BZnRlcigpLCBMZW5ndGhUeXBlOjpGaXhlZCk7Ci0gICAgICAgICAgICBjaGVja01pbk1heEhl aWdodCA9IGZhbHNlOwotICAgICAgICB9Ci0KICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHRSZXN1 bHQ7CiAgICAgICAgIGlmIChjaGVja01pbk1heEhlaWdodCkgewogICAgICAgICAgICAgLy8gQ2Fs bGVycyBwYXNzaW5nIExheW91dFVuaXQ6Om1heCgpIGZvciBsb2dpY2FsSGVpZ2h0IG1lYW5zIGFu IGluZGVmaW5pdGUgaGVpZ2h0LCBzbwo= 473672 2024-12-25 15:25:33 -0800 2024-12-25 19:05:43 -0800 [fast-cq]Patch bug-285147-20241225152532.patch text/plain 5930 zalan RnJvbSAyZmNlNjA4MDdmZjgyODcyYmYxY2FjMWNjYzg1MTRmYTZlYWM3MTcxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMjUgRGVjIDIwMjQgMDY6MTc6NDQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbQ2xlYW51 cF0gRGVjb3VwbGUgZGVwcmVjYXRlZCBhbmQgcmVndWxhciBmbGV4IGJveCBsb2dpYyBpbgogUmVu ZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI4NTE0NwoKUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCgoxLiBNb3Zl IGFsbCBkZXByZWNhdGVkIGZsZXggYm94IGxvZ2ljIHVuZGVyICd1c2VkSGVpZ2h0JyBsYW1iZGEu CjIuIHRyZWF0QXNSZXBsYWNlZCBpcyBub3cganVzdCBpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMp IGZvciBhbGwgdGhlIG90aGVyIHR5cGVzIG9mIGJveGVzLgoKKiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxI ZWlnaHQgY29uc3QpOgotLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw IHwgNTAgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNl cnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCmluZGV4IDdiMzE5YzkyOTE2My4uMzgwODIwMWM4NWI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMzE5NywxOCArMzE5NywxNCBAQCBSZW5kZXJCb3g6 OkxvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVp Z2h0KExheW91dFVuaQogICAgICAgICAgICAgcmV0dXJuIGNvbXB1dGVkVmFsdWVzOwogICAgICAg ICB9CiAKLSAgICAgICAgLy8gRklYTUU6IEFjY291bnQgZm9yIGJsb2NrLWZsb3cgaW4gZmxleGli bGUgYm94ZXMuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NjQxOAotICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9IHBhcmVudCgpLT5pc1Jl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJveE9yaWVu dCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbDsKLSAgICAgICAgYm9vbCBzdHJldGNoaW5nID0g cGFyZW50KCktPnN0eWxlKCkuYm94QWxpZ24oKSA9PSBCb3hBbGlnbm1lbnQ6OlN0cmV0Y2g7Ci0g ICAgICAgIGJvb2wgdHJlYXRBc1JlcGxhY2VkID0gaXM8UmVuZGVyUmVwbGFjZWQ+KCp0aGlzKSAm JiAoIWluSG9yaXpvbnRhbEJveCB8fCAhc3RyZXRjaGluZyk7CiAgICAgICAgIGJvb2wgY2hlY2tN aW5NYXhIZWlnaHQgPSBmYWxzZTsKLQogICAgICAgICAvLyBUaGUgcGFyZW50IGJveCBpcyBmbGV4 aW5nIHVzLCBzbyBpdCBoYXMgaW5jcmVhc2VkIG9yIGRlY3JlYXNlZCBvdXIgaGVpZ2h0LiBXZSBo YXZlIHRvIGdyYWIgb3VyIGNhY2hlZCBmbGV4aWJsZSBoZWlnaHQuCiAgICAgICAgIC8vIEZJWE1F OiBBY2NvdW50IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgogICAgICAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKICAgICAgICAgYXV0 byB1c2VkSGVpZ2h0ID0gWyZdKCkgLT4gTGVuZ3RoIHsKLSAgICAgICAgICAgIGlmIChpczxSZW5k ZXJGbGV4aWJsZUJveD4ocGFyZW50KCkpIHx8IGlzPFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eD4ocGFyZW50KCkpKSB7CisgICAgICAgICAgICBhdXRvJiBwYXJlbnQgPSAqdGhpcy0+cGFyZW50 KCk7CisKKyAgICAgICAgICAgIGlmIChpczxSZW5kZXJGbGV4aWJsZUJveD4ocGFyZW50KSkgewog ICAgICAgICAgICAgICAgIGlmIChhdXRvIG92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0ID0gb3ZlcnJp ZGluZ0xvZ2ljYWxIZWlnaHRGb3JGbGV4QmFzaXNDb21wdXRhdGlvbigpKSB7CiAgICAgICAgICAg ICAgICAgICAgIEFTU0VSVCghdGhpcy0+b3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQoKSk7CiAgICAg ICAgICAgICAgICAgICAgIGNoZWNrTWluTWF4SGVpZ2h0ID0gdHJ1ZTsKQEAgLTMyMTgsMjUgKzMy MTQsNDggQEAgUmVuZGVyQm94OjpMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgUmVuZGVyQm94 Ojpjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRVbmkKICAgICAgICAgICAgICAgICBpZiAoYXV0 byBvdmVycmlkaW5nTG9naWNhbEhlaWdodCA9IHRoaXMtPm92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0 KCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ICpvdmVycmlkaW5nTG9naWNhbEhlaWdo dCwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKIAotICAgICAgICAgICAgICAgIGlmICh0cmVhdEFzUmVw bGFjZWQpCisgICAgICAgICAgICAgICAgaWYgKGlzPFJlbmRlclJlcGxhY2VkPigqdGhpcykpCisg ICAgICAgICAgICAgICAgICAgIHJldHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQo KSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07 CisKKyAgICAgICAgICAgICAgICBjaGVja01pbk1heEhlaWdodCA9IHRydWU7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHN0eWxlKCkubG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBpZiAoQ2hlY2tlZFB0ciBkZXByZWNhdGVkRmxleEJveCA9IGR5bmFtaWNEb3du Y2FzdDxSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g+KHBhcmVudCkpIHsKKyAgICAgICAgICAg ICAgICBpZiAoYXV0byBvdmVycmlkaW5nTG9naWNhbEhlaWdodCA9IHRoaXMtPm92ZXJyaWRpbmdM b2dpY2FsSGVpZ2h0KCkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiB7ICpvdmVycmlkaW5n TG9naWNhbEhlaWdodCwgTGVuZ3RoVHlwZTo6Rml4ZWQgfTsKKworICAgICAgICAgICAgICAgIGF1 dG8mIGZsZXhCb3hTdHlsZSA9IGRlcHJlY2F0ZWRGbGV4Qm94LT5zdHlsZSgpOworICAgICAgICAg ICAgICAgIGF1dG8gdHJlYXRBc1JlcGxhY2VkID0gWyZdIHsKKyAgICAgICAgICAgICAgICAgICAg aWYgKCFpczxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQorICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgICAgICBib29sIGluSG9yaXpvbnRhbEJveCA9 IGZsZXhCb3hTdHlsZS5ib3hPcmllbnQoKSA9PSBCb3hPcmllbnQ6Okhvcml6b250YWw7CisgICAg ICAgICAgICAgICAgICAgIGJvb2wgc3RyZXRjaGluZyA9IGZsZXhCb3hTdHlsZS5ib3hBbGlnbigp ID09IEJveEFsaWdubWVudDo6U3RyZXRjaDsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuICFp bkhvcml6b250YWxCb3ggfHwgIXN0cmV0Y2hpbmc7CisgICAgICAgICAgICAgICAgfTsKKyAgICAg ICAgICAgICAgICBpZiAodHJlYXRBc1JlcGxhY2VkKCkpCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybiB7IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFuZFBhZGRpbmdM b2dpY2FsSGVpZ2h0KCksIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKKyAgICAgICAgICAgICAgICAv LyBCbG9jayBjaGlsZHJlbiBvZiBob3Jpem9udGFsIGZsZXhpYmxlIGJveGVzIGZpbGwgdGhlIGhl aWdodCBvZiB0aGUgYm94LgorICAgICAgICAgICAgICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxIZWln aHQoKS5pc0F1dG8oKSAmJiBmbGV4Qm94U3R5bGUuYm94T3JpZW50KCkgPT0gQm94T3JpZW50OjpI b3Jpem9udGFsICYmIGRlcHJlY2F0ZWRGbGV4Qm94LT5pc1N0cmV0Y2hpbmdDaGlsZHJlbigpKQor ICAgICAgICAgICAgICAgICAgICByZXR1cm4geyBkZXByZWNhdGVkRmxleEJveC0+Y29udGVudExv Z2ljYWxIZWlnaHQoKSAtIG1hcmdpbkJlZm9yZSgpIC0gbWFyZ2luQWZ0ZXIoKSwgTGVuZ3RoVHlw ZTo6Rml4ZWQgfTsKKwogICAgICAgICAgICAgICAgIGNoZWNrTWluTWF4SGVpZ2h0ID0gdHJ1ZTsK ICAgICAgICAgICAgICAgICByZXR1cm4gc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCk7CiAgICAgICAg ICAgICB9CiAKLSAgICAgICAgICAgIGlmIChpczxSZW5kZXJHcmlkPihwYXJlbnQoKSkpIHsKKyAg ICAgICAgICAgIGlmIChpczxSZW5kZXJHcmlkPihwYXJlbnQpKSB7CiAgICAgICAgICAgICAgICAg aWYgKGF1dG8gb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQgPSB0aGlzLT5vdmVycmlkaW5nTG9naWNh bEhlaWdodCgpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4geyAqb3ZlcnJpZGluZ0xvZ2lj YWxIZWlnaHQsIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKLSAgICAgICAgICAgICAgICBpZiAodHJl YXRBc1JlcGxhY2VkKQorICAgICAgICAgICAgICAgIGlmIChpczxSZW5kZXJSZXBsYWNlZD4oKnRo aXMpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4geyBjb21wdXRlUmVwbGFjZWRMb2dpY2Fs SGVpZ2h0KCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpLCBMZW5ndGhUeXBlOjpG aXhlZCB9OwogCiAgICAgICAgICAgICAgICAgY2hlY2tNaW5NYXhIZWlnaHQgPSB0cnVlOwogICAg ICAgICAgICAgICAgIHJldHVybiBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgICAg IH0KIAotICAgICAgICAgICAgaWYgKHRyZWF0QXNSZXBsYWNlZCkKKyAgICAgICAgICAgIGlmIChp czxSZW5kZXJSZXBsYWNlZD4oKnRoaXMpKQogICAgICAgICAgICAgICAgIHJldHVybiB7IGNvbXB1 dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0 KCksIExlbmd0aFR5cGU6OkZpeGVkIH07CiAKICAgICAgICAgICAgIGNoZWNrTWluTWF4SGVpZ2h0 ID0gdHJ1ZTsKQEAgLTMyNDQsMTUgKzMyNjMsNiBAQCBSZW5kZXJCb3g6OkxvZ2ljYWxFeHRlbnRD b21wdXRlZFZhbHVlcyBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KExheW91dFVuaQog ICAgICAgICB9OwogICAgICAgICBoID0gdXNlZEhlaWdodCgpOwogCi0gICAgICAgIC8vIEJsb2Nr IGNoaWxkcmVuIG9mIGhvcml6b250YWwgZmxleGlibGUgYm94ZXMgZmlsbCB0aGUgaGVpZ2h0IG9m IHRoZSBib3guCi0gICAgICAgIC8vIEZJWE1FOiBBY2NvdW50IGZvciBibG9jay1mbG93IGluIGZs ZXhpYmxlIGJveGVzLgotICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDY0MTgKLSAgICAgICAgaWYgKGguaXNBdXRvKCkgJiYgaXM8UmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94PigqcGFyZW50KCkpICYmIHBhcmVudCgpLT5zdHlsZSgpLmJveE9yaWVu dCgpID09IEJveE9yaWVudDo6SG9yaXpvbnRhbAotICAgICAgICAgICAgICAgICYmIGRvd25jYXN0 PFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveD4oKnBhcmVudCgpKS5pc1N0cmV0Y2hpbmdDaGls ZHJlbigpKSB7Ci0gICAgICAgICAgICBoID0gTGVuZ3RoKHBhcmVudEJveCgpLT5jb250ZW50TG9n aWNhbEhlaWdodCgpIC0gbWFyZ2luQmVmb3JlKCkgLSBtYXJnaW5BZnRlcigpLCBMZW5ndGhUeXBl OjpGaXhlZCk7Ci0gICAgICAgICAgICBjaGVja01pbk1heEhlaWdodCA9IGZhbHNlOwotICAgICAg ICB9Ci0KICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHRSZXN1bHQ7CiAgICAgICAgIGlmIChjaGVj a01pbk1heEhlaWdodCkgewogICAgICAgICAgICAgLy8gQ2FsbGVycyBwYXNzaW5nIExheW91dFVu aXQ6Om1heCgpIGZvciBsb2dpY2FsSGVpZ2h0IG1lYW5zIGFuIGluZGVmaW5pdGUgaGVpZ2h0LCBz bwo=