<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>220582</bug_id>
          
          <creation_ts>2021-01-13 01:50:36 -0800</creation_ts>
          <short_desc>Handle min-width/min-height:auto for aspect-ratio</short_desc>
          <delta_ts>2021-02-11 02:55:27 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>CSS</component>
          <version>Other</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>47738</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Rob Buis">rbuis</reporter>
          <assigned_to name="Rob Buis">rbuis</assigned_to>
          <cc>changseok</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>koivisto</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1719233</commentid>
    <comment_count>0</comment_count>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-13 01:50:36 -0800</bug_when>
    <thetext>Handle min-width/min-height:auto for aspect-ratio.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1719234</commentid>
    <comment_count>1</comment_count>
      <attachid>417516</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-13 01:53:36 -0800</bug_when>
    <thetext>Created attachment 417516
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720192</commentid>
    <comment_count>2</comment_count>
      <attachid>417781</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-17 12:19:13 -0800</bug_when>
    <thetext>Created attachment 417781
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720843</commentid>
    <comment_count>3</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-01-20 01:51:12 -0800</bug_when>
    <thetext>&lt;rdar://problem/73395736&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720887</commentid>
    <comment_count>4</comment_count>
      <attachid>417968</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-20 07:58:27 -0800</bug_when>
    <thetext>Created attachment 417968
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1720973</commentid>
    <comment_count>5</comment_count>
      <attachid>417992</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-20 13:06:02 -0800</bug_when>
    <thetext>Created attachment 417992
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1722954</commentid>
    <comment_count>6</comment_count>
      <attachid>418541</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-01-27 06:46:01 -0800</bug_when>
    <thetext>Created attachment 418541
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1725576</commentid>
    <comment_count>7</comment_count>
      <attachid>419265</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-04 03:48:26 -0800</bug_when>
    <thetext>Created attachment 419265
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1726970</commentid>
    <comment_count>8</comment_count>
      <attachid>419685</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-09 00:46:55 -0800</bug_when>
    <thetext>Created attachment 419685
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1727998</commentid>
    <comment_count>9</comment_count>
      <attachid>419685</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-02-11 01:14:20 -0800</bug_when>
    <thetext>Comment on attachment 419685
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=419685&amp;action=review

&gt; Source/WebCore/rendering/RenderBox.cpp:665
&gt; +    Length minLength = styleToUse.logicalMinWidth();

could use auto

&gt; Source/WebCore/rendering/RenderBox.cpp:3810
&gt; +    if (widthType == MinSize &amp;&amp; logicalWidth.isAuto()) {
&gt; +        if (shouldComputeLogicalWidthFromAspectRatio()) {
&gt; +            LayoutUnit minLogicalWidth;
&gt; +            LayoutUnit maxLogicalWidth;
&gt; +            computeIntrinsicLogicalWidths(minLogicalWidth, maxLogicalWidth);
&gt; +            logicalWidth = Length(minLogicalWidth, Fixed);
&gt; +        } else
&gt; +            logicalWidth = Length(0, Fixed);
&gt; +    } else if (widthType == MainOrPreferredSize &amp;&amp; logicalWidth.isAuto() &amp;&amp; shouldComputeLogicalWidthFromAspectRatio())
&gt;          logicalWidth = Length(computeLogicalWidthFromAspectRatio(), Fixed);
&gt;      else if (logicalWidth.isIntrinsic())
&gt;          logicalWidth = Length(computeIntrinsicLogicalWidthUsing(logicalWidth, containerLogicalWidth, bordersPlusPadding) - bordersPlusPadding, Fixed);

This sort of code can often made read better by using lambdas and early returns.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728000</commentid>
    <comment_count>10</comment_count>
      <attachid>419685</attachid>
    <who name="Antti Koivisto">koivisto</who>
    <bug_when>2021-02-11 01:15:58 -0800</bug_when>
    <thetext>Comment on attachment 419685
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=419685&amp;action=review

&gt; LayoutTests/TestExpectations:4421
&gt; +webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html [ ImageOnlyFailure ]

Why does this break?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728002</commentid>
    <comment_count>11</comment_count>
      <attachid>419685</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-11 01:19:03 -0800</bug_when>
    <thetext>Comment on attachment 419685
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=419685&amp;action=review

&gt;&gt; LayoutTests/TestExpectations:4421
&gt;&gt; +webkit.org/b/214463 imported/w3c/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-008.html [ ImageOnlyFailure ]
&gt; 
&gt; Why does this break?

Flex support still needs to land:
https://bugs.webkit.org/show_bug.cgi?id=219679
I am waiting on an Igalia colleague for some flexbox fixes so that patch can be rebased and made smaller.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728011</commentid>
    <comment_count>12</comment_count>
      <attachid>419966</attachid>
    <who name="Rob Buis">rbuis</who>
    <bug_when>2021-02-11 01:54:31 -0800</bug_when>
    <thetext>Created attachment 419966
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1728015</commentid>
    <comment_count>13</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-02-11 02:55:25 -0800</bug_when>
    <thetext>Committed r272718: &lt;https://commits.webkit.org/r272718&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 419966.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417516</attachid>
            <date>2021-01-13 01:53:36 -0800</date>
            <delta_ts>2021-01-17 12:19:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210113105334.patch</filename>
            <type>text/plain</type>
            <size>9642</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkzM2EzNTJjM2IzMDNm
NDM4ODYzNzg5OTgwMzVlZTIyYTNlNjQ5Mi4uOWE1MTc5OTI3YWMwYjU3NmQyNWRlNTk1ZTJjMGE4
OTg4NTA4ZjgyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTEzICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0
aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDEtMTIgIENhdGhpZSBDaGVuICA8
Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFRoZSByb290Qm91bmRzIG9mIEludGVy
c2VjdGlvbk9ic2VydmVyRW50cnkgaXMgbm90IGNvcnJlY3Qgd2hlbiB7cm9vdDpkb2N1bWVudH0K
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggNWJlZDZhMmRiNTcxODk5
OGQyYmZhNzliZGRkNzE5Mzg5Mjg4ZTFkOS4uZjI1MDJkZTcxNmJhYmUyYmU5ZTc0MDIyOTRjYThk
MjQyOGY1MDdiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY0
NSw3ICs2NDUsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0
aEluRnJhZ21lbnRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWwKICAgICBjb25zdCBSZW5kZXJT
dHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7CiAgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxN
YXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWlu
KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNYXhTaXpl
LCBzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdt
ZW50KSk7Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxX
aWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgp
LCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CisgICAgTGVuZ3RoIG1pbkxlbmd0aCA9
IHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCk7CisgICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNw
ZWN0UmF0aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxl
bmd0aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0g
T3ZlcmZsb3c6OlZpc2libGUpIHsKKyAgICAgICAgLy8gTWFrZSBzdXJlIHdlIGFjdHVhbGx5IHVz
ZWQgdGhlIGFzcGVjdCByYXRpby4KKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lk
dGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChNaW5D
b250ZW50KTsKKyAgICB9CisgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0
ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJs
ZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0
cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlv
bmFsPExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0CkBAIC02NTUsNyAr
NjYxLDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlN
aW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPCiAgICAgICAgIGlmIChPcHRpb25hbDxM
YXlvdXRVbml0PiBtYXhIID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNYXhTaXplLCBzdHls
ZVRvVXNlLmxvZ2ljYWxNYXhIZWlnaHQoKSwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAg
ICAgICAgICBsb2dpY2FsSGVpZ2h0ID0gc3RkOjptaW4obG9naWNhbEhlaWdodCwgbWF4SC52YWx1
ZSgpKTsKICAgICB9Ci0gICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNh
bEhlaWdodCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5s
b2dpY2FsTWluSGVpZ2h0KCksIGludHJpbnNpY0NvbnRlbnRIZWlnaHQpKQorICAgIGF1dG8gbG9n
aWNhbE1pbkhlaWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpOworICAgIGlmIChs
b2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJv
bUFzcGVjdFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBzdHlsZVRvVXNlLm92
ZXJmbG93QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkKKyAgICAgICAgbG9n
aWNhbE1pbkhlaWdodCA9IExlbmd0aCgqaW50cmluc2ljQ29udGVudEhlaWdodCwgRml4ZWQpOwor
ICAgIGlmIChPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxIZWlnaHQgPSBjb21w
dXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5IZWlnaHQsIGludHJpbnNp
Y0NvbnRlbnRIZWlnaHQpKQogICAgICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbEhlaWdodCwg
Y29tcHV0ZWRMb2dpY2FsSGVpZ2h0LnZhbHVlKCkpOwogICAgIHJldHVybiBsb2dpY2FsSGVpZ2h0
OwogfQpAQCAtMzcwMyw5ICszNzEyLDE1IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRp
b25lZExvZ2ljYWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiB7CiAg
ICAgQVNTRVJUKHdpZHRoVHlwZSA9PSBNaW5TaXplIHx8IHdpZHRoVHlwZSA9PSBNYWluT3JQcmVm
ZXJyZWRTaXplIHx8ICFsb2dpY2FsV2lkdGguaXNBdXRvKCkpOwogICAgIGF1dG8gb3JpZ2luYWxM
b2dpY2FsV2lkdGhUeXBlID0gbG9naWNhbFdpZHRoLnR5cGUoKTsKLSAgICBpZiAod2lkdGhUeXBl
ID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpKQotICAgICAgICBsb2dpY2FsV2lk
dGggPSBMZW5ndGgoMCwgRml4ZWQpOwotICAgIGVsc2UgaWYgKHdpZHRoVHlwZSA9PSBNYWluT3JQ
cmVmZXJyZWRTaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9n
aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCisgICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXpl
ICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxv
Z2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1p
bkxvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOwor
ICAgICAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRo
LCBtYXhMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKG1p
bkxvZ2ljYWxXaWR0aCwgRml4ZWQpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGxvZ2lj
YWxXaWR0aCA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAgfSBlbHNlIGlmICh3aWR0aFR5cGUgPT0g
TWFpbk9yUHJlZmVycmVkU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29t
cHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICBsb2dpY2FsV2lkdGgg
PSBMZW5ndGgoY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpLCBGaXhlZCk7CiAg
ICAgZWxzZSBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCiAgICAgICAgIGxvZ2ljYWxX
aWR0aCA9IExlbmd0aChjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdp
ZHRoLCBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZykgLSBib3JkZXJz
UGx1c1BhZGRpbmcsIEZpeGVkKTsKQEAgLTM5NzYsNyArMzk5MSw4IEBAIHZvaWQgUmVuZGVyQm94
Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFs
dWVzJiBjb21wCiAgICAgfQogCiAgICAgLy8gQ2FsY3VsYXRlIGNvbnN0cmFpbnQgZXF1YXRpb24g
dmFsdWVzIGZvciAnbWluLWhlaWdodCcgY2FzZS4KLSAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNh
bE1pbkhlaWdodCgpLmlzWmVybygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLmlz
SW50cmluc2ljKCkpIHsKKyAgICBMZW5ndGggbG9naWNhbE1pbkhlaWdodCA9IHN0eWxlVG9Vc2Uu
bG9naWNhbE1pbkhlaWdodCgpOworICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpIHx8
ICFsb2dpY2FsTWluSGVpZ2h0LmlzWmVybygpIHx8IGxvZ2ljYWxNaW5IZWlnaHQuaXNJbnRyaW5z
aWMoKSkgewogICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwog
CiAgICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0
eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9n
aWNhbEhlaWdodCwgYm9yZGVyc1BsdXNQYWRkaW5nLCBsb2dpY2FsSGVpZ2h0LApAQCAtNDA0MSw4
ICs0MDU3LDEyIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWln
aHRVc2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1
ZXMmIGNvbXB1dGVkVmFsdWVzKSBjb25zdAogewogICAgIEFTU0VSVChoZWlnaHRUeXBlID09IE1p
blNpemUgfHwgaGVpZ2h0VHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFsb2dpY2FsSGVp
Z2h0TGVuZ3RoLmlzQXV0bygpKTsKLSAgICBpZiAoaGVpZ2h0VHlwZSA9PSBNaW5TaXplICYmIGxv
Z2ljYWxIZWlnaHRMZW5ndGguaXNBdXRvKCkpCi0gICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5ndGgg
PSBMZW5ndGgoMCwgRml4ZWQpOworICAgIGlmIChoZWlnaHRUeXBlID09IE1pblNpemUgJiYgbG9n
aWNhbEhlaWdodExlbmd0aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxv
Z2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHRM
ZW5ndGggPSBMZW5ndGgobG9naWNhbEhlaWdodCwgRml4ZWQpOworICAgICAgICBlbHNlCisgICAg
ICAgICAgICBsb2dpY2FsSGVpZ2h0TGVuZ3RoID0gTGVuZ3RoKDAsIEZpeGVkKTsKKyAgICB9CiAK
ICAgICAvLyAndG9wJyBhbmQgJ2JvdHRvbScgY2Fubm90IGJvdGggYmUgJ2F1dG8nIGJlY2F1c2Ug
J3RvcCB3b3VsZCBvZiBiZWVuCiAgICAgLy8gY29udmVydGVkIHRvIHRoZSBzdGF0aWMgcG9zaXRp
b24gaW4gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0KCkKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyMjJkZWViMGRj
Y2E2OGRhNDhjMjJjNTc4ZmZlMGExNDRhMGVjYTM5Li45NTNiM2NhNzA1ZTZiNTY3NjMxNjdkMTJi
OTAwMmUzZTkwYTYwYzQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMTMgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBIYW5kbGUgbWluLXdpZHRoL21pbi1o
ZWlnaHQ6YXV0byBmb3IgYXNwZWN0LXJhdGlvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjA1ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisg
ICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMS0xMiAgTGF1cm8gTW91cmEgIDxs
bW91cmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBHYXJkZW5pbmcgRm9jdXMtdmlzaWJs
ZSBmYWlsdXJlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYTNlYzkwMTY4Yjk0NzI5ZjFjZmRmZDVm
ZGUzYTkyNjY4MTYzMzRkNS4uZWQ3MmY5YWI2OTc1MDhjODhjZDc3YmFlNzFjODUzMjgyYzFhMWQ4
NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDA5LDEzICs0NDA5LDcgQEAgd2Via2l0Lm9yZy9i
LzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9z
aGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRlci5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAwOC5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTIuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDEz
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9z
LTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Js
b2NrLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVj
dC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDIwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyMS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0w
MjMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDQyNyw2ICs0NDIxLDcgQEAgd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0
aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
ZmxleC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu
Zy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KK3dlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA4Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3Qt
cmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDEyLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417781</attachid>
            <date>2021-01-17 12:19:13 -0800</date>
            <delta_ts>2021-01-20 07:58:21 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210117211911.patch</filename>
            <type>text/plain</type>
            <size>9497</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg1NDQ5ZGZmOTgzOGQ4
