241689 2022-06-16 09:51:28 -0700 Remove redundant logical right computation for grid items in RenderBlock::computeOverflow 2022-06-17 06:36:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236142 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn jfernandez kondapallykalyan pdr rego simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1876261 0 zalan 2022-06-16 09:51:28 -0700 ssia 1876262 1 460273 zalan 2022-06-16 09:52:56 -0700 Created attachment 460273 Patch 1876336 2 460276 zalan 2022-06-16 14:48:33 -0700 Created attachment 460276 Patch 1876395 3 460289 zalan 2022-06-16 20:31:06 -0700 Created attachment 460289 Patch 1876438 4 ews-feeder 2022-06-17 06:35:10 -0700 Committed r295633 (251638@main): <https://commits.webkit.org/251638@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460289. 1876439 5 webkit-bug-importer 2022-06-17 06:36:13 -0700 <rdar://problem/95381065> 460273 2022-06-16 09:52:56 -0700 2022-06-16 14:48:31 -0700 Patch bug-241689-20220616095256.patch text/plain 9926 zalan RnJvbSA1ZjE0ZWMxOTYzMmQ3ZjBmZGNiMzkxYjEyZDQ5ZDZkOTAwNDI0YTA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDE2IEp1biAyMDIyIDA5OjUxOjUwIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUmVtb3ZlIHJl ZHVuZGFudCBsb2dpY2FsIHJpZ2h0IGNvbXB1dGF0aW9uIGZvciBncmlkIGl0ZW1zIGluCiBSZW5k ZXJCbG9jazo6Y29tcHV0ZU92ZXJmbG93IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNDE2ODkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKRVdTCgoqIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CihXZWJDb3JlOjpSZW5kZXJCbG9j azo6Y2xpZW50TG9naWNhbEJvdHRvbUFmdGVyUmVwb3NpdGlvbmluZyk6CihXZWJDb3JlOjpSZW5k ZXJCbG9jazo6Y29tcHV0ZU92ZXJmbG93KToKKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjbGllbnRM b2dpY2FsUmlnaHRBbmRCb3R0b21BZnRlclJlcG9zaXRpb25pbmcgY29uc3QpOiBEZWxldGVkLgoq IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oOgoqIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwOgooV2ViQ29yZTo6UmVuZGVyQm94OjpsYXlvdXRPdmVy Zmxvd1JlY3RGb3JQcm9wYWdhdGlvbiBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlv dXRCbG9jayk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgooV2Vi Q29yZTo6UmVuZGVyR3JpZDo6bGF5b3V0QmxvY2spOgotLS0KIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAgICAgICB8IDY3ICsrKysrKysrKysrLS0tLS0tLS0KIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oICAgICAgICB8ICAzICstCiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICAgICAgfCAgNyArLQogLi4uL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCAgIHwgIDIgKy0KIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCAgICAgICB8ICAyICstCiA1IGZpbGVzIGNoYW5n ZWQsIDQ5IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGQ2YjY1ZTFjYTBkMC4uYTMwMmZkOTc0MjMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTY4MSwyMyArNjgx LDE5IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFkZE92ZXJmbG93RnJvbUNoaWxkcmVuKCkKICAgICB9 CiB9CiAKLUxheW91dFNpemUgUmVuZGVyQmxvY2s6OmNsaWVudExvZ2ljYWxSaWdodEFuZEJvdHRv bUFmdGVyUmVwb3NpdGlvbmluZygpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlckJsb2NrOjpjbGll bnRMb2dpY2FsQm90dG9tQWZ0ZXJSZXBvc2l0aW9uaW5nKGNvbnN0IFJlbmRlckJsb2NrJiByZW5k ZXJlcikKIHsKLSAgICBMYXlvdXRVbml0IG1heENoaWxkTG9naWNhbFJpZ2h0OwotICAgIExheW91 dFVuaXQgbWF4Q2hpbGRMb2dpY2FsQm90dG9tOwotICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9 IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkp IHsKLSAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICBBU1NF UlQoaXM8UmVuZGVyR3JpZD4ocmVuZGVyZXIpIHx8IGlzPFJlbmRlckZsZXhpYmxlQm94PihyZW5k ZXJlcikpOworICAgIGF1dG8gbWF4Q2hpbGRMb2dpY2FsQm90dG9tID0gTGF5b3V0VW5pdCB7IH07 CisgICAgZm9yIChhdXRvJiBjaGlsZCA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckJveD4ocmVuZGVy ZXIpKSB7CisgICAgICAgIGlmIChjaGlsZC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICBMYXlvdXRVbml0IGNoaWxkTG9naWNhbFJpZ2h0ID0g bG9naWNhbExlZnRGb3JDaGlsZCgqY2hpbGQpICsgbG9naWNhbFdpZHRoRm9yQ2hpbGQoKmNoaWxk KSArIG1hcmdpbkVuZEZvckNoaWxkKCpjaGlsZCk7Ci0gICAgICAgIExheW91dFVuaXQgY2hpbGRM b2dpY2FsQm90dG9tID0gbG9naWNhbFRvcEZvckNoaWxkKCpjaGlsZCkgKyBsb2dpY2FsSGVpZ2h0 Rm9yQ2hpbGQoKmNoaWxkKSArIG1hcmdpbkFmdGVyRm9yQ2hpbGQoKmNoaWxkKTsKLSAgICAgICAg bWF4Q2hpbGRMb2dpY2FsUmlnaHQgPSBzdGQ6Om1heChtYXhDaGlsZExvZ2ljYWxSaWdodCwgY2hp bGRMb2dpY2FsUmlnaHQpOworICAgICAgICBhdXRvIGNoaWxkTG9naWNhbEJvdHRvbSA9IHJlbmRl cmVyLmxvZ2ljYWxUb3BGb3JDaGlsZChjaGlsZCkgKyByZW5kZXJlci5sb2dpY2FsSGVpZ2h0Rm9y Q2hpbGQoY2hpbGQpICsgcmVuZGVyZXIubWFyZ2luQWZ0ZXJGb3JDaGlsZChjaGlsZCk7CiAgICAg ICAgIG1heENoaWxkTG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4KG1heENoaWxkTG9naWNhbEJvdHRv bSwgY2hpbGRMb2dpY2FsQm90dG9tKTsKLQogICAgIH0KLSAgICByZXR1cm4gTGF5b3V0U2l6ZSht YXhDaGlsZExvZ2ljYWxSaWdodCArIHBhZGRpbmdSaWdodCgpLCBzdGQ6Om1heChjbGllbnRMb2dp Y2FsQm90dG9tKCksIG1heENoaWxkTG9naWNhbEJvdHRvbSArIHBhZGRpbmdBZnRlcigpKSk7Cisg ICAgcmV0dXJuIHN0ZDo6bWF4KHJlbmRlcmVyLmNsaWVudExvZ2ljYWxCb3R0b20oKSwgbWF4Q2hp bGRMb2dpY2FsQm90dG9tICsgcmVuZGVyZXIucGFkZGluZ0FmdGVyKCkpOwogfQogCi0KIC8vIE92 ZXJmbG93IGlzIGFsd2F5cyByZWxhdGl2ZSB0byB0aGUgYm9yZGVyLWJveCBvZiB0aGUgZWxlbWVu dCBpbiBxdWVzdGlvbi4KIC8vIFRoZXJlZm9yZSwgaWYgdGhlIGVsZW1lbnQgaGFzIGEgdmVydGlj YWwgc2Nyb2xsYmFyIHBsYWNlZCBvbiB0aGUgbGVmdCwgYW4gb3ZlcmZsb3cgcmVjdCBhdCB4PTJw eCB3b3VsZCBjb25jZXB0dWFsbHkgaW50ZXJzZWN0IHRoZSBzY3JvbGxiYXIuCiB2b2lkIFJlbmRl ckJsb2NrOjpjb21wdXRlT3ZlcmZsb3coTGF5b3V0VW5pdCBvbGRDbGllbnRBZnRlckVkZ2UsIGJv b2wpCkBAIC03MDgsMjMgKzcwNCwzOCBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlT3ZlcmZs b3coTGF5b3V0VW5pdCBvbGRDbGllbnRBZnRlckVkZ2UsIGJvb2wpCiAgICAgYWRkT3ZlcmZsb3dG cm9tUG9zaXRpb25lZE9iamVjdHMoKTsKIAogICAgIGlmIChoYXNOb25WaXNpYmxlT3ZlcmZsb3co KSkgewotICAgICAgICAvLyBTZXQgdGhlIGF4aXMgd2UgZG9uJ3QgY2FyZSBhYm91dCB0byBiZSAx LCBzaW5jZSB3ZSB3YW50IHRoaXMgb3ZlcmZsb3cgdG8gYWx3YXlzIGJlIGNvbnNpZGVyZWQgcmVh Y2hhYmxlLgotICAgICAgICBMYXlvdXRVbml0IHJlY3RXaWR0aCA9IDFfbHU7Ci0gICAgICAgIC8v IEZvciBncmlkLCB3aWR0aCBvZiB0aGUgb3ZlcmZsb3cgcmVjdCBzaG91bGQgYmUgdGhlIHdpZHRo IG9mIHRoZSBncmlkIGFyZWEgb2YgdGhlIGl0ZW1zIHJhdGhlciB0aGFuIHRoZSBjb250YWluZXIg YmxvY2suCi0gICAgICAgIC8vIEFzIHBlciBodHRwczovL2dpdGh1Yi5jb20vdzNjL2Nzc3dnLWRy YWZ0cy9pc3N1ZXMvMzY1MywgY2hpbGQncyBtYXJnaW5zIGFsb25nIHdpdGggcGFkZGluZyBzaG91 bGQgY29udHJpYnV0ZSB0byB0aGUKLSAgICAgICAgLy8gc2Nyb2xsYWJsZSBvdmVyZmxvdyBhcmVh LgotICAgICAgICBpZiAodGhpcy0+aXNSZW5kZXJHcmlkKCkpCi0gICAgICAgICAgICByZWN0V2lk dGggPSBjbGllbnRMb2dpY2FsUmlnaHRBbmRCb3R0b21BZnRlclJlcG9zaXRpb25pbmcoKS53aWR0 aCgpOwotCi0gICAgICAgIC8vIFdoZW4gd2UgaGF2ZSBvdmVyZmxvdyBjbGlwLCBwcm9wYWdhdGUg dGhlIG9yaWdpbmFsIHNwaWxsb3V0IHNpbmNlIGl0IHdpbGwgaW5jbHVkZSBjb2xsYXBzZWQgYm90 dG9tIG1hcmdpbnMKLSAgICAgICAgLy8gYW5kIGJvdHRvbSBwYWRkaW5nLgotICAgICAgICBMYXlv dXRSZWN0IGNsaWVudFJlY3QoZmxpcHBlZENsaWVudEJveFJlY3QoKSk7Ci0gICAgICAgIExheW91 dFJlY3QgcmVjdFRvQXBwbHk7Ci0gICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgp KQotICAgICAgICAgICAgcmVjdFRvQXBwbHkgPSBMYXlvdXRSZWN0KGNsaWVudFJlY3QueCgpLCBj bGllbnRSZWN0LnkoKSwgcmVjdFdpZHRoLCBzdGQ6Om1heCgwX2x1LCBvbGRDbGllbnRBZnRlckVk Z2UgLSBjbGllbnRSZWN0LnkoKSkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICByZWN0VG9B cHBseSA9IExheW91dFJlY3QoY2xpZW50UmVjdC54KCksIGNsaWVudFJlY3QueSgpLCBzdGQ6Om1h eCgwX2x1LCBvbGRDbGllbnRBZnRlckVkZ2UgLSBjbGllbnRSZWN0LngoKSksIHJlY3RXaWR0aCk7 Ci0gICAgICAgIGFkZExheW91dE92ZXJmbG93KHJlY3RUb0FwcGx5KTsKKworICAgICAgICBhdXRv IGluY2x1ZGVQYWRkaW5nRW5kID0gWyZdIHsKKyAgICAgICAgICAgIGlmICghaGFzSG9yaXpvbnRh bExheW91dE92ZXJmbG93KCkgfHwgIXBhZGRpbmdFbmQoKSkKKyAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICAvLyBBcyBwZXIgaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1k cmFmdHMvaXNzdWVzLzM2NTMgcGFkZGluZyBzaG91bGQgY29udHJpYnV0ZSB0byB0aGUgc2Nyb2xs YWJsZSBvdmVyZmxvdyBhcmVhLgorICAgICAgICAgICAgaWYgKCFpczxSZW5kZXJHcmlkPigqdGhp cykpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgYXV0byBsYXlvdXRPdmVy Zmxvd1JlY3QgPSB0aGlzLT5sYXlvdXRPdmVyZmxvd1JlY3QoKTsKKyAgICAgICAgICAgIGlmIChp c0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAgICAgIGxheW91dE92ZXJmbG93 UmVjdC5zZXRXaWR0aChsYXlvdXRPdmVyZmxvd1JlY3Qud2lkdGgoKSArIHBhZGRpbmdFbmQoKSk7 CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgbGF5b3V0T3ZlcmZsb3dSZWN0LnNl dEhlaWdodChsYXlvdXRPdmVyZmxvd1JlY3QuaGVpZ2h0KCkgKyBwYWRkaW5nRW5kKCkpOworICAg ICAgICAgICAgYWRkTGF5b3V0T3ZlcmZsb3cobGF5b3V0T3ZlcmZsb3dSZWN0KTsKKyAgICAgICAg fTsKKyAgICAgICAgaW5jbHVkZVBhZGRpbmdFbmQoKTsKKworICAgICAgICBhdXRvIGluY2x1ZGVQ YWRkaW5nQWZ0ZXIgPSBbJl0geworICAgICAgICAgICAgLy8gV2hlbiB3ZSBoYXZlIG92ZXJmbG93 IGNsaXAsIHByb3BhZ2F0ZSB0aGUgb3JpZ2luYWwgc3BpbGxvdXQgc2luY2UgaXQgd2lsbCBpbmNs dWRlIGNvbGxhcHNlZCBib3R0b20gbWFyZ2lucyBhbmQgYm90dG9tIHBhZGRpbmcuCisgICAgICAg ICAgICBhdXRvIGNsaWVudFJlY3QgPSBmbGlwcGVkQ2xpZW50Qm94UmVjdCgpOworICAgICAgICAg ICAgYXV0byByZWN0VG9BcHBseSA9IGNsaWVudFJlY3Q7CisgICAgICAgICAgICAvLyBTZXQgdGhl IGF4aXMgd2UgZG9uJ3QgY2FyZSBhYm91dCB0byBiZSAxLCBzaW5jZSB3ZSB3YW50IHRoaXMgb3Zl cmZsb3cgdG8gYWx3YXlzIGJlIGNvbnNpZGVyZWQgcmVhY2hhYmxlLgorICAgICAgICAgICAgaWYg KGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgICAgICByZWN0VG9BcHBs eS5zZXRXaWR0aCgxKTsKKyAgICAgICAgICAgICAgICByZWN0VG9BcHBseS5zZXRIZWlnaHQoc3Rk OjptYXgoMF9sdSwgb2xkQ2xpZW50QWZ0ZXJFZGdlIC0gY2xpZW50UmVjdC55KCkpKTsKKyAgICAg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgcmVjdFRvQXBwbHkuc2V0V2lkdGgoc3Rk OjptYXgoMF9sdSwgb2xkQ2xpZW50QWZ0ZXJFZGdlIC0gY2xpZW50UmVjdC54KCkpKTsKKyAgICAg ICAgICAgICAgICByZWN0VG9BcHBseS5zZXRIZWlnaHQoMSk7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICBhZGRMYXlvdXRPdmVyZmxvdyhyZWN0VG9BcHBseSk7CisgICAgICAgIH07CisgICAg ICAgIGluY2x1ZGVQYWRkaW5nQWZ0ZXIoKTsKKwogICAgICAgICBpZiAoaGFzUmVuZGVyT3ZlcmZs b3coKSkKICAgICAgICAgICAgIG1fb3ZlcmZsb3ctPnNldExheW91dENsaWVudEFmdGVyRWRnZShv bGRDbGllbnRBZnRlckVkZ2UpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgKaW5kZXggNDIyZGIzMzhkMzRjLi40ZWM0MjJhYWE5YmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oCkBAIC0yMzEsNyArMjMxLDYgQEAgcHVibGljOgogICAgIExh eW91dFVuaXQgYWRqdXN0SW50cmluc2ljTG9naWNhbEhlaWdodEZvckJveFNpemluZyhMYXlvdXRV bml0IGhlaWdodCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBwYWludEV4Y2x1ZGVkQ2hpbGRy ZW5JbkJvcmRlcihQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYpOwogICAgIAotICAgIExh eW91dFNpemUgY2xpZW50TG9naWNhbFJpZ2h0QW5kQm90dG9tQWZ0ZXJSZXBvc2l0aW9uaW5nKCkg Y29uc3Q7CiAgICAgLy8gQWNjZXNzb3JzIGZvciBsb2dpY2FsIHdpZHRoL2hlaWdodCBhbmQgbWFy Z2lucyBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGJsb2NrLWZsb3cgZGlyZWN0aW9uLgogICAg IGVudW0gQXBwbHlMYXlvdXREZWx0YU1vZGUgeyBBcHBseUxheW91dERlbHRhLCBEb05vdEFwcGx5 TGF5b3V0RGVsdGEgfTsKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aEZvckNoaWxkKGNvbnN0 IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkgPyBjaGlsZC53aWR0aCgpIDogY2hpbGQuaGVpZ2h0KCk7IH0KQEAgLTM3OCw2ICszNzcsOCBA QCBwcm90ZWN0ZWQ6CiAKICAgICBib29sIGNoaWxkQm94SXNVbnNwbGl0dGFibGVGb3JGcmFnbWVu dGF0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpIGNvbnN0OwogCisgICAgc3RhdGljIExheW91 dFVuaXQgY2xpZW50TG9naWNhbEJvdHRvbUFmdGVyUmVwb3NpdGlvbmluZyhjb25zdCBSZW5kZXJC bG9jayYpOworCiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVPdmVyZmxvdyhMYXlv dXRVbml0IG9sZENsaWVudEFmdGVyRWRnZSwgYm9vbCByZWNvbXB1dGVGbG9hdHMgPSBmYWxzZSk7 CiAgICAgdm9pZCBjbGVhckxheW91dE92ZXJmbG93KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCmluZGV4IDFiZmY5MTAzOWQwOS4uOWQwNDNiODJiZWNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNTIzMyw3ICs1MjMzLDEyIEBAIExheW91 dFJlY3QgUmVuZGVyQm94Ojpsb2dpY2FsTGF5b3V0T3ZlcmZsb3dSZWN0Rm9yUHJvcGFnYXRpb24o Y29uc3QgUmVuZGVyU3R5bGUqCiBMYXlvdXRSZWN0IFJlbmRlckJveDo6bGF5b3V0T3ZlcmZsb3dS ZWN0Rm9yUHJvcGFnYXRpb24oY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlKSBjb25zdAog ewogICAgIC8vIE9ubHkgcHJvcGFnYXRlIGludGVyaW9yIGxheW91dCBvdmVyZmxvdyBpZiB3ZSBk b24ndCBjb21wbGV0ZWx5IGNsaXAgaXQuCi0gICAgTGF5b3V0UmVjdCByZWN0ID0gYm9yZGVyQm94 UmVjdCgpOworICAgIGF1dG8gcmVjdCA9IGJvcmRlckJveFJlY3QoKTsKKyAgICBpZiAoaXNHcmlk SXRlbSgpKSB7CisgICAgICAgIC8vIEFzIHBlciBodHRwczovL2dpdGh1Yi5jb20vdzNjL2Nzc3dn LWRyYWZ0cy9pc3N1ZXMvMzY1MywgY2hpbGQncyBtYXJnaW5zIHNob3VsZCBjb250cmlidXRlIHRv IHRoZSBzY3JvbGxhYmxlIG92ZXJmbG93IGFyZWEuCisgICAgICAgIC8vIEZJWE1FOiBFeHBhbmQg aXQgdG8gbm9uLWdyaWQgY2FzZXMgd2hlbiBhcHBsaWNhYmxlLgorICAgICAgICByZWN0LnNldFdp ZHRoKHJlY3Qud2lkdGgoKSArIHN0ZDo6bWF4KDBfbHUsIG1hcmdpbkVuZCgpKSk7CisgICAgfQog ICAgIGlmICghc2hvdWxkQXBwbHlMYXlvdXRDb250YWlubWVudCgpKSB7CiAgICAgICAgIGlmIChz dHlsZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpDbGlwICYmIHN0eWxlKCkub3ZlcmZsb3dZ KCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAgICAgICAgICAgIExheW91dFJlY3QgY2xpcHBl ZE92ZXJmbG93UmVjdCA9IGxheW91dE92ZXJmbG93UmVjdCgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNzhmYWQxZjg5NTM5Li5iMDll YjhhMTJlMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmNwcApAQCAtNDA3LDcgKzQwNyw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91 dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKIAogICAgICAgICByZXBh aW50Q2hpbGRyZW5EdXJpbmdMYXlvdXRJZk1vdmVkKG9sZENoaWxkUmVjdHMpOwogICAgICAgICAv LyBGSVhNRTogY3NzMy9mbGV4Ym94L3JlcGFpbnQtcnRsLWNvbHVtbi5odG1sIHNlZW1zIHRvIHJl cGFpbnQgbW9yZSBvdmVyZmxvdyB0aGFuIGl0IG5lZWRzIHRvLgotICAgICAgICBjb21wdXRlT3Zl cmZsb3coY2xpZW50TG9naWNhbFJpZ2h0QW5kQm90dG9tQWZ0ZXJSZXBvc2l0aW9uaW5nKCkuaGVp Z2h0KCkpOworICAgICAgICBjb21wdXRlT3ZlcmZsb3coY2xpZW50TG9naWNhbEJvdHRvbUFmdGVy UmVwb3NpdGlvbmluZygqdGhpcykpOwogICAgIH0KICAgICB1cGRhdGVMYXllclRyYW5zZm9ybSgp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggM2RkYTZmYmQ3 M2NlLi43Y2M0MmJhMTIyMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5j cHAKQEAgLTM2OSw3ICszNjksNyBAQCB2b2lkIFJlbmRlckdyaWQ6OmxheW91dEJsb2NrKGJvb2wg cmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICAgICAgbGF5b3V0UG9zaXRpb25lZE9i amVjdHMocmVsYXlvdXRDaGlsZHJlbiB8fCBpc0RvY3VtZW50RWxlbWVudFJlbmRlcmVyKCkpOwog ICAgICAgICBtX3RyYWNrU2l6aW5nQWxnb3JpdGhtLnJlc2V0KCk7CiAKLSAgICAgICAgY29tcHV0 ZU92ZXJmbG93KGNsaWVudExvZ2ljYWxSaWdodEFuZEJvdHRvbUFmdGVyUmVwb3NpdGlvbmluZygp LmhlaWdodCgpKTsKKyAgICAgICAgY29tcHV0ZU92ZXJmbG93KGNsaWVudExvZ2ljYWxCb3R0b21B ZnRlclJlcG9zaXRpb25pbmcoKnRoaXMpKTsKICAgICB9CiAKICAgICB1cGRhdGVMYXllclRyYW5z Zm9ybSgpOwo= 460276 2022-06-16 14:48:33 -0700 2022-06-16 20:31:04 -0700 Patch bug-241689-20220616144832.patch text/plain 14211 zalan RnJvbSA0NjBjNjFmNzJhZmNiYmMyM2NjOTJmNDgxMzAwZGNhOWUzYzk0ZDAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDE2IEp1biAyMDIyIDE0OjQwOjU5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUmVtb3ZlIHJl ZHVuZGFudCBsb2dpY2FsIHJpZ2h0IGNvbXB1dGF0aW9uIGZvciBncmlkIGl0ZW1zIGluCiBSZW5k ZXJCbG9jazo6Y29tcHV0ZU92ZXJmbG93IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNDE2ODkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKSWYgdGhlIGdyaWQg Y29udGVudCBwcm9kdWNlcyBsYXlvdXQgb3ZlcmZsb3csIHdlIHNob3VsZCBub3QgbmVlZCB0byBy ZS1jb21wdXRlIGl0IGFnYWluIGJ5IGxvb3BpbmcgdGhyb3VnaCB0aGUgZ3JpZCBpdGVtcy4KCjEu IERlY291cGxlICJpbmNsdWRlIHBhZGRpbmcgZW5kIiBhbmQgImluY2x1ZGUgY2hpbGQncyBtYXJn aW4gZW5kIiBsb2dpYwoyLiBEZWNvdXBsZSAiaW5jbHVkZSBwYWRkaW5nIGFmdGVyIiBhbmQgImlu Y2x1ZGUgcGFkZGluZyBlbmQiIGxvZ2ljLgozLiBSZXN0b3JlIFJlbmRlckZsZXhpYmxlQm94IGFu ZCBSZW5kZXJHcmlkIGNvbXB1dGVPdmVyZmxvdyBjYWxscyB0byBwcmUtcjI4MjQ2MyAod2hlbiBj bGllbnRMb2dpY2FsUmlnaHRBbmRCb3R0b21BZnRlclJlcG9zaXRpb25pbmcgd2FzIGludHJvZHVj ZWQpCgoqIExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvZ3JpZC1ob3Jpem9udGFsLW92ZXJmbG93 LXdpdGgtcGFkZGluZy1lbmQtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCiogTGF5b3V0VGVzdHMvZmFz dC9vdmVyZmxvdy9ncmlkLWhvcml6b250YWwtb3ZlcmZsb3ctd2l0aC1wYWRkaW5nLWVuZC5odG1s OiBBZGRlZC4KKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgooV2Vi Q29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVPdmVyZmxvdyk6CihXZWJDb3JlOjpSZW5kZXJCbG9j azo6bGF5b3V0T3ZlcmZsb3dMb2dpY2FsQm90dG9tKToKKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpj bGllbnRMb2dpY2FsUmlnaHRBbmRCb3R0b21BZnRlclJlcG9zaXRpb25pbmcgY29uc3QpOiBEZWxl dGVkLgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oOgoqIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwOgooV2ViQ29yZTo6UmVuZGVyQm94OjpsYXlv dXRPdmVyZmxvd1JlY3RGb3JQcm9wYWdhdGlvbiBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94 OjpsYXlvdXRCbG9jayk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3Bw OgooV2ViQ29yZTo6UmVuZGVyR3JpZDo6bGF5b3V0QmxvY2spOgotLS0KIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgICAgICB8IDk4ICsrKysrKysrKysrKy0tLS0tLS0K IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oICAgICAgICB8ICAzICstCiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICAgICAgfCAgNyArLQogLi4u L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCAgIHwgIDIgKy0KIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCAgICAgICB8ICAyICstCiAuLi5hbC1v dmVyZmxvdy13aXRoLXBhZGRpbmctZW5kLWV4cGVjdGVkLmh0bWwgfCAzMCArKysrKysKIC4uLi1o b3Jpem9udGFsLW92ZXJmbG93LXdpdGgtcGFkZGluZy1lbmQuaHRtbCB8IDI2ICsrKysrCiA3IGZp bGVzIGNoYW5nZWQsIDEyOSBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBt b2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVy Zmxvdy13aXRoLXBhZGRpbmctZW5kLWV4cGVjdGVkLmh0bWwKIGNyZWF0ZSBtb2RlIDEwMDY0NCBM YXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13aXRoLXBh ZGRpbmctZW5kLmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApp bmRleCBkNmI2NWUxY2EwZDAuLjhlMTEwNjRmY2FlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwCkBAIC02ODEsMjMgKzY4MSw2IEBAIHZvaWQgUmVuZGVyQmxvY2s6 OmFkZE92ZXJmbG93RnJvbUNoaWxkcmVuKCkKICAgICB9CiB9CiAKLUxheW91dFNpemUgUmVuZGVy QmxvY2s6OmNsaWVudExvZ2ljYWxSaWdodEFuZEJvdHRvbUFmdGVyUmVwb3NpdGlvbmluZygpIGNv bnN0Ci17Ci0gICAgTGF5b3V0VW5pdCBtYXhDaGlsZExvZ2ljYWxSaWdodDsKLSAgICBMYXlvdXRV bml0IG1heENoaWxkTG9naWNhbEJvdHRvbTsKLSAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBm aXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZ0JveCgpKSB7 Ci0gICAgICAgIGlmIChjaGlsZC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCi0gICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgTGF5b3V0VW5pdCBjaGlsZExvZ2ljYWxSaWdodCA9IGxvZ2lj YWxMZWZ0Rm9yQ2hpbGQoKmNoaWxkKSArIGxvZ2ljYWxXaWR0aEZvckNoaWxkKCpjaGlsZCkgKyBt YXJnaW5FbmRGb3JDaGlsZCgqY2hpbGQpOwotICAgICAgICBMYXlvdXRVbml0IGNoaWxkTG9naWNh bEJvdHRvbSA9IGxvZ2ljYWxUb3BGb3JDaGlsZCgqY2hpbGQpICsgbG9naWNhbEhlaWdodEZvckNo aWxkKCpjaGlsZCkgKyBtYXJnaW5BZnRlckZvckNoaWxkKCpjaGlsZCk7Ci0gICAgICAgIG1heENo aWxkTG9naWNhbFJpZ2h0ID0gc3RkOjptYXgobWF4Q2hpbGRMb2dpY2FsUmlnaHQsIGNoaWxkTG9n aWNhbFJpZ2h0KTsKLSAgICAgICAgbWF4Q2hpbGRMb2dpY2FsQm90dG9tID0gc3RkOjptYXgobWF4 Q2hpbGRMb2dpY2FsQm90dG9tLCBjaGlsZExvZ2ljYWxCb3R0b20pOwotCi0gICAgfQotICAgIHJl dHVybiBMYXlvdXRTaXplKG1heENoaWxkTG9naWNhbFJpZ2h0ICsgcGFkZGluZ1JpZ2h0KCksIHN0 ZDo6bWF4KGNsaWVudExvZ2ljYWxCb3R0b20oKSwgbWF4Q2hpbGRMb2dpY2FsQm90dG9tICsgcGFk ZGluZ0FmdGVyKCkpKTsKLX0KLQotCiAvLyBPdmVyZmxvdyBpcyBhbHdheXMgcmVsYXRpdmUgdG8g dGhlIGJvcmRlci1ib3ggb2YgdGhlIGVsZW1lbnQgaW4gcXVlc3Rpb24uCiAvLyBUaGVyZWZvcmUs IGlmIHRoZSBlbGVtZW50IGhhcyBhIHZlcnRpY2FsIHNjcm9sbGJhciBwbGFjZWQgb24gdGhlIGxl ZnQsIGFuIG92ZXJmbG93IHJlY3QgYXQgeD0ycHggd291bGQgY29uY2VwdHVhbGx5IGludGVyc2Vj dCB0aGUgc2Nyb2xsYmFyLgogdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZU92ZXJmbG93KExheW91 dFVuaXQgb2xkQ2xpZW50QWZ0ZXJFZGdlLCBib29sKQpAQCAtNzA4LDIzICs2OTEsNTUgQEAgdm9p ZCBSZW5kZXJCbG9jazo6Y29tcHV0ZU92ZXJmbG93KExheW91dFVuaXQgb2xkQ2xpZW50QWZ0ZXJF ZGdlLCBib29sKQogICAgIGFkZE92ZXJmbG93RnJvbVBvc2l0aW9uZWRPYmplY3RzKCk7CiAKICAg ICBpZiAoaGFzTm9uVmlzaWJsZU92ZXJmbG93KCkpIHsKLSAgICAgICAgLy8gU2V0IHRoZSBheGlz IHdlIGRvbid0IGNhcmUgYWJvdXQgdG8gYmUgMSwgc2luY2Ugd2Ugd2FudCB0aGlzIG92ZXJmbG93 IHRvIGFsd2F5cyBiZSBjb25zaWRlcmVkIHJlYWNoYWJsZS4KLSAgICAgICAgTGF5b3V0VW5pdCBy ZWN0V2lkdGggPSAxX2x1OwotICAgICAgICAvLyBGb3IgZ3JpZCwgd2lkdGggb2YgdGhlIG92ZXJm bG93IHJlY3Qgc2hvdWxkIGJlIHRoZSB3aWR0aCBvZiB0aGUgZ3JpZCBhcmVhIG9mIHRoZSBpdGVt cyByYXRoZXIgdGhhbiB0aGUgY29udGFpbmVyIGJsb2NrLgotICAgICAgICAvLyBBcyBwZXIgaHR0 cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy1kcmFmdHMvaXNzdWVzLzM2NTMsIGNoaWxkJ3MgbWFy Z2lucyBhbG9uZyB3aXRoIHBhZGRpbmcgc2hvdWxkIGNvbnRyaWJ1dGUgdG8gdGhlCi0gICAgICAg IC8vIHNjcm9sbGFibGUgb3ZlcmZsb3cgYXJlYS4KLSAgICAgICAgaWYgKHRoaXMtPmlzUmVuZGVy R3JpZCgpKQotICAgICAgICAgICAgcmVjdFdpZHRoID0gY2xpZW50TG9naWNhbFJpZ2h0QW5kQm90 dG9tQWZ0ZXJSZXBvc2l0aW9uaW5nKCkud2lkdGgoKTsKLQotICAgICAgICAvLyBXaGVuIHdlIGhh dmUgb3ZlcmZsb3cgY2xpcCwgcHJvcGFnYXRlIHRoZSBvcmlnaW5hbCBzcGlsbG91dCBzaW5jZSBp dCB3aWxsIGluY2x1ZGUgY29sbGFwc2VkIGJvdHRvbSBtYXJnaW5zCi0gICAgICAgIC8vIGFuZCBi b3R0b20gcGFkZGluZy4KLSAgICAgICAgTGF5b3V0UmVjdCBjbGllbnRSZWN0KGZsaXBwZWRDbGll bnRCb3hSZWN0KCkpOwotICAgICAgICBMYXlvdXRSZWN0IHJlY3RUb0FwcGx5OwotICAgICAgICBp ZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgICAgIHJlY3RUb0FwcGx5ID0g TGF5b3V0UmVjdChjbGllbnRSZWN0LngoKSwgY2xpZW50UmVjdC55KCksIHJlY3RXaWR0aCwgc3Rk OjptYXgoMF9sdSwgb2xkQ2xpZW50QWZ0ZXJFZGdlIC0gY2xpZW50UmVjdC55KCkpKTsKLSAgICAg ICAgZWxzZQotICAgICAgICAgICAgcmVjdFRvQXBwbHkgPSBMYXlvdXRSZWN0KGNsaWVudFJlY3Qu eCgpLCBjbGllbnRSZWN0LnkoKSwgc3RkOjptYXgoMF9sdSwgb2xkQ2xpZW50QWZ0ZXJFZGdlIC0g Y2xpZW50UmVjdC54KCkpLCByZWN0V2lkdGgpOwotICAgICAgICBhZGRMYXlvdXRPdmVyZmxvdyhy ZWN0VG9BcHBseSk7CisgICAgICAgIGF1dG8gaW5jbHVkZVBhZGRpbmdFbmQgPSBbJl0geworICAg ICAgICAgICAgLy8gQXMgcGVyIGh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lz c3Vlcy8zNjUzIHBhZGRpbmcgc2hvdWxkIGNvbnRyaWJ1dGUgdG8gdGhlIHNjcm9sbGFibGUgb3Zl cmZsb3cgYXJlYS4KKyAgICAgICAgICAgIGlmICghcGFkZGluZ0VuZCgpKQorICAgICAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBFeHBhbmQgaXQgdG8gbm9uLWdyaWQg Y2FzZXMgd2hlbiBhcHBsaWNhYmxlLgorICAgICAgICAgICAgaWYgKCFpczxSZW5kZXJHcmlkPigq dGhpcykpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBhdXRvIGxheW91 dE92ZXJmbG93UmVjdCA9IHRoaXMtPmxheW91dE92ZXJmbG93UmVjdCgpOworICAgICAgICAgICAg YXV0byBsYXlvdXRPdmVyZmxvd0xvZ2ljYWxXaWR0aEluY2x1ZGluZ1BhZGRpbmdFbmQgPSBbJl0g eworICAgICAgICAgICAgICAgIGlmIChoYXNIb3Jpem9udGFsTGF5b3V0T3ZlcmZsb3coKSkKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIChpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gbGF5 b3V0T3ZlcmZsb3dSZWN0LndpZHRoKCkgOiBsYXlvdXRPdmVyZmxvd1JlY3QuaGVpZ2h0KCkpICsg cGFkZGluZ0VuZCgpOworCisgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgbm90IHN1 ZmZpY2llbnQgZm9yIEJGQyBsYXlvdXQgKG1pc3Npbmcgbm9uLWZvcm1hdHRpbmctY29udGV4dCBy b290IGRlc2NlbmRhbnRzKS4KKyAgICAgICAgICAgICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsUmln aHQgPSBMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAgICAgICBmb3IgKGF1dG8mIGNoaWxkIDog Y2hpbGRyZW5PZlR5cGU8UmVuZGVyQm94PigqdGhpcykpIHsKKyAgICAgICAgICAgICAgICAgICAg aWYgKGNoaWxkLmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQorICAgICAgICAgICAgICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gY2hpbGRMb2dpY2FsUmlnaHQg PSBsb2dpY2FsTGVmdEZvckNoaWxkKGNoaWxkKSArIGxvZ2ljYWxXaWR0aEZvckNoaWxkKGNoaWxk KSArIG1hcmdpbkVuZEZvckNoaWxkKGNoaWxkKTsKKyAgICAgICAgICAgICAgICAgICAgY29udGVu dExvZ2ljYWxSaWdodCA9IHN0ZDo6bWF4KGNvbnRlbnRMb2dpY2FsUmlnaHQsIGNoaWxkTG9naWNh bFJpZ2h0KTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYXV0byBsb2dpY2Fs UmlnaHRXaXRoUGFkZGluZ0VuZCA9IGNvbnRlbnRMb2dpY2FsUmlnaHQgKyBwYWRkaW5nRW5kKCk7 CisgICAgICAgICAgICAgICAgLy8gVXNlIHBhZGRpbmcgYm94IGFzIHRoZSByZWZlcmVuY2UgYm94 LgorICAgICAgICAgICAgICAgIHJldHVybiBsb2dpY2FsUmlnaHRXaXRoUGFkZGluZ0VuZCAtIChp c0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gYm9yZGVyTGVmdCgpIDogYm9yZGVyVG9wKCkpOwor ICAgICAgICAgICAgfTsKKworICAgICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkpCisgICAgICAgICAgICAgICAgbGF5b3V0T3ZlcmZsb3dSZWN0LnNldFdpZHRoKGxheW91dE92 ZXJmbG93TG9naWNhbFdpZHRoSW5jbHVkaW5nUGFkZGluZ0VuZCgpKTsKKyAgICAgICAgICAgIGVs c2UKKyAgICAgICAgICAgICAgICBsYXlvdXRPdmVyZmxvd1JlY3Quc2V0SGVpZ2h0KGxheW91dE92 ZXJmbG93TG9naWNhbFdpZHRoSW5jbHVkaW5nUGFkZGluZ0VuZCgpKTsKKyAgICAgICAgICAgIGFk ZExheW91dE92ZXJmbG93KGxheW91dE92ZXJmbG93UmVjdCk7CisgICAgICAgIH07CisgICAgICAg IGluY2x1ZGVQYWRkaW5nRW5kKCk7CisKKyAgICAgICAgYXV0byBpbmNsdWRlUGFkZGluZ0FmdGVy ID0gWyZdIHsKKyAgICAgICAgICAgIC8vIFdoZW4gd2UgaGF2ZSBvdmVyZmxvdyBjbGlwLCBwcm9w YWdhdGUgdGhlIG9yaWdpbmFsIHNwaWxsb3V0IHNpbmNlIGl0IHdpbGwgaW5jbHVkZSBjb2xsYXBz ZWQgYm90dG9tIG1hcmdpbnMgYW5kIGJvdHRvbSBwYWRkaW5nLgorICAgICAgICAgICAgYXV0byBj bGllbnRSZWN0ID0gZmxpcHBlZENsaWVudEJveFJlY3QoKTsKKyAgICAgICAgICAgIGF1dG8gcmVj dFRvQXBwbHkgPSBjbGllbnRSZWN0OworICAgICAgICAgICAgLy8gU2V0IHRoZSBheGlzIHdlIGRv bid0IGNhcmUgYWJvdXQgdG8gYmUgMSwgc2luY2Ugd2Ugd2FudCB0aGlzIG92ZXJmbG93IHRvIGFs d2F5cyBiZSBjb25zaWRlcmVkIHJlYWNoYWJsZS4KKyAgICAgICAgICAgIGlmIChpc0hvcml6b250 YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICAgICAgcmVjdFRvQXBwbHkuc2V0V2lkdGgo MSk7CisgICAgICAgICAgICAgICAgcmVjdFRvQXBwbHkuc2V0SGVpZ2h0KHN0ZDo6bWF4KDBfbHUs IG9sZENsaWVudEFmdGVyRWRnZSAtIGNsaWVudFJlY3QueSgpKSk7CisgICAgICAgICAgICB9IGVs c2UgeworICAgICAgICAgICAgICAgIHJlY3RUb0FwcGx5LnNldFdpZHRoKHN0ZDo6bWF4KDBfbHUs IG9sZENsaWVudEFmdGVyRWRnZSAtIGNsaWVudFJlY3QueCgpKSk7CisgICAgICAgICAgICAgICAg cmVjdFRvQXBwbHkuc2V0SGVpZ2h0KDEpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYWRk TGF5b3V0T3ZlcmZsb3cocmVjdFRvQXBwbHkpOworICAgICAgICB9OworICAgICAgICBpbmNsdWRl UGFkZGluZ0FmdGVyKCk7CiAgICAgICAgIGlmIChoYXNSZW5kZXJPdmVyZmxvdygpKQogICAgICAg ICAgICAgbV9vdmVyZmxvdy0+c2V0TGF5b3V0Q2xpZW50QWZ0ZXJFZGdlKG9sZENsaWVudEFmdGVy RWRnZSk7CiAgICAgfQpAQCAtMzUxMCw1ICszNTI1LDE4IEBAIFN0cmluZyBSZW5kZXJCbG9jazo6 dXBkYXRlU2VjdXJpdHlEaXNjQ2hhcmFjdGVycyhjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIFN0 cmluCiAgICAgcmV0dXJuIG1ha2VTdHJpbmdCeVJlcGxhY2luZ0FsbChzdHJpbmcsIGRpc2NDaGFy YWN0ZXJUb1JlcGxhY2UsIHRleHRTZWN1cml0eURpc2NQVUFDb2RlUG9pbnQpOwogI2VuZGlmCiB9 Ci0gICAgCisKK0xheW91dFVuaXQgUmVuZGVyQmxvY2s6OmxheW91dE92ZXJmbG93TG9naWNhbEJv dHRvbShjb25zdCBSZW5kZXJCbG9jayYgcmVuZGVyZXIpCit7CisgICAgQVNTRVJUKGlzPFJlbmRl ckdyaWQ+KHJlbmRlcmVyKSB8fCBpczxSZW5kZXJGbGV4aWJsZUJveD4ocmVuZGVyZXIpKTsKKyAg ICBhdXRvIG1heENoaWxkTG9naWNhbEJvdHRvbSA9IExheW91dFVuaXQgeyB9OworICAgIGZvciAo YXV0byYgY2hpbGQgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJCb3g+KHJlbmRlcmVyKSkgeworICAg ICAgICBpZiAoY2hpbGQuaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCisgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgYXV0byBjaGlsZExvZ2ljYWxCb3R0b20gPSByZW5kZXJlci5sb2dpY2Fs VG9wRm9yQ2hpbGQoY2hpbGQpICsgcmVuZGVyZXIubG9naWNhbEhlaWdodEZvckNoaWxkKGNoaWxk KSArIHJlbmRlcmVyLm1hcmdpbkFmdGVyRm9yQ2hpbGQoY2hpbGQpOworICAgICAgICBtYXhDaGls ZExvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChtYXhDaGlsZExvZ2ljYWxCb3R0b20sIGNoaWxkTG9n aWNhbEJvdHRvbSk7CisgICAgfQorICAgIHJldHVybiBzdGQ6Om1heChyZW5kZXJlci5jbGllbnRM b2dpY2FsQm90dG9tKCksIG1heENoaWxkTG9naWNhbEJvdHRvbSArIHJlbmRlcmVyLnBhZGRpbmdB ZnRlcigpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suaAppbmRleCA0MjJkYjMzOGQzNGMuLjVkMTczNzE3MjRiNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTIzMSw3ICsyMzEsNiBAQCBwdWJs aWM6CiAgICAgTGF5b3V0VW5pdCBhZGp1c3RJbnRyaW5zaWNMb2dpY2FsSGVpZ2h0Rm9yQm94U2l6 aW5nKExheW91dFVuaXQgaGVpZ2h0KSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIHBhaW50RXhj bHVkZWRDaGlsZHJlbkluQm9yZGVyKFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50Jik7CiAg ICAgCi0gICAgTGF5b3V0U2l6ZSBjbGllbnRMb2dpY2FsUmlnaHRBbmRCb3R0b21BZnRlclJlcG9z aXRpb25pbmcoKSBjb25zdDsKICAgICAvLyBBY2Nlc3NvcnMgZm9yIGxvZ2ljYWwgd2lkdGgvaGVp Z2h0IGFuZCBtYXJnaW5zIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgYmxvY2stZmxvdyBkaXJl Y3Rpb24uCiAgICAgZW51bSBBcHBseUxheW91dERlbHRhTW9kZSB7IEFwcGx5TGF5b3V0RGVsdGEs IERvTm90QXBwbHlMYXlvdXREZWx0YSB9OwogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoRm9y Q2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3QgeyByZXR1cm4gaXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKSA/IGNoaWxkLndpZHRoKCkgOiBjaGlsZC5oZWlnaHQoKTsgfQpAQCAtMzc4 LDYgKzM3Nyw4IEBAIHByb3RlY3RlZDoKIAogICAgIGJvb2wgY2hpbGRCb3hJc1Vuc3BsaXR0YWJs ZUZvckZyYWdtZW50YXRpb24oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAKKyAgICBz dGF0aWMgTGF5b3V0VW5pdCBsYXlvdXRPdmVyZmxvd0xvZ2ljYWxCb3R0b20oY29uc3QgUmVuZGVy QmxvY2smKTsKKwogcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlT3ZlcmZsb3coTGF5 b3V0VW5pdCBvbGRDbGllbnRBZnRlckVkZ2UsIGJvb2wgcmVjb21wdXRlRmxvYXRzID0gZmFsc2Up OwogICAgIHZvaWQgY2xlYXJMYXlvdXRPdmVyZmxvdygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcAppbmRleCAxYmZmOTEwMzlkMDkuLjlkMDQzYjgyYmVjYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTUyMzMsNyArNTIzMywxMiBAQCBMYXlv dXRSZWN0IFJlbmRlckJveDo6bG9naWNhbExheW91dE92ZXJmbG93UmVjdEZvclByb3BhZ2F0aW9u KGNvbnN0IFJlbmRlclN0eWxlKgogTGF5b3V0UmVjdCBSZW5kZXJCb3g6OmxheW91dE92ZXJmbG93 UmVjdEZvclByb3BhZ2F0aW9uKGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSkgY29uc3QK IHsKICAgICAvLyBPbmx5IHByb3BhZ2F0ZSBpbnRlcmlvciBsYXlvdXQgb3ZlcmZsb3cgaWYgd2Ug ZG9uJ3QgY29tcGxldGVseSBjbGlwIGl0LgotICAgIExheW91dFJlY3QgcmVjdCA9IGJvcmRlckJv eFJlY3QoKTsKKyAgICBhdXRvIHJlY3QgPSBib3JkZXJCb3hSZWN0KCk7CisgICAgaWYgKGlzR3Jp ZEl0ZW0oKSkgeworICAgICAgICAvLyBBcyBwZXIgaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3 Zy1kcmFmdHMvaXNzdWVzLzM2NTMsIGNoaWxkJ3MgbWFyZ2lucyBzaG91bGQgY29udHJpYnV0ZSB0 byB0aGUgc2Nyb2xsYWJsZSBvdmVyZmxvdyBhcmVhLgorICAgICAgICAvLyBGSVhNRTogRXhwYW5k IGl0IHRvIG5vbi1ncmlkIGNhc2VzIHdoZW4gYXBwbGljYWJsZS4KKyAgICAgICAgcmVjdC5zZXRX aWR0aChyZWN0LndpZHRoKCkgKyBzdGQ6Om1heCgwX2x1LCBtYXJnaW5FbmQoKSkpOworICAgIH0K ICAgICBpZiAoIXNob3VsZEFwcGx5TGF5b3V0Q29udGFpbm1lbnQoKSkgewogICAgICAgICBpZiAo c3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPdmVyZmxvdzo6Q2xpcCAmJiBzdHlsZSgpLm92ZXJmbG93 WSgpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgICAgICBMYXlvdXRSZWN0IGNsaXBw ZWRPdmVyZmxvd1JlY3QgPSBsYXlvdXRPdmVyZmxvd1JlY3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDc4ZmFkMWY4OTUzOS4uMGQ1 NDliMWZiMzI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5jcHAKQEAgLTQwNyw3ICs0MDcsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv dXRCbG9jayhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91dFVuaXQpCiAKICAgICAgICAgcmVw YWludENoaWxkcmVuRHVyaW5nTGF5b3V0SWZNb3ZlZChvbGRDaGlsZFJlY3RzKTsKICAgICAgICAg Ly8gRklYTUU6IGNzczMvZmxleGJveC9yZXBhaW50LXJ0bC1jb2x1bW4uaHRtbCBzZWVtcyB0byBy ZXBhaW50IG1vcmUgb3ZlcmZsb3cgdGhhbiBpdCBuZWVkcyB0by4KLSAgICAgICAgY29tcHV0ZU92 ZXJmbG93KGNsaWVudExvZ2ljYWxSaWdodEFuZEJvdHRvbUFmdGVyUmVwb3NpdGlvbmluZygpLmhl aWdodCgpKTsKKyAgICAgICAgY29tcHV0ZU92ZXJmbG93KGxheW91dE92ZXJmbG93TG9naWNhbEJv dHRvbSgqdGhpcykpOwogICAgIH0KICAgICB1cGRhdGVMYXllclRyYW5zZm9ybSgpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKaW5kZXggM2RkYTZmYmQ3M2NlLi5hN2Fk MjBmNDdkOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTM2 OSw3ICszNjksNyBAQCB2b2lkIFJlbmRlckdyaWQ6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRD aGlsZHJlbiwgTGF5b3V0VW5pdCkKICAgICAgICAgbGF5b3V0UG9zaXRpb25lZE9iamVjdHMocmVs YXlvdXRDaGlsZHJlbiB8fCBpc0RvY3VtZW50RWxlbWVudFJlbmRlcmVyKCkpOwogICAgICAgICBt X3RyYWNrU2l6aW5nQWxnb3JpdGhtLnJlc2V0KCk7CiAKLSAgICAgICAgY29tcHV0ZU92ZXJmbG93 KGNsaWVudExvZ2ljYWxSaWdodEFuZEJvdHRvbUFmdGVyUmVwb3NpdGlvbmluZygpLmhlaWdodCgp KTsKKyAgICAgICAgY29tcHV0ZU92ZXJmbG93KGxheW91dE92ZXJmbG93TG9naWNhbEJvdHRvbSgq dGhpcykpOwogICAgIH0KIAogICAgIHVwZGF0ZUxheWVyVHJhbnNmb3JtKCk7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13aXRo LXBhZGRpbmctZW5kLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dy aWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13aXRoLXBhZGRpbmctZW5kLWV4cGVjdGVkLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi45ZjM3MzM0NDRmODAKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1v dmVyZmxvdy13aXRoLXBhZGRpbmctZW5kLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzMCBAQAor PHN0eWxlPgorLmNvbnRhaW5lciB7CisgIGJveC1zaXppbmc6IGJvcmRlci1ib3g7CisgIHdpZHRo OiAzMjBweDsKKyAgaGVpZ2h0OiAxODhweDsKKyAgb3ZlcmZsb3cteDogc2Nyb2xsOworICBib3Jk ZXI6IDUwcHggc29saWQgYmx1ZTsKKyAgYmFja2dyb3VuZC1jb2xvcjogY3lhbjsKK30KKworLmNv bnRhaW5lciA+IGRpdiB7CisgIG1hcmdpbi1sZWZ0OiAxMHB4OworICB3aWR0aDogMjBweDsKKyAg aGVpZ2h0OiAyMHB4OworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKworI292ZXJmbG93 IHsKKyAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7CisgIHdpZHRoOiAyMTFweDsKKyAg aGVpZ2h0OiAxMHB4OworfQorPC9zdHlsZT4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPjxkaXY+PC9k aXY+PC9kaXY+Cis8ZGl2IGNsYXNzPWNvbnRhaW5lcj48ZGl2IHN0eWxlPSJ3aWR0aDogMjFweCI+ PC9kaXY+PGRpdiBpZD1vdmVyZmxvdz48L2Rpdj48L2Rpdj4KKzxzY3JpcHQ+CitsZXQgc2Nyb2xs ZXJzID0gZG9jdW1lbnQuYm9keS5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCJjb250YWluZXIiKTsK K2ZvciAobGV0IHNjcm9sbGVyIG9mIHNjcm9sbGVycykKKyAgc2Nyb2xsZXIuc2Nyb2xsVG8oMTAw LCAwKTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9n cmlkLWhvcml6b250YWwtb3ZlcmZsb3ctd2l0aC1wYWRkaW5nLWVuZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9vdmVyZmxvdy9ncmlkLWhvcml6b250YWwtb3ZlcmZsb3ctd2l0aC1wYWRkaW5nLWVu ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uMDViZWZhMjAy ZWFiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9ncmlkLWhv cml6b250YWwtb3ZlcmZsb3ctd2l0aC1wYWRkaW5nLWVuZC5odG1sCkBAIC0wLDAgKzEsMjYgQEAK KzxzdHlsZT4KKy5jb250YWluZXIgeworICBib3gtc2l6aW5nOiBib3JkZXItYm94OworICB3aWR0 aDogMzIwcHg7CisgIGhlaWdodDogMTg4cHg7CisgIG92ZXJmbG93LXg6IHNjcm9sbDsKKyAgcGFk ZGluZy1sZWZ0OiAxMHB4OworICBwYWRkaW5nLXJpZ2h0OiAxOTBweDsKKyAgYm9yZGVyOiA1MHB4 IHNvbGlkIGJsdWU7CisgIGJhY2tncm91bmQtY29sb3I6IGN5YW47CisgIGRpc3BsYXk6IGdyaWQ7 Cit9CisKKy5jb250YWluZXIgPiBkaXYgeworICB3aWR0aDogMjBweDsKKyAgaGVpZ2h0OiAyMHB4 OworICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30gICAgICAgIAorPC9zdHlsZT4KKzxkaXYg Y2xhc3M9Y29udGFpbmVyPjxkaXY+PC9kaXY+PC9kaXY+Cis8ZGl2IGNsYXNzPWNvbnRhaW5lcj48 ZGl2IHN0eWxlPSJ3aWR0aDogMjFweCI+PC9kaXY+PC9kaXY+Cis8c2NyaXB0PgorbGV0IHNjcm9s bGVycyA9IGRvY3VtZW50LmJvZHkuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgiY29udGFpbmVyIik7 Citmb3IgKGxldCBzY3JvbGxlciBvZiBzY3JvbGxlcnMpCisgIHNjcm9sbGVyLnNjcm9sbFRvKDEw MCwgMCk7Cis8L3NjcmlwdD4K 460289 2022-06-16 20:31:06 -0700 2022-06-17 06:35:11 -0700 Patch bug-241689-20220616203105.patch text/plain 14225 zalan RnJvbSBjNDcwYjA3NDFlOTQxODIzZjIxMTM3MDI4ZjM5NzUzODA0OGZhOWE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDE2IEp1biAyMDIyIDE0OjQwOjU5IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gUmVtb3ZlIHJl ZHVuZGFudCBsb2dpY2FsIHJpZ2h0IGNvbXB1dGF0aW9uIGZvciBncmlkIGl0ZW1zIGluCiBSZW5k ZXJCbG9jazo6Y29tcHV0ZU92ZXJmbG93IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNDE2ODkKClJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KCklmIHRoZSBncmlkIGNv bnRlbnQgcHJvZHVjZXMgbGF5b3V0IG92ZXJmbG93LCB3ZSBzaG91bGQgbm90IG5lZWQgdG8gcmUt Y29tcHV0ZSBpdCBhZ2FpbiBieSBsb29waW5nIHRocm91Z2ggdGhlIGdyaWQgaXRlbXMuCgoxLiBE ZWNvdXBsZSAiaW5jbHVkZSBwYWRkaW5nIGVuZCIgYW5kICJpbmNsdWRlIGNoaWxkJ3MgbWFyZ2lu IGVuZCIgbG9naWMKMi4gRGVjb3VwbGUgImluY2x1ZGUgcGFkZGluZyBhZnRlciIgYW5kICJpbmNs dWRlIHBhZGRpbmcgZW5kIiBsb2dpYy4KMy4gUmVzdG9yZSBSZW5kZXJGbGV4aWJsZUJveCBhbmQg UmVuZGVyR3JpZCBjb21wdXRlT3ZlcmZsb3cgY2FsbHMgdG8gcHJlLXIyODI0NjMgKHdoZW4gY2xp ZW50TG9naWNhbFJpZ2h0QW5kQm90dG9tQWZ0ZXJSZXBvc2l0aW9uaW5nIHdhcyBpbnRyb2R1Y2Vk KQoKKiBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13 aXRoLXBhZGRpbmctZW5kLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgoqIExheW91dFRlc3RzL2Zhc3Qv b3ZlcmZsb3cvZ3JpZC1ob3Jpem9udGFsLW92ZXJmbG93LXdpdGgtcGFkZGluZy1lbmQuaHRtbDog QWRkZWQuCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKFdlYkNv cmU6OlJlbmRlckJsb2NrOjpjb21wdXRlT3ZlcmZsb3cpOgooV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmxheW91dE92ZXJmbG93TG9naWNhbEJvdHRvbSk6CihXZWJDb3JlOjpSZW5kZXJCbG9jazo6Y2xp ZW50TG9naWNhbFJpZ2h0QW5kQm90dG9tQWZ0ZXJSZXBvc2l0aW9uaW5nIGNvbnN0KTogRGVsZXRl ZC4KKiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJveDo6bGF5b3V0 T3ZlcmZsb3dSZWN0Rm9yUHJvcGFnYXRpb24gY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHA6CihXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6 bGF5b3V0QmxvY2spOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoK KFdlYkNvcmU6OlJlbmRlckdyaWQ6OmxheW91dEJsb2NrKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwICAgICAgfCA5OCArKysrKysrKysrKystLS0tLS0tCiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCAgICAgICAgfCAgMyArLQogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgICAgICAgIHwgIDcgKy0KIC4uLi9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgICB8ICAyICstCiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgICAgICAgfCAgMiArLQogLi4uYWwtb3Zl cmZsb3ctd2l0aC1wYWRkaW5nLWVuZC1leHBlY3RlZC5odG1sIHwgMzAgKysrKysrCiAuLi4taG9y aXpvbnRhbC1vdmVyZmxvdy13aXRoLXBhZGRpbmctZW5kLmh0bWwgfCAyNiArKysrKwogNyBmaWxl cyBjaGFuZ2VkLCAxMjkgaW5zZXJ0aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9k ZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9ncmlkLWhvcml6b250YWwtb3ZlcmZs b3ctd2l0aC1wYWRkaW5nLWVuZC1leHBlY3RlZC5odG1sCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5 b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9ncmlkLWhvcml6b250YWwtb3ZlcmZsb3ctd2l0aC1wYWRk aW5nLWVuZC5odG1sCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5k ZXggZDZiNjVlMWNhMGQwLi5hZjhjNjA4YmFiNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcApAQCAtNjgxLDIzICs2ODEsNiBAQCB2b2lkIFJlbmRlckJsb2NrOjph ZGRPdmVyZmxvd0Zyb21DaGlsZHJlbigpCiAgICAgfQogfQogCi1MYXlvdXRTaXplIFJlbmRlckJs b2NrOjpjbGllbnRMb2dpY2FsUmlnaHRBbmRCb3R0b21BZnRlclJlcG9zaXRpb25pbmcoKSBjb25z dAotewotICAgIExheW91dFVuaXQgbWF4Q2hpbGRMb2dpY2FsUmlnaHQ7Ci0gICAgTGF5b3V0VW5p dCBtYXhDaGlsZExvZ2ljYWxCb3R0b207Ci0gICAgZm9yIChSZW5kZXJCb3gqIGNoaWxkID0gZmly c3RDaGlsZEJveCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmdCb3goKSkgewot ICAgICAgICBpZiAoY2hpbGQtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQotICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgIExheW91dFVuaXQgY2hpbGRMb2dpY2FsUmlnaHQgPSBsb2dpY2Fs TGVmdEZvckNoaWxkKCpjaGlsZCkgKyBsb2dpY2FsV2lkdGhGb3JDaGlsZCgqY2hpbGQpICsgbWFy Z2luRW5kRm9yQ2hpbGQoKmNoaWxkKTsKLSAgICAgICAgTGF5b3V0VW5pdCBjaGlsZExvZ2ljYWxC b3R0b20gPSBsb2dpY2FsVG9wRm9yQ2hpbGQoKmNoaWxkKSArIGxvZ2ljYWxIZWlnaHRGb3JDaGls ZCgqY2hpbGQpICsgbWFyZ2luQWZ0ZXJGb3JDaGlsZCgqY2hpbGQpOwotICAgICAgICBtYXhDaGls ZExvZ2ljYWxSaWdodCA9IHN0ZDo6bWF4KG1heENoaWxkTG9naWNhbFJpZ2h0LCBjaGlsZExvZ2lj YWxSaWdodCk7Ci0gICAgICAgIG1heENoaWxkTG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4KG1heENo aWxkTG9naWNhbEJvdHRvbSwgY2hpbGRMb2dpY2FsQm90dG9tKTsKLQotICAgIH0KLSAgICByZXR1 cm4gTGF5b3V0U2l6ZShtYXhDaGlsZExvZ2ljYWxSaWdodCArIHBhZGRpbmdSaWdodCgpLCBzdGQ6 Om1heChjbGllbnRMb2dpY2FsQm90dG9tKCksIG1heENoaWxkTG9naWNhbEJvdHRvbSArIHBhZGRp bmdBZnRlcigpKSk7Ci19Ci0KLQogLy8gT3ZlcmZsb3cgaXMgYWx3YXlzIHJlbGF0aXZlIHRvIHRo ZSBib3JkZXItYm94IG9mIHRoZSBlbGVtZW50IGluIHF1ZXN0aW9uLgogLy8gVGhlcmVmb3JlLCBp ZiB0aGUgZWxlbWVudCBoYXMgYSB2ZXJ0aWNhbCBzY3JvbGxiYXIgcGxhY2VkIG9uIHRoZSBsZWZ0 LCBhbiBvdmVyZmxvdyByZWN0IGF0IHg9MnB4IHdvdWxkIGNvbmNlcHR1YWxseSBpbnRlcnNlY3Qg dGhlIHNjcm9sbGJhci4KIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVPdmVyZmxvdyhMYXlvdXRV bml0IG9sZENsaWVudEFmdGVyRWRnZSwgYm9vbCkKQEAgLTcwOCwyMyArNjkxLDU1IEBAIHZvaWQg UmVuZGVyQmxvY2s6OmNvbXB1dGVPdmVyZmxvdyhMYXlvdXRVbml0IG9sZENsaWVudEFmdGVyRWRn ZSwgYm9vbCkKICAgICBhZGRPdmVyZmxvd0Zyb21Qb3NpdGlvbmVkT2JqZWN0cygpOwogCiAgICAg aWYgKGhhc05vblZpc2libGVPdmVyZmxvdygpKSB7Ci0gICAgICAgIC8vIFNldCB0aGUgYXhpcyB3 ZSBkb24ndCBjYXJlIGFib3V0IHRvIGJlIDEsIHNpbmNlIHdlIHdhbnQgdGhpcyBvdmVyZmxvdyB0 byBhbHdheXMgYmUgY29uc2lkZXJlZCByZWFjaGFibGUuCi0gICAgICAgIExheW91dFVuaXQgcmVj dFdpZHRoID0gMV9sdTsKLSAgICAgICAgLy8gRm9yIGdyaWQsIHdpZHRoIG9mIHRoZSBvdmVyZmxv dyByZWN0IHNob3VsZCBiZSB0aGUgd2lkdGggb2YgdGhlIGdyaWQgYXJlYSBvZiB0aGUgaXRlbXMg cmF0aGVyIHRoYW4gdGhlIGNvbnRhaW5lciBibG9jay4KLSAgICAgICAgLy8gQXMgcGVyIGh0dHBz Oi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy8zNjUzLCBjaGlsZCdzIG1hcmdp bnMgYWxvbmcgd2l0aCBwYWRkaW5nIHNob3VsZCBjb250cmlidXRlIHRvIHRoZQotICAgICAgICAv LyBzY3JvbGxhYmxlIG92ZXJmbG93IGFyZWEuCi0gICAgICAgIGlmICh0aGlzLT5pc1JlbmRlckdy aWQoKSkKLSAgICAgICAgICAgIHJlY3RXaWR0aCA9IGNsaWVudExvZ2ljYWxSaWdodEFuZEJvdHRv bUFmdGVyUmVwb3NpdGlvbmluZygpLndpZHRoKCk7Ci0KLSAgICAgICAgLy8gV2hlbiB3ZSBoYXZl IG92ZXJmbG93IGNsaXAsIHByb3BhZ2F0ZSB0aGUgb3JpZ2luYWwgc3BpbGxvdXQgc2luY2UgaXQg d2lsbCBpbmNsdWRlIGNvbGxhcHNlZCBib3R0b20gbWFyZ2lucwotICAgICAgICAvLyBhbmQgYm90 dG9tIHBhZGRpbmcuCi0gICAgICAgIExheW91dFJlY3QgY2xpZW50UmVjdChmbGlwcGVkQ2xpZW50 Qm94UmVjdCgpKTsKLSAgICAgICAgTGF5b3V0UmVjdCByZWN0VG9BcHBseTsKLSAgICAgICAgaWYg KGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgICAgICByZWN0VG9BcHBseSA9IExh eW91dFJlY3QoY2xpZW50UmVjdC54KCksIGNsaWVudFJlY3QueSgpLCByZWN0V2lkdGgsIHN0ZDo6 bWF4KDBfbHUsIG9sZENsaWVudEFmdGVyRWRnZSAtIGNsaWVudFJlY3QueSgpKSk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgIHJlY3RUb0FwcGx5ID0gTGF5b3V0UmVjdChjbGllbnRSZWN0Lngo KSwgY2xpZW50UmVjdC55KCksIHN0ZDo6bWF4KDBfbHUsIG9sZENsaWVudEFmdGVyRWRnZSAtIGNs aWVudFJlY3QueCgpKSwgcmVjdFdpZHRoKTsKLSAgICAgICAgYWRkTGF5b3V0T3ZlcmZsb3cocmVj dFRvQXBwbHkpOworICAgICAgICBhdXRvIGluY2x1ZGVQYWRkaW5nRW5kID0gWyZdIHsKKyAgICAg ICAgICAgIC8vIEFzIHBlciBodHRwczovL2dpdGh1Yi5jb20vdzNjL2Nzc3dnLWRyYWZ0cy9pc3N1 ZXMvMzY1MyBwYWRkaW5nIHNob3VsZCBjb250cmlidXRlIHRvIHRoZSBzY3JvbGxhYmxlIG92ZXJm bG93IGFyZWEuCisgICAgICAgICAgICBpZiAoIXBhZGRpbmdFbmQoKSkKKyAgICAgICAgICAgICAg ICByZXR1cm47CisgICAgICAgICAgICAvLyBGSVhNRTogRXhwYW5kIGl0IHRvIG5vbi1ncmlkIGNh c2VzIHdoZW4gYXBwbGljYWJsZS4KKyAgICAgICAgICAgIGlmICghaXM8UmVuZGVyR3JpZD4oKnRo aXMpKQorICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgYXV0byBsYXlvdXRP dmVyZmxvd1JlY3QgPSB0aGlzLT5sYXlvdXRPdmVyZmxvd1JlY3QoKTsKKyAgICAgICAgICAgIGF1 dG8gbGF5b3V0T3ZlcmZsb3dMb2dpY2FsV2lkdGhJbmNsdWRpbmdQYWRkaW5nRW5kID0gWyZdIHsK KyAgICAgICAgICAgICAgICBpZiAoaGFzSG9yaXpvbnRhbExheW91dE92ZXJmbG93KCkpCisgICAg ICAgICAgICAgICAgICAgIHJldHVybiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGxheW91 dE92ZXJmbG93UmVjdC53aWR0aCgpIDogbGF5b3V0T3ZlcmZsb3dSZWN0LmhlaWdodCgpKSArIHBh ZGRpbmdFbmQoKTsKKworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIG5vdCBzdWZm aWNpZW50IGZvciBCRkMgbGF5b3V0IChtaXNzaW5nIG5vbi1mb3JtYXR0aW5nLWNvbnRleHQgcm9v dCBkZXNjZW5kYW50cykuCisgICAgICAgICAgICAgICAgYXV0byBjb250ZW50TG9naWNhbFJpZ2h0 ID0gTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAgICAgICAgZm9yIChhdXRvJiBjaGlsZCA6IGNo aWxkcmVuT2ZUeXBlPFJlbmRlckJveD4oKnRoaXMpKSB7CisgICAgICAgICAgICAgICAgICAgIGlm IChjaGlsZC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgICAgICAgICBhdXRvIGNoaWxkTG9naWNhbFJpZ2h0ID0g bG9naWNhbExlZnRGb3JDaGlsZChjaGlsZCkgKyBsb2dpY2FsV2lkdGhGb3JDaGlsZChjaGlsZCkg KyBzdGQ6Om1heCgwX2x1LCBtYXJnaW5FbmRGb3JDaGlsZChjaGlsZCkpOworICAgICAgICAgICAg ICAgICAgICBjb250ZW50TG9naWNhbFJpZ2h0ID0gc3RkOjptYXgoY29udGVudExvZ2ljYWxSaWdo dCwgY2hpbGRMb2dpY2FsUmlnaHQpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICBhdXRvIGxvZ2ljYWxSaWdodFdpdGhQYWRkaW5nRW5kID0gY29udGVudExvZ2ljYWxSaWdodCAr IHBhZGRpbmdFbmQoKTsKKyAgICAgICAgICAgICAgICAvLyBVc2UgcGFkZGluZyBib3ggYXMgdGhl IHJlZmVyZW5jZSBib3guCisgICAgICAgICAgICAgICAgcmV0dXJuIGxvZ2ljYWxSaWdodFdpdGhQ YWRkaW5nRW5kIC0gKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBib3JkZXJMZWZ0KCkgOiBi b3JkZXJUb3AoKSk7CisgICAgICAgICAgICB9OworCisgICAgICAgICAgICBpZiAoaXNIb3Jpem9u dGFsV3JpdGluZ01vZGUoKSkKKyAgICAgICAgICAgICAgICBsYXlvdXRPdmVyZmxvd1JlY3Quc2V0 V2lkdGgobGF5b3V0T3ZlcmZsb3dMb2dpY2FsV2lkdGhJbmNsdWRpbmdQYWRkaW5nRW5kKCkpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGxheW91dE92ZXJmbG93UmVjdC5zZXRI ZWlnaHQobGF5b3V0T3ZlcmZsb3dMb2dpY2FsV2lkdGhJbmNsdWRpbmdQYWRkaW5nRW5kKCkpOwor ICAgICAgICAgICAgYWRkTGF5b3V0T3ZlcmZsb3cobGF5b3V0T3ZlcmZsb3dSZWN0KTsKKyAgICAg ICAgfTsKKyAgICAgICAgaW5jbHVkZVBhZGRpbmdFbmQoKTsKKworICAgICAgICBhdXRvIGluY2x1 ZGVQYWRkaW5nQWZ0ZXIgPSBbJl0geworICAgICAgICAgICAgLy8gV2hlbiB3ZSBoYXZlIG92ZXJm bG93IGNsaXAsIHByb3BhZ2F0ZSB0aGUgb3JpZ2luYWwgc3BpbGxvdXQgc2luY2UgaXQgd2lsbCBp bmNsdWRlIGNvbGxhcHNlZCBib3R0b20gbWFyZ2lucyBhbmQgYm90dG9tIHBhZGRpbmcuCisgICAg ICAgICAgICBhdXRvIGNsaWVudFJlY3QgPSBmbGlwcGVkQ2xpZW50Qm94UmVjdCgpOworICAgICAg ICAgICAgYXV0byByZWN0VG9BcHBseSA9IGNsaWVudFJlY3Q7CisgICAgICAgICAgICAvLyBTZXQg dGhlIGF4aXMgd2UgZG9uJ3QgY2FyZSBhYm91dCB0byBiZSAxLCBzaW5jZSB3ZSB3YW50IHRoaXMg b3ZlcmZsb3cgdG8gYWx3YXlzIGJlIGNvbnNpZGVyZWQgcmVhY2hhYmxlLgorICAgICAgICAgICAg aWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgICAgICByZWN0VG9B cHBseS5zZXRXaWR0aCgxKTsKKyAgICAgICAgICAgICAgICByZWN0VG9BcHBseS5zZXRIZWlnaHQo c3RkOjptYXgoMF9sdSwgb2xkQ2xpZW50QWZ0ZXJFZGdlIC0gY2xpZW50UmVjdC55KCkpKTsKKyAg ICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgcmVjdFRvQXBwbHkuc2V0V2lkdGgo c3RkOjptYXgoMF9sdSwgb2xkQ2xpZW50QWZ0ZXJFZGdlIC0gY2xpZW50UmVjdC54KCkpKTsKKyAg ICAgICAgICAgICAgICByZWN0VG9BcHBseS5zZXRIZWlnaHQoMSk7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICBhZGRMYXlvdXRPdmVyZmxvdyhyZWN0VG9BcHBseSk7CisgICAgICAgIH07Cisg ICAgICAgIGluY2x1ZGVQYWRkaW5nQWZ0ZXIoKTsKICAgICAgICAgaWYgKGhhc1JlbmRlck92ZXJm bG93KCkpCiAgICAgICAgICAgICBtX292ZXJmbG93LT5zZXRMYXlvdXRDbGllbnRBZnRlckVkZ2Uo b2xkQ2xpZW50QWZ0ZXJFZGdlKTsKICAgICB9CkBAIC0zNTEwLDUgKzM1MjUsMTggQEAgU3RyaW5n IFJlbmRlckJsb2NrOjp1cGRhdGVTZWN1cml0eURpc2NDaGFyYWN0ZXJzKGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZSwgU3RyaW4KICAgICByZXR1cm4gbWFrZVN0cmluZ0J5UmVwbGFjaW5nQWxsKHN0 cmluZywgZGlzY0NoYXJhY3RlclRvUmVwbGFjZSwgdGV4dFNlY3VyaXR5RGlzY1BVQUNvZGVQb2lu dCk7CiAjZW5kaWYKIH0KLSAgICAKKworTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6bGF5b3V0T3Zl cmZsb3dMb2dpY2FsQm90dG9tKGNvbnN0IFJlbmRlckJsb2NrJiByZW5kZXJlcikKK3sKKyAgICBB U1NFUlQoaXM8UmVuZGVyR3JpZD4ocmVuZGVyZXIpIHx8IGlzPFJlbmRlckZsZXhpYmxlQm94Pihy ZW5kZXJlcikpOworICAgIGF1dG8gbWF4Q2hpbGRMb2dpY2FsQm90dG9tID0gTGF5b3V0VW5pdCB7 IH07CisgICAgZm9yIChhdXRvJiBjaGlsZCA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckJveD4ocmVu ZGVyZXIpKSB7CisgICAgICAgIGlmIChjaGlsZC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBhdXRvIGNoaWxkTG9naWNhbEJvdHRvbSA9IHJl bmRlcmVyLmxvZ2ljYWxUb3BGb3JDaGlsZChjaGlsZCkgKyByZW5kZXJlci5sb2dpY2FsSGVpZ2h0 Rm9yQ2hpbGQoY2hpbGQpICsgcmVuZGVyZXIubWFyZ2luQWZ0ZXJGb3JDaGlsZChjaGlsZCk7Cisg ICAgICAgIG1heENoaWxkTG9naWNhbEJvdHRvbSA9IHN0ZDo6bWF4KG1heENoaWxkTG9naWNhbEJv dHRvbSwgY2hpbGRMb2dpY2FsQm90dG9tKTsKKyAgICB9CisgICAgcmV0dXJuIHN0ZDo6bWF4KHJl bmRlcmVyLmNsaWVudExvZ2ljYWxCb3R0b20oKSwgbWF4Q2hpbGRMb2dpY2FsQm90dG9tICsgcmVu ZGVyZXIucGFkZGluZ0FmdGVyKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCmluZGV4IDQyMmRiMzM4ZDM0Yy4uNWQxNzM3 MTcyNGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtMjMxLDcg KzIzMSw2IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGFkanVzdEludHJpbnNpY0xvZ2ljYWxI ZWlnaHRGb3JCb3hTaXppbmcoTGF5b3V0VW5pdCBoZWlnaHQpIGNvbnN0IG92ZXJyaWRlOwogICAg IHZvaWQgcGFpbnRFeGNsdWRlZENoaWxkcmVuSW5Cb3JkZXIoUGFpbnRJbmZvJiwgY29uc3QgTGF5 b3V0UG9pbnQmKTsKICAgICAKLSAgICBMYXlvdXRTaXplIGNsaWVudExvZ2ljYWxSaWdodEFuZEJv dHRvbUFmdGVyUmVwb3NpdGlvbmluZygpIGNvbnN0OwogICAgIC8vIEFjY2Vzc29ycyBmb3IgbG9n aWNhbCB3aWR0aC9oZWlnaHQgYW5kIG1hcmdpbnMgaW4gdGhlIGNvbnRhaW5pbmcgYmxvY2sncyBi bG9jay1mbG93IGRpcmVjdGlvbi4KICAgICBlbnVtIEFwcGx5TGF5b3V0RGVsdGFNb2RlIHsgQXBw bHlMYXlvdXREZWx0YSwgRG9Ob3RBcHBseUxheW91dERlbHRhIH07CiAgICAgTGF5b3V0VW5pdCBs b2dpY2FsV2lkdGhGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdCB7IHJldHVy biBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2hpbGQud2lkdGgoKSA6IGNoaWxkLmhlaWdo dCgpOyB9CkBAIC0zNzgsNiArMzc3LDggQEAgcHJvdGVjdGVkOgogCiAgICAgYm9vbCBjaGlsZEJv eElzVW5zcGxpdHRhYmxlRm9yRnJhZ21lbnRhdGlvbihjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBj b25zdDsKIAorICAgIHN0YXRpYyBMYXlvdXRVbml0IGxheW91dE92ZXJmbG93TG9naWNhbEJvdHRv bShjb25zdCBSZW5kZXJCbG9jayYpOworCiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1 dGVPdmVyZmxvdyhMYXlvdXRVbml0IG9sZENsaWVudEFmdGVyRWRnZSwgYm9vbCByZWNvbXB1dGVG bG9hdHMgPSBmYWxzZSk7CiAgICAgdm9pZCBjbGVhckxheW91dE92ZXJmbG93KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDFiZmY5MTAzOWQwOS4uOWQwNDNiODJi ZWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNTIzMyw3ICs1 MjMzLDEyIEBAIExheW91dFJlY3QgUmVuZGVyQm94Ojpsb2dpY2FsTGF5b3V0T3ZlcmZsb3dSZWN0 Rm9yUHJvcGFnYXRpb24oY29uc3QgUmVuZGVyU3R5bGUqCiBMYXlvdXRSZWN0IFJlbmRlckJveDo6 bGF5b3V0T3ZlcmZsb3dSZWN0Rm9yUHJvcGFnYXRpb24oY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVu dFN0eWxlKSBjb25zdAogewogICAgIC8vIE9ubHkgcHJvcGFnYXRlIGludGVyaW9yIGxheW91dCBv dmVyZmxvdyBpZiB3ZSBkb24ndCBjb21wbGV0ZWx5IGNsaXAgaXQuCi0gICAgTGF5b3V0UmVjdCBy ZWN0ID0gYm9yZGVyQm94UmVjdCgpOworICAgIGF1dG8gcmVjdCA9IGJvcmRlckJveFJlY3QoKTsK KyAgICBpZiAoaXNHcmlkSXRlbSgpKSB7CisgICAgICAgIC8vIEFzIHBlciBodHRwczovL2dpdGh1 Yi5jb20vdzNjL2Nzc3dnLWRyYWZ0cy9pc3N1ZXMvMzY1MywgY2hpbGQncyBtYXJnaW5zIHNob3Vs ZCBjb250cmlidXRlIHRvIHRoZSBzY3JvbGxhYmxlIG92ZXJmbG93IGFyZWEuCisgICAgICAgIC8v IEZJWE1FOiBFeHBhbmQgaXQgdG8gbm9uLWdyaWQgY2FzZXMgd2hlbiBhcHBsaWNhYmxlLgorICAg ICAgICByZWN0LnNldFdpZHRoKHJlY3Qud2lkdGgoKSArIHN0ZDo6bWF4KDBfbHUsIG1hcmdpbkVu ZCgpKSk7CisgICAgfQogICAgIGlmICghc2hvdWxkQXBwbHlMYXlvdXRDb250YWlubWVudCgpKSB7 CiAgICAgICAgIGlmIChzdHlsZSgpLm92ZXJmbG93WCgpID09IE92ZXJmbG93OjpDbGlwICYmIHN0 eWxlKCkub3ZlcmZsb3dZKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAgICAgICAgICAgIExh eW91dFJlY3QgY2xpcHBlZE92ZXJmbG93UmVjdCA9IGxheW91dE92ZXJmbG93UmVjdCgpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNzhm YWQxZjg5NTM5Li4wZDU0OWIxZmIzMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtNDA3LDcgKzQwNyw3IEBAIHZvaWQgUmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCkK IAogICAgICAgICByZXBhaW50Q2hpbGRyZW5EdXJpbmdMYXlvdXRJZk1vdmVkKG9sZENoaWxkUmVj dHMpOwogICAgICAgICAvLyBGSVhNRTogY3NzMy9mbGV4Ym94L3JlcGFpbnQtcnRsLWNvbHVtbi5o dG1sIHNlZW1zIHRvIHJlcGFpbnQgbW9yZSBvdmVyZmxvdyB0aGFuIGl0IG5lZWRzIHRvLgotICAg ICAgICBjb21wdXRlT3ZlcmZsb3coY2xpZW50TG9naWNhbFJpZ2h0QW5kQm90dG9tQWZ0ZXJSZXBv c2l0aW9uaW5nKCkuaGVpZ2h0KCkpOworICAgICAgICBjb21wdXRlT3ZlcmZsb3cobGF5b3V0T3Zl cmZsb3dMb2dpY2FsQm90dG9tKCp0aGlzKSk7CiAgICAgfQogICAgIHVwZGF0ZUxheWVyVHJhbnNm b3JtKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCAzZGRh NmZiZDczY2UuLmE3YWQyMGY0N2Q5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmNwcApAQCAtMzY5LDcgKzM2OSw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6bGF5b3V0QmxvY2so Ym9vbCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0KQogICAgICAgICBsYXlvdXRQb3NpdGlv bmVkT2JqZWN0cyhyZWxheW91dENoaWxkcmVuIHx8IGlzRG9jdW1lbnRFbGVtZW50UmVuZGVyZXIo KSk7CiAgICAgICAgIG1fdHJhY2tTaXppbmdBbGdvcml0aG0ucmVzZXQoKTsKIAotICAgICAgICBj b21wdXRlT3ZlcmZsb3coY2xpZW50TG9naWNhbFJpZ2h0QW5kQm90dG9tQWZ0ZXJSZXBvc2l0aW9u aW5nKCkuaGVpZ2h0KCkpOworICAgICAgICBjb21wdXRlT3ZlcmZsb3cobGF5b3V0T3ZlcmZsb3dM b2dpY2FsQm90dG9tKCp0aGlzKSk7CiAgICAgfQogCiAgICAgdXBkYXRlTGF5ZXJUcmFuc2Zvcm0o KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvZ3JpZC1ob3Jpem9udGFs LW92ZXJmbG93LXdpdGgtcGFkZGluZy1lbmQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zh c3Qvb3ZlcmZsb3cvZ3JpZC1ob3Jpem9udGFsLW92ZXJmbG93LXdpdGgtcGFkZGluZy1lbmQtZXhw ZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjlmMzcz MzQ0NGY4MAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvZ3Jp ZC1ob3Jpem9udGFsLW92ZXJmbG93LXdpdGgtcGFkZGluZy1lbmQtZXhwZWN0ZWQuaHRtbApAQCAt MCwwICsxLDMwIEBACis8c3R5bGU+CisuY29udGFpbmVyIHsKKyAgYm94LXNpemluZzogYm9yZGVy LWJveDsKKyAgd2lkdGg6IDMyMHB4OworICBoZWlnaHQ6IDE4OHB4OworICBvdmVyZmxvdy14OiBz Y3JvbGw7CisgIGJvcmRlcjogNTBweCBzb2xpZCBibHVlOworICBiYWNrZ3JvdW5kLWNvbG9yOiBj eWFuOworfQorCisuY29udGFpbmVyID4gZGl2IHsKKyAgbWFyZ2luLWxlZnQ6IDEwcHg7CisgIHdp ZHRoOiAyMHB4OworICBoZWlnaHQ6IDIwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOwor fQorCisjb3ZlcmZsb3cgeworICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsKKyAgd2lk dGg6IDIxMXB4OworICBoZWlnaHQ6IDEwcHg7Cit9Cis8L3N0eWxlPgorPGRpdiBjbGFzcz1jb250 YWluZXI+PGRpdj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xhc3M9Y29udGFpbmVyPjxkaXYgc3R5bGU9 IndpZHRoOiAyMXB4Ij48L2Rpdj48ZGl2IGlkPW92ZXJmbG93PjwvZGl2PjwvZGl2PgorPHNjcmlw dD4KK2xldCBzY3JvbGxlcnMgPSBkb2N1bWVudC5ib2R5LmdldEVsZW1lbnRzQnlDbGFzc05hbWUo ImNvbnRhaW5lciIpOworZm9yIChsZXQgc2Nyb2xsZXIgb2Ygc2Nyb2xsZXJzKQorICBzY3JvbGxl ci5zY3JvbGxUbygxMDAsIDApOworPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13aXRoLXBhZGRpbmctZW5kLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13 aXRoLXBhZGRpbmctZW5kLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwLi4wNWJlZmEyMDJlYWIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L292 ZXJmbG93L2dyaWQtaG9yaXpvbnRhbC1vdmVyZmxvdy13aXRoLXBhZGRpbmctZW5kLmh0bWwKQEAg LTAsMCArMSwyNiBAQAorPHN0eWxlPgorLmNvbnRhaW5lciB7CisgIGJveC1zaXppbmc6IGJvcmRl ci1ib3g7CisgIHdpZHRoOiAzMjBweDsKKyAgaGVpZ2h0OiAxODhweDsKKyAgb3ZlcmZsb3cteDog c2Nyb2xsOworICBwYWRkaW5nLWxlZnQ6IDEwcHg7CisgIHBhZGRpbmctcmlnaHQ6IDE5MHB4Owor ICBib3JkZXI6IDUwcHggc29saWQgYmx1ZTsKKyAgYmFja2dyb3VuZC1jb2xvcjogY3lhbjsKKyAg ZGlzcGxheTogZ3JpZDsKK30KKworLmNvbnRhaW5lciA+IGRpdiB7CisgIHdpZHRoOiAyMHB4Owor ICBoZWlnaHQ6IDIwcHg7CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfSAgICAgICAgCis8 L3N0eWxlPgorPGRpdiBjbGFzcz1jb250YWluZXI+PGRpdj48L2Rpdj48L2Rpdj4KKzxkaXYgY2xh c3M9Y29udGFpbmVyPjxkaXYgc3R5bGU9IndpZHRoOiAyMXB4Ij48L2Rpdj48L2Rpdj4KKzxzY3Jp cHQ+CitsZXQgc2Nyb2xsZXJzID0gZG9jdW1lbnQuYm9keS5nZXRFbGVtZW50c0J5Q2xhc3NOYW1l KCJjb250YWluZXIiKTsKK2ZvciAobGV0IHNjcm9sbGVyIG9mIHNjcm9sbGVycykKKyAgc2Nyb2xs ZXIuc2Nyb2xsVG8oMTAwLCAwKTsKKzwvc2NyaXB0Pgo=