266357 2023-12-13 10:40:14 -0800 [IFC][Ruby] Incorrect preferred width computation when <ruby> is present 2023-12-13 15:45:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1999334 0 zalan 2023-12-13 10:40:14 -0800 ssia 1999336 1 469019 zalan 2023-12-13 10:53:53 -0800 Created attachment 469019 Patch 1999338 2 469019 koivisto 2023-12-13 10:57:15 -0800 Comment on attachment 469019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=469019&action=review > Source/WebCore/rendering/RenderBlockFlow.cpp:4704 > + rubyBaseMinimumMaximumWidthStack.append(std::make_pair(inlineMin, inlineMax)); I think you can alternatively just say std::pair { inlineMin, inlineMax }, make_pair is not necessary anymore. 1999341 3 469021 zalan 2023-12-13 11:00:53 -0800 Created attachment 469021 Patch 1999358 4 469022 zalan 2023-12-13 12:29:02 -0800 Created attachment 469022 Patch 1999362 5 469023 zalan 2023-12-13 12:36:55 -0800 Created attachment 469023 [fast-cq]Patch 1999426 6 469027 zalan 2023-12-13 15:26:53 -0800 Created attachment 469027 [fast-cq]Patch 1999433 7 ews-feeder 2023-12-13 15:44:47 -0800 Committed 272011@main (fcb3a49fe8cd): <https://commits.webkit.org/272011@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469027. 1999434 8 webkit-bug-importer 2023-12-13 15:45:17 -0800 <rdar://problem/119634971> 469019 2023-12-13 10:53:53 -0800 2023-12-13 11:00:51 -0800 Patch bug-266357-20231213105352.patch text/plain 5005 zalan RnJvbSBmY2IzYTgyNzY3ZWU4Yjc0OWYzYzNhMjc5MjFiMGYzZTcxNTBiYmI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTMgRGVjIDIwMjMgMTA6NTA6NDUgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBJbmNvcnJlY3QgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIHdoZW4gPHJ1Ynk+CiBp cyBwcmVzZW50IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzNTcK ClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKTGV0J3MgaG9sZCBvbiB0byBydWJ5IGJhc2Ug bWluL21heCB3aWR0aCBhbmQgbWFrZSBzdXJlIHRoZSBhc3NvY2lhdGVkIGFubm90YXRpb24gYm94 J3MgbWluL21heCB2YWx1ZXMgYXJlIHRha2VuIGludG8gYWNjb3VudC4KCiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIGNvbnN0KToKLS0tCiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCB8IDM3ICsrKysrKysrKysr KystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRl eCAzZjYyZmY2MDM4N2QuLjlhYzI2ZWI2ODNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTQ2MjUsOCArNDYyNSw3IEBAIHZvaWQgUmVuZGVy QmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyhMYXlvdXRVbml0 JiBtaW5Mb2dpY2FsCiAgICAgYm9vbCBjYW5IYW5nUHVuY3R1YXRpb25BdFN0YXJ0ID0gc3R5bGVU b1VzZS5oYW5naW5nUHVuY3R1YXRpb24oKS5jb250YWlucyhIYW5naW5nUHVuY3R1YXRpb246OkZp cnN0KTsKICAgICBib29sIGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kID0gc3R5bGVUb1VzZS5oYW5n aW5nUHVuY3R1YXRpb24oKS5jb250YWlucyhIYW5naW5nUHVuY3R1YXRpb246Okxhc3QpOwogICAg IFJlbmRlclRleHQqIGxhc3RUZXh0ID0gbnVsbHB0cjsKLSAgICBmbG9hdCBhbm5vdGF0aW9uTWlu aW11bUludHJpbnNpY1dpZHRoID0gMC5mOwotICAgIGZsb2F0IGFubm90YXRpb25NYXhpbXVtSW50 cmluc2ljV2lkdGggPSAwLmY7CisgICAgVmVjdG9yPHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlv dXRVbml0Pj4gcnVieUJhc2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2s7CiAKICAgICBib29sIGFk ZGVkU3RhcnRQdW5jdHVhdGlvbkhhbmcgPSBmYWxzZTsKICAgICAKQEAgLTQ2MzQsMTggKzQ2MzMs MTkgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWwKICAgICAgICAgYm9vbCBhdXRvV3JhcCA9IGNo aWxkLT5pc1JlcGxhY2VkT3JJbmxpbmVCbG9jaygpID8gY2hpbGQtPnBhcmVudCgpLT5zdHlsZSgp LmF1dG9XcmFwKCkgOiBjaGlsZC0+c3R5bGUoKS5hdXRvV3JhcCgpOwogCiAgICAgICAgIC8vIElu dGVybGluZWFyIGFubm90YXRpb25zIGRvbid0IHBhcnRpY2lwYXRlIGluIGlubGluZSBsYXlvdXQs IGJ1dCB0aGV5IHB1dCBhIG1pbmltdW0gd2lkdGggcmVxdWlyZW1lbnQgb24gdGhlIGFzc29jaWF0 ZWQgcnVieSBiYXNlLgotICAgICAgICBhdXRvIGlzSW50ZXJsaW5lYXJUeXBlQW5ub3RhdGlvbiA9 IGNoaWxkLT5zdHlsZSgpLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6UnVieUFubm90YXRpb24g JiYgKGNoaWxkLT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigpICE9IFJ1YnlQb3NpdGlvbjo6SW50ZXJD aGFyYWN0ZXIgfHwgIXN0eWxlVG9Vc2UuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSk7CisgICAg ICAgIGF1dG8gaXNJbnRlcmxpbmVhclR5cGVBbm5vdGF0aW9uID0gaXM8UmVuZGVyQmxvY2s+KCpj aGlsZCkgJiYgY2hpbGQtPnN0eWxlKCkuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpSdWJ5QW5u b3RhdGlvbiAmJiAoY2hpbGQtPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgIT0gUnVieVBvc2l0aW9u OjpJbnRlckNoYXJhY3RlciB8fCAhc3R5bGVUb1VzZS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp KTsKICAgICAgICAgaWYgKGlzSW50ZXJsaW5lYXJUeXBlQW5ub3RhdGlvbikgewotICAgICAgICAg ICAgYXV0byBtaW5pbXVtV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKLSAgICAgICAgICAgIGF1dG8g bWF4aW11bVdpZHRoID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgICAgICBjb21wdXRlQ2hpbGRQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKCpjaGlsZCwgbWluaW11bVdpZHRoLCBtYXhpbXVtV2lkdGgp OwotCi0gICAgICAgICAgICBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dpZHRoICs9IG1pbmlt dW1XaWR0aC5jZWlsVG9GbG9hdCgpOwotICAgICAgICAgICAgYW5ub3RhdGlvbk1heGltdW1JbnRy aW5zaWNXaWR0aCArPSBtYXhpbXVtV2lkdGguY2VpbFRvRmxvYXQoKTsKLQotICAgICAgICAgICAg Ly8gRklYTUU6IEtlZXAgdHJhY2sgb2YgcnVieSBiYXNlIHdpZHRoLgotICAgICAgICAgICAgaW5s aW5lTWluID0gc3RkOjptYXgoaW5saW5lTWluLCBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dp ZHRoKTsKLSAgICAgICAgICAgIGlubGluZU1heCA9IHN0ZDo6bWF4KGlubGluZU1heCwgYW5ub3Rh dGlvbk1heGltdW1JbnRyaW5zaWNXaWR0aCk7CisgICAgICAgICAgICBhdXRvIGFubm90YXRpb25N aW5pbXVtSW50cmluc2ljV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAgIGF1dG8g YW5ub3RhdGlvbk1heGltdW1JbnRyaW5zaWNXaWR0aCA9IExheW91dFVuaXQgeyB9OworICAgICAg ICAgICAgY29tcHV0ZUNoaWxkUHJlZmVycmVkTG9naWNhbFdpZHRocygqY2hpbGQsIGFubm90YXRp b25NaW5pbXVtSW50cmluc2ljV2lkdGgsIGFubm90YXRpb25NYXhpbXVtSW50cmluc2ljV2lkdGgp OworCisgICAgICAgICAgICBpZiAoIXJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0YWNrLmlz RW1wdHkoKSkgeworICAgICAgICAgICAgICAgIC8vIEFubm90YXRpb24gYm94IGlzIGFsd2F5cyBw cmVjZWRlZCBieSB0aGUgYXNzb2NpYXRlZCBydWJ5IGJhc2UuCisgICAgICAgICAgICAgICAgYXV0 byBiYXNlTWluaW11bU1heGltdW1XaWR0aCA9IHJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0 YWNrLnRha2VMYXN0KCk7CisgICAgICAgICAgICAgICAgaW5saW5lTWluICs9IHN0ZDo6bWF4KDAu ZiwgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aC5jZWlsVG9GbG9hdCgpIC0gYmFzZU1p bmltdW1NYXhpbXVtV2lkdGguZmlyc3QpOworICAgICAgICAgICAgICAgIGlubGluZU1heCArPSBz dGQ6Om1heCgwLmYsIGFubm90YXRpb25NYXhpbXVtSW50cmluc2ljV2lkdGguY2VpbFRvRmxvYXQo KSAtIGJhc2VNaW5pbXVtTWF4aW11bVdpZHRoLnNlY29uZCk7CisgICAgICAgICAgICB9IGVsc2UK KyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmICghY2hpbGQtPmlzQlIoKSkgewpAQCAtNDcwMCw5 ICs0NzAwLDIwIEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVk TG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsCiAgICAgICAgICAgICAgICAgICAg IGNoaWxkTWluICs9IGJwbTsKICAgICAgICAgICAgICAgICAgICAgY2hpbGRNYXggKz0gYnBtOwog CisgICAgICAgICAgICAgICAgICAgIGlmIChjaGlsZFN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5 VHlwZTo6UnVieUJhc2UgJiYgIWNoaWxkSXRlcmF0b3IuZW5kT2ZJbmxpbmUpCisgICAgICAgICAg ICAgICAgICAgICAgICBydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5hcHBlbmQoc3Rk OjptYWtlX3BhaXIoaW5saW5lTWluLCBpbmxpbmVNYXgpKTsKKwogICAgICAgICAgICAgICAgICAg ICBpbmxpbmVNaW4gKz0gY2hpbGRNaW47CiAgICAgICAgICAgICAgICAgICAgIGlubGluZU1heCAr PSBjaGlsZE1heDsKIAorICAgICAgICAgICAgICAgICAgICBpZiAoY2hpbGRTdHlsZS5kaXNwbGF5 KCkgPT0gRGlzcGxheVR5cGU6OlJ1YnlCYXNlICYmIGNoaWxkSXRlcmF0b3IuZW5kT2ZJbmxpbmUp IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICghcnVieUJhc2VNaW5pbXVtTWF4aW11bVdp ZHRoU3RhY2suaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXV0byBy dWJ5QmFzZVN0YXJ0ID0gcnVieUJhc2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2subGFzdCgpOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0 YWNrLmxhc3QoKSA9IHN0ZDo6bWFrZV9wYWlyKGlubGluZU1pbiAtIHJ1YnlCYXNlU3RhcnQuZmly c3QsIGlubGluZU1heCAtIHJ1YnlCYXNlU3RhcnQuc2Vjb25kKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgY2hp bGQtPnNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShmYWxzZSk7CiAgICAgICAgICAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgLy8gSW5saW5lIHJlcGxhY2VkIGVsdHMg YWRkIGluIHRoZWlyIG1hcmdpbnMgdG8gdGhlaXIgbWluL21heCB2YWx1ZXMuCg== 469021 2023-12-13 11:00:53 -0800 2023-12-13 12:29:00 -0800 Patch bug-266357-20231213110052.patch text/plain 5001 zalan RnJvbSA1MTFhNDJhODU3MjFkYTliZTlkNWRhOTVmOGFiZjEyZmZlYzBjMDQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTMgRGVjIDIwMjMgMTA6NTA6NDUgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBJbmNvcnJlY3QgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIHdoZW4gPHJ1Ynk+CiBp cyBwcmVzZW50IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzNTcK ClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKTGV0J3MgaG9sZCBvbiB0byBydWJ5IGJhc2Ug bWluL21heCB3aWR0aCBhbmQgbWFrZSBzdXJlIHRoZSBhc3NvY2lhdGVkIGFubm90YXRpb24gYm94 J3MgbWluL21heCB2YWx1ZXMgYXJlIHRha2VuIGludG8gYWNjb3VudC4KCiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIGNvbnN0KToKLS0tCiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCB8IDM3ICsrKysrKysrKysr KystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRl eCAzZjYyZmY2MDM4N2QuLjAxNjg2NjFkMWViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTQ2MjUsOCArNDYyNSw3IEBAIHZvaWQgUmVuZGVy QmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyhMYXlvdXRVbml0 JiBtaW5Mb2dpY2FsCiAgICAgYm9vbCBjYW5IYW5nUHVuY3R1YXRpb25BdFN0YXJ0ID0gc3R5bGVU b1VzZS5oYW5naW5nUHVuY3R1YXRpb24oKS5jb250YWlucyhIYW5naW5nUHVuY3R1YXRpb246OkZp cnN0KTsKICAgICBib29sIGNhbkhhbmdQdW5jdHVhdGlvbkF0RW5kID0gc3R5bGVUb1VzZS5oYW5n aW5nUHVuY3R1YXRpb24oKS5jb250YWlucyhIYW5naW5nUHVuY3R1YXRpb246Okxhc3QpOwogICAg IFJlbmRlclRleHQqIGxhc3RUZXh0ID0gbnVsbHB0cjsKLSAgICBmbG9hdCBhbm5vdGF0aW9uTWlu aW11bUludHJpbnNpY1dpZHRoID0gMC5mOwotICAgIGZsb2F0IGFubm90YXRpb25NYXhpbXVtSW50 cmluc2ljV2lkdGggPSAwLmY7CisgICAgVmVjdG9yPHN0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlv dXRVbml0Pj4gcnVieUJhc2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2s7CiAKICAgICBib29sIGFk ZGVkU3RhcnRQdW5jdHVhdGlvbkhhbmcgPSBmYWxzZTsKICAgICAKQEAgLTQ2MzQsMTggKzQ2MzMs MTkgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2Fs V2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWwKICAgICAgICAgYm9vbCBhdXRvV3JhcCA9IGNo aWxkLT5pc1JlcGxhY2VkT3JJbmxpbmVCbG9jaygpID8gY2hpbGQtPnBhcmVudCgpLT5zdHlsZSgp LmF1dG9XcmFwKCkgOiBjaGlsZC0+c3R5bGUoKS5hdXRvV3JhcCgpOwogCiAgICAgICAgIC8vIElu dGVybGluZWFyIGFubm90YXRpb25zIGRvbid0IHBhcnRpY2lwYXRlIGluIGlubGluZSBsYXlvdXQs IGJ1dCB0aGV5IHB1dCBhIG1pbmltdW0gd2lkdGggcmVxdWlyZW1lbnQgb24gdGhlIGFzc29jaWF0 ZWQgcnVieSBiYXNlLgotICAgICAgICBhdXRvIGlzSW50ZXJsaW5lYXJUeXBlQW5ub3RhdGlvbiA9 IGNoaWxkLT5zdHlsZSgpLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6UnVieUFubm90YXRpb24g JiYgKGNoaWxkLT5zdHlsZSgpLnJ1YnlQb3NpdGlvbigpICE9IFJ1YnlQb3NpdGlvbjo6SW50ZXJD aGFyYWN0ZXIgfHwgIXN0eWxlVG9Vc2UuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSk7CisgICAg ICAgIGF1dG8gaXNJbnRlcmxpbmVhclR5cGVBbm5vdGF0aW9uID0gaXM8UmVuZGVyQmxvY2s+KCpj aGlsZCkgJiYgY2hpbGQtPnN0eWxlKCkuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpSdWJ5QW5u b3RhdGlvbiAmJiAoY2hpbGQtPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgIT0gUnVieVBvc2l0aW9u OjpJbnRlckNoYXJhY3RlciB8fCAhc3R5bGVUb1VzZS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp KTsKICAgICAgICAgaWYgKGlzSW50ZXJsaW5lYXJUeXBlQW5ub3RhdGlvbikgewotICAgICAgICAg ICAgYXV0byBtaW5pbXVtV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKLSAgICAgICAgICAgIGF1dG8g bWF4aW11bVdpZHRoID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgICAgICBjb21wdXRlQ2hpbGRQ cmVmZXJyZWRMb2dpY2FsV2lkdGhzKCpjaGlsZCwgbWluaW11bVdpZHRoLCBtYXhpbXVtV2lkdGgp OwotCi0gICAgICAgICAgICBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dpZHRoICs9IG1pbmlt dW1XaWR0aC5jZWlsVG9GbG9hdCgpOwotICAgICAgICAgICAgYW5ub3RhdGlvbk1heGltdW1JbnRy aW5zaWNXaWR0aCArPSBtYXhpbXVtV2lkdGguY2VpbFRvRmxvYXQoKTsKLQotICAgICAgICAgICAg Ly8gRklYTUU6IEtlZXAgdHJhY2sgb2YgcnVieSBiYXNlIHdpZHRoLgotICAgICAgICAgICAgaW5s aW5lTWluID0gc3RkOjptYXgoaW5saW5lTWluLCBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dp ZHRoKTsKLSAgICAgICAgICAgIGlubGluZU1heCA9IHN0ZDo6bWF4KGlubGluZU1heCwgYW5ub3Rh dGlvbk1heGltdW1JbnRyaW5zaWNXaWR0aCk7CisgICAgICAgICAgICBhdXRvIGFubm90YXRpb25N aW5pbXVtSW50cmluc2ljV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAgIGF1dG8g YW5ub3RhdGlvbk1heGltdW1JbnRyaW5zaWNXaWR0aCA9IExheW91dFVuaXQgeyB9OworICAgICAg ICAgICAgY29tcHV0ZUNoaWxkUHJlZmVycmVkTG9naWNhbFdpZHRocygqY2hpbGQsIGFubm90YXRp b25NaW5pbXVtSW50cmluc2ljV2lkdGgsIGFubm90YXRpb25NYXhpbXVtSW50cmluc2ljV2lkdGgp OworCisgICAgICAgICAgICBpZiAoIXJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0YWNrLmlz RW1wdHkoKSkgeworICAgICAgICAgICAgICAgIC8vIEFubm90YXRpb24gYm94IGlzIGFsd2F5cyBw cmVjZWRlZCBieSB0aGUgYXNzb2NpYXRlZCBydWJ5IGJhc2UuCisgICAgICAgICAgICAgICAgYXV0 byBiYXNlTWluaW11bU1heGltdW1XaWR0aCA9IHJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0 YWNrLnRha2VMYXN0KCk7CisgICAgICAgICAgICAgICAgaW5saW5lTWluICs9IHN0ZDo6bWF4KDAu ZiwgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aC5jZWlsVG9GbG9hdCgpIC0gYmFzZU1p bmltdW1NYXhpbXVtV2lkdGguZmlyc3QpOworICAgICAgICAgICAgICAgIGlubGluZU1heCArPSBz dGQ6Om1heCgwLmYsIGFubm90YXRpb25NYXhpbXVtSW50cmluc2ljV2lkdGguY2VpbFRvRmxvYXQo KSAtIGJhc2VNaW5pbXVtTWF4aW11bVdpZHRoLnNlY29uZCk7CisgICAgICAgICAgICB9IGVsc2UK KyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgICAgIGNvbnRp bnVlOwogICAgICAgICB9CiAgICAgICAgIGlmICghY2hpbGQtPmlzQlIoKSkgewpAQCAtNDcwMCw5 ICs0NzAwLDIwIEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVk TG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsCiAgICAgICAgICAgICAgICAgICAg IGNoaWxkTWluICs9IGJwbTsKICAgICAgICAgICAgICAgICAgICAgY2hpbGRNYXggKz0gYnBtOwog CisgICAgICAgICAgICAgICAgICAgIGlmIChjaGlsZFN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5 VHlwZTo6UnVieUJhc2UgJiYgIWNoaWxkSXRlcmF0b3IuZW5kT2ZJbmxpbmUpCisgICAgICAgICAg ICAgICAgICAgICAgICBydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5hcHBlbmQoc3Rk OjpwYWlyIHsgaW5saW5lTWluLCBpbmxpbmVNYXggfSk7CisKICAgICAgICAgICAgICAgICAgICAg aW5saW5lTWluICs9IGNoaWxkTWluOwogICAgICAgICAgICAgICAgICAgICBpbmxpbmVNYXggKz0g Y2hpbGRNYXg7CiAKKyAgICAgICAgICAgICAgICAgICAgaWYgKGNoaWxkU3R5bGUuZGlzcGxheSgp ID09IERpc3BsYXlUeXBlOjpSdWJ5QmFzZSAmJiBjaGlsZEl0ZXJhdG9yLmVuZE9mSW5saW5lKSB7 CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoIXJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0 aFN0YWNrLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGF1dG8gcnVi eUJhc2VTdGFydCA9IHJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0YWNrLmxhc3QoKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFj ay5sYXN0KCkgPSBzdGQ6OnBhaXIgeyBpbmxpbmVNaW4gLSBydWJ5QmFzZVN0YXJ0LmZpcnN0LCBp bmxpbmVNYXggLSBydWJ5QmFzZVN0YXJ0LnNlY29uZCB9OworICAgICAgICAgICAgICAgICAgICAg ICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgICAgICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAgICAgICBjaGlsZC0+ c2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKICAgICAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAvLyBJbmxpbmUgcmVwbGFjZWQgZWx0cyBhZGQg aW4gdGhlaXIgbWFyZ2lucyB0byB0aGVpciBtaW4vbWF4IHZhbHVlcy4K 469022 2023-12-13 12:29:02 -0800 2023-12-13 12:36:53 -0800 Patch bug-266357-20231213122901.patch text/plain 7007 zalan RnJvbSA0MDdmZGQ5YTgwMDE1ZmVjZWFlNzg5OGNiYWViNTVhY2U3YmFhYjIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTMgRGVjIDIwMjMgMTA6NTA6NDUgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBJbmNvcnJlY3QgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIHdoZW4gPHJ1Ynk+CiBp cyBwcmVzZW50IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzNTcK ClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKTGV0J3MgaG9sZCBvbiB0byBydWJ5IGJhc2Ug bWluL21heCB3aWR0aCBhbmQgbWFrZSBzdXJlIHRoZSBhc3NvY2lhdGVkIGFubm90YXRpb24gYm94 J3MgbWluL21heCB2YWx1ZXMgYXJlIHRha2VuIGludG8gYWNjb3VudC4KCiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIGNvbnN0KToKLS0tCiAuLi4v aW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcCAgICAgICAgICAgfCAxNSArKysrKystLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgMzcgKysrKysr KysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAxNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAK aW5kZXggM2ExNDk1MDdlNjhjLi45ODllZWUzNGFhMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKQEAgLTEwNiw3ICsxMDYsNiBAQCBzdGF0aWMgQmFz ZUluZGV4QW5kT2Zmc2V0IHNoaWZ0UnVieUJhc2VDb250ZW50QnlBbGlnbm1lbnRPZmZzZXQoQmFz ZUluZGV4QW5kT2ZmcwogCiAgICAgLy8gU2hpZnQgYmFzZSBjb250ZW50IHdpdGhpbiB0aGUgYmFz ZSAobm8gcmVzaXplKSBhcyBwYXJ0IG9mIHRoZSBhbGlnbm1lbnQgcHJvY2Vzcy4KICAgICBhdXRv JiBydWJ5QmFzZUJveCA9IGRpc3BsYXlCb3hlc1tiYXNlSW5kZXhdLmxheW91dEJveCgpOwotICAg IGF1dG8mIHJ1YnlCb3ggPSBydWJ5QmFzZUJveC5wYXJlbnQoKTsKICAgICBhdXRvIGJhc2VPZmZz ZXQgPSBiYXNlSW5kZXhBbmRPZmZzZXQub2Zmc2V0OwogICAgIGF1dG8gYmFzZUNvbnRlbnRPZmZz ZXQgPSBhbGlnbm1lbnRPZmZzZXQocnVieUJhc2VCb3gsIGFsaWdubWVudE9mZnNldExpc3QpOwog ICAgIHNpemVfdCBiYXNlQ29udGVudEluZGV4ID0gYmFzZUluZGV4ICsgMTsKQEAgLTExNCwxMCAr MTEzLDE4IEBAIHN0YXRpYyBCYXNlSW5kZXhBbmRPZmZzZXQgc2hpZnRSdWJ5QmFzZUNvbnRlbnRC eUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZzCiAgICAgd2hpbGUgKGJhc2VDb250ZW50 SW5kZXggPCBkaXNwbGF5Qm94ZXMuc2l6ZSgpKSB7CiAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3gg PSBkaXNwbGF5Qm94ZXNbYmFzZUNvbnRlbnRJbmRleF07CiAgICAgICAgIGF1dG8mIGxheW91dEJv eCA9IGRpc3BsYXlCb3gubGF5b3V0Qm94KCk7Ci0gICAgICAgIGlmICgmbGF5b3V0Qm94LnBhcmVu dCgpID09ICZydWJ5Qm94IHx8ICZsYXlvdXRCb3gucGFyZW50KCkgPT0gJnJ1YnlCb3gucGFyZW50 KCkpIHsKLSAgICAgICAgICAgIC8vIE5vdCBpbiB0aGlzIHJ1YnkgYmFzZSBhbnltb3JlLgorICAg ICAgICBhdXRvIGlzSW5zaWRlQ3VycmVudFJ1YnlCYXNlID0gWyZdIHsKKyAgICAgICAgICAgIC8v IFJ1YnkgY29udGVudCB0ZW5kcyB0byBwcm9kdWNlIGZsYXQgc3RydWN0dXJlcy4KKyAgICAgICAg ICAgIGZvciAoYXV0byogYW5jZXN0b3IgPSAmbGF5b3V0Qm94LnBhcmVudCgpOyBhbmNlc3RvciAm JiAhYW5jZXN0b3ItPmlzUnVieSgpOyBhbmNlc3RvciA9ICZhbmNlc3Rvci0+cGFyZW50KCkpIHsK KyAgICAgICAgICAgICAgICBpZiAoYW5jZXN0b3IgPT0gJnJ1YnlCYXNlQm94KQorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICAgICBpZiAoYW5jZXN0b3ItPmlz UnVieUJhc2UoKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9OworICAgICAgICBpZiAo IWlzSW5zaWRlQ3VycmVudFJ1YnlCYXNlKCkpCiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAg fQogICAgICAgICBpZiAoIWxheW91dEJveC5pc1J1YnlBbm5vdGF0aW9uQm94KCkpCiAgICAgICAg ICAgICBzaGlmdERpc3BsYXlCb3goZGlzcGxheUJveCwgYmFzZU9mZnNldCArIGJhc2VDb250ZW50 T2Zmc2V0LCBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCk7CiAgICAgICAgIGlmIChsYXlvdXRCb3gu aXNSdWJ5QmFzZSgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwCmluZGV4IDNmNjJmZjYwMzg3ZC4uMDE2ODY2MWQxZWI0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApAQCAtNDYyNSw4ICs0NjI1LDcgQEAg dm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhz KExheW91dFVuaXQmIG1pbkxvZ2ljYWwKICAgICBib29sIGNhbkhhbmdQdW5jdHVhdGlvbkF0U3Rh cnQgPSBzdHlsZVRvVXNlLmhhbmdpbmdQdW5jdHVhdGlvbigpLmNvbnRhaW5zKEhhbmdpbmdQdW5j dHVhdGlvbjo6Rmlyc3QpOwogICAgIGJvb2wgY2FuSGFuZ1B1bmN0dWF0aW9uQXRFbmQgPSBzdHls ZVRvVXNlLmhhbmdpbmdQdW5jdHVhdGlvbigpLmNvbnRhaW5zKEhhbmdpbmdQdW5jdHVhdGlvbjo6 TGFzdCk7CiAgICAgUmVuZGVyVGV4dCogbGFzdFRleHQgPSBudWxscHRyOwotICAgIGZsb2F0IGFu bm90YXRpb25NaW5pbXVtSW50cmluc2ljV2lkdGggPSAwLmY7Ci0gICAgZmxvYXQgYW5ub3RhdGlv bk1heGltdW1JbnRyaW5zaWNXaWR0aCA9IDAuZjsKKyAgICBWZWN0b3I8c3RkOjpwYWlyPExheW91 dFVuaXQsIExheW91dFVuaXQ+PiBydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjazsKIAog ICAgIGJvb2wgYWRkZWRTdGFydFB1bmN0dWF0aW9uSGFuZyA9IGZhbHNlOwogICAgIApAQCAtNDYz NCwxOCArNDYzMywxOSBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZVByZWZl cnJlZExvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbAogICAgICAgICBib29sIGF1 dG9XcmFwID0gY2hpbGQtPmlzUmVwbGFjZWRPcklubGluZUJsb2NrKCkgPyBjaGlsZC0+cGFyZW50 KCktPnN0eWxlKCkuYXV0b1dyYXAoKSA6IGNoaWxkLT5zdHlsZSgpLmF1dG9XcmFwKCk7CiAKICAg ICAgICAgLy8gSW50ZXJsaW5lYXIgYW5ub3RhdGlvbnMgZG9uJ3QgcGFydGljaXBhdGUgaW4gaW5s aW5lIGxheW91dCwgYnV0IHRoZXkgcHV0IGEgbWluaW11bSB3aWR0aCByZXF1aXJlbWVudCBvbiB0 aGUgYXNzb2NpYXRlZCBydWJ5IGJhc2UuCi0gICAgICAgIGF1dG8gaXNJbnRlcmxpbmVhclR5cGVB bm5vdGF0aW9uID0gY2hpbGQtPnN0eWxlKCkuZGlzcGxheSgpID09IERpc3BsYXlUeXBlOjpSdWJ5 QW5ub3RhdGlvbiAmJiAoY2hpbGQtPnN0eWxlKCkucnVieVBvc2l0aW9uKCkgIT0gUnVieVBvc2l0 aW9uOjpJbnRlckNoYXJhY3RlciB8fCAhc3R5bGVUb1VzZS5pc0hvcml6b250YWxXcml0aW5nTW9k ZSgpKTsKKyAgICAgICAgYXV0byBpc0ludGVybGluZWFyVHlwZUFubm90YXRpb24gPSBpczxSZW5k ZXJCbG9jaz4oKmNoaWxkKSAmJiBjaGlsZC0+c3R5bGUoKS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5 cGU6OlJ1YnlBbm5vdGF0aW9uICYmIChjaGlsZC0+c3R5bGUoKS5ydWJ5UG9zaXRpb24oKSAhPSBS dWJ5UG9zaXRpb246OkludGVyQ2hhcmFjdGVyIHx8ICFzdHlsZVRvVXNlLmlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkpOwogICAgICAgICBpZiAoaXNJbnRlcmxpbmVhclR5cGVBbm5vdGF0aW9uKSB7 Ci0gICAgICAgICAgICBhdXRvIG1pbmltdW1XaWR0aCA9IExheW91dFVuaXQgeyB9OwotICAgICAg ICAgICAgYXV0byBtYXhpbXVtV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKLSAgICAgICAgICAgIGNv bXB1dGVDaGlsZFByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKmNoaWxkLCBtaW5pbXVtV2lkdGgsIG1h eGltdW1XaWR0aCk7Ci0KLSAgICAgICAgICAgIGFubm90YXRpb25NaW5pbXVtSW50cmluc2ljV2lk dGggKz0gbWluaW11bVdpZHRoLmNlaWxUb0Zsb2F0KCk7Ci0gICAgICAgICAgICBhbm5vdGF0aW9u TWF4aW11bUludHJpbnNpY1dpZHRoICs9IG1heGltdW1XaWR0aC5jZWlsVG9GbG9hdCgpOwotCi0g ICAgICAgICAgICAvLyBGSVhNRTogS2VlcCB0cmFjayBvZiBydWJ5IGJhc2Ugd2lkdGguCi0gICAg ICAgICAgICBpbmxpbmVNaW4gPSBzdGQ6Om1heChpbmxpbmVNaW4sIGFubm90YXRpb25NaW5pbXVt SW50cmluc2ljV2lkdGgpOwotICAgICAgICAgICAgaW5saW5lTWF4ID0gc3RkOjptYXgoaW5saW5l TWF4LCBhbm5vdGF0aW9uTWF4aW11bUludHJpbnNpY1dpZHRoKTsKKyAgICAgICAgICAgIGF1dG8g YW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCA9IExheW91dFVuaXQgeyB9OworICAgICAg ICAgICAgYXV0byBhbm5vdGF0aW9uTWF4aW11bUludHJpbnNpY1dpZHRoID0gTGF5b3V0VW5pdCB7 IH07CisgICAgICAgICAgICBjb21wdXRlQ2hpbGRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCpjaGls ZCwgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCwgYW5ub3RhdGlvbk1heGltdW1JbnRy aW5zaWNXaWR0aCk7CisKKyAgICAgICAgICAgIGlmICghcnVieUJhc2VNaW5pbXVtTWF4aW11bVdp ZHRoU3RhY2suaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgLy8gQW5ub3RhdGlvbiBib3gg aXMgYWx3YXlzIHByZWNlZGVkIGJ5IHRoZSBhc3NvY2lhdGVkIHJ1YnkgYmFzZS4KKyAgICAgICAg ICAgICAgICBhdXRvIGJhc2VNaW5pbXVtTWF4aW11bVdpZHRoID0gcnVieUJhc2VNaW5pbXVtTWF4 aW11bVdpZHRoU3RhY2sudGFrZUxhc3QoKTsKKyAgICAgICAgICAgICAgICBpbmxpbmVNaW4gKz0g c3RkOjptYXgoMC5mLCBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dpZHRoLmNlaWxUb0Zsb2F0 KCkgLSBiYXNlTWluaW11bU1heGltdW1XaWR0aC5maXJzdCk7CisgICAgICAgICAgICAgICAgaW5s aW5lTWF4ICs9IHN0ZDo6bWF4KDAuZiwgYW5ub3RhdGlvbk1heGltdW1JbnRyaW5zaWNXaWR0aC5j ZWlsVG9GbG9hdCgpIC0gYmFzZU1pbmltdW1NYXhpbXVtV2lkdGguc2Vjb25kKTsKKyAgICAgICAg ICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFjaGlsZC0+aXNCUigpKSB7 CkBAIC00NzAwLDkgKzQ3MDAsMjAgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1dGVJbmxp bmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWwKICAgICAgICAg ICAgICAgICAgICAgY2hpbGRNaW4gKz0gYnBtOwogICAgICAgICAgICAgICAgICAgICBjaGlsZE1h eCArPSBicG07CiAKKyAgICAgICAgICAgICAgICAgICAgaWYgKGNoaWxkU3R5bGUuZGlzcGxheSgp ID09IERpc3BsYXlUeXBlOjpSdWJ5QmFzZSAmJiAhY2hpbGRJdGVyYXRvci5lbmRPZklubGluZSkK KyAgICAgICAgICAgICAgICAgICAgICAgIHJ1YnlCYXNlTWluaW11bU1heGltdW1XaWR0aFN0YWNr LmFwcGVuZChzdGQ6OnBhaXIgeyBpbmxpbmVNaW4sIGlubGluZU1heCB9KTsKKwogICAgICAgICAg ICAgICAgICAgICBpbmxpbmVNaW4gKz0gY2hpbGRNaW47CiAgICAgICAgICAgICAgICAgICAgIGlu bGluZU1heCArPSBjaGlsZE1heDsKIAorICAgICAgICAgICAgICAgICAgICBpZiAoY2hpbGRTdHls ZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1YnlCYXNlICYmIGNoaWxkSXRlcmF0b3IuZW5k T2ZJbmxpbmUpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICghcnVieUJhc2VNaW5pbXVt TWF4aW11bVdpZHRoU3RhY2suaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYXV0byBydWJ5QmFzZVN0YXJ0ID0gcnVieUJhc2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2su bGFzdCgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJ1YnlCYXNlTWluaW11bU1heGlt dW1XaWR0aFN0YWNrLmxhc3QoKSA9IHN0ZDo6cGFpciB7IGlubGluZU1pbiAtIHJ1YnlCYXNlU3Rh cnQuZmlyc3QsIGlubGluZU1heCAtIHJ1YnlCYXNlU3RhcnQuc2Vjb25kIH07CisgICAgICAgICAg ICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAgICAg ICAgIGNoaWxkLT5zZXRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoZmFsc2UpOwogICAgICAg ICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIElubGluZSByZXBsYWNl ZCBlbHRzIGFkZCBpbiB0aGVpciBtYXJnaW5zIHRvIHRoZWlyIG1pbi9tYXggdmFsdWVzLgo= 469023 2023-12-13 12:36:55 -0800 2023-12-13 15:26:51 -0800 [fast-cq]Patch bug-266357-20231213123654.patch text/plain 7090 zalan RnJvbSA3MmI5YjRkZDVlODkwNTFkNGU0NWY4MjViODRkZjkyNzU5YjJiMGJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTMgRGVjIDIwMjMgMTA6NTA6NDUgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBJbmNvcnJlY3QgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIHdoZW4gPHJ1Ynk+CiBp cyBwcmVzZW50IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzNTcK ClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKTGV0J3MgaG9sZCBvbiB0byBydWJ5IGJhc2Ug bWluL21heCB3aWR0aCBhbmQgbWFrZSBzdXJlIHRoZSBhc3NvY2lhdGVkIGFubm90YXRpb24gYm94 J3MgbWluL21heCB2YWx1ZXMgYXJlIHRha2VuIGludG8gYWNjb3VudC4KCiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIGNvbnN0KToKLS0tCiAuLi4v aW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcCAgICAgICAgICAgfCAxNiArKysrKystLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgMzcgKysrKysr KysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAK aW5kZXggM2ExNDk1MDdlNjhjLi4xM2QwYTIzZGI5OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKQEAgLTEwNSw4ICsxMDUsOCBAQCBzdGF0aWMgQmFz ZUluZGV4QW5kT2Zmc2V0IHNoaWZ0UnVieUJhc2VDb250ZW50QnlBbGlnbm1lbnRPZmZzZXQoQmFz ZUluZGV4QW5kT2ZmcwogICAgIH0KIAogICAgIC8vIFNoaWZ0IGJhc2UgY29udGVudCB3aXRoaW4g dGhlIGJhc2UgKG5vIHJlc2l6ZSkgYXMgcGFydCBvZiB0aGUgYWxpZ25tZW50IHByb2Nlc3MuCisg ICAgYXV0byYgcm9vdEJveCA9IGlubGluZUZvcm1hdHRpbmdDb250ZXh0LnJvb3QoKTsKICAgICBh dXRvJiBydWJ5QmFzZUJveCA9IGRpc3BsYXlCb3hlc1tiYXNlSW5kZXhdLmxheW91dEJveCgpOwot ICAgIGF1dG8mIHJ1YnlCb3ggPSBydWJ5QmFzZUJveC5wYXJlbnQoKTsKICAgICBhdXRvIGJhc2VP ZmZzZXQgPSBiYXNlSW5kZXhBbmRPZmZzZXQub2Zmc2V0OwogICAgIGF1dG8gYmFzZUNvbnRlbnRP ZmZzZXQgPSBhbGlnbm1lbnRPZmZzZXQocnVieUJhc2VCb3gsIGFsaWdubWVudE9mZnNldExpc3Qp OwogICAgIHNpemVfdCBiYXNlQ29udGVudEluZGV4ID0gYmFzZUluZGV4ICsgMTsKQEAgLTExNCwx MCArMTE0LDE4IEBAIHN0YXRpYyBCYXNlSW5kZXhBbmRPZmZzZXQgc2hpZnRSdWJ5QmFzZUNvbnRl bnRCeUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZzCiAgICAgd2hpbGUgKGJhc2VDb250 ZW50SW5kZXggPCBkaXNwbGF5Qm94ZXMuc2l6ZSgpKSB7CiAgICAgICAgIGF1dG8mIGRpc3BsYXlC b3ggPSBkaXNwbGF5Qm94ZXNbYmFzZUNvbnRlbnRJbmRleF07CiAgICAgICAgIGF1dG8mIGxheW91 dEJveCA9IGRpc3BsYXlCb3gubGF5b3V0Qm94KCk7Ci0gICAgICAgIGlmICgmbGF5b3V0Qm94LnBh cmVudCgpID09ICZydWJ5Qm94IHx8ICZsYXlvdXRCb3gucGFyZW50KCkgPT0gJnJ1YnlCb3gucGFy ZW50KCkpIHsKLSAgICAgICAgICAgIC8vIE5vdCBpbiB0aGlzIHJ1YnkgYmFzZSBhbnltb3JlLgor ICAgICAgICBhdXRvIGlzSW5zaWRlQ3VycmVudFJ1YnlCYXNlID0gWyZdIHsKKyAgICAgICAgICAg IC8vIFJ1YnkgY29udGVudCB0ZW5kcyB0byBwcm9kdWNlIGZsYXQgc3RydWN0dXJlcy4KKyAgICAg ICAgICAgIGZvciAoYXV0byogYW5jZXN0b3IgPSAmbGF5b3V0Qm94LnBhcmVudCgpOyBhbmNlc3Rv cjsgYW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpKSB7CisgICAgICAgICAgICAgICAgaWYg KGFuY2VzdG9yID09ICZydWJ5QmFzZUJveCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgICAgICAgICAgICAgaWYgKGFuY2VzdG9yLT5pc1J1YnlCYXNlKCkgfHwgYW5jZXN0 b3ItPmlzUnVieSgpIHx8IGFuY2VzdG9yID09ICZyb290Qm94KQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIH07CisgICAgICAgIGlmICghaXNJbnNpZGVDdXJyZW50UnVieUJhc2UoKSkKICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICB9CiAgICAgICAgIGlmICghbGF5b3V0Qm94LmlzUnVi eUFubm90YXRpb25Cb3goKSkKICAgICAgICAgICAgIHNoaWZ0RGlzcGxheUJveChkaXNwbGF5Qm94 LCBiYXNlT2Zmc2V0ICsgYmFzZUNvbnRlbnRPZmZzZXQsIGlubGluZUZvcm1hdHRpbmdDb250ZXh0 KTsKICAgICAgICAgaWYgKGxheW91dEJveC5pc1J1YnlCYXNlKCkpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggM2Y2MmZmNjAzODdkLi4wMTY4 NjYxZDFlYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCkBAIC00NjI1LDggKzQ2MjUsNyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlu bGluZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbAogICAgIGJv b2wgY2FuSGFuZ1B1bmN0dWF0aW9uQXRTdGFydCA9IHN0eWxlVG9Vc2UuaGFuZ2luZ1B1bmN0dWF0 aW9uKCkuY29udGFpbnMoSGFuZ2luZ1B1bmN0dWF0aW9uOjpGaXJzdCk7CiAgICAgYm9vbCBjYW5I YW5nUHVuY3R1YXRpb25BdEVuZCA9IHN0eWxlVG9Vc2UuaGFuZ2luZ1B1bmN0dWF0aW9uKCkuY29u dGFpbnMoSGFuZ2luZ1B1bmN0dWF0aW9uOjpMYXN0KTsKICAgICBSZW5kZXJUZXh0KiBsYXN0VGV4 dCA9IG51bGxwdHI7Ci0gICAgZmxvYXQgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCA9 IDAuZjsKLSAgICBmbG9hdCBhbm5vdGF0aW9uTWF4aW11bUludHJpbnNpY1dpZHRoID0gMC5mOwor ICAgIFZlY3RvcjxzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4+IHJ1YnlCYXNlTWlu aW11bU1heGltdW1XaWR0aFN0YWNrOwogCiAgICAgYm9vbCBhZGRlZFN0YXJ0UHVuY3R1YXRpb25I YW5nID0gZmFsc2U7CiAgICAgCkBAIC00NjM0LDE4ICs0NjMzLDE5IEBAIHZvaWQgUmVuZGVyQmxv Y2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBt aW5Mb2dpY2FsCiAgICAgICAgIGJvb2wgYXV0b1dyYXAgPSBjaGlsZC0+aXNSZXBsYWNlZE9ySW5s aW5lQmxvY2soKSA/IGNoaWxkLT5wYXJlbnQoKS0+c3R5bGUoKS5hdXRvV3JhcCgpIDogY2hpbGQt PnN0eWxlKCkuYXV0b1dyYXAoKTsKIAogICAgICAgICAvLyBJbnRlcmxpbmVhciBhbm5vdGF0aW9u cyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBpbmxpbmUgbGF5b3V0LCBidXQgdGhleSBwdXQgYSBtaW5p bXVtIHdpZHRoIHJlcXVpcmVtZW50IG9uIHRoZSBhc3NvY2lhdGVkIHJ1YnkgYmFzZS4KLSAgICAg ICAgYXV0byBpc0ludGVybGluZWFyVHlwZUFubm90YXRpb24gPSBjaGlsZC0+c3R5bGUoKS5kaXNw bGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1YnlBbm5vdGF0aW9uICYmIChjaGlsZC0+c3R5bGUoKS5y dWJ5UG9zaXRpb24oKSAhPSBSdWJ5UG9zaXRpb246OkludGVyQ2hhcmFjdGVyIHx8ICFzdHlsZVRv VXNlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpOworICAgICAgICBhdXRvIGlzSW50ZXJsaW5l YXJUeXBlQW5ub3RhdGlvbiA9IGlzPFJlbmRlckJsb2NrPigqY2hpbGQpICYmIGNoaWxkLT5zdHls ZSgpLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6UnVieUFubm90YXRpb24gJiYgKGNoaWxkLT5z dHlsZSgpLnJ1YnlQb3NpdGlvbigpICE9IFJ1YnlQb3NpdGlvbjo6SW50ZXJDaGFyYWN0ZXIgfHwg IXN0eWxlVG9Vc2UuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSk7CiAgICAgICAgIGlmIChpc0lu dGVybGluZWFyVHlwZUFubm90YXRpb24pIHsKLSAgICAgICAgICAgIGF1dG8gbWluaW11bVdpZHRo ID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgICAgICBhdXRvIG1heGltdW1XaWR0aCA9IExheW91 dFVuaXQgeyB9OwotICAgICAgICAgICAgY29tcHV0ZUNoaWxkUHJlZmVycmVkTG9naWNhbFdpZHRo cygqY2hpbGQsIG1pbmltdW1XaWR0aCwgbWF4aW11bVdpZHRoKTsKLQotICAgICAgICAgICAgYW5u b3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCArPSBtaW5pbXVtV2lkdGguY2VpbFRvRmxvYXQo KTsKLSAgICAgICAgICAgIGFubm90YXRpb25NYXhpbXVtSW50cmluc2ljV2lkdGggKz0gbWF4aW11 bVdpZHRoLmNlaWxUb0Zsb2F0KCk7Ci0KLSAgICAgICAgICAgIC8vIEZJWE1FOiBLZWVwIHRyYWNr IG9mIHJ1YnkgYmFzZSB3aWR0aC4KLSAgICAgICAgICAgIGlubGluZU1pbiA9IHN0ZDo6bWF4KGlu bGluZU1pbiwgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCk7Ci0gICAgICAgICAgICBp bmxpbmVNYXggPSBzdGQ6Om1heChpbmxpbmVNYXgsIGFubm90YXRpb25NYXhpbXVtSW50cmluc2lj V2lkdGgpOworICAgICAgICAgICAgYXV0byBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dpZHRo ID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAgICBhdXRvIGFubm90YXRpb25NYXhpbXVtSW50 cmluc2ljV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAgIGNvbXB1dGVDaGlsZFBy ZWZlcnJlZExvZ2ljYWxXaWR0aHMoKmNoaWxkLCBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dp ZHRoLCBhbm5vdGF0aW9uTWF4aW11bUludHJpbnNpY1dpZHRoKTsKKworICAgICAgICAgICAgaWYg KCFydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5pc0VtcHR5KCkpIHsKKyAgICAgICAg ICAgICAgICAvLyBBbm5vdGF0aW9uIGJveCBpcyBhbHdheXMgcHJlY2VkZWQgYnkgdGhlIGFzc29j aWF0ZWQgcnVieSBiYXNlLgorICAgICAgICAgICAgICAgIGF1dG8gYmFzZU1pbmltdW1NYXhpbXVt V2lkdGggPSBydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay50YWtlTGFzdCgpOworICAg ICAgICAgICAgICAgIGlubGluZU1pbiArPSBzdGQ6Om1heCgwLmYsIGFubm90YXRpb25NaW5pbXVt SW50cmluc2ljV2lkdGguY2VpbFRvRmxvYXQoKSAtIGJhc2VNaW5pbXVtTWF4aW11bVdpZHRoLmZp cnN0KTsKKyAgICAgICAgICAgICAgICBpbmxpbmVNYXggKz0gc3RkOjptYXgoMC5mLCBhbm5vdGF0 aW9uTWF4aW11bUludHJpbnNpY1dpZHRoLmNlaWxUb0Zsb2F0KCkgLSBiYXNlTWluaW11bU1heGlt dW1XaWR0aC5zZWNvbmQpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAg ICAgICBpZiAoIWNoaWxkLT5pc0JSKCkpIHsKQEAgLTQ3MDAsOSArNDcwMCwyMCBAQCB2b2lkIFJl bmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoTGF5b3V0 VW5pdCYgbWluTG9naWNhbAogICAgICAgICAgICAgICAgICAgICBjaGlsZE1pbiArPSBicG07CiAg ICAgICAgICAgICAgICAgICAgIGNoaWxkTWF4ICs9IGJwbTsKIAorICAgICAgICAgICAgICAgICAg ICBpZiAoY2hpbGRTdHlsZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1YnlCYXNlICYmICFj aGlsZEl0ZXJhdG9yLmVuZE9mSW5saW5lKQorICAgICAgICAgICAgICAgICAgICAgICAgcnVieUJh c2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2suYXBwZW5kKHN0ZDo6cGFpciB7IGlubGluZU1pbiwg aW5saW5lTWF4IH0pOworCiAgICAgICAgICAgICAgICAgICAgIGlubGluZU1pbiArPSBjaGlsZE1p bjsKICAgICAgICAgICAgICAgICAgICAgaW5saW5lTWF4ICs9IGNoaWxkTWF4OwogCisgICAgICAg ICAgICAgICAgICAgIGlmIChjaGlsZFN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6UnVi eUJhc2UgJiYgY2hpbGRJdGVyYXRvci5lbmRPZklubGluZSkgeworICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKCFydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5pc0VtcHR5KCkpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHJ1YnlCYXNlU3RhcnQgPSBydWJ5QmFz ZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5sYXN0KCk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcnVieUJhc2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2subGFzdCgpID0gc3RkOjpwYWly IHsgaW5saW5lTWluIC0gcnVieUJhc2VTdGFydC5maXJzdCwgaW5saW5lTWF4IC0gcnVieUJhc2VT dGFydC5zZWNvbmQgfTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgICAg ICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgY2hpbGQtPnNldFByZWZlcnJlZExvZ2ljYWxX aWR0aHNEaXJ0eShmYWxzZSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg ICAgICAgICAgLy8gSW5saW5lIHJlcGxhY2VkIGVsdHMgYWRkIGluIHRoZWlyIG1hcmdpbnMgdG8g dGhlaXIgbWluL21heCB2YWx1ZXMuCg== 469027 2023-12-13 15:26:53 -0800 2023-12-13 15:44:49 -0800 [fast-cq]Patch bug-266357-20231213152653.patch text/plain 7090 zalan RnJvbSA3MmI5YjRkZDVlODkwNTFkNGU0NWY4MjViODRkZjkyNzU5YjJiMGJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFdlZCwgMTMgRGVjIDIwMjMgMTA6NTA6NDUgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBJbmNvcnJlY3QgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIHdoZW4gPHJ1Ynk+CiBp cyBwcmVzZW50IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjYzNTcK ClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKTGV0J3MgaG9sZCBvbiB0byBydWJ5IGJhc2Ug bWluL21heCB3aWR0aCBhbmQgbWFrZSBzdXJlIHRoZSBhc3NvY2lhdGVkIGFubm90YXRpb24gYm94 J3MgbWluL21heCB2YWx1ZXMgYXJlIHRha2VuIGludG8gYWNjb3VudC4KCiogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9ja0Zs b3c6OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzIGNvbnN0KToKLS0tCiAuLi4v aW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcCAgICAgICAgICAgfCAxNiArKysrKystLQog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgIHwgMzcgKysrKysr KysrKysrLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAxNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAK aW5kZXggM2ExNDk1MDdlNjhjLi4xM2QwYTIzZGI5OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKQEAgLTEwNSw4ICsxMDUsOCBAQCBzdGF0aWMgQmFz ZUluZGV4QW5kT2Zmc2V0IHNoaWZ0UnVieUJhc2VDb250ZW50QnlBbGlnbm1lbnRPZmZzZXQoQmFz ZUluZGV4QW5kT2ZmcwogICAgIH0KIAogICAgIC8vIFNoaWZ0IGJhc2UgY29udGVudCB3aXRoaW4g dGhlIGJhc2UgKG5vIHJlc2l6ZSkgYXMgcGFydCBvZiB0aGUgYWxpZ25tZW50IHByb2Nlc3MuCisg ICAgYXV0byYgcm9vdEJveCA9IGlubGluZUZvcm1hdHRpbmdDb250ZXh0LnJvb3QoKTsKICAgICBh dXRvJiBydWJ5QmFzZUJveCA9IGRpc3BsYXlCb3hlc1tiYXNlSW5kZXhdLmxheW91dEJveCgpOwot ICAgIGF1dG8mIHJ1YnlCb3ggPSBydWJ5QmFzZUJveC5wYXJlbnQoKTsKICAgICBhdXRvIGJhc2VP ZmZzZXQgPSBiYXNlSW5kZXhBbmRPZmZzZXQub2Zmc2V0OwogICAgIGF1dG8gYmFzZUNvbnRlbnRP ZmZzZXQgPSBhbGlnbm1lbnRPZmZzZXQocnVieUJhc2VCb3gsIGFsaWdubWVudE9mZnNldExpc3Qp OwogICAgIHNpemVfdCBiYXNlQ29udGVudEluZGV4ID0gYmFzZUluZGV4ICsgMTsKQEAgLTExNCwx MCArMTE0LDE4IEBAIHN0YXRpYyBCYXNlSW5kZXhBbmRPZmZzZXQgc2hpZnRSdWJ5QmFzZUNvbnRl bnRCeUFsaWdubWVudE9mZnNldChCYXNlSW5kZXhBbmRPZmZzCiAgICAgd2hpbGUgKGJhc2VDb250 ZW50SW5kZXggPCBkaXNwbGF5Qm94ZXMuc2l6ZSgpKSB7CiAgICAgICAgIGF1dG8mIGRpc3BsYXlC b3ggPSBkaXNwbGF5Qm94ZXNbYmFzZUNvbnRlbnRJbmRleF07CiAgICAgICAgIGF1dG8mIGxheW91 dEJveCA9IGRpc3BsYXlCb3gubGF5b3V0Qm94KCk7Ci0gICAgICAgIGlmICgmbGF5b3V0Qm94LnBh cmVudCgpID09ICZydWJ5Qm94IHx8ICZsYXlvdXRCb3gucGFyZW50KCkgPT0gJnJ1YnlCb3gucGFy ZW50KCkpIHsKLSAgICAgICAgICAgIC8vIE5vdCBpbiB0aGlzIHJ1YnkgYmFzZSBhbnltb3JlLgor ICAgICAgICBhdXRvIGlzSW5zaWRlQ3VycmVudFJ1YnlCYXNlID0gWyZdIHsKKyAgICAgICAgICAg IC8vIFJ1YnkgY29udGVudCB0ZW5kcyB0byBwcm9kdWNlIGZsYXQgc3RydWN0dXJlcy4KKyAgICAg ICAgICAgIGZvciAoYXV0byogYW5jZXN0b3IgPSAmbGF5b3V0Qm94LnBhcmVudCgpOyBhbmNlc3Rv cjsgYW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpKSB7CisgICAgICAgICAgICAgICAgaWYg KGFuY2VzdG9yID09ICZydWJ5QmFzZUJveCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgICAgICAgICAgICAgaWYgKGFuY2VzdG9yLT5pc1J1YnlCYXNlKCkgfHwgYW5jZXN0 b3ItPmlzUnVieSgpIHx8IGFuY2VzdG9yID09ICZyb290Qm94KQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIH07CisgICAgICAgIGlmICghaXNJbnNpZGVDdXJyZW50UnVieUJhc2UoKSkKICAg ICAgICAgICAgIGJyZWFrOwotICAgICAgICB9CiAgICAgICAgIGlmICghbGF5b3V0Qm94LmlzUnVi eUFubm90YXRpb25Cb3goKSkKICAgICAgICAgICAgIHNoaWZ0RGlzcGxheUJveChkaXNwbGF5Qm94 LCBiYXNlT2Zmc2V0ICsgYmFzZUNvbnRlbnRPZmZzZXQsIGlubGluZUZvcm1hdHRpbmdDb250ZXh0 KTsKICAgICAgICAgaWYgKGxheW91dEJveC5pc1J1YnlCYXNlKCkpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggM2Y2MmZmNjAzODdkLi4wMTY4 NjYxZDFlYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCkBAIC00NjI1LDggKzQ2MjUsNyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlu bGluZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoTGF5b3V0VW5pdCYgbWluTG9naWNhbAogICAgIGJv b2wgY2FuSGFuZ1B1bmN0dWF0aW9uQXRTdGFydCA9IHN0eWxlVG9Vc2UuaGFuZ2luZ1B1bmN0dWF0 aW9uKCkuY29udGFpbnMoSGFuZ2luZ1B1bmN0dWF0aW9uOjpGaXJzdCk7CiAgICAgYm9vbCBjYW5I YW5nUHVuY3R1YXRpb25BdEVuZCA9IHN0eWxlVG9Vc2UuaGFuZ2luZ1B1bmN0dWF0aW9uKCkuY29u dGFpbnMoSGFuZ2luZ1B1bmN0dWF0aW9uOjpMYXN0KTsKICAgICBSZW5kZXJUZXh0KiBsYXN0VGV4 dCA9IG51bGxwdHI7Ci0gICAgZmxvYXQgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCA9 IDAuZjsKLSAgICBmbG9hdCBhbm5vdGF0aW9uTWF4aW11bUludHJpbnNpY1dpZHRoID0gMC5mOwor ICAgIFZlY3RvcjxzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0VW5pdD4+IHJ1YnlCYXNlTWlu aW11bU1heGltdW1XaWR0aFN0YWNrOwogCiAgICAgYm9vbCBhZGRlZFN0YXJ0UHVuY3R1YXRpb25I YW5nID0gZmFsc2U7CiAgICAgCkBAIC00NjM0LDE4ICs0NjMzLDE5IEBAIHZvaWQgUmVuZGVyQmxv Y2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBt aW5Mb2dpY2FsCiAgICAgICAgIGJvb2wgYXV0b1dyYXAgPSBjaGlsZC0+aXNSZXBsYWNlZE9ySW5s aW5lQmxvY2soKSA/IGNoaWxkLT5wYXJlbnQoKS0+c3R5bGUoKS5hdXRvV3JhcCgpIDogY2hpbGQt PnN0eWxlKCkuYXV0b1dyYXAoKTsKIAogICAgICAgICAvLyBJbnRlcmxpbmVhciBhbm5vdGF0aW9u cyBkb24ndCBwYXJ0aWNpcGF0ZSBpbiBpbmxpbmUgbGF5b3V0LCBidXQgdGhleSBwdXQgYSBtaW5p bXVtIHdpZHRoIHJlcXVpcmVtZW50IG9uIHRoZSBhc3NvY2lhdGVkIHJ1YnkgYmFzZS4KLSAgICAg ICAgYXV0byBpc0ludGVybGluZWFyVHlwZUFubm90YXRpb24gPSBjaGlsZC0+c3R5bGUoKS5kaXNw bGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1YnlBbm5vdGF0aW9uICYmIChjaGlsZC0+c3R5bGUoKS5y dWJ5UG9zaXRpb24oKSAhPSBSdWJ5UG9zaXRpb246OkludGVyQ2hhcmFjdGVyIHx8ICFzdHlsZVRv VXNlLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpOworICAgICAgICBhdXRvIGlzSW50ZXJsaW5l YXJUeXBlQW5ub3RhdGlvbiA9IGlzPFJlbmRlckJsb2NrPigqY2hpbGQpICYmIGNoaWxkLT5zdHls ZSgpLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6UnVieUFubm90YXRpb24gJiYgKGNoaWxkLT5z dHlsZSgpLnJ1YnlQb3NpdGlvbigpICE9IFJ1YnlQb3NpdGlvbjo6SW50ZXJDaGFyYWN0ZXIgfHwg IXN0eWxlVG9Vc2UuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSk7CiAgICAgICAgIGlmIChpc0lu dGVybGluZWFyVHlwZUFubm90YXRpb24pIHsKLSAgICAgICAgICAgIGF1dG8gbWluaW11bVdpZHRo ID0gTGF5b3V0VW5pdCB7IH07Ci0gICAgICAgICAgICBhdXRvIG1heGltdW1XaWR0aCA9IExheW91 dFVuaXQgeyB9OwotICAgICAgICAgICAgY29tcHV0ZUNoaWxkUHJlZmVycmVkTG9naWNhbFdpZHRo cygqY2hpbGQsIG1pbmltdW1XaWR0aCwgbWF4aW11bVdpZHRoKTsKLQotICAgICAgICAgICAgYW5u b3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCArPSBtaW5pbXVtV2lkdGguY2VpbFRvRmxvYXQo KTsKLSAgICAgICAgICAgIGFubm90YXRpb25NYXhpbXVtSW50cmluc2ljV2lkdGggKz0gbWF4aW11 bVdpZHRoLmNlaWxUb0Zsb2F0KCk7Ci0KLSAgICAgICAgICAgIC8vIEZJWE1FOiBLZWVwIHRyYWNr IG9mIHJ1YnkgYmFzZSB3aWR0aC4KLSAgICAgICAgICAgIGlubGluZU1pbiA9IHN0ZDo6bWF4KGlu bGluZU1pbiwgYW5ub3RhdGlvbk1pbmltdW1JbnRyaW5zaWNXaWR0aCk7Ci0gICAgICAgICAgICBp bmxpbmVNYXggPSBzdGQ6Om1heChpbmxpbmVNYXgsIGFubm90YXRpb25NYXhpbXVtSW50cmluc2lj V2lkdGgpOworICAgICAgICAgICAgYXV0byBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dpZHRo ID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAgICBhdXRvIGFubm90YXRpb25NYXhpbXVtSW50 cmluc2ljV2lkdGggPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAgIGNvbXB1dGVDaGlsZFBy ZWZlcnJlZExvZ2ljYWxXaWR0aHMoKmNoaWxkLCBhbm5vdGF0aW9uTWluaW11bUludHJpbnNpY1dp ZHRoLCBhbm5vdGF0aW9uTWF4aW11bUludHJpbnNpY1dpZHRoKTsKKworICAgICAgICAgICAgaWYg KCFydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5pc0VtcHR5KCkpIHsKKyAgICAgICAg ICAgICAgICAvLyBBbm5vdGF0aW9uIGJveCBpcyBhbHdheXMgcHJlY2VkZWQgYnkgdGhlIGFzc29j aWF0ZWQgcnVieSBiYXNlLgorICAgICAgICAgICAgICAgIGF1dG8gYmFzZU1pbmltdW1NYXhpbXVt V2lkdGggPSBydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay50YWtlTGFzdCgpOworICAg ICAgICAgICAgICAgIGlubGluZU1pbiArPSBzdGQ6Om1heCgwLmYsIGFubm90YXRpb25NaW5pbXVt SW50cmluc2ljV2lkdGguY2VpbFRvRmxvYXQoKSAtIGJhc2VNaW5pbXVtTWF4aW11bVdpZHRoLmZp cnN0KTsKKyAgICAgICAgICAgICAgICBpbmxpbmVNYXggKz0gc3RkOjptYXgoMC5mLCBhbm5vdGF0 aW9uTWF4aW11bUludHJpbnNpY1dpZHRoLmNlaWxUb0Zsb2F0KCkgLSBiYXNlTWluaW11bU1heGlt dW1XaWR0aC5zZWNvbmQpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAg ICAgICBpZiAoIWNoaWxkLT5pc0JSKCkpIHsKQEAgLTQ3MDAsOSArNDcwMCwyMCBAQCB2b2lkIFJl bmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoTGF5b3V0 VW5pdCYgbWluTG9naWNhbAogICAgICAgICAgICAgICAgICAgICBjaGlsZE1pbiArPSBicG07CiAg ICAgICAgICAgICAgICAgICAgIGNoaWxkTWF4ICs9IGJwbTsKIAorICAgICAgICAgICAgICAgICAg ICBpZiAoY2hpbGRTdHlsZS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1YnlCYXNlICYmICFj aGlsZEl0ZXJhdG9yLmVuZE9mSW5saW5lKQorICAgICAgICAgICAgICAgICAgICAgICAgcnVieUJh c2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2suYXBwZW5kKHN0ZDo6cGFpciB7IGlubGluZU1pbiwg aW5saW5lTWF4IH0pOworCiAgICAgICAgICAgICAgICAgICAgIGlubGluZU1pbiArPSBjaGlsZE1p bjsKICAgICAgICAgICAgICAgICAgICAgaW5saW5lTWF4ICs9IGNoaWxkTWF4OwogCisgICAgICAg ICAgICAgICAgICAgIGlmIChjaGlsZFN0eWxlLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6UnVi eUJhc2UgJiYgY2hpbGRJdGVyYXRvci5lbmRPZklubGluZSkgeworICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKCFydWJ5QmFzZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5pc0VtcHR5KCkpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHJ1YnlCYXNlU3RhcnQgPSBydWJ5QmFz ZU1pbmltdW1NYXhpbXVtV2lkdGhTdGFjay5sYXN0KCk7CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcnVieUJhc2VNaW5pbXVtTWF4aW11bVdpZHRoU3RhY2subGFzdCgpID0gc3RkOjpwYWly IHsgaW5saW5lTWluIC0gcnVieUJhc2VTdGFydC5maXJzdCwgaW5saW5lTWF4IC0gcnVieUJhc2VT dGFydC5zZWNvbmQgfTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgICAg ICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgY2hpbGQtPnNldFByZWZlcnJlZExvZ2ljYWxX aWR0aHNEaXJ0eShmYWxzZSk7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg ICAgICAgICAgLy8gSW5saW5lIHJlcGxhY2VkIGVsdHMgYWRkIGluIHRoZWlyIG1hcmdpbnMgdG8g dGhlaXIgbWluL21heCB2YWx1ZXMuCg==