NGQwMjgzYWNkNmMwZDk1MWE0YTc1OGUxYi4uNDY5ZTk0YTYxOWY1Njg2ZWFkY2Y5M2FkMjEzYTAx
MmE0YWQ4NDVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTE3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0
aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDEtMTcgIFphbGFuIEJ1anRhcyAg
PHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE5vIG5lZWQgdG8gbWFpbnRh
aW4gdGhlICJpcyBjb25zaWRlcmVkIGVtcHR5IiBiaXQgYW55bW9yZS4KZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu
ZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggMjc2YzYzNDQ2NjQyMjhjYWNhMWMxOWUyNTdiZmEz
OTQxOTU0MzQxMS4uOWE0M2U4ZmRmYzZhYTNhMjZmZDlhMmI4ZDAwNDY4NTdmMWRiMDAyNiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY1Miw3ICs2NTIsMTMgQEAg
TGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1p
bk1heChMYXlvdXRVbml0IGxvZ2ljYWwKIAogICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWF4
V2lkdGgoKS5pc1VuZGVmaW5lZCgpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6Om1pbihs
b2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWF4U2l6ZSwg
c3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKSwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVu
dCkpOwotICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lk
dGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKSwg
YXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOworICAgIExlbmd0aCBtaW5MZW5ndGggPSBz
dHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpOworICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVj
dFJhdGlvKCkgJiYgc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc0F1dG8oKSAmJiBtaW5MZW5n
dGguaXNBdXRvKCkgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0lubGluZURpcmVjdGlvbigpID09IE92
ZXJmbG93OjpWaXNpYmxlKSB7CisgICAgICAgIC8vIE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2Vk
IHRoZSBhc3BlY3QgcmF0aW8uCisgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRo
RnJvbUFzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBtaW5MZW5ndGggPSBMZW5ndGgoTWluQ29u
dGVudCk7CisgICAgfQorICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVM
b2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgbWluTGVuZ3RoLCBhdmFpbGFibGVX
aWR0aCwgY2IsIGZyYWdtZW50KSk7CiB9CiAKIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJh
aW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25h
bDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSBjb25zdApAQCAtNjYyLDcgKzY2
OCwxMCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWlu
TWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgTwogICAgICAgICBpZiAoT3B0aW9uYWw8TGF5
b3V0VW5pdD4gbWF4SCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWF4U2l6ZSwgc3R5bGVU
b1VzZS5sb2dpY2FsTWF4SGVpZ2h0KCksIGludHJpbnNpY0NvbnRlbnRIZWlnaHQpKQogICAgICAg
ICAgICAgbG9naWNhbEhlaWdodCA9IHN0ZDo6bWluKGxvZ2ljYWxIZWlnaHQsIG1heEgudmFsdWUo
KSk7CiAgICAgfQotICAgIGlmIChPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxI
ZWlnaHQgPSBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9n
aWNhbE1pbkhlaWdodCgpLCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSkKKyAgICBhdXRvIGxvZ2lj
YWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKTsKKyAgICBpZiAobG9n
aWNhbE1pbkhlaWdodC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21B
c3BlY3RSYXRpbygpICYmIGludHJpbnNpY0NvbnRlbnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5vdmVy
Zmxvd0Jsb2NrRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpCisgICAgICAgIGxvZ2lj
YWxNaW5IZWlnaHQgPSBMZW5ndGgoKmludHJpbnNpY0NvbnRlbnRIZWlnaHQsIEZpeGVkKTsKKyAg
ICBpZiAoT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0
ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBsb2dpY2FsTWluSGVpZ2h0LCBpbnRyaW5zaWND
b250ZW50SGVpZ2h0KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxIZWlnaHQsIGNv
bXB1dGVkTG9naWNhbEhlaWdodC52YWx1ZSgpKTsKICAgICByZXR1cm4gbG9naWNhbEhlaWdodDsK
IH0KQEAgLTM3NDYsOSArMzc1NSwxNSBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9u
ZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSB3aWR0aFR5cGUsIExlbmd0aCBsbwogewogICAg
IEFTU0VSVCh3aWR0aFR5cGUgPT0gTWluU2l6ZSB8fCB3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVy
cmVkU2l6ZSB8fCAhbG9naWNhbFdpZHRoLmlzQXV0bygpKTsKICAgICBhdXRvIG9yaWdpbmFsTG9n
aWNhbFdpZHRoVHlwZSA9IGxvZ2ljYWxXaWR0aC50eXBlKCk7Ci0gICAgaWYgKHdpZHRoVHlwZSA9
PSBNaW5TaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkKLSAgICAgICAgbG9naWNhbFdpZHRo
ID0gTGVuZ3RoKDAsIEZpeGVkKTsKLSAgICBlbHNlIGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJl
ZmVycmVkU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2lj
YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAm
JiBsb2dpY2FsV2lkdGguaXNBdXRvKCkpIHsKKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dp
Y2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgeworICAgICAgICAgICAgTGF5b3V0VW5pdCBtaW5M
b2dpY2FsV2lkdGg7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1heExvZ2ljYWxXaWR0aDsKKyAg
ICAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwg
bWF4TG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aChtaW5M
b2dpY2FsV2lkdGgsIEZpeGVkKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBsb2dpY2Fs
V2lkdGggPSBMZW5ndGgoMCwgRml4ZWQpOworICAgIH0gZWxzZSBpZiAod2lkdGhUeXBlID09IE1h
aW5PclByZWZlcnJlZFNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpICYmIHNob3VsZENvbXB1
dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0g
TGVuZ3RoKGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSwgRml4ZWQpOwogICAg
IGVsc2UgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJpbnNpYygpKQogICAgICAgICBsb2dpY2FsV2lk
dGggPSBMZW5ndGgoY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0
aCwgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3JkZXJzUGx1c1BhZGRpbmcpIC0gYm9yZGVyc1Bs
dXNQYWRkaW5nLCBGaXhlZCk7CkBAIC00MDE5LDcgKzQwMzQsOCBAQCB2b2lkIFJlbmRlckJveDo6
Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVl
cyYgY29tcAogICAgIH0KIAogICAgIC8vIENhbGN1bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZh
bHVlcyBmb3IgJ21pbi1oZWlnaHQnIGNhc2UuCi0gICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxN
aW5IZWlnaHQoKS5pc1plcm8oKSB8fCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKS5pc0lu
dHJpbnNpYygpKSB7CisgICAgTGVuZ3RoIGxvZ2ljYWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNlLmxv
Z2ljYWxNaW5IZWlnaHQoKTsKKyAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1dG8oKSB8fCAh
bG9naWNhbE1pbkhlaWdodC5pc1plcm8oKSB8fCBsb2dpY2FsTWluSGVpZ2h0LmlzSW50cmluc2lj
KCkpIHsKICAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIG1pblZhbHVlczsKIAog
ICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBzdHls
ZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKSwgY29udGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2lj
YWxIZWlnaHQsIGJvcmRlcnNQbHVzUGFkZGluZywgbG9naWNhbEhlaWdodCwKQEAgLTQwODQsOCAr
NDEwMCwxMiBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0
VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuZ3RoCiAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVz
JiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKICAgICBBU1NFUlQoaGVpZ2h0VHlwZSA9PSBNaW5T
aXplIHx8IGhlaWdodFR5cGUgPT0gTWFpbk9yUHJlZmVycmVkU2l6ZSB8fCAhbG9naWNhbEhlaWdo
dExlbmd0aC5pc0F1dG8oKSk7Ci0gICAgaWYgKGhlaWdodFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dp
Y2FsSGVpZ2h0TGVuZ3RoLmlzQXV0bygpKQotICAgICAgICBsb2dpY2FsSGVpZ2h0TGVuZ3RoID0g
TGVuZ3RoKDAsIEZpeGVkKTsKKyAgICBpZiAoaGVpZ2h0VHlwZSA9PSBNaW5TaXplICYmIGxvZ2lj
YWxIZWlnaHRMZW5ndGguaXNBdXRvKCkpIHsKKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dp
Y2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpCisgICAgICAgICAgICBsb2dpY2FsSGVpZ2h0TGVu
Z3RoID0gTGVuZ3RoKGxvZ2ljYWxIZWlnaHQsIEZpeGVkKTsKKyAgICAgICAgZWxzZQorICAgICAg
ICAgICAgbG9naWNhbEhlaWdodExlbmd0aCA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAgfQogCiAg
ICAgLy8gJ3RvcCcgYW5kICdib3R0b20nIGNhbm5vdCBib3RoIGJlICdhdXRvJyBiZWNhdXNlICd0
b3Agd291bGQgb2YgYmVlbgogICAgIC8vIGNvbnZlcnRlZCB0byB0aGUgc3RhdGljIHBvc2l0aW9u
IGluIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodCgpCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzAwMTE1NDg5MTFh
NTRkYjg5ZmM4OGE5MzM0M2IwNGI2MTU3ZjVhMi4uYzYyODM2OWJmYTBhYjhlMGQ2MTc3N2VmOGU0
MmIzOTNmMjMwOWRiYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh
eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTE3ICBSb2IgQnVp
cyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4taGVp
Z2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgRW5hYmxlIHNvbWUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAg
ICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMTUgIFJvYiBCdWlzICA8cmJ1aXNA
aWdhbGlhLmNvbT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MjIwMjI0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA4Y2JiMjI4MWQxZDM4YWNjMDUwOWM3
OGUzNzA0OTFmMmNlMmU4Mjc0Li42YjAwMTQxY2E5NTdlYmI3ZDVkZmMzZDYwNzkyZWU3ODAyZjVk
ODY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ0MDcsMTkgKzQ0MDcsMTQgQEAgd2Via2l0Lm9y
Zy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGlu
Zy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjdGlvbmFsaXR5LTAwMi50ZW50
YXRpdmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zbG90dGVkLXBsYWNl
aG9sZGVyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9hYnNwb3MtMDEyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vYWJzcG9zLTAxMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVj
dC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0w
MjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4
LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDQuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRp
by0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9m
bGV4LWFzcGVjdC1yYXRpby0wMDguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTEuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417968</attachid>
            <date>2021-01-20 07:58:27 -0800</date>
            <delta_ts>2021-01-20 13:05:56 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210120165825.patch</filename>
            <type>text/plain</type>
            <size>9565</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk2OWZiNDIzNmM4OGQ1
