220224 2021-01-02 02:51:10 -0800 Support transferred min/max block size for aspect-ratio 2021-01-20 08:02:08 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 47738 1 rbuis rbuis changseok darin esprehn+autocc ews-watchlist glenn kondapallykalyan pdr sam webkit-bug-importer oldest_to_newest 1716983 0 rbuis 2021-01-02 02:51:10 -0800 Support transferred min/max block size for aspect-ratio 1716985 1 416893 rbuis 2021-01-02 02:53:39 -0800 Created attachment 416893 Patch 1718237 2 417250 rbuis 2021-01-08 00:50:47 -0800 Created attachment 417250 Patch 1718246 3 417257 rbuis 2021-01-08 01:41:02 -0800 Created attachment 417257 Patch 1718555 4 417339 rbuis 2021-01-09 01:13:36 -0800 Created attachment 417339 Patch 1718557 5 webkit-bug-importer 2021-01-09 02:52:14 -0800 <rdar://problem/72961058> 1718569 6 417342 rbuis 2021-01-09 08:17:30 -0800 Created attachment 417342 Patch 1718597 7 417349 rbuis 2021-01-10 06:35:20 -0800 Created attachment 417349 Patch 1719583 8 417615 rbuis 2021-01-14 06:40:26 -0800 Created attachment 417615 Patch 1719589 9 417618 rbuis 2021-01-14 07:02:36 -0800 Created attachment 417618 Patch 1719592 10 417619 rbuis 2021-01-14 07:39:43 -0800 Created attachment 417619 Patch 1719731 11 417619 sam 2021-01-14 15:42:42 -0800 Comment on attachment 417619 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417619&action=review > Source/WebCore/rendering/RenderBox.cpp:5058 > +void RenderBox::computeMinMaxLogicalWidthFromAspectRatio(LayoutUnit& transferredMinSize, LayoutUnit& transferredMaxSize) const This should return a pair (or a bespoke struct) rather than using out parameters. 1719847 12 417693 rbuis 2021-01-15 05:38:30 -0800 Created attachment 417693 Patch 1719896 13 417619 rbuis 2021-01-15 09:07:17 -0800 Comment on attachment 417619 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417619&action=review >> Source/WebCore/rendering/RenderBox.cpp:5058 >> +void RenderBox::computeMinMaxLogicalWidthFromAspectRatio(LayoutUnit& transferredMinSize, LayoutUnit& transferredMaxSize) const > > This should return a pair (or a bespoke struct) rather than using out parameters. Done. 1720091 14 417693 darin 2021-01-15 17:31:12 -0800 Comment on attachment 417693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417693&action=review > Source/WebCore/rendering/RenderBox.cpp:650 > + logicalWidth = std::max(logicalMinWidth, std::min(logicalWidth, logicalMaxWidth)); I’m fond of using std::clamp for this sort of thing, but it’s maybe not *exactly* the same as the std::max/min combo here. 1720119 15 ews-feeder 2021-01-15 23:58:01 -0800 Committed r271554: <https://trac.webkit.org/changeset/271554> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417693. 1720133 16 417693 sam 2021-01-16 10:22:41 -0800 Comment on attachment 417693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417693&action=review > Source/WebCore/rendering/RenderBox.cpp:649 > + LayoutUnit logicalMinWidth, logicalMaxWidth; > + std::tie(logicalMinWidth, logicalMaxWidth) = computeMinMaxLogicalWidthFromAspectRatio(); No need to change this, but in the future, you can write these two lines as: auto [logicalMinWidth, logicalMaxWidth] = computeMinMaxLogicalWidthFromAspectRatio(); You still have to use std::tie in some circumstances, like if you have existing variables, but in cases like this the structured binding approach is quite clean. >> Source/WebCore/rendering/RenderBox.cpp:650 >> + logicalWidth = std::max(logicalMinWidth, std::min(logicalWidth, logicalMaxWidth)); > > I’m fond of using std::clamp for this sort of thing, but it’s maybe not *exactly* the same as the std::max/min combo here. It should be exactly the same I think. 1720135 17 417693 rbuis 2021-01-16 10:59:31 -0800 Comment on attachment 417693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417693&action=review >> Source/WebCore/rendering/RenderBox.cpp:649 >> + std::tie(logicalMinWidth, logicalMaxWidth) = computeMinMaxLogicalWidthFromAspectRatio(); > > No need to change this, but in the future, you can write these two lines as: > > auto [logicalMinWidth, logicalMaxWidth] = computeMinMaxLogicalWidthFromAspectRatio(); > > You still have to use std::tie in some circumstances, like if you have existing variables, but in cases like this the structured binding approach is quite clean. I tried it first but I got a compile error (on Big sur) at the place where the other std::tie is used: if (shouldComputeLogicalHeightFromAspectRatio()) std::tie(transferredMinSize, transferredMaxSize) = computeMinMaxLogicalWidthFromAspectRatio(); You can try for yourself if you are interested, I forgot the exact error. >>> Source/WebCore/rendering/RenderBox.cpp:650 >>> + logicalWidth = std::max(logicalMinWidth, std::min(logicalWidth, logicalMaxWidth)); >> >> I’m fond of using std::clamp for this sort of thing, but it’s maybe not *exactly* the same as the std::max/min combo here. > > It should be exactly the same I think. I am not sure, but mainly I think it would like a non-intuitive and maybe suspicious clamp, i.e. why clamp between max, min range instead of usual min, max. Maybe we need a mathematician to chime in here, Igalia has a few of them... 1720548 18 417693 darin 2021-01-19 09:39:57 -0800 Comment on attachment 417693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417693&action=review >>>> Source/WebCore/rendering/RenderBox.cpp:650 >>>> + logicalWidth = std::max(logicalMinWidth, std::min(logicalWidth, logicalMaxWidth)); >>> >>> I’m fond of using std::clamp for this sort of thing, but it’s maybe not *exactly* the same as the std::max/min combo here. >> >> It should be exactly the same I think. > > I am not sure, but mainly I think it would like a non-intuitive and maybe suspicious clamp, i.e. why clamp between max, min range instead of usual min, max. Maybe we need a mathematician to chime in here, Igalia has a few of them... There is a small difference, one I learned when I researched clamp. The difference is when minimum > maximum. You can carefully use std::max/min so the minimum takes precedence over the maximum. But in std::clamp, the maximum takes precedence. I have no idea what this has to do with mathematicians! I love std::clamp for its clarity, clamp a value between low and high, rather than using std::max/min where it’s harder to read. 1720550 19 rbuis 2021-01-19 09:45:42 -0800 Reopening to attach new patch. 1720551 20 417881 rbuis 2021-01-19 09:45:45 -0800 Created attachment 417881 Patch 1720554 21 417693 rbuis 2021-01-19 09:49:25 -0800 Comment on attachment 417693 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417693&action=review >>>>> Source/WebCore/rendering/RenderBox.cpp:650 >>>>> + logicalWidth = std::max(logicalMinWidth, std::min(logicalWidth, logicalMaxWidth)); >>>> >>>> I’m fond of using std::clamp for this sort of thing, but it’s maybe not *exactly* the same as the std::max/min combo here. >>> >>> It should be exactly the same I think. >> >> I am not sure, but mainly I think it would like a non-intuitive and maybe suspicious clamp, i.e. why clamp between max, min range instead of usual min, max. Maybe we need a mathematician to chime in here, Igalia has a few of them... > > There is a small difference, one I learned when I researched clamp. The difference is when minimum > maximum. You can carefully use std::max/min so the minimum takes precedence over the maximum. But in std::clamp, the maximum takes precedence. I have no idea what this has to do with mathematicians! I love std::clamp for its clarity, clamp a value between low and high, rather than using std::max/min where it’s harder to read. I probably misinterpreted the code. Let's see if it turns up green using std:clamp, I also prefer it. 1720642 22 darin 2021-01-19 13:01:38 -0800 (In reply to Rob Buis from comment #17) > I tried it first but I got a compile error (on Big sur) at the place where > the other std::tie is used: > if (shouldComputeLogicalHeightFromAspectRatio()) > std::tie(transferredMinSize, transferredMaxSize) = > computeMinMaxLogicalWidthFromAspectRatio(); > > You can try for yourself if you are interested, I forgot the exact error. That’s exactly what Sam meant when he said, "You still have to use std::tie in some circumstances, like if you have existing variables." These are existing variables. 1720661 23 rbuis 2021-01-19 13:25:01 -0800 (In reply to Darin Adler from comment #22) > (In reply to Rob Buis from comment #17) > > I tried it first but I got a compile error (on Big sur) at the place where > > the other std::tie is used: > > if (shouldComputeLogicalHeightFromAspectRatio()) > > std::tie(transferredMinSize, transferredMaxSize) = > > computeMinMaxLogicalWidthFromAspectRatio(); > > > > You can try for yourself if you are interested, I forgot the exact error. > > That’s exactly what Sam meant when he said, "You still have to use std::tie > in some circumstances, like if you have existing variables." These are > existing variables. I see, thanks for the clarification! I think I will use the std::tie usage as-is since otherwise it feels a bit inconsistent. 1720665 24 darin 2021-01-19 13:27:13 -0800 (In reply to Rob Buis from comment #23) > I think I will use the std::tie usage > as-is since otherwise it feels a bit inconsistent. I’m a fan of combining both since the structured binding is so much more terse when we are both defining and initializing at once. 1720823 25 417947 rbuis 2021-01-20 00:31:51 -0800 Created attachment 417947 Patch 1720891 26 ews-feeder 2021-01-20 08:02:06 -0800 Committed r271648: <https://trac.webkit.org/changeset/271648> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417947. 416893 2021-01-02 02:53:39 -0800 2021-01-08 00:50:41 -0800 Patch bug-220224-20210102115337.patch text/plain 4234 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGI1NmYyZWEzNTRkYjE5 NGM1YTY3MDJkMjJmM2U4MGM2YTIzNmFiMi4uZTE2NDYxNDE0OWUyMzk5NjU3MjdlYTBjMjc3ZDVj ODJjZWVhYjlhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAxLTAyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMC0xMi0zMSAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gSG9yaXpvbnRhbCBw YWRkaW5nL2JvcmRlciBtYWtlcyB0aGUgaW5saW5lIGJveCBub24tZW1wdHkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZWQ5ZmEzNDk4NjFmNmVhMDljMWNhZTA3YWI5 ZjhiNGNlYWNiYmNiOC4uZmQ0YmNmMjJmMjhjNGUzMmRmOTg2ZTQ2YTNkNTJmNTgwNjUwNzUwYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY0Myw2ICs2NDMsMTMg QEAgdm9pZCBSZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKIExheW91dFVuaXQgUmVu ZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBj YiwgUmVuZGVyRnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAogewogICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKKworICAgIGlmIChzaG91bGRDb21w dXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgIExheW91dFVuaXQg bG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGg7CisgICAgICAgIGNvbXB1dGVNaW5NYXhM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8obG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lk dGgpOworICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1heChsb2dpY2FsTWluV2lkdGgsIHN0 ZDo6bWluKGxvZ2ljYWxXaWR0aCwgbG9naWNhbE1heFdpZHRoKSk7CisgICAgfQorCiAgICAgaWYg KCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgIGxv Z2ljYWxXaWR0aCA9IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aElu RnJhZ21lbnRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLCBhdmFp bGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxX aWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBzdHlsZVRv VXNlLmxvZ2ljYWxNaW5XaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CkBA IC01MDQzLDYgKzUwNTAsMjEgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2Fs V2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIKICAgICByZXR1cm4g Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29u dGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVu dCk7CiB9CiAKK3ZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFz cGVjdFJhdGlvKExheW91dFVuaXQmIHRyYW5zZmVycmVkTWluU2l6ZSwgTGF5b3V0VW5pdCYgdHJh bnNmZXJyZWRNYXhTaXplKSBjb25zdAoreworICAgIGRvdWJsZSByYXRpbyA9IHN0eWxlKCkubG9n aWNhbEFzcGVjdFJhdGlvKCk7CisgICAgTGF5b3V0VW5pdCBibG9ja01pblNpemUgPSBjb25zdHJh aW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCgpLCBXVEY6Om51bGxvcHQpOworICAg IExheW91dFVuaXQgYmxvY2tNYXhTaXplID0gY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4 KExheW91dFVuaXQ6Om1heCgpLCBXVEY6Om51bGxvcHQpOworICAgIHRyYW5zZmVycmVkTWluU2l6 ZSA9IExheW91dFVuaXQoKTsKKyAgICB0cmFuc2ZlcnJlZE1heFNpemUgPSBMYXlvdXRVbml0Ojpt YXgoKTsKKyAgICBpZiAoYmxvY2tNaW5TaXplID4gTGF5b3V0VW5pdCgpKQorICAgICAgICB0cmFu c2ZlcnJlZE1pblNpemUgPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3Jk ZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBy YXRpbywgc3R5bGUoKS5ib3hTaXppbmcoKSwgYmxvY2tNaW5TaXplKTsKKyAgICBpZiAoYmxvY2tN YXhTaXplICE9IExheW91dFVuaXQ6Om1heCgpKQorICAgICAgICB0cmFuc2ZlcnJlZE1heFNpemUg PSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0 ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCByYXRpbywgc3R5bGUoKS5i b3hTaXppbmcoKSwgYmxvY2tNYXhTaXplKTsKKyAgICAvLyBNaW5pbXVtIHNpemUgd2lucyBvdmVy IG1heGltdW0gc2l6ZS4KKyAgICB0cmFuc2ZlcnJlZE1heFNpemUgPSBzdGQ6Om1heCh0cmFuc2Zl cnJlZE1heFNpemUsIHRyYW5zZmVycmVkTWluU2l6ZSk7Cit9CisKIGJvb2wgUmVuZGVyQm94Ojpo YXNSZWxhdGl2ZURpbWVuc2lvbnMoKSBjb25zdAogewogICAgIHJldHVybiBzdHlsZSgpLmhlaWdo dCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpIHx8IHN0eWxlKCkud2lkdGgoKS5pc1BlcmNlbnRP ckNhbGN1bGF0ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDk2ZTcy ZDRmODViYzQ5M2ZiNDcyMGJjYzJlMTg1MGU0MDhiNDFjODQuLjg0OWU5ZTBhN2YzN2IzNzJjY2I2 ODM3YTAwMjM4MjZmOTVkZGRjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK QEAgLTc0OCw2ICs3NDgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0OwogICAgIExheW91dFVu aXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRh aW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNaW5TaXplLCBMYXlvdXRV bml0JiB0cmFuc2ZlcnJlZE1heFNpemUpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIC8vIFRoZSB3 aWR0aC9oZWlnaHQgb2YgdGhlIGNvbnRlbnRzICsgYm9yZGVycyArIHBhZGRpbmcuICBUaGUgeC95 IGxvY2F0aW9uIGlzIHJlbGF0aXZlIHRvIG91ciBjb250YWluZXIgKHdoaWNoIGlzIG5vdCBhbHdh eXMgb3VyIHBhcmVudCkuCg== 417250 2021-01-08 00:50:47 -0800 2021-01-08 01:40:55 -0800 Patch bug-220224-20210108095045.patch text/plain 4233 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgzM2QxN2YxOWUxOWNj NDE0ZjhmN2U2ODNmNDg1NzU1MTkyZWYyZi4uODMwMDc4ZWE2NzM2OTIzNzhiMGY3YzNlYWE2Y2Y0 NmI1ZTM3Mzk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAxLTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0wMS0wNyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIHBheXBhbC5jb206IHRleHQgYXQgdGhl IGJvdHRvbSBvZiB0aGUgcGFnZSBpcyBub3QgYWxpZ25lZCBwcm9wZXJseQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA3MDZkOWNiMGFjYzFjMGM0ODg0NjFmNWMwYjIz NTc3ZjhhYjU2NDQxLi44NTg4OGU1MWMzOWM5NTQyYjcyZmJlMzM1MzVkN2JmOTI4ZGMzZGFjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjQzLDYgKzY0MywxMyBA QCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQogTGF5b3V0VW5pdCBSZW5k ZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNi LCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CiB7CiAgICAgY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOworCisgICAgaWYgKHNob3VsZENvbXB1 dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBs b2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aDsKKyAgICAgICAgY29tcHV0ZU1pbk1heExv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0 aCk7CisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4KGxvZ2ljYWxNaW5XaWR0aCwgc3Rk OjptaW4obG9naWNhbFdpZHRoLCBsb2dpY2FsTWF4V2lkdGgpKTsKKyAgICB9CisKICAgICBpZiAo IXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkKICAgICAgICAgbG9n aWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5G cmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWls YWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdp ZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIHN0eWxlVG9V c2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKQEAg LTUwMzgsNiArNTA0NSwyMSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lcgogICAgIHJldHVybiBj b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250 YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50 KTsKIH0KIAordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNaW5TaXplLCBMYXlvdXRVbml0JiB0cmFu c2ZlcnJlZE1heFNpemUpIGNvbnN0Cit7CisgICAgZG91YmxlIHJhdGlvID0gc3R5bGUoKS5sb2dp Y2FsQXNwZWN0UmF0aW8oKTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWluU2l6ZSA9IGNvbnN0cmFp bkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0KCksIFdURjo6bnVsbG9wdCk7CisgICAg TGF5b3V0VW5pdCBibG9ja01heFNpemUgPSBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgo TGF5b3V0VW5pdDo6bWF4KCksIFdURjo6bnVsbG9wdCk7CisgICAgdHJhbnNmZXJyZWRNaW5TaXpl ID0gTGF5b3V0VW5pdCgpOworICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IExheW91dFVuaXQ6Om1h eCgpOworICAgIGlmIChibG9ja01pblNpemUgPiBMYXlvdXRVbml0KCkpCisgICAgICAgIHRyYW5z ZmVycmVkTWluU2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRl ckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJh dGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01pblNpemUpOworICAgIGlmIChibG9ja01h eFNpemUgIT0gTGF5b3V0VW5pdDo6bWF4KCkpCisgICAgICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9 IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJhdGlvLCBzdHlsZSgpLmJv eFNpemluZygpLCBibG9ja01heFNpemUpOworICAgIC8vIE1pbmltdW0gc2l6ZSB3aW5zIG92ZXIg bWF4aW11bSBzaXplLgorICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IHN0ZDo6bWF4KHRyYW5zZmVy cmVkTWF4U2l6ZSwgdHJhbnNmZXJyZWRNaW5TaXplKTsKK30KKwogYm9vbCBSZW5kZXJCb3g6Omhh c1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHN0eWxlKCkuaGVpZ2h0 KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS53aWR0aCgpLmlzUGVyY2VudE9y Q2FsY3VsYXRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggOTZlNzJk NGY4NWJjNDkzZmI0NzIwYmNjMmUxODUwZTQwOGI0MWM4NC4uODQ5ZTllMGE3ZjM3YjM3MmNjYjY4 MzdhMDAyMzgyNmY5NWRkZGMyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApA QCAtNzQ4LDYgKzc0OCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNh bFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5p dCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFp bmVyKiA9IG51bGxwdHIpIGNvbnN0OworICAgIHZvaWQgY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1pblNpemUsIExheW91dFVu aXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgLy8gVGhlIHdp ZHRoL2hlaWdodCBvZiB0aGUgY29udGVudHMgKyBib3JkZXJzICsgcGFkZGluZy4gIFRoZSB4L3kg bG9jYXRpb24gaXMgcmVsYXRpdmUgdG8gb3VyIGNvbnRhaW5lciAod2hpY2ggaXMgbm90IGFsd2F5 cyBvdXIgcGFyZW50KS4K 417257 2021-01-08 01:41:02 -0800 2021-01-09 01:13:31 -0800 Patch bug-220224-20210108104100.patch text/plain 6766 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjgzM2QxN2YxOWUxOWNj NDE0ZjhmN2U2ODNmNDg1NzU1MTkyZWYyZi4uODMwMDc4ZWE2NzM2OTIzNzhiMGY3YzNlYWE2Y2Y0 NmI1ZTM3Mzk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTAxLTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29uc3QpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0wMS0wNyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIHBheXBhbC5jb206IHRleHQgYXQgdGhl IGJvdHRvbSBvZiB0aGUgcGFnZSBpcyBub3QgYWxpZ25lZCBwcm9wZXJseQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA3MDZkOWNiMGFjYzFjMGM0ODg0NjFmNWMwYjIz NTc3ZjhhYjU2NDQxLi44NTg4OGU1MWMzOWM5NTQyYjcyZmJlMzM1MzVkN2JmOTI4ZGMzZGFjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjQzLDYgKzY0MywxMyBA QCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQogTGF5b3V0VW5pdCBSZW5k ZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNi LCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CiB7CiAgICAgY29uc3Qg UmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOworCisgICAgaWYgKHNob3VsZENvbXB1 dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBs b2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aDsKKyAgICAgICAgY29tcHV0ZU1pbk1heExv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0 aCk7CisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4KGxvZ2ljYWxNaW5XaWR0aCwgc3Rk OjptaW4obG9naWNhbFdpZHRoLCBsb2dpY2FsTWF4V2lkdGgpKTsKKyAgICB9CisKICAgICBpZiAo IXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkKICAgICAgICAgbG9n aWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5G cmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWls YWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdp ZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIHN0eWxlVG9V c2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKQEAg LTUwMzgsNiArNTA0NSwyMSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lcgogICAgIHJldHVybiBj b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250 YWluZXJXaWR0aEluSW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50 KTsKIH0KIAordm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8oTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNaW5TaXplLCBMYXlvdXRVbml0JiB0cmFu c2ZlcnJlZE1heFNpemUpIGNvbnN0Cit7CisgICAgZG91YmxlIHJhdGlvID0gc3R5bGUoKS5sb2dp Y2FsQXNwZWN0UmF0aW8oKTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWluU2l6ZSA9IGNvbnN0cmFp bkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0KCksIFdURjo6bnVsbG9wdCk7CisgICAg TGF5b3V0VW5pdCBibG9ja01heFNpemUgPSBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgo TGF5b3V0VW5pdDo6bWF4KCksIFdURjo6bnVsbG9wdCk7CisgICAgdHJhbnNmZXJyZWRNaW5TaXpl ID0gTGF5b3V0VW5pdCgpOworICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IExheW91dFVuaXQ6Om1h eCgpOworICAgIGlmIChibG9ja01pblNpemUgPiBMYXlvdXRVbml0KCkpCisgICAgICAgIHRyYW5z ZmVycmVkTWluU2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRl ckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJh dGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01pblNpemUpOworICAgIGlmIChibG9ja01h eFNpemUgIT0gTGF5b3V0VW5pdDo6bWF4KCkpCisgICAgICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9 IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJhdGlvLCBzdHlsZSgpLmJv eFNpemluZygpLCBibG9ja01heFNpemUpOworICAgIC8vIE1pbmltdW0gc2l6ZSB3aW5zIG92ZXIg bWF4aW11bSBzaXplLgorICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IHN0ZDo6bWF4KHRyYW5zZmVy cmVkTWF4U2l6ZSwgdHJhbnNmZXJyZWRNaW5TaXplKTsKK30KKwogYm9vbCBSZW5kZXJCb3g6Omhh c1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHN0eWxlKCkuaGVpZ2h0 KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS53aWR0aCgpLmlzUGVyY2VudE9y Q2FsY3VsYXRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggOTZlNzJk NGY4NWJjNDkzZmI0NzIwYmNjMmUxODUwZTQwOGI0MWM4NC4uODQ5ZTllMGE3ZjM3YjM3MmNjYjY4 MzdhMDAyMzgyNmY5NWRkZGMyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApA QCAtNzQ4LDYgKzc0OCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBzaG91bGRDb21wdXRlTG9naWNh bFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRDb21wdXRlTG9n aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5p dCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFp bmVyKiA9IG51bGxwdHIpIGNvbnN0OworICAgIHZvaWQgY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1pblNpemUsIExheW91dFVu aXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgLy8gVGhlIHdp ZHRoL2hlaWdodCBvZiB0aGUgY29udGVudHMgKyBib3JkZXJzICsgcGFkZGluZy4gIFRoZSB4L3kg bG9jYXRpb24gaXMgcmVsYXRpdmUgdG8gb3VyIGNvbnRhaW5lciAod2hpY2ggaXMgbm90IGFsd2F5 cyBvdXIgcGFyZW50KS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMGY2Y2YxMmEyNTJjYjljODg4ZGU0ZDJlOTQ5OWI0ZDhm NWM1MGY5Li45MmRiYmI4OGY4NWY1NGY1MjY1MGI1MDliNmUzNGVjOGYzNDVhOWQ1IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMDggIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI0 CisgICAgICAgIFN1cHBvcnQgdHJhbnNmZXJyZWQgbWluL21heCBibG9jayBzaXplIGZvciBhc3Bl Y3QtcmF0aW8KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVj dGF0aW9uczoKKwogMjAyMS0wMS0wNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIHBheXBhbC5jb206IHRleHQgYXQgdGhlIGJvdHRvbSBvZiB0aGUgcGFnZSBpcyBu b3QgYWxpZ25lZCBwcm9wZXJseQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYWJlMmYxODM5ZjY2M2Qz MzM0ODkwYWU4ZTE1MTM0MDMwZDQyMjM2YS4uZWY4NGE5YjY0MzIyOTRkNjlmMDJjZDg1OTA2YzUy ZDBkNTlmM2FlNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDMzLDEyICs0NDMzLDcgQEAgd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0 LXJhdGlvLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAy MC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2Nr LWFzcGVjdC1yYXRpby0wMjEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDIzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1y YXRpby0wMjYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9ibG9jay1hc3BlY3QtcmF0aW8tMDI3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp emluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw ZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 417339 2021-01-09 01:13:36 -0800 2021-01-09 08:17:24 -0800 Patch bug-220224-20210109101334.patch text/plain 11847 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODYwZGRmNThiYTQwMzVh ODBmNDlmYmU0MjRjMWM5ZWEzYWIzMmI3My4uNjg5OTEwZDFmMzRmN2JkNzYwNDI4N2E0NWFiODVk MGEyMzc0NWRlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAxLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorCiAyMDIxLTAxLTA4 ICBQZW5nIExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CiAKICAgICAgICAgQSB2aWRlbyBlbGVt ZW50IG5lZWRzIHRvIGlnbm9yZSB0aGUgcmVxdWVzdCB0byBlbnRlci9leGl0IGZ1bGxzY3JlZW4g YmVmb3JlIHRoZSBjdXJyZW50IGZ1bGxzY3JlZW4gbW9kZSBjaGFuZ2UgaXMgY29tcGxldGVkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGI4ZDY0NDhmZTUxYjE5MDEy NjcxZjZlZWU0NTgzODA2MTVjMjg2OWEuLjBlZjljMTM3NzhiOGI0MDEyODgzNzYwMzZhNzJmNWY2 ZDVmYzNkZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NDMs NiArNjQzLDEzIEBAIHZvaWQgUmVuZGVyQm94Ojp1cGRhdGVMYXllclRyYW5zZm9ybSgpCiBMYXlv dXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5k ZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBmcmFnbWVudCkgY29uc3QKIHsK ICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CisKKyAgICBpZiAo c2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkgeworICAgICAgICBM YXlvdXRVbml0IGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoOworICAgICAgICBjb21w dXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKGxvZ2ljYWxNaW5XaWR0aCwgbG9n aWNhbE1heFdpZHRoKTsKKyAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptYXgobG9naWNhbE1p bldpZHRoLCBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCkpOworICAgIH0K KwogICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQog ICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dp Y2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lk dGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwogICAgIHJldHVybiBzdGQ6Om1h eChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6 ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFn bWVudCkpOwpAQCAtMzYyNSwzOCArMzYzMiw1MiBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBv c2l0aW9uZWRMb2dpY2FsV2lkdGgoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgs IGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdo dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVz KTsKIAorICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRNaW5TaXplID0gTGF5b3V0VW5pdCgpOwor ICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRNYXhTaXplID0gTGF5b3V0VW5pdDo6bWF4KCk7Cisg ICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpCisgICAg ICAgIGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8odHJhbnNmZXJyZWRN aW5TaXplLCB0cmFuc2ZlcnJlZE1heFNpemUpOworCisgICAgTG9naWNhbEV4dGVudENvbXB1dGVk VmFsdWVzIG1heFZhbHVlczsKKyAgICBtYXhWYWx1ZXMubV9leHRlbnQgPSBMYXlvdXRVbml0Ojpt YXgoKTsKICAgICAvLyBDYWxjdWxhdGUgY29uc3RyYWludCBlcXVhdGlvbiB2YWx1ZXMgZm9yICdt YXgtd2lkdGgnIGNhc2UuCiAgICAgaWYgKCFzdHlsZSgpLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5k ZWZpbmVkKCkpIHsKLSAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1heFZhbHVl czsKLQogICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5nKE1heFNpemUs IHN0eWxlKCkubG9naWNhbE1heFdpZHRoKCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJEaXJl Y3Rpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGFp bmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxvZ2ljYWxSaWdodExl bmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhWYWx1ZXMpOwotCi0gICAgICAgIGlm IChjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA+IG1heFZhbHVlcy5tX2V4dGVudCkgewotICAgICAg ICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBtYXhWYWx1ZXMubV9leHRlbnQ7Ci0gICAg ICAgICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbWF4VmFsdWVzLm1fcG9zaXRpb247 Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9zdGFydCA9IG1heFZhbHVl cy5tX21hcmdpbnMubV9zdGFydDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lu cy5tX2VuZCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9lbmQ7Ci0gICAgICAgIH0KKyAgICB9Cisg ICAgaWYgKHRyYW5zZmVycmVkTWF4U2l6ZSA8IG1heFZhbHVlcy5tX2V4dGVudCkgeworICAgICAg ICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5nKE1heFNpemUsIExlbmd0aCh0cmFu c2ZlcnJlZE1heFNpemUsIEZpeGVkKSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckRpcmVjdGlv biwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXJM b2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3Ro LCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heFZhbHVlcyk7CisgICAgfQorICAgIGlmIChj b21wdXRlZFZhbHVlcy5tX2V4dGVudCA+IG1heFZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBj b21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IG1heFZhbHVlcy5tX2V4dGVudDsKKyAgICAgICAgY29t cHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IG1heFZhbHVlcy5tX3Bvc2l0aW9uOworICAgICAgICBj b21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9z dGFydDsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWF4VmFsdWVz Lm1fbWFyZ2lucy5tX2VuZDsKICAgICB9CiAKKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1 ZXMgbWluVmFsdWVzOwogICAgIC8vIENhbGN1bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZhbHVl cyBmb3IgJ21pbi13aWR0aCcgY2FzZS4KICAgICBpZiAoIXN0eWxlKCkubG9naWNhbE1pbldpZHRo KCkuaXNaZXJvKCkgfHwgc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKSB7 Ci0gICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBtaW5WYWx1ZXM7Ci0KICAgICAg ICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhNaW5TaXplLCBzdHlsZSgpLmxv Z2ljYWxNaW5XaWR0aCgpLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxX aWR0aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdp bkxvZ2ljYWxMZWZ0LCBtYXJnaW5Mb2dpY2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbWluVmFsdWVzKTsKLQotICAgICAgICBpZiAoY29tcHV0ZWRW YWx1ZXMubV9leHRlbnQgPCBtaW5WYWx1ZXMubV9leHRlbnQpIHsKLSAgICAgICAgICAgIGNvbXB1 dGVkVmFsdWVzLm1fZXh0ZW50ID0gbWluVmFsdWVzLm1fZXh0ZW50OwotICAgICAgICAgICAgY29t cHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IG1pblZhbHVlcy5tX3Bvc2l0aW9uOwotICAgICAgICAg ICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5z Lm1fc3RhcnQ7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQgPSBt aW5WYWx1ZXMubV9tYXJnaW5zLm1fZW5kOwotICAgICAgICB9CisgICAgfQorICAgIGlmICh0cmFu c2ZlcnJlZE1pblNpemUgPiBtaW5WYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZVBv c2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhNaW5TaXplLCBMZW5ndGgodHJhbnNmZXJyZWRNaW5T aXplLCBGaXhlZCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJEaXJlY3Rpb24sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdpZHRo LCBib3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9n aWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtaW5WYWx1ZXMpOworICAgIH0KKyAgICBpZiAoY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQgPCBtaW5WYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQgPSBtaW5WYWx1ZXMubV9leHRlbnQ7CisgICAgICAgIGNvbXB1dGVkVmFsdWVz Lm1fcG9zaXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKKyAgICAgICAgY29tcHV0ZWRWYWx1 ZXMubV9tYXJnaW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQ7CisgICAg ICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1pblZhbHVlcy5tX21hcmdpbnMu bV9lbmQ7CiAgICAgfQogCiAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgKz0gYm9yZGVyc1Bs dXNQYWRkaW5nOwpAQCAtNTAzMyw2ICs1MDU0LDIxIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpj b21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVy CiAgICAgcmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dp Y2FsV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxv Y2soKSwgZnJhZ21lbnQpOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1pblNpemUsIExh eW91dFVuaXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3QKK3sKKyAgICBkb3VibGUgcmF0aW8g PSBzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpOworICAgIExheW91dFVuaXQgYmxvY2tNaW5T aXplID0gY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQoKSwgV1RGOjpu dWxsb3B0KTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWF4U2l6ZSA9IGNvbnN0cmFpbkxvZ2ljYWxI ZWlnaHRCeU1pbk1heChMYXlvdXRVbml0OjptYXgoKSwgV1RGOjpudWxsb3B0KTsKKyAgICB0cmFu c2ZlcnJlZE1pblNpemUgPSBMYXlvdXRVbml0KCk7CisgICAgdHJhbnNmZXJyZWRNYXhTaXplID0g TGF5b3V0VW5pdDo6bWF4KCk7CisgICAgaWYgKGJsb2NrTWluU2l6ZSA+IExheW91dFVuaXQoKSkK KyAgICAgICAgdHJhbnNmZXJyZWRNaW5TaXplID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyho b3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRp bmdFeHRlbnQoKSwgcmF0aW8sIHN0eWxlKCkuYm94U2l6aW5nKCksIGJsb2NrTWluU2l6ZSk7Cisg ICAgaWYgKGJsb2NrTWF4U2l6ZSAhPSBMYXlvdXRVbml0OjptYXgoKSkKKyAgICAgICAgdHJhbnNm ZXJyZWRNYXhTaXplID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVy QW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgcmF0 aW8sIHN0eWxlKCkuYm94U2l6aW5nKCksIGJsb2NrTWF4U2l6ZSk7CisgICAgLy8gTWluaW11bSBz aXplIHdpbnMgb3ZlciBtYXhpbXVtIHNpemUuCisgICAgdHJhbnNmZXJyZWRNYXhTaXplID0gc3Rk OjptYXgodHJhbnNmZXJyZWRNYXhTaXplLCB0cmFuc2ZlcnJlZE1pblNpemUpOworfQorCiBib29s IFJlbmRlckJveDo6aGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3QKIHsKICAgICByZXR1cm4g c3R5bGUoKS5oZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSB8fCBzdHlsZSgpLndpZHRo KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu aAppbmRleCBjM2EzNmE3YmZmNmU1NDUyMGNlYjA4ZDY4N2RiZmJiYzE5MGI1Y2JkLi44YmVmYzMx NGJmNDQyNmY3ODhkZjUzZGY5YjMxYjY3NmVkOWQ0YTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCkBAIC03MDAsNiArNzAwLDcgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgc2hv dWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wg c2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0 OwogICAgIExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5k ZXJGcmFnbWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVN aW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRN aW5TaXplLCBMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1heFNpemUpIGNvbnN0OwogCiAgICAgc3Rh dGljIExheW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQgYm9yZGVy UGFkZGluZ0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQmxvY2tTdW0sIGRvdWJs ZSBhc3BlY3RSYXRpbywgQm94U2l6aW5nIGJveFNpemluZywgTGF5b3V0VW5pdCBpbmxpbmVTaXpl KQogICAgIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCAwZjRhYmJkZDNlMDI0YmE4MzExOTUxZGMzYmI4YzVmZjQ5ZWMyMmQ5 Li40MTZhNTFlZTU5MDk3YmIwOGNjMjRjMTAxODJkNmUzOTRhZTY4NzFhIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTQgQEAKKzIwMjEtMDEtMDkgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI0CisgICAg ICAgIFN1cHBvcnQgdHJhbnNmZXJyZWQgbWluL21heCBibG9jayBzaXplIGZvciBhc3BlY3QtcmF0 aW8KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbmFi bGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9u czoKKwogMjAyMS0wMS0wOCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZpbmcgYnJva2VuIHRlc3QgZnJvbSByMjcxMzM3IHVudGlsIEkgY2FuIGZpeCBp dC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0 cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDg4ODVlOWNjYzY3ODc5MjU2YzkxYTBkOWQyNjc5MTlk Y2E1NjliZTEuLjZiYzM4ZDFhYzI5N2U1ZThlYjgzZmZlODNmM2I1MWY3OGZjN2YxMDAgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVz dEV4cGVjdGF0aW9ucwpAQCAtNDQyNSw3ICs0NDI1LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGly ZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA4 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9z LTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fi c3Bvcy0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ0MzMsMTIgKzQ0MzIs NyBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9j ay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3Qt cmF0aW8tMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjMuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2st YXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0 aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v ZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 417342 2021-01-09 08:17:30 -0800 2021-01-10 06:35:12 -0800 Patch bug-220224-20210109171728.patch text/plain 11813 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWJiNzIyZDFjNDhmNTlk ZThmZTk4ZGU4ZTVjOTdiMDQzYWI1ZDE0ZC4uMTk0MjNiNDExNDJkZGQ0OWU5MmRkOWY4NWFkNzll ZTQzZjg4OGM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAxLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj YWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRp byBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5oOgorCiAyMDIxLTAxLTA5 ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgcGxheS5nb29nbGUu Y29tOiBBcHAgcHJldmlldyBpbWFnZXMgYXJlIGNsaXBwZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKaW5kZXggYjhkNjQ0OGZlNTFiMTkwMTI2NzFmNmVlZTQ1ODM4MDYxNWMy ODY5YS4uOTI3NGRkNDBiNjJiZWM0MzFiNWI3MDUzNWUxY2RiODQ1NWQ1OThmYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY0Myw2ICs2NDMsMTMgQEAgdm9pZCBS ZW5kZXJCb3g6OnVwZGF0ZUxheWVyVHJhbnNmb3JtKCkKIExheW91dFVuaXQgUmVuZGVyQm94Ojpj b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIFJlbmRlckJsb2NrJiBjYiwgUmVuZGVy RnJhZ21lbnRDb250YWluZXIqIGZyYWdtZW50KSBjb25zdAogewogICAgIGNvbnN0IFJlbmRlclN0 eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKKworICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNh bEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgIExheW91dFVuaXQgbG9naWNhbE1p bldpZHRoLCBsb2dpY2FsTWF4V2lkdGg7CisgICAgICAgIGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8obG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOworICAg ICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1heChsb2dpY2FsTWluV2lkdGgsIHN0ZDo6bWluKGxv Z2ljYWxXaWR0aCwgbG9naWNhbE1heFdpZHRoKSk7CisgICAgfQorCiAgICAgaWYgKCFzdHlsZVRv VXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0 aCA9IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRV c2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLCBhdmFpbGFibGVXaWR0 aCwgY2IsIGZyYWdtZW50KSk7CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29t cHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2lj YWxNaW5XaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CkBAIC0zNjI1LDM4 ICszNjMyLDUzIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0 aChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3Ro LCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0LAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMpOwogCisgICAgTGF5b3V0VW5p dCB0cmFuc2ZlcnJlZE1pblNpemUgPSBMYXlvdXRVbml0OjptaW4oKTsKKyAgICBMYXlvdXRVbml0 IHRyYW5zZmVycmVkTWF4U2l6ZSA9IExheW91dFVuaXQ6Om1heCgpOworICAgIGlmIChzaG91bGRD b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICBjb21wdXRlTWlu TWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKHRyYW5zZmVycmVkTWluU2l6ZSwgdHJhbnNm ZXJyZWRNYXhTaXplKTsKKworICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBtYXhWYWx1 ZXM7CisgICAgbWF4VmFsdWVzLm1fZXh0ZW50ID0gTGF5b3V0VW5pdDo6bWF4KCk7CiAgICAgLy8g Q2FsY3VsYXRlIGNvbnN0cmFpbnQgZXF1YXRpb24gdmFsdWVzIGZvciAnbWF4LXdpZHRoJyBjYXNl LgogICAgIGlmICghc3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKSB7Ci0g ICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBtYXhWYWx1ZXM7Ci0KICAgICAgICAg Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhNYXhTaXplLCBzdHlsZSgpLmxvZ2lj YWxNYXhXaWR0aCgpLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0 aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGxvZ2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxv Z2ljYWxMZWZ0LCBtYXJnaW5Mb2dpY2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWF4VmFsdWVzKTsKLQotICAgICAgICBpZiAoY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQgPiBtYXhWYWx1ZXMubV9leHRlbnQpIHsKLSAgICAgICAgICAgIGNvbXB1dGVk VmFsdWVzLm1fZXh0ZW50ID0gbWF4VmFsdWVzLm1fZXh0ZW50OwotICAgICAgICAgICAgY29tcHV0 ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IG1heFZhbHVlcy5tX3Bvc2l0aW9uOwotICAgICAgICAgICAg Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQgPSBtYXhWYWx1ZXMubV9tYXJnaW5zLm1f c3RhcnQ7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQgPSBtYXhW YWx1ZXMubV9tYXJnaW5zLm1fZW5kOwotICAgICAgICB9CisgICAgfQorICAgIGlmICh0cmFuc2Zl cnJlZE1heFNpemUgPCBtYXhWYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZVBvc2l0 aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhNYXhTaXplLCBMZW5ndGgodHJhbnNmZXJyZWRNYXhTaXpl LCBGaXhlZCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJEaXJlY3Rpb24sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdpZHRoLCBi b3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNh bExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBtYXhWYWx1ZXMpOworICAgIH0KKyAgICBpZiAoY29tcHV0ZWRWYWx1ZXMu bV9leHRlbnQgPiBtYXhWYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMu bV9leHRlbnQgPSBtYXhWYWx1ZXMubV9leHRlbnQ7CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1f cG9zaXRpb24gPSBtYXhWYWx1ZXMubV9wb3NpdGlvbjsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMu bV9tYXJnaW5zLm1fc3RhcnQgPSBtYXhWYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQ7CisgICAgICAg IGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9l bmQ7CiAgICAgfQogCisgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1pblZhbHVlczsK KyAgICBtaW5WYWx1ZXMubV9leHRlbnQgPSBMYXlvdXRVbml0OjptaW4oKTsKICAgICAvLyBDYWxj dWxhdGUgY29uc3RyYWludCBlcXVhdGlvbiB2YWx1ZXMgZm9yICdtaW4td2lkdGgnIGNhc2UuCiAg ICAgaWYgKCFzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpLmlzWmVybygpIHx8IHN0eWxlKCkubG9n aWNhbE1pbldpZHRoKCkuaXNJbnRyaW5zaWMoKSkgewotICAgICAgICBMb2dpY2FsRXh0ZW50Q29t cHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwotCiAgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNh bFdpZHRoVXNpbmcoTWluU2l6ZSwgc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKSwgY29udGFpbmVy QmxvY2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdExl bmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNh bFJpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1pblZh bHVlcyk7Ci0KLSAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IDwgbWluVmFsdWVz Lm1fZXh0ZW50KSB7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IG1pblZh bHVlcy5tX2V4dGVudDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBt aW5WYWx1ZXMubV9wb3NpdGlvbjsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lu cy5tX3N0YXJ0ID0gbWluVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OwotICAgICAgICAgICAgY29t cHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWluVmFsdWVzLm1fbWFyZ2lucy5tX2VuZDsK LSAgICAgICAgfQorICAgIH0KKyAgICBpZiAodHJhbnNmZXJyZWRNaW5TaXplID4gbWluVmFsdWVz Lm1fZXh0ZW50KSB7CisgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmco TWluU2l6ZSwgTGVuZ3RoKHRyYW5zZmVycmVkTWluU2l6ZSwgRml4ZWQpLCBjb250YWluZXJCbG9j aywgY29udGFpbmVyRGlyZWN0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0TGVuZ3Ro LCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBtYXJnaW5Mb2dpY2FsUmln aHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWluVmFsdWVz KTsKKyAgICB9CisgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IDwgbWluVmFsdWVzLm1f ZXh0ZW50KSB7CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0gbWluVmFsdWVzLm1f ZXh0ZW50OworICAgICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0gbWluVmFsdWVzLm1f cG9zaXRpb247CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0ID0gbWlu VmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OworICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdp bnMubV9lbmQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fZW5kOwogICAgIH0KIAogICAgIGNvbXB1 dGVkVmFsdWVzLm1fZXh0ZW50ICs9IGJvcmRlcnNQbHVzUGFkZGluZzsKQEAgLTUwMzMsNiArNTA1 NSwyMSBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3Bl Y3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRhaW5lcgogICAgIHJldHVybiBjb25zdHJhaW5Mb2dp Y2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgobG9naWNhbFdpZHRoLCBjb250YWluZXJXaWR0aElu SW5saW5lRGlyZWN0aW9uLCAqY29udGFpbmluZ0Jsb2NrKCksIGZyYWdtZW50KTsKIH0KIAordm9p ZCBSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oTGF5 b3V0VW5pdCYgdHJhbnNmZXJyZWRNaW5TaXplLCBMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1heFNp emUpIGNvbnN0Cit7CisgICAgZG91YmxlIHJhdGlvID0gc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0 aW8oKTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWluU2l6ZSA9IGNvbnN0cmFpbkxvZ2ljYWxIZWln aHRCeU1pbk1heChMYXlvdXRVbml0KCksIFdURjo6bnVsbG9wdCk7CisgICAgTGF5b3V0VW5pdCBi bG9ja01heFNpemUgPSBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdDo6 bWF4KCksIFdURjo6bnVsbG9wdCk7CisgICAgdHJhbnNmZXJyZWRNaW5TaXplID0gTGF5b3V0VW5p dCgpOworICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IExheW91dFVuaXQ6Om1heCgpOworICAgIGlm IChibG9ja01pblNpemUgPiBMYXlvdXRVbml0KCkpCisgICAgICAgIHRyYW5zZmVycmVkTWluU2l6 ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdF eHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJhdGlvLCBzdHlsZSgp LmJveFNpemluZygpLCBibG9ja01pblNpemUpOworICAgIGlmIChibG9ja01heFNpemUgIT0gTGF5 b3V0VW5pdDo6bWF4KCkpCisgICAgICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IGlubGluZVNpemVG cm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGlj YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJhdGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBi bG9ja01heFNpemUpOworICAgIC8vIE1pbmltdW0gc2l6ZSB3aW5zIG92ZXIgbWF4aW11bSBzaXpl LgorICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IHN0ZDo6bWF4KHRyYW5zZmVycmVkTWF4U2l6ZSwg dHJhbnNmZXJyZWRNaW5TaXplKTsKK30KKwogYm9vbCBSZW5kZXJCb3g6Omhhc1JlbGF0aXZlRGlt ZW5zaW9ucygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHN0eWxlKCkuaGVpZ2h0KCkuaXNQZXJjZW50 T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS53aWR0aCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKaW5kZXggYzNhMzZhN2JmZjZlNTQ1MjBj ZWIwOGQ2ODdkYmZiYmMxOTBiNWNiZC4uOGJlZmMzMTRiZjQ0MjZmNzg4ZGY1M2RmOWIzMWI2NzZl ZDlkNGE5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaApAQCAtNzAwLDYgKzcw MCw3IEBAIHByb3RlY3RlZDoKICAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9t QXNwZWN0UmF0aW8oKSBjb25zdDsKICAgICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG cm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVs bHB0cikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKExheW91dFVuaXQmIHRyYW5zZmVycmVkTWluU2l6ZSwgTGF5b3V0VW5pdCYgdHJhbnNm ZXJyZWRNYXhTaXplKSBjb25zdDsKIAogICAgIHN0YXRpYyBMYXlvdXRVbml0IGJsb2NrU2l6ZUZy b21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0IGJvcmRlclBhZGRpbmdJbmxpbmVTdW0sIExheW91dFVu aXQgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtLCBkb3VibGUgYXNwZWN0UmF0aW8sIEJveFNpemluZyBi b3hTaXppbmcsIExheW91dFVuaXQgaW5saW5lU2l6ZSkKICAgICB7CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTg1OGFiMmMx NTdhZWQ0OGM1OGM1MWFmZWQyYjRlZjFkNWQ0MjdjZi4uZGI5Mzk0YmFmYTkxMjM3MDA0NjJmMTMy YmUyZDQ2MWQzYjM2ZjQ2YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTA5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5v dy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMDkgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBwbGF5Lmdvb2dsZS5jb206IEFwcCBw cmV2aWV3IGltYWdlcyBhcmUgY2xpcHBlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggODg4NWU5Y2Nj Njc4NzkyNTZjOTFhMGQ5ZDI2NzkxOWRjYTU2OWJlMS4uNmJjMzhkMWFjMjk3ZTVlOGViODNmZmU4 M2YzYjUxZjc4ZmM3ZjEwMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDI1LDcgKzQ0MjUsNiBA QCB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9uYWxp dHktMDAyLnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Ns b3R0ZWQtcGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2Fic3Bvcy0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQpAQCAtNDQzMywxMiArNDQzMiw3IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTQuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE1 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2st YXNwZWN0LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg XQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJh dGlvLTAyMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2Jsb2NrLWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNy5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz cGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQo= 417349 2021-01-10 06:35:20 -0800 2021-01-14 06:40:21 -0800 Patch bug-220224-20210110153518.patch text/plain 11901 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWVjYzM0NTM0Njc5YzA4 NDY4MmIzZjE5OWM5MTc2MDM0YmE1MDdmOC4uYjU4OTdlYzQ1NWFjYzMzZjE1M2I0MzMzMjFlODQx NjhlOGYwNDgyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTEwICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxvZ2ljIHRvIHRyYW5zZmVyIG1pbi1oZWln aHQvbWF4LWhlaWdodCBmb3IgbWlubWF4IGxvZ2ljYWwgd2lkdGgKKyAgICAgICAgY2FsY3VsYXRp b24gaW4gY2FzZSBhc3BlY3QtcmF0aW8gc2hvdWxkIGJlIGFwcGxpZWQuIEJvdGggYWJzb2x1dGUg YW5kCisgICAgICAgIG5vcm1hbGx5IHBvc2l0aW9uZWQgZWxlbWVudHMgYXJlIHN1cHBvcnRlZC4K KworICAgICAgICBbMV0gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1zaXppbmctNC8jYXNw ZWN0LXJhdGlvLXNpemUtdHJhbnNmZXJzCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRo SW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94Ojpjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvIGNvbnN0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisKIDIwMjEtMDEtMTAgIEFudHRp IEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBJbmxpbmVCb3g6 Omhhc1NlbGVjdGVkQ2hpbGRyZW4gYml0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCmluZGV4IGI4ZDY0NDhmZTUxYjE5MDEyNjcxZjZlZWU0NTgzODA2MTVjMjg2OWEuLjJhZTY2 NmIwOGQyOWQ4MmUwMWJlZjJkOTUwZGFlM2QyYTkxNzdkZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwCkBAIC02NDMsNiArNjQzLDEzIEBAIHZvaWQgUmVuZGVyQm94Ojp1 cGRhdGVMYXllclRyYW5zZm9ybSgpCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9n aWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbFdpZHRoLCBMYXlv dXRVbml0IGF2YWlsYWJsZVdpZHRoLCBSZW5kZXJCbG9jayYgY2IsIFJlbmRlckZyYWdtZW50Q29u dGFpbmVyKiBmcmFnbWVudCkgY29uc3QKIHsKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVU b1VzZSA9IHN0eWxlKCk7CisKKyAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t QXNwZWN0UmF0aW8oKSkgeworICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxNaW5XaWR0aCwgbG9n aWNhbE1heFdpZHRoOworICAgICAgICBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVj dFJhdGlvKGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoKTsKKyAgICAgICAgbG9naWNh bFdpZHRoID0gc3RkOjptYXgobG9naWNhbE1pbldpZHRoLCBzdGQ6Om1pbihsb2dpY2FsV2lkdGgs IGxvZ2ljYWxNYXhXaWR0aCkpOworICAgIH0KKwogICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2Fs TWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1p bihsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6 ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFn bWVudCkpOwogICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2Fs V2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgo KSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwpAQCAtMzYyNSwzOCArMzYzMiw1MyBA QCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGgoTG9naWNhbEV4 dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9n aWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzKTsKIAorICAgIExheW91dFVuaXQgdHJhbnNmZXJy ZWRNaW5TaXplID0gTGF5b3V0VW5pdDo6bWluKCk7CisgICAgTGF5b3V0VW5pdCB0cmFuc2ZlcnJl ZE1heFNpemUgPSBMYXlvdXRVbml0OjptYXgoKTsKKyAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2lj YWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgY29tcHV0ZU1pbk1heExvZ2ljYWxX aWR0aEZyb21Bc3BlY3RSYXRpbyh0cmFuc2ZlcnJlZE1pblNpemUsIHRyYW5zZmVycmVkTWF4U2l6 ZSk7CisKKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWF4VmFsdWVzOworICAgIG1h eFZhbHVlcy5tX2V4dGVudCA9IExheW91dFVuaXQ6Om1heCgpOwogICAgIC8vIENhbGN1bGF0ZSBj b25zdHJhaW50IGVxdWF0aW9uIHZhbHVlcyBmb3IgJ21heC13aWR0aCcgY2FzZS4KICAgICBpZiAo IXN0eWxlKCkubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkgewotICAgICAgICBMb2dp Y2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWF4VmFsdWVzOwotCiAgICAgICAgIGNvbXB1dGVQb3Np dGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoTWF4U2l6ZSwgc3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgo KSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQ bHVzUGFkZGluZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs b2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwg bWFyZ2luTG9naWNhbFJpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1heFZhbHVlcyk7Ci0KLSAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 ID4gbWF4VmFsdWVzLm1fZXh0ZW50KSB7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4 dGVudCA9IG1heFZhbHVlcy5tX2V4dGVudDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1f cG9zaXRpb24gPSBtYXhWYWx1ZXMubV9wb3NpdGlvbjsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFs dWVzLm1fbWFyZ2lucy5tX3N0YXJ0ID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OwotICAg ICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWF4VmFsdWVzLm1fbWFy Z2lucy5tX2VuZDsKLSAgICAgICAgfQorICAgIH0KKyAgICBpZiAodHJhbnNmZXJyZWRNYXhTaXpl IDwgbWF4VmFsdWVzLm1fZXh0ZW50KSB7CisgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNh bFdpZHRoVXNpbmcoTWF4U2l6ZSwgTGVuZ3RoKHRyYW5zZmVycmVkTWF4U2l6ZSwgRml4ZWQpLCBj b250YWluZXJCbG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAorICAgICAgICAgICAgY29udGFpbmVy TG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgICAgICBsb2dpY2FsTGVm dExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9n aWNhbFJpZ2h0LAorICAgICAgICAgICAgbWF4VmFsdWVzKTsKKyAgICB9CisgICAgaWYgKGNvbXB1 dGVkVmFsdWVzLm1fZXh0ZW50ID4gbWF4VmFsdWVzLm1fZXh0ZW50KSB7CisgICAgICAgIGNvbXB1 dGVkVmFsdWVzLm1fZXh0ZW50ID0gbWF4VmFsdWVzLm1fZXh0ZW50OworICAgICAgICBjb21wdXRl ZFZhbHVlcy5tX3Bvc2l0aW9uID0gbWF4VmFsdWVzLm1fcG9zaXRpb247CisgICAgICAgIGNvbXB1 dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0ID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0 OworICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQgPSBtYXhWYWx1ZXMubV9t YXJnaW5zLm1fZW5kOwogICAgIH0KIAorICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBt aW5WYWx1ZXM7CisgICAgbWluVmFsdWVzLm1fZXh0ZW50ID0gTGF5b3V0VW5pdDo6bWluKCk7CiAg ICAgLy8gQ2FsY3VsYXRlIGNvbnN0cmFpbnQgZXF1YXRpb24gdmFsdWVzIGZvciAnbWluLXdpZHRo JyBjYXNlLgogICAgIGlmICghc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKS5pc1plcm8oKSB8fCBz dHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpLmlzSW50cmluc2ljKCkpIHsKLSAgICAgICAgTG9naWNh bEV4dGVudENvbXB1dGVkVmFsdWVzIG1pblZhbHVlczsKLQogICAgICAgICBjb21wdXRlUG9zaXRp b25lZExvZ2ljYWxXaWR0aFVzaW5nKE1pblNpemUsIHN0eWxlKCkubG9naWNhbE1pbldpZHRoKCks IGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJEaXJlY3Rpb24sCisgICAgICAgICAgICBjb250YWlu ZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZywKKyAgICAgICAgICAgIGxvZ2ljYWxM ZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBtYXJnaW5M b2dpY2FsUmlnaHQsCisgICAgICAgICAgICBtaW5WYWx1ZXMpOworICAgIH0KKyAgICBpZiAodHJh bnNmZXJyZWRNaW5TaXplID4gbWluVmFsdWVzLm1fZXh0ZW50KSB7CisgICAgICAgIGNvbXB1dGVQ b3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoTWluU2l6ZSwgTGVuZ3RoKHRyYW5zZmVycmVkTWlu U2l6ZSwgRml4ZWQpLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0 aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGxvZ2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxv Z2ljYWxMZWZ0LCBtYXJnaW5Mb2dpY2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbWluVmFsdWVzKTsKLQotICAgICAgICBpZiAoY29tcHV0ZWRWYWx1 ZXMubV9leHRlbnQgPCBtaW5WYWx1ZXMubV9leHRlbnQpIHsKLSAgICAgICAgICAgIGNvbXB1dGVk VmFsdWVzLm1fZXh0ZW50ID0gbWluVmFsdWVzLm1fZXh0ZW50OwotICAgICAgICAgICAgY29tcHV0 ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IG1pblZhbHVlcy5tX3Bvc2l0aW9uOwotICAgICAgICAgICAg Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1f c3RhcnQ7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQgPSBtaW5W YWx1ZXMubV9tYXJnaW5zLm1fZW5kOwotICAgICAgICB9CisgICAgfQorICAgIGlmIChjb21wdXRl ZFZhbHVlcy5tX2V4dGVudCA8IG1pblZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRl ZFZhbHVlcy5tX2V4dGVudCA9IG1pblZhbHVlcy5tX2V4dGVudDsKKyAgICAgICAgY29tcHV0ZWRW YWx1ZXMubV9wb3NpdGlvbiA9IG1pblZhbHVlcy5tX3Bvc2l0aW9uOworICAgICAgICBjb21wdXRl ZFZhbHVlcy5tX21hcmdpbnMubV9zdGFydCA9IG1pblZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsK KyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWluVmFsdWVzLm1fbWFy Z2lucy5tX2VuZDsKICAgICB9CiAKICAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCArPSBib3Jk ZXJzUGx1c1BhZGRpbmc7CkBAIC01MDMzLDYgKzUwNTUsMjEgQEAgTGF5b3V0VW5pdCBSZW5kZXJC b3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250 YWluZXIKICAgICByZXR1cm4gY29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4 KGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5p bmdCbG9jaygpLCBmcmFnbWVudCk7CiB9CiAKK3ZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTWluTWF4 TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQmIHRyYW5zZmVycmVkTWluU2l6 ZSwgTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNYXhTaXplKSBjb25zdAoreworICAgIGRvdWJsZSBy YXRpbyA9IHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCk7CisgICAgTGF5b3V0VW5pdCBibG9j a01pblNpemUgPSBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCgpLCBX VEY6Om51bGxvcHQpOworICAgIExheW91dFVuaXQgYmxvY2tNYXhTaXplID0gY29uc3RyYWluTG9n aWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQ6Om1heCgpLCBXVEY6Om51bGxvcHQpOworICAg IHRyYW5zZmVycmVkTWluU2l6ZSA9IExheW91dFVuaXQoKTsKKyAgICB0cmFuc2ZlcnJlZE1heFNp emUgPSBMYXlvdXRVbml0OjptYXgoKTsKKyAgICBpZiAoYmxvY2tNaW5TaXplID4gTGF5b3V0VW5p dCgpKQorICAgICAgICB0cmFuc2ZlcnJlZE1pblNpemUgPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJh dGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5k UGFkZGluZ0V4dGVudCgpLCByYXRpbywgc3R5bGUoKS5ib3hTaXppbmcoKSwgYmxvY2tNaW5TaXpl KTsKKyAgICBpZiAoYmxvY2tNYXhTaXplICE9IExheW91dFVuaXQ6Om1heCgpKQorICAgICAgICB0 cmFuc2ZlcnJlZE1heFNpemUgPSBpbmxpbmVTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxC b3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgp LCByYXRpbywgc3R5bGUoKS5ib3hTaXppbmcoKSwgYmxvY2tNYXhTaXplKTsKKyAgICAvLyBNaW5p bXVtIHNpemUgd2lucyBvdmVyIG1heGltdW0gc2l6ZS4KKyAgICB0cmFuc2ZlcnJlZE1heFNpemUg PSBzdGQ6Om1heCh0cmFuc2ZlcnJlZE1heFNpemUsIHRyYW5zZmVycmVkTWluU2l6ZSk7Cit9CisK IGJvb2wgUmVuZGVyQm94OjpoYXNSZWxhdGl2ZURpbWVuc2lvbnMoKSBjb25zdAogewogICAgIHJl dHVybiBzdHlsZSgpLmhlaWdodCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpIHx8IHN0eWxlKCku d2lkdGgoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCmluZGV4IGMzYTM2YTdiZmY2ZTU0NTIwY2ViMDhkNjg3ZGJmYmJjMTkwYjVjYmQuLjhi ZWZjMzE0YmY0NDI2Zjc4OGRmNTNkZjliMzFiNjc2ZWQ5ZDRhOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmgKQEAgLTcwMCw2ICs3MDAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9v bCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkgY29uc3Q7CiAgICAg Ym9vbCBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvQW5kSW5zZXRzKCkg Y29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv KFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiA9IG51bGxwdHIpIGNvbnN0OworICAgIHZvaWQgY29t cHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2Zl cnJlZE1pblNpemUsIExheW91dFVuaXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3Q7CiAKICAg ICBzdGF0aWMgTGF5b3V0VW5pdCBibG9ja1NpemVGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCBi b3JkZXJQYWRkaW5nSW5saW5lU3VtLCBMYXlvdXRVbml0IGJvcmRlclBhZGRpbmdCbG9ja1N1bSwg ZG91YmxlIGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRVbml0IGlubGlu ZVNpemUpCiAgICAgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGU4NThhYjJjMTU3YWVkNDhjNThjNTFhZmVkMmI0ZWYxZDVk NDI3Y2YuLjJlNWEwMWM5Y2MxY2Y3Mjk1NTYzYjg1MDA3MWY0YWY4OTAzNzgyYjAgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNCBAQAorMjAyMS0wMS0xMCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAyMjQK KyAgICAgICAgU3VwcG9ydCB0cmFuc2ZlcnJlZCBtaW4vbWF4IGJsb2NrIHNpemUgZm9yIGFzcGVj dC1yYXRpbworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0 YXRpb25zOgorCiAyMDIxLTAxLTA5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgcGxheS5nb29nbGUuY29tOiBBcHAgcHJldmlldyBpbWFnZXMgYXJlIGNsaXBwZWQK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IDg4ODVlOWNjYzY3ODc5MjU2YzkxYTBkOWQyNjc5MTlkY2E1 NjliZTEuLjZiYzM4ZDFhYzI5N2U1ZThlYjgzZmZlODNmM2I1MWY3OGZjN2YxMDAgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucwpAQCAtNDQyNSw3ICs0NDI1LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMK IHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA4Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAx Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bv cy0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9h YnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ0MzMsMTIgKzQ0MzIsNyBA QCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1h c3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0 aW8tMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v YmxvY2stYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp bmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjMuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw ZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFn ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8t MDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxl eC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 417615 2021-01-14 06:40:26 -0800 2021-01-14 07:04:04 -0800 Patch bug-220224-20210114154025.patch text/plain 11978 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmYjkxZmJiYmQ1Njlh YWI0Mzc2YjdkOWU3NjFjYzc5MmY5YmJlMy4uZWZiMTQ5MWVlMmJmM2MyMjgxYWRkY2FkNTljMzAz MmQ3OTllZGQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTE0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxvZ2ljIHRvIHRyYW5zZmVyIG1pbi1oZWln aHQvbWF4LWhlaWdodCBmb3IgbWlubWF4IGxvZ2ljYWwgd2lkdGgKKyAgICAgICAgY2FsY3VsYXRp b24gaW4gY2FzZSBhc3BlY3QtcmF0aW8gc2hvdWxkIGJlIGFwcGxpZWQgWzFdLiBCb3RoIGFic29s dXRlCisgICAgICAgIGFuZCBub3JtYWxseSBwb3NpdGlvbmVkIGVsZW1lbnRzIGFyZSBoYW5kbGVk LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh c3BlY3QtcmF0aW8tc2l6ZS10cmFuc2ZlcnMKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0wMS0xNCAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ11bUXVpcmtd IExldCdzIGFkb3B0IGEgbGVzcyBxdWlya3kgYmVoYXZpb3IgZm9yIGxpbmUgYnJlYWtzIG9uIG5v bi1lbXB0eSBsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA2 YjljMTE2NmU5N2IzOWMyMmVmMjc4M2MyYzAyZWY2N2QyYTkzY2VkLi4yNmMyMmI3MGRiZWRlNjJh MDFiM2U5NjU5YTk3ODdhMjZiMmZkYjRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcApAQCAtNjQzLDYgKzY0MywxMyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJU cmFuc2Zvcm0oKQogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu RnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJh Z21lbnQpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHls ZSgpOworCisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlv KCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0 aDsKKyAgICAgICAgY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhsb2dp Y2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0 ZDo6bWF4KGxvZ2ljYWxNaW5XaWR0aCwgc3RkOjptaW4obG9naWNhbFdpZHRoLCBsb2dpY2FsTWF4 V2lkdGgpKTsKKyAgICB9CisKICAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCku aXNVbmRlZmluZWQoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdp ZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9V c2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKICAg ICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFn bWVudFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJs ZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKQEAgLTM2MjUsMzggKzM2MzIsNTMgQEAgdm9pZCBSZW5k ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoKExvZ2ljYWxFeHRlbnRDb21wdXRl ZFZhbHVlcyYgY29tcHUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxv Z2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBt YXJnaW5Mb2dpY2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb21wdXRlZFZhbHVlcyk7CiAKKyAgICBMYXlvdXRVbml0IHRyYW5zZmVycmVkTWluU2l6ZSA9 IExheW91dFVuaXQ6Om1pbigpOworICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRNYXhTaXplID0g TGF5b3V0VW5pdDo6bWF4KCk7CisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJv bUFzcGVjdFJhdGlvKCkpCisgICAgICAgIGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8odHJhbnNmZXJyZWRNaW5TaXplLCB0cmFuc2ZlcnJlZE1heFNpemUpOworCisgICAg TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1heFZhbHVlczsKKyAgICBtYXhWYWx1ZXMubV9l eHRlbnQgPSBMYXlvdXRVbml0OjptYXgoKTsKICAgICAvLyBDYWxjdWxhdGUgY29uc3RyYWludCBl cXVhdGlvbiB2YWx1ZXMgZm9yICdtYXgtd2lkdGgnIGNhc2UuCiAgICAgaWYgKCFzdHlsZSgpLmxv Z2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzIG1heFZhbHVlczsKLQogICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2lj YWxXaWR0aFVzaW5nKE1heFNpemUsIHN0eWxlKCkubG9naWNhbE1heFdpZHRoKCksIGNvbnRhaW5l ckJsb2NrLCBjb250YWluZXJEaXJlY3Rpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRM ZW5ndGgsIGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2lj YWxSaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhW YWx1ZXMpOwotCi0gICAgICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA+IG1heFZhbHVl cy5tX2V4dGVudCkgewotICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBtYXhW YWx1ZXMubV9leHRlbnQ7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0g bWF4VmFsdWVzLm1fcG9zaXRpb247Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdp bnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKLSAgICAgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9lbmQ7 Ci0gICAgICAgIH0KKyAgICB9CisgICAgaWYgKHRyYW5zZmVycmVkTWF4U2l6ZSA8IG1heFZhbHVl cy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5n KE1heFNpemUsIExlbmd0aCh0cmFuc2ZlcnJlZE1heFNpemUsIEZpeGVkKSwgY29udGFpbmVyQmxv Y2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKKyAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0 aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAorICAgICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxv Z2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwK KyAgICAgICAgICAgIG1heFZhbHVlcyk7CisgICAgfQorICAgIGlmIChjb21wdXRlZFZhbHVlcy5t X2V4dGVudCA+IG1heFZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlZFZhbHVlcy5t X2V4dGVudCA9IG1heFZhbHVlcy5tX2V4dGVudDsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9w b3NpdGlvbiA9IG1heFZhbHVlcy5tX3Bvc2l0aW9uOworICAgICAgICBjb21wdXRlZFZhbHVlcy5t X21hcmdpbnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKKyAgICAgICAg Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX2Vu ZDsKICAgICB9CiAKKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwor ICAgIG1pblZhbHVlcy5tX2V4dGVudCA9IExheW91dFVuaXQ6Om1pbigpOwogICAgIC8vIENhbGN1 bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZhbHVlcyBmb3IgJ21pbi13aWR0aCcgY2FzZS4KICAg ICBpZiAoIXN0eWxlKCkubG9naWNhbE1pbldpZHRoKCkuaXNaZXJvKCkgfHwgc3R5bGUoKS5sb2dp Y2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKSB7Ci0gICAgICAgIExvZ2ljYWxFeHRlbnRDb21w dXRlZFZhbHVlcyBtaW5WYWx1ZXM7Ci0KICAgICAgICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs V2lkdGhVc2luZyhNaW5TaXplLCBzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpLCBjb250YWluZXJC bG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAorICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdp ZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwg bG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0 LAorICAgICAgICAgICAgbWluVmFsdWVzKTsKKyAgICB9CisgICAgaWYgKHRyYW5zZmVycmVkTWlu U2l6ZSA+IG1pblZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlUG9zaXRpb25lZExv Z2ljYWxXaWR0aFVzaW5nKE1pblNpemUsIExlbmd0aCh0cmFuc2ZlcnJlZE1pblNpemUsIEZpeGVk KSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQ bHVzUGFkZGluZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs b2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwg bWFyZ2luTG9naWNhbFJpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1pblZhbHVlcyk7Ci0KLSAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 IDwgbWluVmFsdWVzLm1fZXh0ZW50KSB7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4 dGVudCA9IG1pblZhbHVlcy5tX2V4dGVudDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1f cG9zaXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFs dWVzLm1fbWFyZ2lucy5tX3N0YXJ0ID0gbWluVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OwotICAg ICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWluVmFsdWVzLm1fbWFy Z2lucy5tX2VuZDsKLSAgICAgICAgfQorICAgIH0KKyAgICBpZiAoY29tcHV0ZWRWYWx1ZXMubV9l eHRlbnQgPCBtaW5WYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9l eHRlbnQgPSBtaW5WYWx1ZXMubV9leHRlbnQ7CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9z aXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9t YXJnaW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQ7CisgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1pblZhbHVlcy5tX21hcmdpbnMubV9lbmQ7 CiAgICAgfQogCiAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgKz0gYm9yZGVyc1BsdXNQYWRk aW5nOwpAQCAtNTAzMyw2ICs1MDU1LDIxIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAg cmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lk dGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwg ZnJhZ21lbnQpOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1pblNpemUsIExheW91dFVu aXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3QKK3sKKyAgICBkb3VibGUgcmF0aW8gPSBzdHls ZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpOworICAgIExheW91dFVuaXQgYmxvY2tNaW5TaXplID0g Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQoKSwgV1RGOjpudWxsb3B0 KTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWF4U2l6ZSA9IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRC eU1pbk1heChMYXlvdXRVbml0OjptYXgoKSwgV1RGOjpudWxsb3B0KTsKKyAgICB0cmFuc2ZlcnJl ZE1pblNpemUgPSBMYXlvdXRVbml0KCk7CisgICAgdHJhbnNmZXJyZWRNYXhTaXplID0gTGF5b3V0 VW5pdDo6bWF4KCk7CisgICAgaWYgKGJsb2NrTWluU2l6ZSA+IExheW91dFVuaXQoKSkKKyAgICAg ICAgdHJhbnNmZXJyZWRNaW5TaXplID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9u dGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgcmF0aW8sIHN0eWxlKCkuYm94U2l6aW5nKCksIGJsb2NrTWluU2l6ZSk7CisgICAgaWYg KGJsb2NrTWF4U2l6ZSAhPSBMYXlvdXRVbml0OjptYXgoKSkKKyAgICAgICAgdHJhbnNmZXJyZWRN YXhTaXplID0gaW5saW5lU2l6ZUZyb21Bc3BlY3RSYXRpbyhob3Jpem9udGFsQm9yZGVyQW5kUGFk ZGluZ0V4dGVudCgpLCB2ZXJ0aWNhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgcmF0aW8sIHN0 eWxlKCkuYm94U2l6aW5nKCksIGJsb2NrTWF4U2l6ZSk7CisgICAgLy8gTWluaW11bSBzaXplIHdp bnMgb3ZlciBtYXhpbXVtIHNpemUuCisgICAgdHJhbnNmZXJyZWRNYXhTaXplID0gc3RkOjptYXgo dHJhbnNmZXJyZWRNYXhTaXplLCB0cmFuc2ZlcnJlZE1pblNpemUpOworfQorCiBib29sIFJlbmRl ckJveDo6aGFzUmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3QKIHsKICAgICByZXR1cm4gc3R5bGUo KS5oZWlnaHQoKS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSB8fCBzdHlsZSgpLndpZHRoKCkuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRl eCA2MDRlYTlhNWQ3N2ViYTI2NmFmNTU0NDk4YjUzOWMwOGQ0YjJjNDNhLi4zNTVlMzRhMDU1Nzk5 OWE5ODY1NGVhMThhODU4NDYzMTI2YTU1MzgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5oCkBAIC03MDEsNiArNzAxLDcgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgc2hvdWxkQ29t cHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxk Q29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0OwogICAg IExheW91dFVuaXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFn bWVudENvbnRhaW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVNaW5NYXhM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNaW5TaXpl LCBMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1heFNpemUpIGNvbnN0OwogCiAgICAgc3RhdGljIExh eW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQgYm9yZGVyUGFkZGlu Z0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQmxvY2tTdW0sIExheW91dFVuaXQg YXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcsIExheW91dFVuaXQgaW5saW5lU2l6ZSkK ICAgICB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggOGU0ZmUwNzc5NWMzM2I0ZGYxNTg2NTg3MDBhMGMyZjMzNzU5MDMwOC4u ZmIzNTNiOTU3NDEwNjY2MzBlMGY4ZDZhMmZmNWQ4M2I3MDEwMjA1ZCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDIxLTAxLTE0ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAg ICBTdXBwb3J0IHRyYW5zZmVycmVkIG1pbi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlv CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5hYmxl IHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6 CisKIDIwMjEtMDEtMTQgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtjc3Mtc2Nyb2xsLXNuYXBdIHNjcm9sbC1zbmFwLWFsaWduIHBhcnNpbmcgaXMg aW5jb3JyZWN0L2JhY2t3YXJkcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0 aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYWUwMGIzODU4ZDAzNGVm MGU3ZWY3YWZlYjQ1ZmQ0ZmJkMGE1Yzk3Ny4uOGNiYjIyODFkMWQzOGFjYzA1MDljNzhlMzcwNDkx ZjJjZTJlODI3NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDA3LDcgKzQ0MDcsNiBAQCB3ZWJr aXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z Y29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9uYWxpdHktMDAy LnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYy IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQt cGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Fic3Bvcy0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9hYnNwb3MtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpA QCAtNDQxNSwxMiArNDQxNCw3IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3Jn L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv YXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0 LXJhdGlvLTAxNy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh dGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDIxLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAy My5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2Nr LWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI2Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNy5odG1sIFsg SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1y YXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp by9mbGV4LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQo= 417618 2021-01-14 07:02:36 -0800 2021-01-14 07:41:54 -0800 Patch bug-220224-20210114160234.patch text/plain 11982 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmYjkxZmJiYmQ1Njlh YWI0Mzc2YjdkOWU3NjFjYzc5MmY5YmJlMy4uZWZiMTQ5MWVlMmJmM2MyMjgxYWRkY2FkNTljMzAz MmQ3OTllZGQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTE0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxvZ2ljIHRvIHRyYW5zZmVyIG1pbi1oZWln aHQvbWF4LWhlaWdodCBmb3IgbWlubWF4IGxvZ2ljYWwgd2lkdGgKKyAgICAgICAgY2FsY3VsYXRp b24gaW4gY2FzZSBhc3BlY3QtcmF0aW8gc2hvdWxkIGJlIGFwcGxpZWQgWzFdLiBCb3RoIGFic29s dXRlCisgICAgICAgIGFuZCBub3JtYWxseSBwb3NpdGlvbmVkIGVsZW1lbnRzIGFyZSBoYW5kbGVk LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh c3BlY3QtcmF0aW8tc2l6ZS10cmFuc2ZlcnMKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0wMS0xNCAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ11bUXVpcmtd IExldCdzIGFkb3B0IGEgbGVzcyBxdWlya3kgYmVoYXZpb3IgZm9yIGxpbmUgYnJlYWtzIG9uIG5v bi1lbXB0eSBsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA2 YjljMTE2NmU5N2IzOWMyMmVmMjc4M2MyYzAyZWY2N2QyYTkzY2VkLi42ZjZlYTU5OWFjYjNkN2Qz YTUwYWQxOWIwNGI4ZjAwNWMxMWRhMjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcApAQCAtNjQzLDYgKzY0MywxMyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJU cmFuc2Zvcm0oKQogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu RnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJh Z21lbnQpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHls ZSgpOworCisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlv KCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0 aDsKKyAgICAgICAgY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhsb2dp Y2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0 ZDo6bWF4KGxvZ2ljYWxNaW5XaWR0aCwgc3RkOjptaW4obG9naWNhbFdpZHRoLCBsb2dpY2FsTWF4 V2lkdGgpKTsKKyAgICB9CisKICAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCku aXNVbmRlZmluZWQoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdp ZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9V c2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKICAg ICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFn bWVudFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJs ZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKQEAgLTM2MjUsMzggKzM2MzIsNTMgQEAgdm9pZCBSZW5k ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoKExvZ2ljYWxFeHRlbnRDb21wdXRl ZFZhbHVlcyYgY29tcHUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxv Z2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBt YXJnaW5Mb2dpY2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb21wdXRlZFZhbHVlcyk7CiAKKyAgICBMYXlvdXRVbml0IHRyYW5zZmVycmVkTWluU2l6ZSA9 IExheW91dFVuaXQ6Om1pbigpOworICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRNYXhTaXplID0g TGF5b3V0VW5pdDo6bWF4KCk7CisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJv bUFzcGVjdFJhdGlvKCkpCisgICAgICAgIGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8odHJhbnNmZXJyZWRNaW5TaXplLCB0cmFuc2ZlcnJlZE1heFNpemUpOworCisgICAg TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1heFZhbHVlczsKKyAgICBtYXhWYWx1ZXMubV9l eHRlbnQgPSBMYXlvdXRVbml0OjptYXgoKTsKICAgICAvLyBDYWxjdWxhdGUgY29uc3RyYWludCBl cXVhdGlvbiB2YWx1ZXMgZm9yICdtYXgtd2lkdGgnIGNhc2UuCiAgICAgaWYgKCFzdHlsZSgpLmxv Z2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzIG1heFZhbHVlczsKLQogICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2lj YWxXaWR0aFVzaW5nKE1heFNpemUsIHN0eWxlKCkubG9naWNhbE1heFdpZHRoKCksIGNvbnRhaW5l ckJsb2NrLCBjb250YWluZXJEaXJlY3Rpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRM ZW5ndGgsIGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2lj YWxSaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhW YWx1ZXMpOwotCi0gICAgICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA+IG1heFZhbHVl cy5tX2V4dGVudCkgewotICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBtYXhW YWx1ZXMubV9leHRlbnQ7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0g bWF4VmFsdWVzLm1fcG9zaXRpb247Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdp bnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKLSAgICAgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9lbmQ7 Ci0gICAgICAgIH0KKyAgICB9CisgICAgaWYgKHRyYW5zZmVycmVkTWF4U2l6ZSA8IG1heFZhbHVl cy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5n KE1heFNpemUsIExlbmd0aCh0cmFuc2ZlcnJlZE1heFNpemUsIEZpeGVkKSwgY29udGFpbmVyQmxv Y2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKKyAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0 aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAorICAgICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxv Z2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwK KyAgICAgICAgICAgIG1heFZhbHVlcyk7CisgICAgfQorICAgIGlmIChjb21wdXRlZFZhbHVlcy5t X2V4dGVudCA+IG1heFZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlZFZhbHVlcy5t X2V4dGVudCA9IG1heFZhbHVlcy5tX2V4dGVudDsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9w b3NpdGlvbiA9IG1heFZhbHVlcy5tX3Bvc2l0aW9uOworICAgICAgICBjb21wdXRlZFZhbHVlcy5t X21hcmdpbnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKKyAgICAgICAg Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX2Vu ZDsKICAgICB9CiAKKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwor ICAgIG1pblZhbHVlcy5tX2V4dGVudCA9IExheW91dFVuaXQ6Om1pbigpOwogICAgIC8vIENhbGN1 bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZhbHVlcyBmb3IgJ21pbi13aWR0aCcgY2FzZS4KICAg ICBpZiAoIXN0eWxlKCkubG9naWNhbE1pbldpZHRoKCkuaXNaZXJvKCkgfHwgc3R5bGUoKS5sb2dp Y2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKSB7Ci0gICAgICAgIExvZ2ljYWxFeHRlbnRDb21w dXRlZFZhbHVlcyBtaW5WYWx1ZXM7Ci0KICAgICAgICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs V2lkdGhVc2luZyhNaW5TaXplLCBzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpLCBjb250YWluZXJC bG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAorICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdp ZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwg bG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0 LAorICAgICAgICAgICAgbWluVmFsdWVzKTsKKyAgICB9CisgICAgaWYgKHRyYW5zZmVycmVkTWlu U2l6ZSA+IG1pblZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlUG9zaXRpb25lZExv Z2ljYWxXaWR0aFVzaW5nKE1pblNpemUsIExlbmd0aCh0cmFuc2ZlcnJlZE1pblNpemUsIEZpeGVk KSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQ bHVzUGFkZGluZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs b2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwg bWFyZ2luTG9naWNhbFJpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1pblZhbHVlcyk7Ci0KLSAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 IDwgbWluVmFsdWVzLm1fZXh0ZW50KSB7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4 dGVudCA9IG1pblZhbHVlcy5tX2V4dGVudDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1f cG9zaXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFs dWVzLm1fbWFyZ2lucy5tX3N0YXJ0ID0gbWluVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OwotICAg ICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWluVmFsdWVzLm1fbWFy Z2lucy5tX2VuZDsKLSAgICAgICAgfQorICAgIH0KKyAgICBpZiAoY29tcHV0ZWRWYWx1ZXMubV9l eHRlbnQgPCBtaW5WYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9l eHRlbnQgPSBtaW5WYWx1ZXMubV9leHRlbnQ7CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9z aXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9t YXJnaW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQ7CisgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1pblZhbHVlcy5tX21hcmdpbnMubV9lbmQ7 CiAgICAgfQogCiAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgKz0gYm9yZGVyc1BsdXNQYWRk aW5nOwpAQCAtNTAzMyw2ICs1MDU1LDIxIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAg cmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lk dGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwg ZnJhZ21lbnQpOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1pblNpemUsIExheW91dFVu aXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0IHJhdGlvID0g c3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWluU2l6 ZSA9IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0KCksIFdURjo6bnVs bG9wdCk7CisgICAgTGF5b3V0VW5pdCBibG9ja01heFNpemUgPSBjb25zdHJhaW5Mb2dpY2FsSGVp Z2h0QnlNaW5NYXgoTGF5b3V0VW5pdDo6bWF4KCksIFdURjo6bnVsbG9wdCk7CisgICAgdHJhbnNm ZXJyZWRNaW5TaXplID0gTGF5b3V0VW5pdCgpOworICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IExh eW91dFVuaXQ6Om1heCgpOworICAgIGlmIChibG9ja01pblNpemUgPiBMYXlvdXRVbml0KCkpCisg ICAgICAgIHRyYW5zZmVycmVkTWluU2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9y aXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5n RXh0ZW50KCksIHJhdGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01pblNpemUpOworICAg IGlmIChibG9ja01heFNpemUgIT0gTGF5b3V0VW5pdDo6bWF4KCkpCisgICAgICAgIHRyYW5zZmVy cmVkTWF4U2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJhdGlv LCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01heFNpemUpOworICAgIC8vIE1pbmltdW0gc2l6 ZSB3aW5zIG92ZXIgbWF4aW11bSBzaXplLgorICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IHN0ZDo6 bWF4KHRyYW5zZmVycmVkTWF4U2l6ZSwgdHJhbnNmZXJyZWRNaW5TaXplKTsKK30KKwogYm9vbCBS ZW5kZXJCb3g6Omhhc1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHN0 eWxlKCkuaGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUoKS53aWR0aCgp LmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgK aW5kZXggNjA0ZWE5YTVkNzdlYmEyNjZhZjU1NDQ5OGI1MzljMDhkNGIyYzQzYS4uMzU1ZTM0YTA1 NTc5OTlhOTg2NTRlYTE4YTg1ODQ2MzEyNmE1NTM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guaApAQCAtNzAxLDYgKzcwMSw3IEBAIHByb3RlY3RlZDoKICAgICBib29sIHNob3Vs ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKICAgICBib29sIHNo b3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMoKSBjb25zdDsK ICAgICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVy RnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlTWlu TWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQmIHRyYW5zZmVycmVkTWlu U2l6ZSwgTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNYXhTaXplKSBjb25zdDsKIAogICAgIHN0YXRp YyBMYXlvdXRVbml0IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0IGJvcmRlclBh ZGRpbmdJbmxpbmVTdW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Jsb2NrU3VtLCBMYXlvdXRV bml0IGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRVbml0IGlubGluZVNp emUpCiAgICAgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDhlNGZlMDc3OTVjMzNiNGRmMTU4NjU4NzAwYTBjMmYzMzc1OTAz MDguLmZiMzUzYjk1NzQxMDY2NjMwZTBmOGQ2YTJmZjVkODNiNzAxMDIwNWQgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAyMS0wMS0xNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAyMjQKKyAg ICAgICAgU3VwcG9ydCB0cmFuc2ZlcnJlZCBtaW4vbWF4IGJsb2NrIHNpemUgZm9yIGFzcGVjdC1y YXRpbworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVu YWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRp b25zOgorCiAyMDIxLTAxLTE0ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNv bT4KIAogICAgICAgICBbY3NzLXNjcm9sbC1zbmFwXSBzY3JvbGwtc25hcC1hbGlnbiBwYXJzaW5n IGlzIGluY29ycmVjdC9iYWNrd2FyZHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBl Y3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGFlMDBiMzg1OGQw MzRlZjBlN2VmN2FmZWI0NWZkNGZiZDBhNWM5NzcuLjhjYmIyMjgxZDFkMzhhY2MwNTA5Yzc4ZTM3 MDQ5MWYyY2UyZTgyNzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMK KysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQwNyw3ICs0NDA3LDYgQEAg d2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5 LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx NDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90 dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9hYnNwb3MtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl IF0KQEAgLTQ0MTUsMTIgKzQ0MTQsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz cGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRp by0wMjMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9i bG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjcuaHRt bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3Bl Y3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0 NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0K 417619 2021-01-14 07:39:43 -0800 2021-01-15 05:38:23 -0800 Patch bug-220224-20210114163941.patch text/plain 11991 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzlmYjkxZmJiYmQ1Njlh YWI0Mzc2YjdkOWU3NjFjYzc5MmY5YmJlMy4uZWZiMTQ5MWVlMmJmM2MyMjgxYWRkY2FkNTljMzAz MmQ3OTllZGQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTE0ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxvZ2ljIHRvIHRyYW5zZmVyIG1pbi1oZWln aHQvbWF4LWhlaWdodCBmb3IgbWlubWF4IGxvZ2ljYWwgd2lkdGgKKyAgICAgICAgY2FsY3VsYXRp b24gaW4gY2FzZSBhc3BlY3QtcmF0aW8gc2hvdWxkIGJlIGFwcGxpZWQgWzFdLiBCb3RoIGFic29s dXRlCisgICAgICAgIGFuZCBub3JtYWxseSBwb3NpdGlvbmVkIGVsZW1lbnRzIGFyZSBoYW5kbGVk LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh c3BlY3QtcmF0aW8tc2l6ZS10cmFuc2ZlcnMKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0wMS0xNCAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ11bUXVpcmtd IExldCdzIGFkb3B0IGEgbGVzcyBxdWlya3kgYmVoYXZpb3IgZm9yIGxpbmUgYnJlYWtzIG9uIG5v bi1lbXB0eSBsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA2 YjljMTE2NmU5N2IzOWMyMmVmMjc4M2MyYzAyZWY2N2QyYTkzY2VkLi5jY2U0MjZkMTVmNmQ0N2Nk M2NhM2YyZWU0YWQzMzM4Y2EyZWZhOTIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcApAQCAtNjQzLDYgKzY0MywxMyBAQCB2b2lkIFJlbmRlckJveDo6dXBkYXRlTGF5ZXJU cmFuc2Zvcm0oKQogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aElu RnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJGcmFnbWVudENvbnRhaW5lciogZnJh Z21lbnQpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlVG9Vc2UgPSBzdHls ZSgpOworCisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlv KCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0 aDsKKyAgICAgICAgY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhsb2dp Y2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0 ZDo6bWF4KGxvZ2ljYWxNaW5XaWR0aCwgc3RkOjptaW4obG9naWNhbFdpZHRoLCBsb2dpY2FsTWF4 V2lkdGgpKTsKKyAgICB9CisKICAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCku aXNVbmRlZmluZWQoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdp ZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9V c2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKICAg ICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFn bWVudFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJs ZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKQEAgLTM2MjUsMzggKzM2MzIsNTMgQEAgdm9pZCBSZW5k ZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoKExvZ2ljYWxFeHRlbnRDb21wdXRl ZFZhbHVlcyYgY29tcHUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxv Z2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBt YXJnaW5Mb2dpY2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb21wdXRlZFZhbHVlcyk7CiAKKyAgICBMYXlvdXRVbml0IHRyYW5zZmVycmVkTWluU2l6ZSA9 IExheW91dFVuaXQ6Om1pbigpOworICAgIExheW91dFVuaXQgdHJhbnNmZXJyZWRNYXhTaXplID0g TGF5b3V0VW5pdDo6bWF4KCk7CisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJv bUFzcGVjdFJhdGlvKCkpCisgICAgICAgIGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNw ZWN0UmF0aW8odHJhbnNmZXJyZWRNaW5TaXplLCB0cmFuc2ZlcnJlZE1heFNpemUpOworCisgICAg TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1heFZhbHVlczsKKyAgICBtYXhWYWx1ZXMubV9l eHRlbnQgPSBMYXlvdXRVbml0OjptYXgoKTsKICAgICAvLyBDYWxjdWxhdGUgY29uc3RyYWludCBl cXVhdGlvbiB2YWx1ZXMgZm9yICdtYXgtd2lkdGgnIGNhc2UuCiAgICAgaWYgKCFzdHlsZSgpLmxv Z2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzIG1heFZhbHVlczsKLQogICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2lj YWxXaWR0aFVzaW5nKE1heFNpemUsIHN0eWxlKCkubG9naWNhbE1heFdpZHRoKCksIGNvbnRhaW5l ckJsb2NrLCBjb250YWluZXJEaXJlY3Rpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9naWNhbExlZnRM ZW5ndGgsIGxvZ2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2lj YWxSaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXhW YWx1ZXMpOwotCi0gICAgICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA+IG1heFZhbHVl cy5tX2V4dGVudCkgewotICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBtYXhW YWx1ZXMubV9leHRlbnQ7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0g bWF4VmFsdWVzLm1fcG9zaXRpb247Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdp bnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKLSAgICAgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9lbmQ7 Ci0gICAgICAgIH0KKyAgICB9CisgICAgaWYgKHRyYW5zZmVycmVkTWF4U2l6ZSA8IG1heFZhbHVl cy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5n KE1heFNpemUsIExlbmd0aCh0cmFuc2ZlcnJlZE1heFNpemUsIEZpeGVkKSwgY29udGFpbmVyQmxv Y2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKKyAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0 aCwgYm9yZGVyc1BsdXNQYWRkaW5nLAorICAgICAgICAgICAgbG9naWNhbExlZnRMZW5ndGgsIGxv Z2ljYWxSaWdodExlbmd0aCwgbWFyZ2luTG9naWNhbExlZnQsIG1hcmdpbkxvZ2ljYWxSaWdodCwK KyAgICAgICAgICAgIG1heFZhbHVlcyk7CisgICAgfQorICAgIGlmIChjb21wdXRlZFZhbHVlcy5t X2V4dGVudCA+IG1heFZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlZFZhbHVlcy5t X2V4dGVudCA9IG1heFZhbHVlcy5tX2V4dGVudDsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9w b3NpdGlvbiA9IG1heFZhbHVlcy5tX3Bvc2l0aW9uOworICAgICAgICBjb21wdXRlZFZhbHVlcy5t X21hcmdpbnMubV9zdGFydCA9IG1heFZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKKyAgICAgICAg Y29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX2Vu ZDsKICAgICB9CiAKKyAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwor ICAgIG1pblZhbHVlcy5tX2V4dGVudCA9IExheW91dFVuaXQ6Om1pbigpOwogICAgIC8vIENhbGN1 bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZhbHVlcyBmb3IgJ21pbi13aWR0aCcgY2FzZS4KICAg ICBpZiAoIXN0eWxlKCkubG9naWNhbE1pbldpZHRoKCkuaXNaZXJvKCkgfHwgc3R5bGUoKS5sb2dp Y2FsTWluV2lkdGgoKS5pc0ludHJpbnNpYygpKSB7Ci0gICAgICAgIExvZ2ljYWxFeHRlbnRDb21w dXRlZFZhbHVlcyBtaW5WYWx1ZXM7Ci0KICAgICAgICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2Fs V2lkdGhVc2luZyhNaW5TaXplLCBzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0aCgpLCBjb250YWluZXJC bG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAorICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdp ZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcsCisgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwg bG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0 LAorICAgICAgICAgICAgbWluVmFsdWVzKTsKKyAgICB9CisgICAgaWYgKHRyYW5zZmVycmVkTWlu U2l6ZSA+IG1pblZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlUG9zaXRpb25lZExv Z2ljYWxXaWR0aFVzaW5nKE1pblNpemUsIExlbmd0aCh0cmFuc2ZlcnJlZE1pblNpemUsIEZpeGVk KSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckRpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQ bHVzUGFkZGluZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBs b2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwg bWFyZ2luTG9naWNhbFJpZ2h0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1pblZhbHVlcyk7Ci0KLSAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 IDwgbWluVmFsdWVzLm1fZXh0ZW50KSB7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4 dGVudCA9IG1pblZhbHVlcy5tX2V4dGVudDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1f cG9zaXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFs dWVzLm1fbWFyZ2lucy5tX3N0YXJ0ID0gbWluVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OwotICAg ICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJnaW5zLm1fZW5kID0gbWluVmFsdWVzLm1fbWFy Z2lucy5tX2VuZDsKLSAgICAgICAgfQorICAgIH0KKyAgICBpZiAoY29tcHV0ZWRWYWx1ZXMubV9l eHRlbnQgPCBtaW5WYWx1ZXMubV9leHRlbnQpIHsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9l eHRlbnQgPSBtaW5WYWx1ZXMubV9leHRlbnQ7CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9z aXRpb24gPSBtaW5WYWx1ZXMubV9wb3NpdGlvbjsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9t YXJnaW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQ7CisgICAgICAgIGNv bXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX2VuZCA9IG1pblZhbHVlcy5tX21hcmdpbnMubV9lbmQ7 CiAgICAgfQogCiAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgKz0gYm9yZGVyc1BsdXNQYWRk aW5nOwpAQCAtNTAzMyw2ICs1MDU1LDIxIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRl TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKFJlbmRlckZyYWdtZW50Q29udGFpbmVyCiAgICAg cmV0dXJuIGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChsb2dpY2FsV2lk dGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sICpjb250YWluaW5nQmxvY2soKSwg ZnJhZ21lbnQpOwogfQogCit2b2lkIFJlbmRlckJveDo6Y29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0 aEZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0JiB0cmFuc2ZlcnJlZE1pblNpemUsIExheW91dFVu aXQmIHRyYW5zZmVycmVkTWF4U2l6ZSkgY29uc3QKK3sKKyAgICBhdXRvIHJhdGlvID0gTGF5b3V0 VW5pdCB7IHN0eWxlKCkubG9naWNhbEFzcGVjdFJhdGlvKCkgfTsKKyAgICBMYXlvdXRVbml0IGJs b2NrTWluU2l6ZSA9IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0KCks IFdURjo6bnVsbG9wdCk7CisgICAgTGF5b3V0VW5pdCBibG9ja01heFNpemUgPSBjb25zdHJhaW5M b2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdDo6bWF4KCksIFdURjo6bnVsbG9wdCk7Cisg ICAgdHJhbnNmZXJyZWRNaW5TaXplID0gTGF5b3V0VW5pdCgpOworICAgIHRyYW5zZmVycmVkTWF4 U2l6ZSA9IExheW91dFVuaXQ6Om1heCgpOworICAgIGlmIChibG9ja01pblNpemUgPiBMYXlvdXRV bml0KCkpCisgICAgICAgIHRyYW5zZmVycmVkTWluU2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0 UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJB bmRQYWRkaW5nRXh0ZW50KCksIHJhdGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01pblNp emUpOworICAgIGlmIChibG9ja01heFNpemUgIT0gTGF5b3V0VW5pdDo6bWF4KCkpCisgICAgICAg IHRyYW5zZmVycmVkTWF4U2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRh bEJvcmRlckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50 KCksIHJhdGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01heFNpemUpOworICAgIC8vIE1p bmltdW0gc2l6ZSB3aW5zIG92ZXIgbWF4aW11bSBzaXplLgorICAgIHRyYW5zZmVycmVkTWF4U2l6 ZSA9IHN0ZDo6bWF4KHRyYW5zZmVycmVkTWF4U2l6ZSwgdHJhbnNmZXJyZWRNaW5TaXplKTsKK30K KwogYm9vbCBSZW5kZXJCb3g6Omhhc1JlbGF0aXZlRGltZW5zaW9ucygpIGNvbnN0CiB7CiAgICAg cmV0dXJuIHN0eWxlKCkuaGVpZ2h0KCkuaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgfHwgc3R5bGUo KS53aWR0aCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKaW5kZXggNjA0ZWE5YTVkNzdlYmEyNjZhZjU1NDQ5OGI1MzljMDhkNGIyYzQzYS4u MzU1ZTM0YTA1NTc5OTlhOTg2NTRlYTE4YTg1ODQ2MzEyNmE1NTM4MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guaApAQCAtNzAxLDYgKzcwMSw3IEBAIHByb3RlY3RlZDoKICAgICBi b29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdDsKICAg ICBib29sIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMo KSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0 aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIqID0gbnVsbHB0cikgY29uc3Q7CisgICAgdm9pZCBj b21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKExheW91dFVuaXQmIHRyYW5z ZmVycmVkTWluU2l6ZSwgTGF5b3V0VW5pdCYgdHJhbnNmZXJyZWRNYXhTaXplKSBjb25zdDsKIAog ICAgIHN0YXRpYyBMYXlvdXRVbml0IGJsb2NrU2l6ZUZyb21Bc3BlY3RSYXRpbyhMYXlvdXRVbml0 IGJvcmRlclBhZGRpbmdJbmxpbmVTdW0sIExheW91dFVuaXQgYm9yZGVyUGFkZGluZ0Jsb2NrU3Vt LCBMYXlvdXRVbml0IGFzcGVjdFJhdGlvLCBCb3hTaXppbmcgYm94U2l6aW5nLCBMYXlvdXRVbml0 IGlubGluZVNpemUpCiAgICAgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDhlNGZlMDc3OTVjMzNiNGRmMTU4NjU4NzAwYTBj MmYzMzc1OTAzMDguLmZiMzUzYjk1NzQxMDY2NjMwZTBmOGQ2YTJmZjVkODNiNzAxMDIwNWQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMS0xNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MjAyMjQKKyAgICAgICAgU3VwcG9ydCB0cmFuc2ZlcnJlZCBtaW4vbWF4IGJsb2NrIHNpemUgZm9y IGFzcGVjdC1yYXRpbworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEVuYWJsZSBzb21lIHRlc3RzIHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0 RXhwZWN0YXRpb25zOgorCiAyMDIxLTAxLTE0ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25A aWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLXNjcm9sbC1zbmFwXSBzY3JvbGwtc25hcC1hbGln biBwYXJzaW5nIGlzIGluY29ycmVjdC9iYWNrd2FyZHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGFl MDBiMzg1OGQwMzRlZjBlN2VmN2FmZWI0NWZkNGZiZDBhNWM5NzcuLjhjYmIyMjgxZDFkMzhhY2Mw NTA5Yzc4ZTM3MDQ5MWYyY2UyZTgyNzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBl Y3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQwNyw3ICs0 NDA3LDYgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVj dGlvbmFsaXR5LTAwMi50ZW50YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0 Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2Nv cGluZy9zbG90dGVkLXBsYWNlaG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Vi a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt c2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTMuaHRtbCBbIEltYWdlT25seUZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9u bHlGYWlsdXJlIF0KQEAgLTQ0MTUsMTIgKzQ0MTQsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv Lwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJ bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJh dGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv L2Jsb2NrLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0 Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDIwLmh0bWwgWyBJbWFnZU9ubHlG YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyMS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz cGVjdC1yYXRpby0wMjMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K LXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRp by0wMjcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9i bG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0K 417693 2021-01-15 05:38:30 -0800 2021-01-19 09:45:34 -0800 Patch bug-220224-20210115143828.patch text/plain 12084 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NjZjUzMGRhZDJiNGIz NmQwZDM2ZDBmYWY1MDJmMWIzZTk0YWY3MS4uMWU0YTEwYTg2YWRiMTAyZDUzNjkxMGNiYTRhY2Vj ODA0NzFhNGNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTE1ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1p bi9tYXggYmxvY2sgc2l6ZSBmb3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxvZ2ljIHRvIHRyYW5zZmVyIG1pbi1oZWln aHQvbWF4LWhlaWdodCBmb3IgbWlubWF4IGxvZ2ljYWwgd2lkdGgKKyAgICAgICAgY2FsY3VsYXRp b24gaW4gY2FzZSBhc3BlY3QtcmF0aW8gc2hvdWxkIGJlIGFwcGxpZWQgWzFdLiBCb3RoIGFic29s dXRlCisgICAgICAgIGFuZCBub3JtYWxseSBwb3NpdGlvbmVkIGVsZW1lbnRzIGFyZSBoYW5kbGVk LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy00LyNh c3BlY3QtcmF0aW8tc2l6ZS10cmFuc2ZlcnMKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lk dGhJbkZyYWdtZW50QnlNaW5NYXggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8gY29u c3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKwogMjAyMS0wMS0xNSAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9u XSBSRUdSRVNTSU9OIChyMjcwMTIzKSBmYWNlYm9vay5jb20gYmlydGhkYXkgZHJvcGRvd24gZG8g bm90IHdvcmsgd2hlbiBjcmVhdGluZyBuZXcgYWNjb3VudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcAppbmRleCA4ZDdhZTk3ZjAyYTQyYWUyM2I2NTYyMmRkY2FlYjVjMTJmNTYw NzFiLi4zYTU0N2JmZjQ2ZGE3MmJkOGNjNGE5MDhjZjI1ZGMwNzYyOTU5ZjJiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjQzLDYgKzY0MywxMyBAQCB2b2lkIFJl bmRlckJveDo6dXBkYXRlTGF5ZXJUcmFuc2Zvcm0oKQogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNv bnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgUmVuZGVyQmxvY2smIGNiLCBSZW5kZXJG cmFnbWVudENvbnRhaW5lciogZnJhZ21lbnQpIGNvbnN0CiB7CiAgICAgY29uc3QgUmVuZGVyU3R5 bGUmIHN0eWxlVG9Vc2UgPSBzdHlsZSgpOworCisgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2Fs SGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBsb2dpY2FsTWlu V2lkdGgsIGxvZ2ljYWxNYXhXaWR0aDsKKyAgICAgICAgc3RkOjp0aWUobG9naWNhbE1pbldpZHRo LCBsb2dpY2FsTWF4V2lkdGgpID0gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RS YXRpbygpOworICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1heChsb2dpY2FsTWluV2lkdGgs IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwgbG9naWNhbE1heFdpZHRoKSk7CisgICAgfQorCiAgICAg aWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCiAgICAgICAg IGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0 aEluRnJhZ21lbnRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLCBh dmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2lj YWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBzdHls ZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7 CkBAIC0zNjI1LDM4ICszNjMyLDUzIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l ZExvZ2ljYWxXaWR0aChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwgbG9naWNh bFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMpOwogCisg ICAgTGF5b3V0VW5pdCB0cmFuc2ZlcnJlZE1pblNpemUgPSBMYXlvdXRVbml0OjptaW4oKTsKKyAg ICBMYXlvdXRVbml0IHRyYW5zZmVycmVkTWF4U2l6ZSA9IExheW91dFVuaXQ6Om1heCgpOworICAg IGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAg ICBzdGQ6OnRpZSh0cmFuc2ZlcnJlZE1pblNpemUsIHRyYW5zZmVycmVkTWF4U2l6ZSkgPSBjb21w dXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisKKyAgICBMb2dpY2FsRXh0 ZW50Q29tcHV0ZWRWYWx1ZXMgbWF4VmFsdWVzOworICAgIG1heFZhbHVlcy5tX2V4dGVudCA9IExh eW91dFVuaXQ6Om1heCgpOwogICAgIC8vIENhbGN1bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZh bHVlcyBmb3IgJ21heC13aWR0aCcgY2FzZS4KICAgICBpZiAoIXN0eWxlKCkubG9naWNhbE1heFdp ZHRoKCkuaXNVbmRlZmluZWQoKSkgewotICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1 ZXMgbWF4VmFsdWVzOwotCiAgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp bmcoTWF4U2l6ZSwgc3R5bGUoKS5sb2dpY2FsTWF4V2lkdGgoKSwgY29udGFpbmVyQmxvY2ssIGNv bnRhaW5lckRpcmVjdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZywKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwgbG9n aWNhbFJpZ2h0TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1heFZhbHVlcyk7Ci0K LSAgICAgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID4gbWF4VmFsdWVzLm1fZXh0ZW50 KSB7Ci0gICAgICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IG1heFZhbHVlcy5tX2V4 dGVudDsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fcG9zaXRpb24gPSBtYXhWYWx1ZXMu bV9wb3NpdGlvbjsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0 ID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OwotICAgICAgICAgICAgY29tcHV0ZWRWYWx1 ZXMubV9tYXJnaW5zLm1fZW5kID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX2VuZDsKLSAgICAgICAg fQorICAgIH0KKyAgICBpZiAodHJhbnNmZXJyZWRNYXhTaXplIDwgbWF4VmFsdWVzLm1fZXh0ZW50 KSB7CisgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoTWF4U2l6ZSwg TGVuZ3RoKHRyYW5zZmVycmVkTWF4U2l6ZSwgRml4ZWQpLCBjb250YWluZXJCbG9jaywgY29udGFp bmVyRGlyZWN0aW9uLAorICAgICAgICAgICAgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJz UGx1c1BhZGRpbmcsCisgICAgICAgICAgICBsb2dpY2FsTGVmdExlbmd0aCwgbG9naWNhbFJpZ2h0 TGVuZ3RoLCBtYXJnaW5Mb2dpY2FsTGVmdCwgbWFyZ2luTG9naWNhbFJpZ2h0LAorICAgICAgICAg ICAgbWF4VmFsdWVzKTsKKyAgICB9CisgICAgaWYgKGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID4g bWF4VmFsdWVzLm1fZXh0ZW50KSB7CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0g bWF4VmFsdWVzLm1fZXh0ZW50OworICAgICAgICBjb21wdXRlZFZhbHVlcy5tX3Bvc2l0aW9uID0g bWF4VmFsdWVzLm1fcG9zaXRpb247CisgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fbWFyZ2lucy5t X3N0YXJ0ID0gbWF4VmFsdWVzLm1fbWFyZ2lucy5tX3N0YXJ0OworICAgICAgICBjb21wdXRlZFZh bHVlcy5tX21hcmdpbnMubV9lbmQgPSBtYXhWYWx1ZXMubV9tYXJnaW5zLm1fZW5kOwogICAgIH0K IAorICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBtaW5WYWx1ZXM7CisgICAgbWluVmFs dWVzLm1fZXh0ZW50ID0gTGF5b3V0VW5pdDo6bWluKCk7CiAgICAgLy8gQ2FsY3VsYXRlIGNvbnN0 cmFpbnQgZXF1YXRpb24gdmFsdWVzIGZvciAnbWluLXdpZHRoJyBjYXNlLgogICAgIGlmICghc3R5 bGUoKS5sb2dpY2FsTWluV2lkdGgoKS5pc1plcm8oKSB8fCBzdHlsZSgpLmxvZ2ljYWxNaW5XaWR0 aCgpLmlzSW50cmluc2ljKCkpIHsKLSAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVz IG1pblZhbHVlczsKLQogICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0aFVzaW5n KE1pblNpemUsIHN0eWxlKCkubG9naWNhbE1pbldpZHRoKCksIGNvbnRhaW5lckJsb2NrLCBjb250 YWluZXJEaXJlY3Rpb24sCisgICAgICAgICAgICBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRl cnNQbHVzUGFkZGluZywKKyAgICAgICAgICAgIGxvZ2ljYWxMZWZ0TGVuZ3RoLCBsb2dpY2FsUmln aHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBtYXJnaW5Mb2dpY2FsUmlnaHQsCisgICAgICAg ICAgICBtaW5WYWx1ZXMpOworICAgIH0KKyAgICBpZiAodHJhbnNmZXJyZWRNaW5TaXplID4gbWlu VmFsdWVzLm1fZXh0ZW50KSB7CisgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRo VXNpbmcoTWluU2l6ZSwgTGVuZ3RoKHRyYW5zZmVycmVkTWluU2l6ZSwgRml4ZWQpLCBjb250YWlu ZXJCbG9jaywgY29udGFpbmVyRGlyZWN0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCwgYm9yZGVyc1BsdXNQYWRkaW5n LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxMZWZ0 TGVuZ3RoLCBsb2dpY2FsUmlnaHRMZW5ndGgsIG1hcmdpbkxvZ2ljYWxMZWZ0LCBtYXJnaW5Mb2dp Y2FsUmlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWlu VmFsdWVzKTsKLQotICAgICAgICBpZiAoY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPCBtaW5WYWx1 ZXMubV9leHRlbnQpIHsKLSAgICAgICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0gbWlu VmFsdWVzLm1fZXh0ZW50OwotICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9 IG1pblZhbHVlcy5tX3Bvc2l0aW9uOwotICAgICAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9tYXJn aW5zLm1fc3RhcnQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fc3RhcnQ7Ci0gICAgICAgICAgICBj b21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9lbmQgPSBtaW5WYWx1ZXMubV9tYXJnaW5zLm1fZW5k OwotICAgICAgICB9CisgICAgfQorICAgIGlmIChjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA8IG1p blZhbHVlcy5tX2V4dGVudCkgeworICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCA9IG1p blZhbHVlcy5tX2V4dGVudDsKKyAgICAgICAgY29tcHV0ZWRWYWx1ZXMubV9wb3NpdGlvbiA9IG1p blZhbHVlcy5tX3Bvc2l0aW9uOworICAgICAgICBjb21wdXRlZFZhbHVlcy5tX21hcmdpbnMubV9z dGFydCA9IG1pblZhbHVlcy5tX21hcmdpbnMubV9zdGFydDsKKyAgICAgICAgY29tcHV0ZWRWYWx1 ZXMubV9tYXJnaW5zLm1fZW5kID0gbWluVmFsdWVzLm1fbWFyZ2lucy5tX2VuZDsKICAgICB9CiAK ICAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCArPSBib3JkZXJzUGx1c1BhZGRpbmc7CkBAIC01 MDMzLDYgKzUwNTUsMjIgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lk dGhGcm9tQXNwZWN0UmF0aW8oUmVuZGVyRnJhZ21lbnRDb250YWluZXIKICAgICByZXR1cm4gY29u c3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KGxvZ2ljYWxXaWR0aCwgY29udGFp bmVyV2lkdGhJbklubGluZURpcmVjdGlvbiwgKmNvbnRhaW5pbmdCbG9jaygpLCBmcmFnbWVudCk7 CiB9CiAKK3N0ZDo6cGFpcjxMYXlvdXRVbml0LCBMYXlvdXRVbml0PiBSZW5kZXJCb3g6OmNvbXB1 dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSBjb25zdAoreworICAgIGF1dG8g cmF0aW8gPSBMYXlvdXRVbml0IHsgc3R5bGUoKS5sb2dpY2FsQXNwZWN0UmF0aW8oKSB9OworICAg IExheW91dFVuaXQgYmxvY2tNaW5TaXplID0gY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4 KExheW91dFVuaXQoKSwgV1RGOjpudWxsb3B0KTsKKyAgICBMYXlvdXRVbml0IGJsb2NrTWF4U2l6 ZSA9IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0OjptYXgoKSwgV1RG OjpudWxsb3B0KTsKKyAgICBMYXlvdXRVbml0IHRyYW5zZmVycmVkTWluU2l6ZSA9IExheW91dFVu aXQoKTsKKyAgICBMYXlvdXRVbml0IHRyYW5zZmVycmVkTWF4U2l6ZSA9IExheW91dFVuaXQ6Om1h eCgpOworICAgIGlmIChibG9ja01pblNpemUgPiBMYXlvdXRVbml0KCkpCisgICAgICAgIHRyYW5z ZmVycmVkTWluU2l6ZSA9IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRl ckFuZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJh dGlvLCBzdHlsZSgpLmJveFNpemluZygpLCBibG9ja01pblNpemUpOworICAgIGlmIChibG9ja01h eFNpemUgIT0gTGF5b3V0VW5pdDo6bWF4KCkpCisgICAgICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9 IGlubGluZVNpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl bnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHJhdGlvLCBzdHlsZSgpLmJv eFNpemluZygpLCBibG9ja01heFNpemUpOworICAgIC8vIE1pbmltdW0gc2l6ZSB3aW5zIG92ZXIg bWF4aW11bSBzaXplLgorICAgIHRyYW5zZmVycmVkTWF4U2l6ZSA9IHN0ZDo6bWF4KHRyYW5zZmVy cmVkTWF4U2l6ZSwgdHJhbnNmZXJyZWRNaW5TaXplKTsKKyAgICByZXR1cm4geyB0cmFuc2ZlcnJl ZE1pblNpemUsIHRyYW5zZmVycmVkTWF4U2l6ZSB9OworfQorCiBib29sIFJlbmRlckJveDo6aGFz UmVsYXRpdmVEaW1lbnNpb25zKCkgY29uc3QKIHsKICAgICByZXR1cm4gc3R5bGUoKS5oZWlnaHQo KS5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSB8fCBzdHlsZSgpLndpZHRoKCkuaXNQZXJjZW50T3JD YWxjdWxhdGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCA2MDRlYTlh NWQ3N2ViYTI2NmFmNTU0NDk4YjUzOWMwOGQ0YjJjNDNhLi4yMmQwYmEzNzUzMjI1MjhmZjU1MTM2 OTJjZGI2ZWJiMDJmNTNjZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBA IC03MDEsNiArNzAxLDcgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxvZ2lj YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkQ29tcHV0ZUxv Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cygpIGNvbnN0OwogICAgIExheW91dFVu aXQgY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbyhSZW5kZXJGcmFnbWVudENvbnRh aW5lciogPSBudWxscHRyKSBjb25zdDsKKyAgICBzdGQ6OnBhaXI8TGF5b3V0VW5pdCwgTGF5b3V0 VW5pdD4gY29tcHV0ZU1pbk1heExvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpIGNvbnN0Owog CiAgICAgc3RhdGljIExheW91dFVuaXQgYmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKExheW91dFVu aXQgYm9yZGVyUGFkZGluZ0lubGluZVN1bSwgTGF5b3V0VW5pdCBib3JkZXJQYWRkaW5nQmxvY2tT dW0sIExheW91dFVuaXQgYXNwZWN0UmF0aW8sIEJveFNpemluZyBib3hTaXppbmcsIExheW91dFVu aXQgaW5saW5lU2l6ZSkKICAgICB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWJmZjJkZWQ2NWFiOGExMTFhYjk1MTg3ZTRk NDhhOWY1YTg0ZDg1Ny4uZWFlOTQwMTU1OWQ2OWQyYzhiODUyMWViMDU4NWI1MzU1MDAwYTI1YyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTE1ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxp YS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyMDIyNAorICAgICAgICBTdXBwb3J0IHRyYW5zZmVycmVkIG1pbi9tYXggYmxvY2sgc2l6ZSBm b3IgYXNwZWN0LXJhdGlvCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAqIFRl c3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMTUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gUkVHUkVTU0lPTiAocjI3MDEyMykg ZmFjZWJvb2suY29tIGJpcnRoZGF5IGRyb3Bkb3duIGRvIG5vdCB3b3JrIHdoZW4gY3JlYXRpbmcg bmV3IGFjY291bnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9M YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGFlMDBiMzg1OGQwMzRlZjBlN2VmN2Fm ZWI0NWZkNGZiZDBhNWM5NzcuLjhjYmIyMjgxZDFkMzhhY2MwNTA5Yzc4ZTM3MDQ5MWYyY2UyZTgy NzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQwNyw3ICs0NDA3LDYgQEAgd2Via2l0Lm9yZy9i LzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9z aGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y bS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50YXRp dmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNlaG9s ZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9h YnNwb3MtMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYWJzcG9zLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0 NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Fic3Bvcy0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ0MTUs MTIgKzQ0MTQsNyBAQCB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2 MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y YXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VP bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0w MTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9j ay1hc3BlY3QtcmF0aW8tMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcv Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy ZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjMuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3Qt cmF0aW8tMDI0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMg aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMjcuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4 Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1h c3BlY3QtcmF0aW8tMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8y MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl Y3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K 417881 2021-01-19 09:45:45 -0800 2021-01-20 00:31:45 -0800 Patch bug-220224-20210119184544.patch text/plain 1652 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFhZjJjNDg5YWQ2YmMw MzI3M2E3NzU2Y2VhODQ5OGM3MDQ1YzEzZC4uYjU2MWM2YWQzOTFmMmQzOWRjOGJiNDlhMGRhN2Y2 YTExZTAwMTNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAxLTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDIyNAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVVNlIHN0ZDo6Y2xhbXAgZm9yIGNsYXJpdHkuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToKKwogMjAyMS0w MS0xOCAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAg QXBwbGUgTWFpbCBBWCwgVm9pY2VPdmVyOiBXaGVuIGNvbXBvc2luZyBhIG5ldyBlbWFpbCBtZXNz YWdlLCBtb3ZpbmcgVk8gZm9jdXMgdG8gdGhlIG1lc3NhZ2UgYm9keSBmaWVsZCBkb2VzIG5vdCBi cmluZyBrZXlib2FyZCBmb2N1cyBhbG9uZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKaW5kZXggMjc2YzYzNDQ2NjQyMjhjYWNhMWMxOWUyNTdiZmEzOTQxOTU0MzQxMS4uOWYw ZDY3MGMzOTNkZTljYmIwYzE4NjM2YTU5ZTNkODdiZDMzZjRmYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY0Nyw3ICs2NDcsNyBAQCBMYXlvdXRVbml0IFJlbmRl ckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQg bG9naWNhbAogICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp bygpKSB7CiAgICAgICAgIExheW91dFVuaXQgbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lk dGg7CiAgICAgICAgIHN0ZDo6dGllKGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoKSA9 IGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKLSAgICAgICAgbG9n aWNhbFdpZHRoID0gc3RkOjptYXgobG9naWNhbE1pbldpZHRoLCBzdGQ6Om1pbihsb2dpY2FsV2lk dGgsIGxvZ2ljYWxNYXhXaWR0aCkpOworICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1w KGxvZ2ljYWxXaWR0aCwgbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOwogICAgIH0K IAogICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQo= 417947 2021-01-20 00:31:51 -0800 2021-01-20 08:02:07 -0800 Patch bug-220224-20210120093150.patch text/plain 1846 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFhZjJjNDg5YWQ2YmMw MzI3M2E3NzU2Y2VhODQ5OGM3MDQ1YzEzZC4uZGZhMTJjNTM4ZDE0M2M1M2JmYzFlODk2MzM4Njg1 MDc1YWEzYTY0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAxLTE5ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgU3VwcG9ydCB0cmFuc2ZlcnJlZCBt aW4vbWF4IGJsb2NrIHNpemUgZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMjI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgVXNlIHN0ZDo6Y2xhbXAgZm9yIGNsYXJpdHkuIEFsc28g dXNlIHN0cnVjdHVyZWQgYmluZGluZ3Mgd2hlcmUgcG9zc2libGUuCisKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29uc3Ry YWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToKKwogMjAyMS0wMS0xOCAg QW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgQXBwbGUg TWFpbCBBWCwgVm9pY2VPdmVyOiBXaGVuIGNvbXBvc2luZyBhIG5ldyBlbWFpbCBtZXNzYWdlLCBt b3ZpbmcgVk8gZm9jdXMgdG8gdGhlIG1lc3NhZ2UgYm9keSBmaWVsZCBkb2VzIG5vdCBicmluZyBr ZXlib2FyZCBmb2N1cyBhbG9uZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAK aW5kZXggMjc2YzYzNDQ2NjQyMjhjYWNhMWMxOWUyNTdiZmEzOTQxOTU0MzQxMS4uMmMwZmI2NzYw YmIxZGIyY2U0NzVmZTNlMTc2YjczNjA2ODk4ZTk5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5jcHAKQEAgLTY0NSw5ICs2NDUsOCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNh bAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKIAogICAgIGlm IChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKSB7Ci0gICAgICAg IExheW91dFVuaXQgbG9naWNhbE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGg7Ci0gICAgICAgIHN0 ZDo6dGllKGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoKSA9IGNvbXB1dGVNaW5NYXhM b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKLSAgICAgICAgbG9naWNhbFdpZHRoID0gc3Rk OjptYXgobG9naWNhbE1pbldpZHRoLCBzdGQ6Om1pbihsb2dpY2FsV2lkdGgsIGxvZ2ljYWxNYXhX aWR0aCkpOworICAgICAgICBhdXRvIFtsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aF0g PSBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7CisgICAgICAgIGxv Z2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxv Z2ljYWxNYXhXaWR0aCk7CiAgICAgfQogCiAgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhX aWR0aCgpLmlzVW5kZWZpbmVkKCkpCg==