NmYzYWYyMjVkMGZhNjUwNjgxYWZkM2VjNC4uYjQzMmU3MTM3MTc0ZDMzZDRmZjMwNDEzZmY1NzIw
ZGRiN2M4ODVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgV0lQLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv
eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0
aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6
OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcgY29uc3QpOgor
ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWln
aHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDEtMjAgIFNhbSBXZWluaWcgIDx3
ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgICJSZW1vdmUgcmVtYWluaW5nIG5vbi1zdGFuZGFy
ZCBDTVlLQSBzdXBwb3J0IGZyb20gQ2FudmFzIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcAppbmRleCA5MGZhZjkyYjUyODI4OTZjZDI3NzBjYWJhMjc3YjViNmJjNzUxMjAyLi5m
YmViMWZlNTg4ZDQ4NzYwZTc4NjFjODExODRlMDAyMDgzNDk3ZWMzIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y
ZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjU1LDcgKzY1NSwxMyBAQCBMYXlvdXRVbml0IFJl
bmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVu
aXQgbG9naWNhbAogCiAgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5k
ZWZpbmVkKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwg
Y29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxv
Z2ljYWxNYXhXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7Ci0gICAgcmV0
dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRV
c2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpLCBhdmFpbGFibGVXaWR0
aCwgY2IsIGZyYWdtZW50KSk7CisgICAgTGVuZ3RoIG1pbkxlbmd0aCA9IHN0eWxlVG9Vc2UubG9n
aWNhbE1pbldpZHRoKCk7CisgICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0UmF0aW8oKSAmJiBz
dHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0aC5pc0F1dG8oKSAm
JiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2li
bGUpIHsKKyAgICAgICAgLy8gTWFrZSBzdXJlIHdlIGFjdHVhbGx5IHVzZWQgdGhlIGFzcGVjdCBy
YXRpby4KKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0
aW8oKSkKKyAgICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChNaW5Db250ZW50KTsKKyAgICB9
CisgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aElu
RnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJh
Z21lbnQpKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWln
aHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlvbmFsPExheW91dFVuaXQ+
IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0CkBAIC02NjUsNyArNjcxLDEwIEBAIExheW91
dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5p
dCBsb2dpY2FsSGVpZ2h0LCBPCiAgICAgICAgIGlmIChPcHRpb25hbDxMYXlvdXRVbml0PiBtYXhI
ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxN
YXhIZWlnaHQoKSwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAgICAgICAgICBsb2dpY2Fs
SGVpZ2h0ID0gc3RkOjptaW4obG9naWNhbEhlaWdodCwgbWF4SC52YWx1ZSgpKTsKICAgICB9Ci0g
ICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhlaWdodCA9IGNvbXB1
dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0
KCksIGludHJpbnNpY0NvbnRlbnRIZWlnaHQpKQorICAgIGF1dG8gbG9naWNhbE1pbkhlaWdodCA9
IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpOworICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0
LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkg
JiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBzdHlsZVRvVXNlLm92ZXJmbG93QmxvY2tEaXJl
Y3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkKKyAgICAgICAgbG9naWNhbE1pbkhlaWdodCA9
IExlbmd0aCgqaW50cmluc2ljQ29udGVudEhlaWdodCwgRml4ZWQpOworICAgIGlmIChPcHRpb25h
bDxMYXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxIZWlnaHQgPSBjb21wdXRlTG9naWNhbEhlaWdo
dFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5IZWlnaHQsIGludHJpbnNpY0NvbnRlbnRIZWlnaHQp
KQogICAgICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbEhlaWdodCwgY29tcHV0ZWRMb2dpY2Fs
SGVpZ2h0LnZhbHVlKCkpOwogICAgIHJldHVybiBsb2dpY2FsSGVpZ2h0OwogfQpAQCAtMzc0OSw5
ICszNzU4LDE1IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxXaWR0
aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiB7CiAgICAgQVNTRVJUKHdpZHRo
VHlwZSA9PSBNaW5TaXplIHx8IHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFs
b2dpY2FsV2lkdGguaXNBdXRvKCkpOwogICAgIGF1dG8gb3JpZ2luYWxMb2dpY2FsV2lkdGhUeXBl
ID0gbG9naWNhbFdpZHRoLnR5cGUoKTsKLSAgICBpZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYg
bG9naWNhbFdpZHRoLmlzQXV0bygpKQotICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoMCwg
Rml4ZWQpOwotICAgIGVsc2UgaWYgKHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplICYm
IGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFz
cGVjdFJhdGlvKCkpCisgICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXplICYmIGxvZ2ljYWxXaWR0
aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21B
c3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aDsK
KyAgICAgICAgICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOworICAgICAgICAgICAgY29t
cHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lk
dGgpOworICAgICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKG1pbkxvZ2ljYWxXaWR0aCwg
Rml4ZWQpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0
aCgwLCBGaXhlZCk7CisgICAgfSBlbHNlIGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVycmVk
U2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0
aEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoY29tcHV0
ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpLCBGaXhlZCk7CiAgICAgZWxzZSBpZiAobG9n
aWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aChj
b21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdpZHRoLCBjb250YWluZXJM
b2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZykgLSBib3JkZXJzUGx1c1BhZGRpbmcsIEZp
eGVkKTsKQEAgLTQwMjIsNyArNDAzNyw4IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRp
b25lZExvZ2ljYWxIZWlnaHQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wCiAgICAg
fQogCiAgICAgLy8gQ2FsY3VsYXRlIGNvbnN0cmFpbnQgZXF1YXRpb24gdmFsdWVzIGZvciAnbWlu
LWhlaWdodCcgY2FzZS4KLSAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLmlz
WmVybygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLmlzSW50cmluc2ljKCkpIHsK
KyAgICBMZW5ndGggbG9naWNhbE1pbkhlaWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdo
dCgpOworICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpIHx8ICFsb2dpY2FsTWluSGVp
Z2h0LmlzWmVybygpIHx8IGxvZ2ljYWxNaW5IZWlnaHQuaXNJbnRyaW5zaWMoKSkgewogICAgICAg
ICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwogCiAgICAgICAgIGNvbXB1
dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNh
bE1pbkhlaWdodCgpLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNhbEhlaWdodCwgYm9y
ZGVyc1BsdXNQYWRkaW5nLCBsb2dpY2FsSGVpZ2h0LApAQCAtNDA4Nyw4ICs0MTAzLDEyIEBAIHZv
aWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyhTaXplVHlw
ZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGVkVmFs
dWVzKSBjb25zdAogewogICAgIEFTU0VSVChoZWlnaHRUeXBlID09IE1pblNpemUgfHwgaGVpZ2h0
VHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0
bygpKTsKLSAgICBpZiAoaGVpZ2h0VHlwZSA9PSBNaW5TaXplICYmIGxvZ2ljYWxIZWlnaHRMZW5n
dGguaXNBdXRvKCkpCi0gICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5ndGggPSBMZW5ndGgoMCwgRml4
ZWQpOworICAgIGlmIChoZWlnaHRUeXBlID09IE1pblNpemUgJiYgbG9naWNhbEhlaWdodExlbmd0
aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9t
QXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5ndGggPSBMZW5ndGgo
bG9naWNhbEhlaWdodCwgRml4ZWQpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBsb2dpY2Fs
SGVpZ2h0TGVuZ3RoID0gTGVuZ3RoKDAsIEZpeGVkKTsKKyAgICB9CiAKICAgICAvLyAndG9wJyBh
bmQgJ2JvdHRvbScgY2Fubm90IGJvdGggYmUgJ2F1dG8nIGJlY2F1c2UgJ3RvcCB3b3VsZCBvZiBi
ZWVuCiAgICAgLy8gY29udmVydGVkIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24gaW4gY29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsSGVpZ2h0KCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyOGY2ODQ2MmNkOGM5MGJiZGIyZjJmYzA4
MzNjNzI5N2UwOGYwMzc3Li5jNzllZDM2NTE5ODE3YmZmYTY5NWU0NzFhZDk1NzJlM2ZlNzVkMDEy
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMjAgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KKworICAgICAgICBIYW5kbGUgbWluLXdpZHRoL21pbi1oZWlnaHQ6YXV0byBmb3Ig
YXNwZWN0LXJhdGlvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0yMjA1ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBFbmFibGUgc29tZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4
cGVjdGF0aW9uczoKKwogMjAyMS0wMS0yMCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+
CiAKICAgICAgICAgUmVtb3ZlIHJlbWFpbmluZyBub24tc3RhbmRhcmQgQ01ZS0Egc3VwcG9ydCBm
cm9tIGNhbnZhcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOGNiYjIyODFkMWQzOGFjYzA1MDljNzhl
MzcwNDkxZjJjZTJlODI3NC4uNWVlZjE4ZDRkOGM1YjlmYzkyODMzNTBhNjVhODkxNmJjZTk4ZjEy
YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC00NDA3LDE5ICs0NDA3LDE1IEBAIHdlYmtpdC5vcmcv
Yi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcv
c2hhZG93LWRpcmVjCiB3ZWJraXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0
aXZlLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhv
bGRlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
YWJzcG9zLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2Fic3Bvcy0wMTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQorIyBhYnNwb3MtMDE0Lmh0
bWwgZGVwZW5kcyBvbiBtaXNzaW5nIGNvbnRhaW4taW50cmluc2ljLXNpemUgc3VwcG9ydC4KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Ci13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0
aW8tMDE0Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1w
b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v
YmxvY2stYXNwZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw
ZWN0LXJhdGlvLTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAw
NC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgt
YXNwZWN0LXJhdGlvLTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAxMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417992</attachid>
            <date>2021-01-20 13:06:02 -0800</date>
            <delta_ts>2021-01-27 06:45:55 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210120220600.patch</filename>
            <type>text/plain</type>
            <size>9800</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk2OWZiNDIzNmM4OGQ1
NmYzYWYyMjVkMGZhNjUwNjgxYWZkM2VjNC4uMWM2ZGU4ZjA2MDE5OGQyZjdiNmJiZWVkMzVkNWU4
NDZhNDk4MDNmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAxLTIwICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGF1dG9tYXRpYyBtaW5pbXVtIHNpemUgWzFd
IGhhbmRsaW5nIGZvciBhc3BlY3QtcmF0aW8KKyAgICAgICAgYXMgc3BlY2lmaWVkIGhlcmUgWzJd
LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy0zLyNh
dXRvbWF0aWMtbWluaW11bS1zaXplCisgICAgICAgIFsyXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFp
bkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp
bmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDEtMjAgIFNh
bSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgICJSZW1vdmUgcmVtYWluaW5n
IG5vbi1zdGFuZGFyZCBDTVlLQSBzdXBwb3J0IGZyb20gQ2FudmFzIgpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCA5MGZhZjkyYjUyODI4OTZjZDI3NzBjYWJhMjc3YjVi
NmJjNzUxMjAyLi5mYmViMWZlNTg4ZDQ4NzYwZTc4NjFjODExODRlMDAyMDgzNDk3ZWMzIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjU1LDcgKzY1NSwxMyBAQCBM
YXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWlu
TWF4KExheW91dFVuaXQgbG9naWNhbAogCiAgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhX
aWR0aCgpLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKGxv
Z2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNYXhTaXplLCBz
dHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50
KSk7Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0
aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpLCBh
dmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CisgICAgTGVuZ3RoIG1pbkxlbmd0aCA9IHN0
eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCk7CisgICAgaWYgKHN0eWxlVG9Vc2UuaGFzQXNwZWN0
UmF0aW8oKSAmJiBzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIG1pbkxlbmd0
aC5pc0F1dG8oKSAmJiBzdHlsZVRvVXNlLm92ZXJmbG93SW5saW5lRGlyZWN0aW9uKCkgPT0gT3Zl
cmZsb3c6OlZpc2libGUpIHsKKyAgICAgICAgLy8gTWFrZSBzdXJlIHdlIGFjdHVhbGx5IHVzZWQg
dGhlIGFzcGVjdCByYXRpby4KKyAgICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhG
cm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIG1pbkxlbmd0aCA9IExlbmd0aChNaW5Db250
ZW50KTsKKyAgICB9CisgICAgcmV0dXJuIHN0ZDo6bWF4KGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxv
Z2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBtaW5MZW5ndGgsIGF2YWlsYWJsZVdp
ZHRoLCBjYiwgZnJhZ21lbnQpKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFp
bkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE9wdGlvbmFs
PExheW91dFVuaXQ+IGludHJpbnNpY0NvbnRlbnRIZWlnaHQpIGNvbnN0CkBAIC02NjUsNyArNjcx
LDEwIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5N
YXgoTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0LCBPCiAgICAgICAgIGlmIChPcHRpb25hbDxMYXlv
dXRVbml0PiBtYXhIID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNYXhTaXplLCBzdHlsZVRv
VXNlLmxvZ2ljYWxNYXhIZWlnaHQoKSwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAgICAg
ICAgICBsb2dpY2FsSGVpZ2h0ID0gc3RkOjptaW4obG9naWNhbEhlaWdodCwgbWF4SC52YWx1ZSgp
KTsKICAgICB9Ci0gICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhl
aWdodCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dp
Y2FsTWluSGVpZ2h0KCksIGludHJpbnNpY0NvbnRlbnRIZWlnaHQpKQorICAgIGF1dG8gbG9naWNh
bE1pbkhlaWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpOworICAgIGlmIChsb2dp
Y2FsTWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFz
cGVjdFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAmJiBzdHlsZVRvVXNlLm92ZXJm
bG93QmxvY2tEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkKKyAgICAgICAgbG9naWNh
bE1pbkhlaWdodCA9IExlbmd0aCgqaW50cmluc2ljQ29udGVudEhlaWdodCwgRml4ZWQpOworICAg
IGlmIChPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxIZWlnaHQgPSBjb21wdXRl
TG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIGxvZ2ljYWxNaW5IZWlnaHQsIGludHJpbnNpY0Nv
bnRlbnRIZWlnaHQpKQogICAgICAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbEhlaWdodCwgY29t
cHV0ZWRMb2dpY2FsSGVpZ2h0LnZhbHVlKCkpOwogICAgIHJldHVybiBsb2dpY2FsSGVpZ2h0Owog
fQpAQCAtMzc0OSw5ICszNzU4LDE1IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxXaWR0aFVzaW5nKFNpemVUeXBlIHdpZHRoVHlwZSwgTGVuZ3RoIGxvCiB7CiAgICAg
QVNTRVJUKHdpZHRoVHlwZSA9PSBNaW5TaXplIHx8IHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJy
ZWRTaXplIHx8ICFsb2dpY2FsV2lkdGguaXNBdXRvKCkpOwogICAgIGF1dG8gb3JpZ2luYWxMb2dp
Y2FsV2lkdGhUeXBlID0gbG9naWNhbFdpZHRoLnR5cGUoKTsKLSAgICBpZiAod2lkdGhUeXBlID09
IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpKQotICAgICAgICBsb2dpY2FsV2lkdGgg
PSBMZW5ndGgoMCwgRml4ZWQpOwotICAgIGVsc2UgaWYgKHdpZHRoVHlwZSA9PSBNYWluT3JQcmVm
ZXJyZWRTaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNh
bFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCisgICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXplICYm
IGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2lj
YWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKSB7CisgICAgICAgICAgICBMYXlvdXRVbml0IG1pbkxv
Z2ljYWxXaWR0aDsKKyAgICAgICAgICAgIExheW91dFVuaXQgbWF4TG9naWNhbFdpZHRoOworICAg
ICAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMobWluTG9naWNhbFdpZHRoLCBt
YXhMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKG1pbkxv
Z2ljYWxXaWR0aCwgRml4ZWQpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxX
aWR0aCA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAgfSBlbHNlIGlmICh3aWR0aFR5cGUgPT0gTWFp
bk9yUHJlZmVycmVkU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0
ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBM
ZW5ndGgoY29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpLCBGaXhlZCk7CiAgICAg
ZWxzZSBpZiAobG9naWNhbFdpZHRoLmlzSW50cmluc2ljKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0
aCA9IExlbmd0aChjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRoVXNpbmcobG9naWNhbFdpZHRo
LCBjb250YWluZXJMb2dpY2FsV2lkdGgsIGJvcmRlcnNQbHVzUGFkZGluZykgLSBib3JkZXJzUGx1
c1BhZGRpbmcsIEZpeGVkKTsKQEAgLTQwMjIsNyArNDAzNyw4IEBAIHZvaWQgUmVuZGVyQm94Ojpj
b21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVz
JiBjb21wCiAgICAgfQogCiAgICAgLy8gQ2FsY3VsYXRlIGNvbnN0cmFpbnQgZXF1YXRpb24gdmFs
dWVzIGZvciAnbWluLWhlaWdodCcgY2FzZS4KLSAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1p
bkhlaWdodCgpLmlzWmVybygpIHx8IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLmlzSW50
cmluc2ljKCkpIHsKKyAgICBMZW5ndGggbG9naWNhbE1pbkhlaWdodCA9IHN0eWxlVG9Vc2UubG9n
aWNhbE1pbkhlaWdodCgpOworICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpIHx8ICFs
b2dpY2FsTWluSGVpZ2h0LmlzWmVybygpIHx8IGxvZ2ljYWxNaW5IZWlnaHQuaXNJbnRyaW5zaWMo
KSkgewogICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgbWluVmFsdWVzOwogCiAg
ICAgICAgIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0eWxl
VG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLCBjb250YWluZXJCbG9jaywgY29udGFpbmVyTG9naWNh
bEhlaWdodCwgYm9yZGVyc1BsdXNQYWRkaW5nLCBsb2dpY2FsSGVpZ2h0LApAQCAtNDA4Nyw4ICs0
MTAzLDEyIEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRV
c2luZyhTaXplVHlwZSBoZWlnaHRUeXBlLCBMZW5ndGgKICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMm
IGNvbXB1dGVkVmFsdWVzKSBjb25zdAogewogICAgIEFTU0VSVChoZWlnaHRUeXBlID09IE1pblNp
emUgfHwgaGVpZ2h0VHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplIHx8ICFsb2dpY2FsSGVpZ2h0
TGVuZ3RoLmlzQXV0bygpKTsKLSAgICBpZiAoaGVpZ2h0VHlwZSA9PSBNaW5TaXplICYmIGxvZ2lj
YWxIZWlnaHRMZW5ndGguaXNBdXRvKCkpCi0gICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5ndGggPSBM
ZW5ndGgoMCwgRml4ZWQpOworICAgIGlmIChoZWlnaHRUeXBlID09IE1pblNpemUgJiYgbG9naWNh
bEhlaWdodExlbmd0aC5pc0F1dG8oKSkgeworICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2lj
YWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5n
dGggPSBMZW5ndGgobG9naWNhbEhlaWdodCwgRml4ZWQpOworICAgICAgICBlbHNlCisgICAgICAg
ICAgICBsb2dpY2FsSGVpZ2h0TGVuZ3RoID0gTGVuZ3RoKDAsIEZpeGVkKTsKKyAgICB9CiAKICAg
ICAvLyAndG9wJyBhbmQgJ2JvdHRvbScgY2Fubm90IGJvdGggYmUgJ2F1dG8nIGJlY2F1c2UgJ3Rv
cCB3b3VsZCBvZiBiZWVuCiAgICAgLy8gY29udmVydGVkIHRvIHRoZSBzdGF0aWMgcG9zaXRpb24g
aW4gY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0KCkKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyOGY2ODQ2MmNkOGM5
MGJiZGIyZjJmYzA4MzNjNzI5N2UwOGYwMzc3Li4wOGE3N2ZhYTJmMTEwNDNmMGZjNzFmYjYzMTZj
M2JjODk4NThlNTkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDEtMjAgIFJvYiBCdWlz
ICA8cmJ1aXNAaWdhbGlhLmNvbT4KKworICAgICAgICBIYW5kbGUgbWluLXdpZHRoL21pbi1oZWln
aHQ6YXV0byBmb3IgYXNwZWN0LXJhdGlvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn
L3Nob3dfYnVnLmNnaT9pZD0yMjA1ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P
UFMhKS4KKworICAgICAgICBFbmFibGUgdGVzdHMgdGhhdCBwYXNzIG5vdy4KKworICAgICAgICAq
IFRlc3RFeHBlY3RhdGlvbnM6CisKIDIwMjEtMDEtMjAgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBw
bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSByZW1haW5pbmcgbm9uLXN0YW5kYXJkIENNWUtBIHN1
cHBvcnQgZnJvbSBjYW52YXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlv
bnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDhjYmIyMjgxZDFkMzhhY2Mw
NTA5Yzc4ZTM3MDQ5MWYyY2UyZTgyNzQuLjVlZWYxOGQ0ZDhjNWI5ZmM5MjgzMzUwYTY1YTg5MTZi
Y2U5OGYxMmMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNDQwNywxOSArNDQwNywxNSBAQCB3ZWJr
aXQub3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
Y29waW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9uYWxpdHktMDAy
LnRlbnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYy
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQt
cGxhY2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2Fic3Bvcy0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9hYnNwb3MtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KKyMgYWJzcG9z
LTAxNC5odG1sIGRlcGVuZHMgb24gbWlzc2luZyBjb250YWluLWludHJpbnNpYy1zaXplIHN1cHBv
cnQuCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDA5Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw
ZWN0LXJhdGlvLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv
LTAyNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Js
b2NrLWFzcGVjdC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1y
YXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBp
bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRp
by9mbGV4LWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDguaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDkuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418541</attachid>
            <date>2021-01-27 06:46:01 -0800</date>
            <delta_ts>2021-02-04 03:48:21 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210127154600.patch</filename>
            <type>text/plain</type>
            <size>10231</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxOTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjlhZTRmNThlODM3ZDQ2
OTFlMWY3OWQzNTA4MzZhYmI1ZWYwNmNhMi4uZmJjOWE2MDFiOWFkMGJkNjA0YTc1M2Q4MzA3NmEw
OWY2YjgyYmFhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAxLTI3ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGF1dG9tYXRpYyBtaW5pbXVtIHNpemUgWzFd
IGhhbmRsaW5nIGZvciBhc3BlY3QtcmF0aW8KKyAgICAgICAgYXMgc3BlY2lmaWVkIGhlcmUgWzJd
LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy0zLyNh
dXRvbWF0aWMtbWluaW11bS1zaXplCisgICAgICAgIFsyXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFp
bkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp
bmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDEtMjcgIFJv
YiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBIYW5kbGUgemVybyBhc3BlY3Qt
cmF0aW8gd2lkdGgvaGVpZ2h0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv
UmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmlu
ZGV4IDk4ZDJjMGEyOTk1ZWViNDM1Y2QxNzI2NWYxZTczZmYwNGVkZjUxMTIuLmRiYjA0NmFkY2Vk
MzEzZDc4ZjYwZmEyNjE4ZjA0YTI5OThiYzhkYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S
ZW5kZXJCb3guY3BwCkBAIC02NjIsNyArNjYyLDEzIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpj
b25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2Fs
CiAKICAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkK
ICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9n
aWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdp
ZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKLSAgICByZXR1cm4gc3RkOjpt
YXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNp
emUsIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJh
Z21lbnQpKTsKKyAgICBMZW5ndGggbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lk
dGgoKTsKKyAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2Uu
bG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9V
c2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAg
ICAgICAvLyBNYWtlIHN1cmUgd2UgYWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlvLgorICAg
ICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAg
ICAgICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKE1pbkNvbnRlbnQpOworICAgIH0KKyAgICByZXR1
cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVz
aW5nKE1pblNpemUsIG1pbkxlbmd0aCwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwog
fQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4
KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2lj
Q29udGVudEhlaWdodCkgY29uc3QKQEAgLTY3Miw3ICs2NzgsMTAgQEAgTGF5b3V0VW5pdCBSZW5k
ZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxI
ZWlnaHQsIE8KICAgICAgICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IG1heEggPSBjb21wdXRl
TG9naWNhbEhlaWdodFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heEhlaWdodCgp
LCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSkKICAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHQgPSBz
dGQ6Om1pbihsb2dpY2FsSGVpZ2h0LCBtYXhILnZhbHVlKCkpOwogICAgIH0KLSAgICBpZiAoT3B0
aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxI
ZWlnaHRVc2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKSwgaW50cmlu
c2ljQ29udGVudEhlaWdodCkpCisgICAgYXV0byBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5bGVUb1Vz
ZS5sb2dpY2FsTWluSGVpZ2h0KCk7CisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkg
JiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAmJiBpbnRyaW5z
aWNDb250ZW50SGVpZ2h0ICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dCbG9ja0RpcmVjdGlvbigpID09
IE92ZXJmbG93OjpWaXNpYmxlKQorICAgICAgICBsb2dpY2FsTWluSGVpZ2h0ID0gTGVuZ3RoKCpp
bnRyaW5zaWNDb250ZW50SGVpZ2h0LCBGaXhlZCk7CisgICAgaWYgKE9wdGlvbmFsPExheW91dFVu
aXQ+IGNvbXB1dGVkTG9naWNhbEhlaWdodCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWlu
U2l6ZSwgbG9naWNhbE1pbkhlaWdodCwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAgICAg
IHJldHVybiBzdGQ6Om1heChsb2dpY2FsSGVpZ2h0LCBjb21wdXRlZExvZ2ljYWxIZWlnaHQudmFs
dWUoKSk7CiAgICAgcmV0dXJuIGxvZ2ljYWxIZWlnaHQ7CiB9CkBAIC0zNzg0LDkgKzM3OTMsMTUg
QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6
ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KIHsKICAgICBBU1NFUlQod2lkdGhUeXBlID09IE1p
blNpemUgfHwgd2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgfHwgIWxvZ2ljYWxXaWR0
aC5pc0F1dG8oKSk7CiAgICAgYXV0byBvcmlnaW5hbExvZ2ljYWxXaWR0aFR5cGUgPSBsb2dpY2Fs
V2lkdGgudHlwZSgpOwotICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lk
dGguaXNBdXRvKCkpCi0gICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhlZCk7Ci0g
ICAgZWxzZSBpZiAod2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgbG9naWNhbFdp
ZHRoLmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o
KSkKKyAgICBpZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygp
KSB7CisgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlv
KCkpIHsKKyAgICAgICAgICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoOworICAgICAgICAg
ICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7CisgICAgICAgICAgICBjb21wdXRlSW50cmlu
c2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAg
ICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgobWluTG9naWNhbFdpZHRoLCBGaXhlZCk7Cisg
ICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKDAsIEZpeGVk
KTsKKyAgICB9IGVsc2UgaWYgKHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplICYmIGxv
Z2ljYWxXaWR0aC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aChjb21wdXRlTG9naWNhbFdp
ZHRoRnJvbUFzcGVjdFJhdGlvKCksIEZpeGVkKTsKICAgICBlbHNlIGlmIChsb2dpY2FsV2lkdGgu
aXNJbnRyaW5zaWMoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKGNvbXB1dGVJbnRy
aW5zaWNMb2dpY2FsV2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGNvbnRhaW5lckxvZ2ljYWxXaWR0
aCwgYm9yZGVyc1BsdXNQYWRkaW5nKSAtIGJvcmRlcnNQbHVzUGFkZGluZywgRml4ZWQpOwpAQCAt
NDA1Nyw3ICs0MDcyLDggQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNh
bEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKICAgICB9CiAKICAgICAv
LyBDYWxjdWxhdGUgY29uc3RyYWludCBlcXVhdGlvbiB2YWx1ZXMgZm9yICdtaW4taGVpZ2h0JyBj
YXNlLgotICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCkuaXNaZXJvKCkgfHwg
c3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCkuaXNJbnRyaW5zaWMoKSkgeworICAgIExlbmd0
aCBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7CisgICAg
aWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkgfHwgIWxvZ2ljYWxNaW5IZWlnaHQuaXNaZXJv
KCkgfHwgbG9naWNhbE1pbkhlaWdodC5pc0ludHJpbnNpYygpKSB7CiAgICAgICAgIExvZ2ljYWxF
eHRlbnRDb21wdXRlZFZhbHVlcyBtaW5WYWx1ZXM7CiAKICAgICAgICAgY29tcHV0ZVBvc2l0aW9u
ZWRMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0
KCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBib3JkZXJzUGx1c1Bh
ZGRpbmcsIGxvZ2ljYWxIZWlnaHQsCkBAIC00MTIyLDggKzQxMzgsMTIgQEAgdm9pZCBSZW5kZXJC
b3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5
cGUsIExlbmd0aAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMpIGNvbnN0
CiB7CiAgICAgQVNTRVJUKGhlaWdodFR5cGUgPT0gTWluU2l6ZSB8fCBoZWlnaHRUeXBlID09IE1h
aW5PclByZWZlcnJlZFNpemUgfHwgIWxvZ2ljYWxIZWlnaHRMZW5ndGguaXNBdXRvKCkpOwotICAg
IGlmIChoZWlnaHRUeXBlID09IE1pblNpemUgJiYgbG9naWNhbEhlaWdodExlbmd0aC5pc0F1dG8o
KSkKLSAgICAgICAgbG9naWNhbEhlaWdodExlbmd0aCA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAg
aWYgKGhlaWdodFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0bygp
KSB7CisgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRp
bygpKQorICAgICAgICAgICAgbG9naWNhbEhlaWdodExlbmd0aCA9IExlbmd0aChsb2dpY2FsSGVp
Z2h0LCBGaXhlZCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5n
dGggPSBMZW5ndGgoMCwgRml4ZWQpOworICAgIH0KIAogICAgIC8vICd0b3AnIGFuZCAnYm90dG9t
JyBjYW5ub3QgYm90aCBiZSAnYXV0bycgYmVjYXVzZSAndG9wIHdvdWxkIG9mIGJlZW4KICAgICAv
LyBjb252ZXJ0ZWQgdG8gdGhlIHN0YXRpYyBwb3NpdGlvbiBpbiBjb21wdXRlUG9zaXRpb25lZExv
Z2ljYWxIZWlnaHQoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0
VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZiOGU1NGM1MmQxNjA1MmQzZWY3ZDllZjIwYWM4YjJlNDk5
NTFiYmIuLjU1NGM2ZGFmYzg4NDBiNzYxNDE3NzAyNGI4NjliMTYyM2U1Nzg1YWYgMTAwNjQ0Ci0t
LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg
LTEsMyArMSwxNCBAQAorMjAyMS0wMS0yNyAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgor
CisgICAgICAgIEhhbmRsZSBtaW4td2lkdGgvbWluLWhlaWdodDphdXRvIGZvciBhc3BlY3QtcmF0
aW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDU4
MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJs
ZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwog
MjAyMS0wMS0yNyAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzE5NDAuCmRpZmYgLS1naXQgYS9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRl
eCBlZWUxNmU2MjczNjZkZjc3ZTNjZWQwNWI1OTQzN2QzZWRiYjk1OGM0Li42ZTA3ZjMwMTJkNDVj
YThkOWY3N2YwN2U0NWI3ZWY4YzkzNTVlOTk4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0
RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ0MTAs
MTYgKzQ0MTAsMTEgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWMKIHdlYmtpdC5vcmcvYi8yMTQ0
NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRl
ZC1wbGFjZWhvbGRlci5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi8y
MTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3Bl
Y3QtcmF0aW8vYWJzcG9zLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KKyMg
YWJzcG9zLTAxNC5odG1sIGRlcGVuZHMgb24gbWlzc2luZyBjb250YWluLWludHJpbnNpYy1zaXpl
IHN1cHBvcnQuCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTQuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE1Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJh
dGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlv
L2Jsb2NrLWFzcGVjdC1yYXRpby0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0
Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6
aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAxNC5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFz
cGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRp
by0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBv
cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9i
bG9jay1hc3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAgLTQ0Mjcs
NiArNDQyMiw3IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z
aXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t
dGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3cz
Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNw
ZWN0LXJhdGlvLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3
ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAx
Mi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419265</attachid>
            <date>2021-02-04 03:48:26 -0800</date>
            <delta_ts>2021-02-09 00:46:46 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210204124824.patch</filename>
            <type>text/plain</type>
            <size>10123</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVjODQ3NDU1NmMxMTQz
MDkzMzk5NGE2MzFkNmFhN2Q0ODNjMjQwNC4uZjFkMDI1ZjJmY2QyZTc4ODk0NDdkYTVlNzk5M2U0
MWNiZmM2ZDAzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAyLTA0ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGF1dG9tYXRpYyBtaW5pbXVtIHNpemUgWzFd
IGhhbmRsaW5nIGZvciBhc3BlY3QtcmF0aW8KKyAgICAgICAgYXMgc3BlY2lmaWVkIGhlcmUgWzJd
LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy0zLyNh
dXRvbWF0aWMtbWluaW11bS1zaXplCisgICAgICAgIFsyXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFp
bkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp
bmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDItMDQgIFJv
YiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBNYWtlIHNob3VsZENvbXB1dGVM
b2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW9BbmRJbnNldHMgd3JpdGluZyBtb2RlIGF3YXJlCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDM3ZjY3NjVjYjMzYTg0YTgz
OWY1YTdhMTQ2MjZhNmRjYzgyMzAxODIuLjg2ZjVhZmEwZGRmMTEyNWM2NTNmNmFiNGU4YWJhNDU5
Mzk3Zjg3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC02NjIs
NyArNjYyLDEzIEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJ
bkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBsb2dpY2FsCiAKICAgICBpZiAoIXN0eWxlVG9V
c2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSkKICAgICAgICAgbG9naWNhbFdpZHRo
ID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVz
aW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRo
LCBjYiwgZnJhZ21lbnQpKTsKLSAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21w
dXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNh
bE1pbldpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKKyAgICBMZW5ndGgg
bWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluV2lkdGgoKTsKKyAgICBpZiAoc3R5bGVU
b1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRv
KCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJl
Y3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkgeworICAgICAgICAvLyBNYWtlIHN1cmUgd2Ug
YWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlvLgorICAgICAgICBpZiAoc2hvdWxkQ29tcHV0
ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgbWluTGVuZ3RoID0g
TGVuZ3RoKE1pbkNvbnRlbnQpOworICAgIH0KKyAgICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdp
ZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIG1pbkxlbmd0
aCwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVudCkpOwogfQogCiBMYXlvdXRVbml0IFJlbmRl
ckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhl
aWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50cmluc2ljQ29udGVudEhlaWdodCkgY29uc3QK
QEAgLTY3Miw3ICs2NzgsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2lj
YWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIE8KICAgICAgICAgaWYg
KE9wdGlvbmFsPExheW91dFVuaXQ+IG1heEggPSBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1h
eFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heEhlaWdodCgpLCBpbnRyaW5zaWNDb250ZW50SGVp
Z2h0KSkKICAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1pbihsb2dpY2FsSGVpZ2h0
LCBtYXhILnZhbHVlKCkpOwogICAgIH0KLSAgICBpZiAoT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29t
cHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBz
dHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKSwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCisg
ICAgYXV0byBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7
CisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2lj
YWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAmJiBpbnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIHN0
eWxlVG9Vc2Uub3ZlcmZsb3dCbG9ja0RpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKQor
ICAgICAgICBsb2dpY2FsTWluSGVpZ2h0ID0gTGVuZ3RoKCppbnRyaW5zaWNDb250ZW50SGVpZ2h0
LCBGaXhlZCk7CisgICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhl
aWdodCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgbG9naWNhbE1pbkhlaWdo
dCwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om1heChsb2dp
Y2FsSGVpZ2h0LCBjb21wdXRlZExvZ2ljYWxIZWlnaHQudmFsdWUoKSk7CiAgICAgcmV0dXJuIGxv
Z2ljYWxIZWlnaHQ7CiB9CkBAIC0zNzg3LDkgKzM3OTYsMTUgQEAgdm9pZCBSZW5kZXJCb3g6OmNv
bXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNpbmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5n
dGggbG8KIHsKICAgICBBU1NFUlQod2lkdGhUeXBlID09IE1pblNpemUgfHwgd2lkdGhUeXBlID09
IE1haW5PclByZWZlcnJlZFNpemUgfHwgIWxvZ2ljYWxXaWR0aC5pc0F1dG8oKSk7CiAgICAgYXV0
byBvcmlnaW5hbExvZ2ljYWxXaWR0aFR5cGUgPSBsb2dpY2FsV2lkdGgudHlwZSgpOwotICAgIGlm
ICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkpCi0gICAgICAg
IGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhlZCk7Ci0gICAgZWxzZSBpZiAod2lkdGhUeXBl
ID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpICYmIHNob3Vs
ZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkKKyAgICBpZiAod2lkdGhUeXBl
ID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlzQXV0bygpKSB7CisgICAgICAgIGlmIChzaG91
bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpIHsKKyAgICAgICAgICAgIExh
eW91dFVuaXQgbWluTG9naWNhbFdpZHRoOworICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXhMb2dp
Y2FsV2lkdGg7CisgICAgICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5M
b2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICBsb2dpY2FsV2lkdGgg
PSBMZW5ndGgobWluTG9naWNhbFdpZHRoLCBGaXhlZCk7CisgICAgICAgIH0gZWxzZQorICAgICAg
ICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKDAsIEZpeGVkKTsKKyAgICB9IGVsc2UgaWYgKHdp
ZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSAm
JiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIGxv
Z2ljYWxXaWR0aCA9IExlbmd0aChjb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCks
IEZpeGVkKTsKICAgICBlbHNlIGlmIChsb2dpY2FsV2lkdGguaXNJbnRyaW5zaWMoKSkKICAgICAg
ICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2lu
Zyhsb2dpY2FsV2lkdGgsIGNvbnRhaW5lckxvZ2ljYWxXaWR0aCwgYm9yZGVyc1BsdXNQYWRkaW5n
KSAtIGJvcmRlcnNQbHVzUGFkZGluZywgRml4ZWQpOwpAQCAtNDA2MCw3ICs0MDc1LDggQEAgdm9p
ZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50
Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKICAgICB9CiAKICAgICAvLyBDYWxjdWxhdGUgY29uc3RyYWlu
dCBlcXVhdGlvbiB2YWx1ZXMgZm9yICdtaW4taGVpZ2h0JyBjYXNlLgotICAgIGlmICghc3R5bGVU
b1VzZS5sb2dpY2FsTWluSGVpZ2h0KCkuaXNaZXJvKCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsTWlu
SGVpZ2h0KCkuaXNJbnRyaW5zaWMoKSkgeworICAgIExlbmd0aCBsb2dpY2FsTWluSGVpZ2h0ID0g
c3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7CisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQu
aXNBdXRvKCkgfHwgIWxvZ2ljYWxNaW5IZWlnaHQuaXNaZXJvKCkgfHwgbG9naWNhbE1pbkhlaWdo
dC5pc0ludHJpbnNpYygpKSB7CiAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBt
aW5WYWx1ZXM7CiAKICAgICAgICAgY29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmco
TWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCksIGNvbnRhaW5lckJsb2NrLCBj
b250YWluZXJMb2dpY2FsSGVpZ2h0LCBib3JkZXJzUGx1c1BhZGRpbmcsIGxvZ2ljYWxIZWlnaHQs
CkBAIC00MTI1LDggKzQxNDEsMTIgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk
TG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhlaWdodFR5cGUsIExlbmd0aAogICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIExvZ2ljYWxFeHRlbnRD
b21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGhlaWdo
dFR5cGUgPT0gTWluU2l6ZSB8fCBoZWlnaHRUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgfHwg
IWxvZ2ljYWxIZWlnaHRMZW5ndGguaXNBdXRvKCkpOwotICAgIGlmIChoZWlnaHRUeXBlID09IE1p
blNpemUgJiYgbG9naWNhbEhlaWdodExlbmd0aC5pc0F1dG8oKSkKLSAgICAgICAgbG9naWNhbEhl
aWdodExlbmd0aCA9IExlbmd0aCgwLCBGaXhlZCk7CisgICAgaWYgKGhlaWdodFR5cGUgPT0gTWlu
U2l6ZSAmJiBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0bygpKSB7CisgICAgICAgIGlmIChzaG91
bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQorICAgICAgICAgICAgbG9n
aWNhbEhlaWdodExlbmd0aCA9IExlbmd0aChsb2dpY2FsSGVpZ2h0LCBGaXhlZCk7CisgICAgICAg
IGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHRMZW5ndGggPSBMZW5ndGgoMCwgRml4ZWQp
OworICAgIH0KIAogICAgIC8vICd0b3AnIGFuZCAnYm90dG9tJyBjYW5ub3QgYm90aCBiZSAnYXV0
bycgYmVjYXVzZSAndG9wIHdvdWxkIG9mIGJlZW4KICAgICAvLyBjb252ZXJ0ZWQgdG8gdGhlIHN0
YXRpYyBwb3NpdGlvbiBpbiBjb21wdXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHQoKQpkaWZmIC0t
Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4
IDg5NGJkYTQ1ZTY1NGY4OWQ0NWFhNWJlZWU4ODE2ODA2NWMzNzE1MDUuLjJhZTk4NTFlMmJkYmE0
OWRlMmNjMzcyZDk4YjY0NzYyYTY1OWY5YWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0w
Mi0wNCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIEhhbmRsZSBtaW4t
d2lkdGgvbWluLWhlaWdodDphdXRvIGZvciBhc3BlY3QtcmF0aW8KKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDU4MgorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSB0ZXN0cyB0aGF0IHBhc3Mgbm93
LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wMi0wNCAgUm9iIEJ1aXMg
IDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE1ha2Ugc2hvdWxkQ29tcHV0ZUxvZ2ljYWxX
aWR0aEZyb21Bc3BlY3RSYXRpb0FuZEluc2V0cyB3cml0aW5nIG1vZGUgYXdhcmUKZGlmZiAtLWdp
dCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCmluZGV4IDNmN2E1MmIyNTFiNDBjNGVmNjdmOWY4YzFjZjdmYjA1OThjOThmZjIuLjg1
NjY2MTYwODIzY2QyMDlhNTM1MWE3ZjMxZjI3MjA4NDQyNjVhYmUgMTAwNjQ0Ci0tLSBhL0xheW91
dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u
cwpAQCAtNDQwOCwxNSArNDQwOCw5IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjCiB3ZWJraXQu
b3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29w
aW5nL3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0aXZlLmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRlci5odG1sIFsgSW1hZ2VPbmx5
RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMi5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTMuaHRtbCBb
IEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw
ZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMDYuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv
LTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Js
b2NrLWFzcGVjdC1yYXRpby0wMTUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9y
Zy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5n
L2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE3Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAyNC5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVj
dC1yYXRpby0wMjguaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDMwLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KQEAg
LTQ0MjQsNiArNDQxOCw3IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vCiB3ZWJraXQub3JnL2Iv
MjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw
ZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
CiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz
L2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwNC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlv
LTAwNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCit3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Zs
ZXgtYXNwZWN0LXJhdGlvLTAwOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3Jn
L2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcv
YXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVy
ZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv
Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJhdGlvLTAxMS5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2ZsZXgtYXNwZWN0LXJh
dGlvLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419685</attachid>
            <date>2021-02-09 00:46:55 -0800</date>
            <delta_ts>2021-02-11 01:54:22 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210209094652.patch</filename>
            <type>text/plain</type>
            <size>9803</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTExNmFlNGQ5OGRlNTYy
YTcwOThhNTI5ZWU4ODYzMTM5ODUxY2IzMi4uYzZlNzc0NTI1MTA3ZjhkNTgwNzdjM2RmOWU3YjU4
ZDFkMDhjOGYwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAyLTA5ICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ
IChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IGF1dG9tYXRpYyBtaW5pbXVtIHNpemUgWzFd
IGhhbmRsaW5nIGZvciBhc3BlY3QtcmF0aW8KKyAgICAgICAgYXMgc3BlY2lmaWVkIGhlcmUgWzJd
LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy0zLyNh
dXRvbWF0aWMtbWluaW11bS1zaXplCisgICAgICAgIFsyXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFp
bkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp
bmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDItMDggIFJv
YiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBNYWtlIGF1dG8gJiYgPHJhdGlv
PiB1c2UgY29udGVudCBib3gtc2l6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu
Y3BwCmluZGV4IDJlZGVhMzQxNjNlZGJmZDUyMWM4ZGJiMzY5ZTk0MWQ0MGI2NDczYjkuLmU2ZGRm
MmU4YThmYWM3OGIwZDFiNWFjYzI2YmI1MjFlMTU5NjdhYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl
cmluZy9SZW5kZXJCb3guY3BwCkBAIC02NjIsNyArNjYyLDEzIEBAIExheW91dFVuaXQgUmVuZGVy
Qm94Ojpjb25zdHJhaW5Mb2dpY2FsV2lkdGhJbkZyYWdtZW50QnlNaW5NYXgoTGF5b3V0VW5pdCBs
b2dpY2FsCiAKICAgICBpZiAoIXN0eWxlVG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmlu
ZWQoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gc3RkOjptaW4obG9naWNhbFdpZHRoLCBjb21w
dXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNh
bE1heFdpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBjYiwgZnJhZ21lbnQpKTsKLSAgICByZXR1cm4g
c3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5n
KE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1pbldpZHRoKCksIGF2YWlsYWJsZVdpZHRoLCBj
YiwgZnJhZ21lbnQpKTsKKyAgICBMZW5ndGggbWluTGVuZ3RoID0gc3R5bGVUb1VzZS5sb2dpY2Fs
TWluV2lkdGgoKTsKKyAgICBpZiAoc3R5bGVUb1VzZS5oYXNBc3BlY3RSYXRpbygpICYmIHN0eWxl
VG9Vc2UubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgbWluTGVuZ3RoLmlzQXV0bygpICYmIHN0
eWxlVG9Vc2Uub3ZlcmZsb3dJbmxpbmVEaXJlY3Rpb24oKSA9PSBPdmVyZmxvdzo6VmlzaWJsZSkg
eworICAgICAgICAvLyBNYWtlIHN1cmUgd2UgYWN0dWFsbHkgdXNlZCB0aGUgYXNwZWN0IHJhdGlv
LgorICAgICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygp
KQorICAgICAgICAgICAgbWluTGVuZ3RoID0gTGVuZ3RoKE1pbkNvbnRlbnQpOworICAgIH0KKyAg
ICByZXR1cm4gc3RkOjptYXgobG9naWNhbFdpZHRoLCBjb21wdXRlTG9naWNhbFdpZHRoSW5GcmFn
bWVudFVzaW5nKE1pblNpemUsIG1pbkxlbmd0aCwgYXZhaWxhYmxlV2lkdGgsIGNiLCBmcmFnbWVu
dCkpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5
TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgT3B0aW9uYWw8TGF5b3V0VW5pdD4gaW50
cmluc2ljQ29udGVudEhlaWdodCkgY29uc3QKQEAgLTY3Miw3ICs2NzgsMTAgQEAgTGF5b3V0VW5p
dCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxv
Z2ljYWxIZWlnaHQsIE8KICAgICAgICAgaWYgKE9wdGlvbmFsPExheW91dFVuaXQ+IG1heEggPSBj
b21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1heEhl
aWdodCgpLCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSkKICAgICAgICAgICAgIGxvZ2ljYWxIZWln
aHQgPSBzdGQ6Om1pbihsb2dpY2FsSGVpZ2h0LCBtYXhILnZhbHVlKCkpOwogICAgIH0KLSAgICBp
ZiAoT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxv
Z2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKSwg
aW50cmluc2ljQ29udGVudEhlaWdodCkpCisgICAgYXV0byBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5
bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7CisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNB
dXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8oKSAmJiBp
bnRyaW5zaWNDb250ZW50SGVpZ2h0ICYmIHN0eWxlVG9Vc2Uub3ZlcmZsb3dCbG9ja0RpcmVjdGlv
bigpID09IE92ZXJmbG93OjpWaXNpYmxlKQorICAgICAgICBsb2dpY2FsTWluSGVpZ2h0ID0gTGVu
Z3RoKCppbnRyaW5zaWNDb250ZW50SGVpZ2h0LCBGaXhlZCk7CisgICAgaWYgKE9wdGlvbmFsPExh
eW91dFVuaXQ+IGNvbXB1dGVkTG9naWNhbEhlaWdodCA9IGNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNp
bmcoTWluU2l6ZSwgbG9naWNhbE1pbkhlaWdodCwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCiAg
ICAgICAgIHJldHVybiBzdGQ6Om1heChsb2dpY2FsSGVpZ2h0LCBjb21wdXRlZExvZ2ljYWxIZWln
aHQudmFsdWUoKSk7CiAgICAgcmV0dXJuIGxvZ2ljYWxIZWlnaHQ7CiB9CkBAIC0zNzg3LDkgKzM3
OTYsMTUgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp
bmcoU2l6ZVR5cGUgd2lkdGhUeXBlLCBMZW5ndGggbG8KIHsKICAgICBBU1NFUlQod2lkdGhUeXBl
ID09IE1pblNpemUgfHwgd2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgfHwgIWxvZ2lj
YWxXaWR0aC5pc0F1dG8oKSk7CiAgICAgYXV0byBvcmlnaW5hbExvZ2ljYWxXaWR0aFR5cGUgPSBs
b2dpY2FsV2lkdGgudHlwZSgpOwotICAgIGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dp
Y2FsV2lkdGguaXNBdXRvKCkpCi0gICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aCgwLCBGaXhl
ZCk7Ci0gICAgZWxzZSBpZiAod2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgbG9n
aWNhbFdpZHRoLmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0
UmF0aW8oKSkKKyAgICBpZiAod2lkdGhUeXBlID09IE1pblNpemUgJiYgbG9naWNhbFdpZHRoLmlz
QXV0bygpKSB7CisgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVj
dFJhdGlvKCkpIHsKKyAgICAgICAgICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoOworICAg
ICAgICAgICAgTGF5b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGg7CisgICAgICAgICAgICBjb21wdXRl
SW50cmluc2ljTG9naWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7
CisgICAgICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgobWluTG9naWNhbFdpZHRoLCBGaXhl
ZCk7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKDAs
IEZpeGVkKTsKKyAgICB9IGVsc2UgaWYgKHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXpl
ICYmIGxvZ2ljYWxXaWR0aC5pc0F1dG8oKSAmJiBzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJv
bUFzcGVjdFJhdGlvKCkpCiAgICAgICAgIGxvZ2ljYWxXaWR0aCA9IExlbmd0aChjb21wdXRlTG9n
aWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCksIEZpeGVkKTsKICAgICBlbHNlIGlmIChsb2dpY2Fs
V2lkdGguaXNJbnRyaW5zaWMoKSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKGNvbXB1
dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhVc2luZyhsb2dpY2FsV2lkdGgsIGNvbnRhaW5lckxvZ2lj
YWxXaWR0aCwgYm9yZGVyc1BsdXNQYWRkaW5nKSAtIGJvcmRlcnNQbHVzUGFkZGluZywgRml4ZWQp
OwpAQCAtNDA2MCw3ICs0MDc1LDggQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVk
TG9naWNhbEhlaWdodChMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXAKICAgICB9CiAK
ICAgICAvLyBDYWxjdWxhdGUgY29uc3RyYWludCBlcXVhdGlvbiB2YWx1ZXMgZm9yICdtaW4taGVp
Z2h0JyBjYXNlLgotICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCkuaXNaZXJv
KCkgfHwgc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCkuaXNJbnRyaW5zaWMoKSkgeworICAg
IExlbmd0aCBsb2dpY2FsTWluSGVpZ2h0ID0gc3R5bGVUb1VzZS5sb2dpY2FsTWluSGVpZ2h0KCk7
CisgICAgaWYgKGxvZ2ljYWxNaW5IZWlnaHQuaXNBdXRvKCkgfHwgIWxvZ2ljYWxNaW5IZWlnaHQu
aXNaZXJvKCkgfHwgbG9naWNhbE1pbkhlaWdodC5pc0ludHJpbnNpYygpKSB7CiAgICAgICAgIExv
Z2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBtaW5WYWx1ZXM7CiAKICAgICAgICAgY29tcHV0ZVBv
c2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWlu
SGVpZ2h0KCksIGNvbnRhaW5lckJsb2NrLCBjb250YWluZXJMb2dpY2FsSGVpZ2h0LCBib3JkZXJz
UGx1c1BhZGRpbmcsIGxvZ2ljYWxIZWlnaHQsCkBAIC00MTI1LDggKzQxNDEsMTIgQEAgdm9pZCBS
ZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhlaWdodFVzaW5nKFNpemVUeXBlIGhl
aWdodFR5cGUsIExlbmd0aAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcHV0ZWRWYWx1ZXMp
IGNvbnN0CiB7CiAgICAgQVNTRVJUKGhlaWdodFR5cGUgPT0gTWluU2l6ZSB8fCBoZWlnaHRUeXBl
ID09IE1haW5PclByZWZlcnJlZFNpemUgfHwgIWxvZ2ljYWxIZWlnaHRMZW5ndGguaXNBdXRvKCkp
OwotICAgIGlmIChoZWlnaHRUeXBlID09IE1pblNpemUgJiYgbG9naWNhbEhlaWdodExlbmd0aC5p
c0F1dG8oKSkKLSAgICAgICAgbG9naWNhbEhlaWdodExlbmd0aCA9IExlbmd0aCgwLCBGaXhlZCk7
CisgICAgaWYgKGhlaWdodFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlz
QXV0bygpKSB7CisgICAgICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3Bl
Y3RSYXRpbygpKQorICAgICAgICAgICAgbG9naWNhbEhlaWdodExlbmd0aCA9IExlbmd0aChsb2dp
Y2FsSGVpZ2h0LCBGaXhlZCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGxvZ2ljYWxIZWln
aHRMZW5ndGggPSBMZW5ndGgoMCwgRml4ZWQpOworICAgIH0KIAogICAgIC8vICd0b3AnIGFuZCAn
Ym90dG9tJyBjYW5ub3QgYm90aCBiZSAnYXV0bycgYmVjYXVzZSAndG9wIHdvdWxkIG9mIGJlZW4K
ICAgICAvLyBjb252ZXJ0ZWQgdG8gdGhlIHN0YXRpYyBwb3NpdGlvbiBpbiBjb21wdXRlUG9zaXRp
b25lZExvZ2ljYWxIZWlnaHQoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDFkZjVmY2M5ZTRjNDBiMGNhMWE2NGNiZjU3YjAz
MDUwOGM4MTg2MzguLmM4ZDVhZjY5MjNlMzRhNTA3N2JmNGI5ODk5ZWE4N2ZhNjRiNWY2ZTMgMTAw
NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM
b2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0wMi0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEu
Y29tPgorCisgICAgICAgIEhhbmRsZSBtaW4td2lkdGgvbWluLWhlaWdodDphdXRvIGZvciBhc3Bl
Y3QtcmF0aW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTIyMDU4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IEVuYWJsZSB0ZXN0cyB0aGF0IHBhc3Mgbm93LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9u
czoKKwogMjAyMS0wMi0wOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAg
IE1ha2UgYXV0byAmJiA8cmF0aW8+IHVzZSBjb250ZW50IGJveC1zaXppbmcKZGlmZiAtLWdpdCBh
L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp
b25zCmluZGV4IGRhNjcyN2IxNDNmYmM0ODJlZDNiYjVmMDE2Zjg1NTI2YWYzNmEyZWUuLmRiODg4
ODZmMDVmMjBkN2UwMmIwZWFiYmRhYzhiY2M4YmNiODZiNDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRl
c3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpA
QCAtNDQxMCwxMyArNDQxMCw3IEBAIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNjb3Bpbmcvc2hhZG93LWRpcmVjCiB3ZWJraXQub3Jn
L2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5n
L3NoYWRvdy1kaXJlY3Rpb25hbGl0eS0wMDIudGVudGF0aXZlLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjIgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLXNjb3Bpbmcvc2xvdHRlZC1wbGFjZWhvbGRlci5odG1sIFsgSW1hZ2VPbmx5RmFp
bHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYWJzcG9zLTAxMi5odG1sIFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZv
cm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Fic3Bvcy0wMTMuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9hYnNwb3MtMDE0Lmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0
LXJhdGlvLTAwOS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE1Lmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAx
Ny5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2Nr
LWFzcGVjdC1yYXRpby0wMjQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz
cGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9j
c3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzMC5odG1sIFsg
SW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC00NDI0LDYgKzQ0MTgsNyBAQCB3ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvLwogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDIuaHRt
bCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVj
dC1yYXRpby0wMDQuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1y
YXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQord2Vi
a2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
c2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDguaHRtbCBbIEltYWdlT25s
eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMDku
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93
M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9mbGV4LWFz
cGVjdC1yYXRpby0wMTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9mbGV4LWFzcGVjdC1yYXRpby0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>419966</attachid>
            <date>2021-02-11 01:54:31 -0800</date>
            <delta_ts>2021-02-11 02:55:26 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220582-20210211105428.patch</filename>
            <type>text/plain</type>
            <size>9831</size>
            <attacher name="Rob Buis">rbuis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWIzNGY5ZWY5NGM2MTg4
MmE1ODdkZDYwODE1YTgwZmZkOWZjMGZlMi4uZDhjOTcwNjczZWRjYWFmOTE1MjQ0YjU0YmM3NWM3
ZjQyYzBjZGIyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAyLTExICBSb2Ig
QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgSGFuZGxlIG1pbi13aWR0aC9taW4t
aGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkg
S29pdmlzdG8uCisKKyAgICAgICAgSW1wbGVtZW50IGF1dG9tYXRpYyBtaW5pbXVtIHNpemUgWzFd
IGhhbmRsaW5nIGZvciBhc3BlY3QtcmF0aW8KKyAgICAgICAgYXMgc3BlY2lmaWVkIGhlcmUgWzJd
LgorCisgICAgICAgIFsxXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXNpemluZy0zLyNh
dXRvbWF0aWMtbWluaW11bS1zaXplCisgICAgICAgIFsyXSBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8tbWluaW11bQorCisgICAgICAgICogcmVuZGVy
aW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbnN0cmFp
bkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heCBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl
OjpSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCBjb25zdCk6CisgICAg
ICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbFdpZHRoVXNp
bmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUG9zaXRpb25l
ZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21w
dXRlUG9zaXRpb25lZExvZ2ljYWxIZWlnaHRVc2luZyBjb25zdCk6CisKIDIwMjEtMDItMTEgIFpp
cmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KIAogICAgICAgICB0aGUgbmVzdGVkIGdyaWQgY29u
dGFpbmVyIHdoaWNoIGhhcyByZXBsYWNlZCBpdGVtIHdpdGggJ21heC1oZWlnaHQnIGhhcyB3cm9u
ZyB3aWR0aCgwcHgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl
ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCAy
ZWRlYTM0MTYzZWRiZmQ1MjFjOGRiYjM2OWU5NDFkNDBiNjQ3M2I5Li4zZDZiOTY4OTkwMDBmZDNl
MWFjYzA3NjJjM2I5NGMyMzUzNDgwMjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy
Qm94LmNwcApAQCAtNjYyLDcgKzY2MiwxMyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29uc3Ry
YWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbAogCiAg
ICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkpCiAgICAg
ICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6bWluKGxvZ2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxX
aWR0aEluRnJhZ21lbnRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgp
LCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KGxv
Z2ljYWxXaWR0aCwgY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBz
dHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50
KSk7CisgICAgYXV0byBtaW5MZW5ndGggPSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5XaWR0aCgpOwor
ICAgIGlmIChzdHlsZVRvVXNlLmhhc0FzcGVjdFJhdGlvKCkgJiYgc3R5bGVUb1VzZS5sb2dpY2Fs
V2lkdGgoKS5pc0F1dG8oKSAmJiBtaW5MZW5ndGguaXNBdXRvKCkgJiYgc3R5bGVUb1VzZS5vdmVy
Zmxvd0lubGluZURpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CisgICAgICAgIC8v
IE1ha2Ugc3VyZSB3ZSBhY3R1YWxseSB1c2VkIHRoZSBhc3BlY3QgcmF0aW8uCisgICAgICAgIGlm
IChzaG91bGRDb21wdXRlTG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCkpCisgICAgICAgICAg
ICBtaW5MZW5ndGggPSBMZW5ndGgoTWluQ29udGVudCk7CisgICAgfQorICAgIHJldHVybiBzdGQ6
Om1heChsb2dpY2FsV2lkdGgsIGNvbXB1dGVMb2dpY2FsV2lkdGhJbkZyYWdtZW50VXNpbmcoTWlu
U2l6ZSwgbWluTGVuZ3RoLCBhdmFpbGFibGVXaWR0aCwgY2IsIGZyYWdtZW50KSk7CiB9CiAKIExh
eW91dFVuaXQgUmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0
VW5pdCBsb2dpY2FsSGVpZ2h0LCBPcHRpb25hbDxMYXlvdXRVbml0PiBpbnRyaW5zaWNDb250ZW50
SGVpZ2h0KSBjb25zdApAQCAtNjcyLDcgKzY3OCwxMCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6
Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwg
TwogICAgICAgICBpZiAoT3B0aW9uYWw8TGF5b3V0VW5pdD4gbWF4SCA9IGNvbXB1dGVMb2dpY2Fs
SGVpZ2h0VXNpbmcoTWF4U2l6ZSwgc3R5bGVUb1VzZS5sb2dpY2FsTWF4SGVpZ2h0KCksIGludHJp
bnNpY0NvbnRlbnRIZWlnaHQpKQogICAgICAgICAgICAgbG9naWNhbEhlaWdodCA9IHN0ZDo6bWlu
KGxvZ2ljYWxIZWlnaHQsIG1heEgudmFsdWUoKSk7CiAgICAgfQotICAgIGlmIChPcHRpb25hbDxM
YXlvdXRVbml0PiBjb21wdXRlZExvZ2ljYWxIZWlnaHQgPSBjb21wdXRlTG9naWNhbEhlaWdodFVz
aW5nKE1pblNpemUsIHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdodCgpLCBpbnRyaW5zaWNDb250
ZW50SGVpZ2h0KSkKKyAgICBhdXRvIGxvZ2ljYWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNlLmxvZ2lj
YWxNaW5IZWlnaHQoKTsKKyAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1dG8oKSAmJiBzaG91
bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpICYmIGludHJpbnNpY0NvbnRl
bnRIZWlnaHQgJiYgc3R5bGVUb1VzZS5vdmVyZmxvd0Jsb2NrRGlyZWN0aW9uKCkgPT0gT3ZlcmZs
b3c6OlZpc2libGUpCisgICAgICAgIGxvZ2ljYWxNaW5IZWlnaHQgPSBMZW5ndGgoKmludHJpbnNp
Y0NvbnRlbnRIZWlnaHQsIEZpeGVkKTsKKyAgICBpZiAoT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29t
cHV0ZWRMb2dpY2FsSGVpZ2h0ID0gY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBs
b2dpY2FsTWluSGVpZ2h0LCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSkKICAgICAgICAgcmV0dXJu
IHN0ZDo6bWF4KGxvZ2ljYWxIZWlnaHQsIGNvbXB1dGVkTG9naWNhbEhlaWdodC52YWx1ZSgpKTsK
ICAgICByZXR1cm4gbG9naWNhbEhlaWdodDsKIH0KQEAgLTM3ODcsOSArMzc5NiwxNSBAQCB2b2lk
IFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsV2lkdGhVc2luZyhTaXplVHlwZSB3
aWR0aFR5cGUsIExlbmd0aCBsbwogewogICAgIEFTU0VSVCh3aWR0aFR5cGUgPT0gTWluU2l6ZSB8
fCB3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVycmVkU2l6ZSB8fCAhbG9naWNhbFdpZHRoLmlzQXV0
bygpKTsKICAgICBhdXRvIG9yaWdpbmFsTG9naWNhbFdpZHRoVHlwZSA9IGxvZ2ljYWxXaWR0aC50
eXBlKCk7Ci0gICAgaWYgKHdpZHRoVHlwZSA9PSBNaW5TaXplICYmIGxvZ2ljYWxXaWR0aC5pc0F1
dG8oKSkKLSAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKDAsIEZpeGVkKTsKLSAgICBlbHNl
IGlmICh3aWR0aFR5cGUgPT0gTWFpbk9yUHJlZmVycmVkU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNB
dXRvKCkgJiYgc2hvdWxkQ29tcHV0ZUxvZ2ljYWxXaWR0aEZyb21Bc3BlY3RSYXRpbygpKQorICAg
IGlmICh3aWR0aFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsV2lkdGguaXNBdXRvKCkpIHsKKyAg
ICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKSkgewor
ICAgICAgICAgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGg7CisgICAgICAgICAgICBMYXlv
dXRVbml0IG1heExvZ2ljYWxXaWR0aDsKKyAgICAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dp
Y2FsV2lkdGhzKG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAg
IGxvZ2ljYWxXaWR0aCA9IExlbmd0aChtaW5Mb2dpY2FsV2lkdGgsIEZpeGVkKTsKKyAgICAgICAg
fSBlbHNlCisgICAgICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoMCwgRml4ZWQpOworICAg
IH0gZWxzZSBpZiAod2lkdGhUeXBlID09IE1haW5PclByZWZlcnJlZFNpemUgJiYgbG9naWNhbFdp
ZHRoLmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8o
KSkKICAgICAgICAgbG9naWNhbFdpZHRoID0gTGVuZ3RoKGNvbXB1dGVMb2dpY2FsV2lkdGhGcm9t
QXNwZWN0UmF0aW8oKSwgRml4ZWQpOwogICAgIGVsc2UgaWYgKGxvZ2ljYWxXaWR0aC5pc0ludHJp
bnNpYygpKQogICAgICAgICBsb2dpY2FsV2lkdGggPSBMZW5ndGgoY29tcHV0ZUludHJpbnNpY0xv
Z2ljYWxXaWR0aFVzaW5nKGxvZ2ljYWxXaWR0aCwgY29udGFpbmVyTG9naWNhbFdpZHRoLCBib3Jk
ZXJzUGx1c1BhZGRpbmcpIC0gYm9yZGVyc1BsdXNQYWRkaW5nLCBGaXhlZCk7CkBAIC00MDYwLDcg
KzQwNzUsOCBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0
KExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyYgY29tcAogICAgIH0KIAogICAgIC8vIENhbGN1
bGF0ZSBjb25zdHJhaW50IGVxdWF0aW9uIHZhbHVlcyBmb3IgJ21pbi1oZWlnaHQnIGNhc2UuCi0g
ICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKS5pc1plcm8oKSB8fCBzdHlsZVRv
VXNlLmxvZ2ljYWxNaW5IZWlnaHQoKS5pc0ludHJpbnNpYygpKSB7CisgICAgTGVuZ3RoIGxvZ2lj
YWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKTsKKyAgICBpZiAobG9n
aWNhbE1pbkhlaWdodC5pc0F1dG8oKSB8fCAhbG9naWNhbE1pbkhlaWdodC5pc1plcm8oKSB8fCBs
b2dpY2FsTWluSGVpZ2h0LmlzSW50cmluc2ljKCkpIHsKICAgICAgICAgTG9naWNhbEV4dGVudENv
bXB1dGVkVmFsdWVzIG1pblZhbHVlczsKIAogICAgICAgICBjb21wdXRlUG9zaXRpb25lZExvZ2lj
YWxIZWlnaHRVc2luZyhNaW5TaXplLCBzdHlsZVRvVXNlLmxvZ2ljYWxNaW5IZWlnaHQoKSwgY29u
dGFpbmVyQmxvY2ssIGNvbnRhaW5lckxvZ2ljYWxIZWlnaHQsIGJvcmRlcnNQbHVzUGFkZGluZywg
bG9naWNhbEhlaWdodCwKQEAgLTQxMjUsOCArNDE0MSwxMiBAQCB2b2lkIFJlbmRlckJveDo6Y29t
cHV0ZVBvc2l0aW9uZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVu
Z3RoCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlZFZhbHVlcykgY29uc3QKIHsKICAg
ICBBU1NFUlQoaGVpZ2h0VHlwZSA9PSBNaW5TaXplIHx8IGhlaWdodFR5cGUgPT0gTWFpbk9yUHJl
ZmVycmVkU2l6ZSB8fCAhbG9naWNhbEhlaWdodExlbmd0aC5pc0F1dG8oKSk7Ci0gICAgaWYgKGhl
aWdodFR5cGUgPT0gTWluU2l6ZSAmJiBsb2dpY2FsSGVpZ2h0TGVuZ3RoLmlzQXV0bygpKQotICAg
ICAgICBsb2dpY2FsSGVpZ2h0TGVuZ3RoID0gTGVuZ3RoKDAsIEZpeGVkKTsKKyAgICBpZiAoaGVp
Z2h0VHlwZSA9PSBNaW5TaXplICYmIGxvZ2ljYWxIZWlnaHRMZW5ndGguaXNBdXRvKCkpIHsKKyAg
ICAgICAgaWYgKHNob3VsZENvbXB1dGVMb2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkpCisg
ICAgICAgICAgICBsb2dpY2FsSGVpZ2h0TGVuZ3RoID0gTGVuZ3RoKGxvZ2ljYWxIZWlnaHQsIEZp
eGVkKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbG9naWNhbEhlaWdodExlbmd0aCA9IExl
bmd0aCgwLCBGaXhlZCk7CisgICAgfQogCiAgICAgLy8gJ3RvcCcgYW5kICdib3R0b20nIGNhbm5v
dCBib3RoIGJlICdhdXRvJyBiZWNhdXNlICd0b3Agd291bGQgb2YgYmVlbgogICAgIC8vIGNvbnZl
cnRlZCB0byB0aGUgc3RhdGljIHBvc2l0aW9uIGluIGNvbXB1dGVQb3NpdGlvbmVkTG9naWNhbEhl
aWdodCgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D
aGFuZ2VMb2cKaW5kZXggZjY3OGRjZWI0ZTg1NDFmYTkwNjExMzU2YTdiMWU5NWIwNWI3YTkwZi4u
MmUyNmI5YmQyMWM4ZmUwNzlmNTA3NjBkYTZlNTkzMDRhZDMwYWUzOCAxMDA2NDQKLS0tIGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx
LDE0IEBACisyMDIxLTAyLTExICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAg
ICAgSGFuZGxlIG1pbi13aWR0aC9taW4taGVpZ2h0OmF1dG8gZm9yIGFzcGVjdC1yYXRpbworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNTgyCisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgRW5hYmxlIHRlc3Rz
IHRoYXQgcGFzcyBub3cuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTAy
LTEwICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgVXNlIGV2ZW50IGxv
b3AgdG8gc2V0IHRpdGxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25z
IGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA1MmIxNTJlMGE0NTA4OTA2NDNh
OGE1YTZhZWVjNWI4ZDVkNzhmZTMxLi5mYzU0ZDlmMTQzZWFlMGY1NjRiNDIyNzI0MjE5NzgzNmY2
NTRiMTJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTQ1NTUsMTMgKzQ1NTUsNyBAQCB3ZWJraXQu
b3JnL2IvMjE0NDYyIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29w
aW5nL3NoYWRvdy1kaXJlYwogd2Via2l0Lm9yZy9iLzIxNDQ2MiBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2NvcGluZy9zaGFkb3ctZGlyZWN0aW9uYWxpdHktMDAyLnRl
bnRhdGl2ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYyIGlt
cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zY29waW5nL3Nsb3R0ZWQtcGxh
Y2Vob2xkZXIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMjE0NDYz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJh
dGlvL2Fic3Bvcy0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIx
NDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj
dC1yYXRpby9hYnNwb3MtMDEzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcv
Yi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h
c3BlY3QtcmF0aW8vYWJzcG9zLTAxNC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQu
b3JnL2IvMjE0NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXpp
bmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMDkuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQotd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDE0Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNw
ZWN0LXJhdGlvLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMjE0
NDYzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0
LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMTcuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDI0Lmh0bWwgWyBJbWFn
ZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv
LTAyOC5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE0NDYzIGltcG9y
dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Js
b2NrLWFzcGVjdC1yYXRpby0wMzAuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtNDU2OSw2
ICs0NTYzLDcgQEAgd2Via2l0Lm9yZy9iLzIxNDQ2MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby8KIHdlYmtpdC5vcmcvYi8yMTQ0NjMg
aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0
aW8vZmxleC1hc3BlY3QtcmF0aW8tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNp
emluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA0Lmh0bWwgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA1Lmh0
bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3Bl
Y3QtcmF0aW8tMDA4Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0
NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3Qt
cmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDA5Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDExLmh0bWwgWyBJbWFnZU9u
bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTQ0NjMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9y
bS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vZmxleC1hc3BlY3QtcmF0aW8tMDEy
Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
      

    </bug>

</bugzilla>