<?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>225590</bug_id>
          
          <creation_ts>2021-05-10 04:34:44 -0700</creation_ts>
          <short_desc>[css-flexbox] Do not clamp flex base size with {min|max}-{height|width}</short_desc>
          <delta_ts>2021-10-29 13:20:12 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>REOPENED</bug_status>
          <resolution></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>
          <dependson>227764</dependson>
    
    <dependson>232481</dependson>
          <blocked>227597</blocked>
    
    <blocked>227878</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Sergio Villar Senin">svillar</reporter>
          <assigned_to name="Sergio Villar Senin">svillar</assigned_to>
          <cc>cdumez</cc>
    
    <cc>changseok</cc>
    
    <cc>commit-queue</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>graouts</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>pdr</cc>
    
    <cc>rego</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>svillar</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
    
    <cc>ysuzuki</cc>
    
    <cc>zalan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1758466</commentid>
    <comment_count>0</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-05-10 04:34:44 -0700</bug_when>
    <thetext>[css-flexbox] Do not clamp flex base size with {min|max}-{height|width}</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1758467</commentid>
    <comment_count>1</comment_count>
      <attachid>428165</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-05-10 04:48:56 -0700</bug_when>
    <thetext>Created attachment 428165
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1760723</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-05-17 04:35:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/78100329&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1769429</commentid>
    <comment_count>3</comment_count>
      <attachid>431337</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-06-14 09:27:53 -0700</bug_when>
    <thetext>Created attachment 431337
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772534</commentid>
    <comment_count>4</comment_count>
      <attachid>431337</attachid>
    <who name="alan">zalan</who>
    <bug_when>2021-06-24 20:29:53 -0700</bug_when>
    <thetext>Comment on attachment 431337
Patch

:( same as https://bugs.webkit.org/show_bug.cgi?id=226634#c5</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772538</commentid>
    <comment_count>5</comment_count>
      <attachid>431337</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2021-06-24 20:37:35 -0700</bug_when>
    <thetext>Comment on attachment 431337
Patch

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

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1309
&gt; +// A scoped class that resets either min-width &amp; max-witdh or min-height &amp; max-height (depending on the

witdh

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1314
&gt; +class ScopedUnboundedBox {

Can we share some of this with DisableMinMaxConstrainsScope?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772576</commentid>
    <comment_count>6</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-06-25 01:06:12 -0700</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #5)
&gt; Comment on attachment 431337 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=431337&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1309
&gt; &gt; +// A scoped class that resets either min-width &amp; max-witdh or min-height &amp; max-height (depending on the
&gt; 
&gt; witdh
&gt; 
&gt; &gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1314
&gt; &gt; +class ScopedUnboundedBox {
&gt; 
&gt; Can we share some of this with DisableMinMaxConstrainsScope?

No without making them unnecessarily complex because there are some usages of ScopedUnboundedBox that do not imply DisableMinMaxConstrainScope</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772588</commentid>
    <comment_count>7</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-06-25 01:59:23 -0700</bug_when>
    <thetext>Committed r279271 (239150@main): &lt;https://commits.webkit.org/239150@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772604</commentid>
    <comment_count>8</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-06-25 03:00:02 -0700</bug_when>
    <thetext>(In reply to Sergio Villar Senin from comment #6)
&gt; (In reply to Simon Fraser (smfr) from comment #5)
&gt; &gt; Comment on attachment 431337 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=431337&amp;action=review
&gt; &gt; 
&gt; &gt; &gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1309
&gt; &gt; &gt; +// A scoped class that resets either min-width &amp; max-witdh or min-height &amp; max-height (depending on the
&gt; &gt; 
&gt; &gt; witdh
&gt; &gt; 
&gt; &gt; &gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1314
&gt; &gt; &gt; +class ScopedUnboundedBox {
&gt; &gt; 
&gt; &gt; Can we share some of this with DisableMinMaxConstrainsScope?
&gt; 
&gt; No without making them unnecessarily complex because there are some usages
&gt; of ScopedUnboundedBox that do not imply DisableMinMaxConstrainScope

Oh wait I thought you&apos;re talking about the overriding scope. Now that you mention I think I have messed it up and reported two bugs for the same issue...

I&apos;ll mark bug 226634 as duplicate. Sorry for the mess</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1772606</commentid>
    <comment_count>9</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-06-25 03:00:35 -0700</bug_when>
    <thetext>*** Bug 226634 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1775392</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2021-07-07 12:35:18 -0700</bug_when>
    <thetext>Re-opened since this is blocked by bug 227764</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1799236</commentid>
    <comment_count>11</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-10-01 05:17:54 -0700</bug_when>
    <thetext>I&apos;ve a new patch for this issue that does not suffer from the Gmail bug. It&apos;s based on the previous work done in bug 230755 so I need to get that in before posting a new patch here (which BTW fixes 3 tests with no regressions).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805510</commentid>
    <comment_count>12</comment_count>
      <attachid>441578</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-10-18 03:18:36 -0700</bug_when>
    <thetext>Created attachment 441578
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805525</commentid>
    <comment_count>13</comment_count>
      <attachid>441578</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-10-18 04:17:55 -0700</bug_when>
    <thetext>Comment on attachment 441578
Patch

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

r=me, let&apos;s hope there&apos;s no more unexpected breakage.

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1010
&gt; +        m_originalMin = m_isHorizontalWritingModeInParallelFlow ? m_child.style().minWidth() : m_child.style().minHeight();
&gt; +        m_originalMax = m_isHorizontalWritingModeInParallelFlow ? m_child.style().maxWidth() : m_child.style().maxHeight();

Nit: We&apos;ve the very same if just below, maybe we can put this inside that if directly.

&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1048
&gt;      Length m_originalLength;
&gt; +    Length m_originalMin;
&gt; +    Length m_originalMax;

Nit: I&apos;ve the feeling that m_originalSize, m_originalMinSize and m_originalMaxSize might be easier to understand.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805528</commentid>
    <comment_count>14</comment_count>
      <attachid>441578</attachid>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-10-18 04:24:46 -0700</bug_when>
    <thetext>Comment on attachment 441578
Patch

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

Thanks for the review!

&gt;&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1010
&gt;&gt; +        m_originalMax = m_isHorizontalWritingModeInParallelFlow ? m_child.style().maxWidth() : m_child.style().maxHeight();
&gt; 
&gt; Nit: We&apos;ve the very same if just below, maybe we can put this inside that if directly.

Sure, I developed both patches independently so came up with two different presentations. I&apos;ll move them there.

&gt;&gt; Source/WebCore/rendering/RenderFlexibleBox.cpp:1048
&gt;&gt; +    Length m_originalMax;
&gt; 
&gt; Nit: I&apos;ve the feeling that m_originalSize, m_originalMinSize and m_originalMaxSize might be easier to understand.

Makes sense. I&apos;ll rename before landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805710</commentid>
    <comment_count>15</comment_count>
    <who name="Sergio Villar Senin">svillar</who>
    <bug_when>2021-10-18 13:51:10 -0700</bug_when>
    <thetext>Committed r284397 (243173@main): &lt;https://commits.webkit.org/243173@main&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1810203</commentid>
    <comment_count>16</comment_count>
    <who name="Yusuke Suzuki">ysuzuki</who>
    <bug_when>2021-10-29 13:18:32 -0700</bug_when>
    <thetext>Reverted in https://trac.webkit.org/changeset/285045/webkit
Because the relying change causes 100% CPU usage in Twitter</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>428165</attachid>
            <date>2021-05-10 04:48:56 -0700</date>
            <delta_ts>2021-06-14 09:27:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225590-20210510134854.patch</filename>
            <type>text/plain</type>
            <size>11572</size>
            <attacher name="Sergio Villar Senin">svillar</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjFlMDIyZTA2N2NkZmE1
MmJkZmY5NDhkZGI1MGE0M2QzN2MzMmYyYi4uOGRkODljY2RjMDBjYjExMDQ0OGU4Yzc3OWY4MThm
MDg0ZDJmNjdlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA1LTEwICBTZXJn
aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl
eGJveF0gRG8gbm90IGNsYW1wIGZsZXggYmFzZSBzaXplIHdpdGgge21pbnxtYXh9LXtoZWlnaHR8
d2lkdGh9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MjU1OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX
aGVuIGNvbXB1dGluZyBmbGV4IGJhc2Ugc2l6ZSB3ZSBzaG91bGQgbm90IGNsYW1wIGl0IHdpdGgg
bmVpdGhlciBtaW4te2hlaWdodHx3aWR0aH0KKyAgICAgICAgbm9yIG1heC17aGVpZ2h0fHdpZHRo
fS4gVGhhdCB3b3VsZCBiZSBkb25lIGxhdGVyIGFuZCB3aWxsIGJlIGNhbGxlZCB0aGUgaHlwb3Ro
ZXRpY2FsCisgICAgICAgIG1haW4gc2l6ZS4KKworICAgICAgICBGb3IgbW9zdCBvZiB0aGUgY2Fz
ZXMgd2Ugd2VyZSBhbHJlYWR5IGRvaW5nIGl0LCBob3dldmVyIHRoZXJlIGFyZSBzb21lIHBhcnRp
Y3VsYXIgY2FzZXMKKyAgICAgICAgaW4gd2hpY2ggd2UgaGF2ZSB0byBjYWxsIHRoZSBnZW5lcmlj
IGxheW91dCBjb2RlIHdoaWNoIGRvZXMgY2xhbXAgdGhlIHNpemVzIHVzaW5nIG1pbgorICAgICAg
ICBhbmQgbWF4IHNpemVzLiBJbiBvcmRlciB0byBtYWtlIHRob3NlIGNvZGUgcGF0aHMgd29yaywg
d2UgcmVzZXQgdGhlIG1pbnxtYXggdmFsdWVzIHRvCisgICAgICAgIHRoZWlyIGluaXRpYWwgb25l
cyAoc28gdGhleSBlZmZlY3RpdmVseSBiZWNvbWUgaW5hY3RpdmUpIGFuZCB0aGVuIHdlIHNldCB0
aGUgb3JpZ2luYWwKKyAgICAgICAgdmFsdWVzIGJhY2sgYWZ0ZXIgY29tcHV0aW5nIHRoZSBiYXNl
IHNpemUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6U2NvcGVkVW5ib3VuZGVkQm94OjpTY29wZWRVbmJvdW5kZWRCb3gpOiBO
ZXcgc2NvcGVkIGNsYXNzIHRoYXQgc2V0cyBtaW58bWF4IHNpemVzCisgICAgICAgIHRvIHRoZWly
IGluaXRpYWwgdmFsdWVzIG9uIGluc3RhbnRpYXRpb24gYW5kIHJlc3RvcmVzIHRoZSBvcmlnaW5h
bCB2YWx1ZXMgb24gZGVzdHJ1Y3Rpb24uCisgICAgICAgIChXZWJDb3JlOjpTY29wZWRVbmJvdW5k
ZWRCb3g6On5TY29wZWRVbmJvdW5kZWRCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl
eGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtcyk6IFdyYXAgdGhlIGJhc2Ugc2l6ZSBjb21wdXRh
dGlvbiB3aXRoIGEKKyAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94LgorCiAyMDIxLTA1LTEwICBS
b2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IDxmb3JtPi5y
ZXF1ZXN0U3VibWl0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k
ZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli
bGVCb3guY3BwCmluZGV4IDBkZTM0Y2ZjMDU4YWY1M2QyYzNjYTYzZWZjMmQ2NmZmMjYwNGVhNWMu
LmQzZTg3ZTk3YjQwMjIzYzE5ZTkwZGJjNDU5ZDM4OTk2ZjczMGIwYTQgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMTI3NSw2ICsxMjc1
LDQ3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmFkanVzdENoaWxkU2l6ZUZvckFz
cGVjdFJhdGlvQ3Jvc3NBeGlzTWluQW5kTWF4KGNvCiAgICAgcmV0dXJuIGNoaWxkU2l6ZTsKIH0K
IAorLy8gQSBzY29wZWQgY2xhc3MgdGhhdCByZXNldHMgZWl0aGVyIG1pbi13aWR0aCAmIG1heC13
aXRkaCBvciBtaW4taGVpZ2h0ICYgbWF4LWhlaWdodCAoZGVwZW5kaW5nIG9uIHRoZQorLy8gZmxl
eCBjb250YWluZXIgbWFpbiBzaXplKSB0byB0aGVpciBpbml0aWFsIHZhbHVlcyBvbiBpbnN0YW50
aWF0aW9uLiBJdCBsYXRlciByZXNldHMgdGhlbSBiYWNrIHRvIHRoZWlyCisvLyBvcmlnaW5hbCB2
YWx1ZXMgb24gZGVzdHJ1Y3Rpb24uIEl0J3MgdXNlZCB3aGVuIGNvbXB1dGluZyB0aGUgZmxleCBi
YXNlIHNpemVzIG9mIGZsZXggaXRlbXMgYXMgIndoZW4gZGV0ZXJtaW5pbmcgCisvLyB0aGUgZmxl
eCBiYXNlIHNpemUsIHRoZSBpdGVt4oCZcyBtaW4gYW5kIG1heCBtYWluIHNpemVzIGFyZSBpZ25v
cmVkIChubyBjbGFtcGluZyBvY2N1cnMpIi4gU2VlCisvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5v
cmcvY3NzLWZsZXhib3gvI2xpbmUtc2l6aW5nCitjbGFzcyBTY29wZWRVbmJvdW5kZWRCb3ggewor
V1RGX01BS0VfTk9OQ09QWUFCTEUoU2NvcGVkVW5ib3VuZGVkQm94KTsKK3B1YmxpYzoKKyAgICBT
Y29wZWRVbmJvdW5kZWRCb3goUmVuZGVyQm94JiBib3gsIGJvb2wgbWFpbkF4aXNJc0NoaWxkSW5s
aW5lQXhpcykKKyAgICAgICAgOiBtX2JveChib3gpCisgICAgICAgICwgbV9pc0hvcml6b250YWxX
cml0aW5nTW9kZUluUGFyYWxsZWxGbG93KG1haW5BeGlzSXNDaGlsZElubGluZUF4aXMgPT0gYm94
LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAgeworICAgICAgICBtX29yaWdpbmFsTWlu
ID0gbV9pc0hvcml6b250YWxXcml0aW5nTW9kZUluUGFyYWxsZWxGbG93ID8gbV9ib3guc3R5bGUo
KS5taW5XaWR0aCgpIDogbV9ib3guc3R5bGUoKS5taW5IZWlnaHQoKTsKKyAgICAgICAgbV9vcmln
aW5hbE1heCA9IG1faXNIb3Jpem9udGFsV3JpdGluZ01vZGVJblBhcmFsbGVsRmxvdyA/IG1fYm94
LnN0eWxlKCkubWF4V2lkdGgoKSA6IG1fYm94LnN0eWxlKCkubWF4SGVpZ2h0KCk7CisgICAgICAg
IGlmIChtX2lzSG9yaXpvbnRhbFdyaXRpbmdNb2RlSW5QYXJhbGxlbEZsb3cpIHsKKyAgICAgICAg
ICAgIG1fYm94Lm11dGFibGVTdHlsZSgpLnNldE1pbldpZHRoKFJlbmRlclN0eWxlOjppbml0aWFs
TWluU2l6ZSgpKTsKKyAgICAgICAgICAgIG1fYm94Lm11dGFibGVTdHlsZSgpLnNldE1heFdpZHRo
KFJlbmRlclN0eWxlOjppbml0aWFsTWF4U2l6ZSgpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg
ICAgICAgfQorICAgICAgICBtX2JveC5tdXRhYmxlU3R5bGUoKS5zZXRNaW5IZWlnaHQoUmVuZGVy
U3R5bGU6OmluaXRpYWxNaW5TaXplKCkpOworICAgICAgICBtX2JveC5tdXRhYmxlU3R5bGUoKS5z
ZXRNYXhIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxNYXhTaXplKCkpOworICAgIH0KKworICAg
IH5TY29wZWRVbmJvdW5kZWRCb3goKQorICAgIHsKKyAgICAgICAgaWYgKG1faXNIb3Jpem9udGFs
V3JpdGluZ01vZGVJblBhcmFsbGVsRmxvdykgeworICAgICAgICAgICAgbV9ib3gubXV0YWJsZVN0
eWxlKCkuc2V0TWluV2lkdGgoV1RGTW92ZShtX29yaWdpbmFsTWluKSk7CisgICAgICAgICAgICBt
X2JveC5tdXRhYmxlU3R5bGUoKS5zZXRNYXhXaWR0aChXVEZNb3ZlKG1fb3JpZ2luYWxNYXgpKTsK
KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBtX2JveC5tdXRhYmxlU3R5
bGUoKS5zZXRNaW5IZWlnaHQoV1RGTW92ZShtX29yaWdpbmFsTWluKSk7CisgICAgICAgIG1fYm94
Lm11dGFibGVTdHlsZSgpLnNldE1heEhlaWdodChXVEZNb3ZlKG1fb3JpZ2luYWxNYXgpKTsKKyAg
ICB9CisKK3ByaXZhdGU6CisgICAgUmVuZGVyQm94JiBtX2JveDsKKyAgICBib29sIG1faXNIb3Jp
em9udGFsV3JpdGluZ01vZGVJblBhcmFsbGVsRmxvdzsKKyAgICBMZW5ndGggbV9vcmlnaW5hbE1p
bjsKKyAgICBMZW5ndGggbV9vcmlnaW5hbE1heDsKK307CisKIFZlY3RvcjxGbGV4SXRlbT4gUmVu
ZGVyRmxleGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4p
CiB7CiAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gaW5GbGV4SXRlbUNvbnN0cnVjdGlvbihtX2luRmxl
eEl0ZW1Db25zdHJ1Y3Rpb24sIHRydWUpOwpAQCAtMTI4OSwzMSArMTMzMCwzNCBAQCBWZWN0b3I8
RmxleEl0ZW0+IFJlbmRlckZsZXhpYmxlQm94Ojpjb25zdHJ1Y3RGbGV4SXRlbXMoYm9vbCByZWxh
eW91dENoaWxkcmVuKQogICAgICAgICB9CiAKICAgICAgICAgYXV0byBjb25zdHJ1Y3RGbGV4SXRl
bUZvckNoaWxkQm94ID0gWyZdKGF1dG8mIGNoaWxkQm94KSB7Ci0gICAgICAgICAgICBjaGlsZEJv
eC5jbGVhck92ZXJyaWRpbmdDb250ZW50U2l6ZSgpOwotICAgICAgICAgICAgaWYgKGNoaWxkSGFz
SW50cmluc2ljTWFpbkF4aXNTaXplKGNoaWxkQm94KSkgewotICAgICAgICAgICAgICAgIC8vIElm
IHRoaXMgY29uZGl0aW9uIGlzIHRydWUsIHRoZW4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hp
bGQgd2lsbCBjYWxsCi0gICAgICAgICAgICAgICAgLy8gY2hpbGQuaW50cmluc2ljQ29udGVudExv
Z2ljYWxIZWlnaHQoKSBhbmQgY2hpbGQuc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpLAotICAgICAg
ICAgICAgICAgIC8vIHNvIGlmIHRoZSBjaGlsZCBoYXMgaW50cmluc2ljIG1pbi9tYXgvcHJlZmVy
cmVkIHNpemUsIHJ1biBsYXlvdXQgb24gaXQgbm93IHRvIG1ha2Ugc3VyZQotICAgICAgICAgICAg
ICAgIC8vIGl0cyBsb2dpY2FsIGhlaWdodCBhbmQgc2Nyb2xsIGJhcnMgYXJlIHVwIHRvIGRhdGUu
Ci0gICAgICAgICAgICAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5Qml0c0JlZm9yZUxheW91dChy
ZWxheW91dENoaWxkcmVuLCBjaGlsZEJveCk7Ci0gICAgICAgICAgICAgICAgLy8gRG9uJ3QgcmVz
b2x2ZSBwZXJjZW50YWdlcyBpbiBjaGlsZHJlbi4gVGhpcyBpcyBlc3BlY2lhbGx5IGltcG9ydGFu
dCBmb3IgdGhlIG1pbi1oZWlnaHQgY2FsY3VsYXRpb24sCi0gICAgICAgICAgICAgICAgLy8gd2hl
cmUgd2Ugd2FudCBwZXJjZW50YWdlcyB0byBiZSB0cmVhdGVkIGFzIGF1dG8uIEZvciBmbGV4LWJh
c2lzIGl0c2VsZiwgdGhpcyBpcyBub3QgYSBwcm9ibGVtIGJlY2F1c2UKLSAgICAgICAgICAgICAg
ICAvLyBieSBkZWZpbml0aW9uIHdlIGhhdmUgYW4gaW5kZWZpbml0ZSBmbGV4IGJhc2lzIGhlcmUg
YW5kIHRodXMgcGVyY2VudGFnZXMgc2hvdWxkIG5vdCByZXNvbHZlLgotICAgICAgICAgICAgICAg
IGlmIChjaGlsZEJveC5uZWVkc0xheW91dCgpIHx8ICFtX2ludHJpbnNpY1NpemVBbG9uZ01haW5B
eGlzLmNvbnRhaW5zKCZjaGlsZEJveCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGlzSG9y
aXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGRCb3guaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo
KSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkQm94LnNldE92ZXJyaWRpbmdDb250YWlu
aW5nQmxvY2tDb250ZW50TG9naWNhbEhlaWdodChXVEY6Om51bGxvcHQpOwotICAgICAgICAgICAg
ICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICBjaGlsZEJveC5zZXRPdmVycmlk
aW5nQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aChXVEY6Om51bGxvcHQpOwotICAg
ICAgICAgICAgICAgICAgICBjaGlsZEJveC5jbGVhck92ZXJyaWRpbmdDb250ZW50U2l6ZSgpOwot
ICAgICAgICAgICAgICAgICAgICBjaGlsZEJveC5zZXRDaGlsZE5lZWRzTGF5b3V0KE1hcmtPbmx5
VGhpcyk7Ci0gICAgICAgICAgICAgICAgICAgIGNoaWxkQm94LmxheW91dElmTmVlZGVkKCk7Ci0g
ICAgICAgICAgICAgICAgICAgIGNhY2hlQ2hpbGRNYWluU2l6ZShjaGlsZEJveCk7Ci0gICAgICAg
ICAgICAgICAgICAgIGNoaWxkQm94LmNsZWFyT3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRl
bnRTaXplKCk7CisgICAgICAgICAgICBhdXRvIGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250
YWxGbG93KCkgPyBjaGlsZEJveC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDog
Y2hpbGRCb3gudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7CisgICAgICAgICAgICBM
YXlvdXRVbml0IGNoaWxkSW5uZXJGbGV4QmFzZVNpemU7CisgICAgICAgICAgICB7CisgICAgICAg
ICAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94IHVuYm91bmRlZChjaGlsZEJveCwgbWFpbkF4aXNJ
c0NoaWxkSW5saW5lQXhpcyhjaGlsZEJveCkpOworICAgICAgICAgICAgICAgIGNoaWxkQm94LmNs
ZWFyT3ZlcnJpZGluZ0NvbnRlbnRTaXplKCk7CisgICAgICAgICAgICAgICAgaWYgKGNoaWxkSGFz
SW50cmluc2ljTWFpbkF4aXNTaXplKGNoaWxkQm94KSkgeworICAgICAgICAgICAgICAgICAgICAv
LyBJZiB0aGlzIGNvbmRpdGlvbiBpcyB0cnVlLCB0aGVuIGNvbXB1dGVNYWluQXhpc0V4dGVudEZv
ckNoaWxkIHdpbGwgY2FsbAorICAgICAgICAgICAgICAgICAgICAvLyBjaGlsZC5pbnRyaW5zaWND
b250ZW50TG9naWNhbEhlaWdodCgpIGFuZCBjaGlsZC5zY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCks
CisgICAgICAgICAgICAgICAgICAgIC8vIHNvIGlmIHRoZSBjaGlsZCBoYXMgaW50cmluc2ljIG1p
bi9tYXgvcHJlZmVycmVkIHNpemUsIHJ1biBsYXlvdXQgb24gaXQgbm93IHRvIG1ha2Ugc3VyZQor
ICAgICAgICAgICAgICAgICAgICAvLyBpdHMgbG9naWNhbCBoZWlnaHQgYW5kIHNjcm9sbCBiYXJz
IGFyZSB1cCB0byBkYXRlLgorICAgICAgICAgICAgICAgICAgICB1cGRhdGVCbG9ja0NoaWxkRGly
dHlCaXRzQmVmb3JlTGF5b3V0KHJlbGF5b3V0Q2hpbGRyZW4sIGNoaWxkQm94KTsKKyAgICAgICAg
ICAgICAgICAgICAgLy8gRG9uJ3QgcmVzb2x2ZSBwZXJjZW50YWdlcyBpbiBjaGlsZHJlbi4gVGhp
cyBpcyBlc3BlY2lhbGx5IGltcG9ydGFudCBmb3IgdGhlIG1pbi1oZWlnaHQgY2FsY3VsYXRpb24s
CisgICAgICAgICAgICAgICAgICAgIC8vIHdoZXJlIHdlIHdhbnQgcGVyY2VudGFnZXMgdG8gYmUg
dHJlYXRlZCBhcyBhdXRvLiBGb3IgZmxleC1iYXNpcyBpdHNlbGYsIHRoaXMgaXMgbm90IGEgcHJv
YmxlbSBiZWNhdXNlCisgICAgICAgICAgICAgICAgICAgIC8vIGJ5IGRlZmluaXRpb24gd2UgaGF2
ZSBhbiBpbmRlZmluaXRlIGZsZXggYmFzaXMgaGVyZSBhbmQgdGh1cyBwZXJjZW50YWdlcyBzaG91
bGQgbm90IHJlc29sdmUuCisgICAgICAgICAgICAgICAgICAgIGlmIChjaGlsZEJveC5uZWVkc0xh
eW91dCgpIHx8ICFtX2ludHJpbnNpY1NpemVBbG9uZ01haW5BeGlzLmNvbnRhaW5zKCZjaGlsZEJv
eCkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0aW5nTW9k
ZSgpID09IGNoaWxkQm94LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgY2hpbGRCb3guc2V0T3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRl
bnRMb2dpY2FsSGVpZ2h0KFdURjo6bnVsbG9wdCk7CisgICAgICAgICAgICAgICAgICAgICAgICBl
bHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hpbGRCb3guc2V0T3ZlcnJpZGluZ0Nv
bnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoV1RGOjpudWxsb3B0KTsKKyAgICAgICAg
ICAgICAgICAgICAgICAgIGNoaWxkQm94LmNsZWFyT3ZlcnJpZGluZ0NvbnRlbnRTaXplKCk7Cisg
ICAgICAgICAgICAgICAgICAgICAgICBjaGlsZEJveC5zZXRDaGlsZE5lZWRzTGF5b3V0KE1hcmtP
bmx5VGhpcyk7CisgICAgICAgICAgICAgICAgICAgICAgICBjaGlsZEJveC5sYXlvdXRJZk5lZWRl
ZCgpOworICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGVDaGlsZE1haW5TaXplKGNoaWxkQm94
KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkQm94LmNsZWFyT3ZlcnJpZGluZ0NvbnRh
aW5pbmdCbG9ja0NvbnRlbnRTaXplKCk7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAg
ICAgICAgICB9CisgICAgICAgICAgICAgICAgY2hpbGRJbm5lckZsZXhCYXNlU2l6ZSA9IGNvbXB1
dGVJbm5lckZsZXhCYXNlU2l6ZUZvckNoaWxkKGNoaWxkQm94LCBib3JkZXJBbmRQYWRkaW5nKTsK
ICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgYXV0byBib3JkZXJBbmRQYWRkaW5nID0gaXNI
b3Jpem9udGFsRmxvdygpID8gY2hpbGRCb3guaG9yaXpvbnRhbEJvcmRlckFuZFBhZGRpbmdFeHRl
bnQoKSA6IGNoaWxkQm94LnZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpOwotICAgICAg
ICAgICAgYXV0byBjaGlsZElubmVyRmxleEJhc2VTaXplID0gY29tcHV0ZUlubmVyRmxleEJhc2VT
aXplRm9yQ2hpbGQoY2hpbGRCb3gsIGJvcmRlckFuZFBhZGRpbmcpOwogICAgICAgICAgICAgYXV0
byBjaGlsZE1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCA9IGFkanVzdENoaWxkU2l6ZUZvck1p
bkFuZE1heChjaGlsZEJveCwgY2hpbGRJbm5lckZsZXhCYXNlU2l6ZSk7CiAgICAgICAgICAgICBh
dXRvIG1hcmdpbiA9IGlzSG9yaXpvbnRhbEZsb3coKSA/IGNoaWxkQm94Lmhvcml6b250YWxNYXJn
aW5FeHRlbnQoKSA6IGNoaWxkQm94LnZlcnRpY2FsTWFyZ2luRXh0ZW50KCk7CiAgICAgICAgICAg
ICByZXR1cm4gRmxleEl0ZW0oY2hpbGRCb3gsIGNoaWxkSW5uZXJGbGV4QmFzZVNpemUsIGNoaWxk
TWluTWF4QXBwbGllZE1haW5BeGlzRXh0ZW50LCBib3JkZXJBbmRQYWRkaW5nLCBtYXJnaW4pOwpk
aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n
CmluZGV4IDc1ZWQyMzllZWIxYWY3YzQ2NTIwNjVhYWFkMDdlZTE3ZWEyNDQyMDMuLjdjYzYzN2Uw
YzIzMDg1YWZhOTJjM2M2NjBmOTE2OGNlN2EyZWFkNmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz
L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor
MjAyMS0wNS0xMCAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KKwor
ICAgICAgICBbY3NzLWZsZXhib3hdIERvIG5vdCBjbGFtcCBmbGV4IGJhc2Ugc2l6ZSB3aXRoIHtt
aW58bWF4fS17aGVpZ2h0fHdpZHRofQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjI1NTkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOiBVbnNraXBwZWQgMyBXUFQgdGVzdHMg
dGhhdCBhcmUgcGFzc2luZyBub3cuCisKIDIwMjEtMDUtMTAgIFJvYiBCdWlzICA8cmJ1aXNAaWdh
bGlhLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgPGZvcm0+LnJlcXVlc3RTdWJtaXQoKQpkaWZm
IC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RF
eHBlY3RhdGlvbnMKaW5kZXggNmIwNDAxMTQ2ZGUyMDhiNTQ2MzhkOWYzM2RlZDJkMGE4ZTMxYzA0
MS4uZGVjYzc4NWMyM2MwMjcyODk4NDdhOWMyMWNhNWE3ZjVjMzJjZWI2YSAxMDA2NDQKLS0tIGEv
TGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0
YXRpb25zCkBAIC0zODY1LDkgKzM4NjUsNyBAQCB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3ZlcnRpYwogd2Vi
a2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt
d3JpdGluZy1tb2Rlcy92ZXJ0aWNhbC1hbGlnbm1lbnQtc3JsLTAzNC54aHQgWyBJbWFnZU9ubHlG
YWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10
ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvdmVydGljYWwtYWxpZ25tZW50LXNybC0wNDAueGh0
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNj
L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1n
LWNvbHVtbi0wMTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFz
cGVjdC1yYXRpby1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr
aXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m
bGV4Ym94L2ZsZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAx
My5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVk
L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRy
aW5zaWMtc2l6ZS0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQpAQCAtMzk0MSw3ICszOTM5
LDYgQEAgd2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtZmxleGJveC90YWJsZS1hcy1pdGUKIHdlYmtpdC5vcmcvYi8yMjE0NzMgaW1wb3J0
ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvdGFibGUtYXMtaXRlbS1p
bmZsZXhpYmxlLWluLWNvbHVtbi0yLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8yMjE0NzMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhi
b3gvdGFibGUtYXMtaXRlbS1pbmZsZXhpYmxlLWluLXJvdy0yLmh0bWwgWyBJbWFnZU9ubHlGYWls
dXJlIF0KIHdlYmtpdC5vcmcvYi8yMjE0NzMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0
cy9jc3MvY3NzLWZsZXhib3gvdGFibGUtYXMtaXRlbS1zcGVjaWZpZWQtaGVpZ2h0Lmh0bWwgWyBJ
bWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8yMjE0NzMgaW1wb3J0ZWQvdzNjL3dlYi1w
bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvdGFibGUtYXMtaXRlbS1taW4taGVpZ2h0LTEu
aHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCiAjIFNWR3MgYXMgZmxleCBpdGVtcy4KIHdlYmtp
dC5vcmcvYi8yMjE0NzQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvc3ZnLXJvb3QtYXMtZmxleC1pdGVtLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBd
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431337</attachid>
            <date>2021-06-14 09:27:53 -0700</date>
            <delta_ts>2021-10-18 03:18:22 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225590-20210614182751.patch</filename>
            <type>text/plain</type>
            <size>12255</size>
            <attacher name="Sergio Villar Senin">svillar</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4ODI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU4Y2EyMzBmMmZlMTZm
MjExNjNlN2VmMGIxMmY2ZGU1MjFjOWVjNC4uOTgzNTRhMGY5ZDBkNjA1MWRkNGNjMjRlZDEyOGVk
M2M3OTNlYjgwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTA2LTE0ICBTZXJn
aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl
eGJveF0gRG8gbm90IGNsYW1wIGZsZXggYmFzZSBzaXplIHdpdGgge21pbnxtYXh9LXtoZWlnaHR8
d2lkdGh9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MjU1OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX
aGVuIGNvbXB1dGluZyBmbGV4IGJhc2Ugc2l6ZSB3ZSBzaG91bGQgbm90IGNsYW1wIGl0IHdpdGgg
bmVpdGhlciBtaW4te2hlaWdodHx3aWR0aH0KKyAgICAgICAgbm9yIG1heC17aGVpZ2h0fHdpZHRo
fS4gVGhhdCB3b3VsZCBiZSBkb25lIGxhdGVyIGFuZCB3aWxsIGJlIGNhbGxlZCB0aGUgaHlwb3Ro
ZXRpY2FsCisgICAgICAgIG1haW4gc2l6ZS4KKworICAgICAgICBGb3IgbW9zdCBvZiB0aGUgY2Fz
ZXMgd2Ugd2VyZSBhbHJlYWR5IGRvaW5nIGl0LCBob3dldmVyIHRoZXJlIGFyZSBzb21lIHBhcnRp
Y3VsYXIgY2FzZXMKKyAgICAgICAgaW4gd2hpY2ggd2UgaGF2ZSB0byBjYWxsIHRoZSBnZW5lcmlj
IGxheW91dCBjb2RlIHdoaWNoIGRvZXMgY2xhbXAgdGhlIHNpemVzIHVzaW5nIG1pbgorICAgICAg
ICBhbmQgbWF4IHNpemVzLiBJbiBvcmRlciB0byBtYWtlIHRob3NlIGNvZGUgcGF0aHMgd29yaywg
d2UgcmVzZXQgdGhlIG1pbnxtYXggdmFsdWVzIHRvCisgICAgICAgIHRoZWlyIGluaXRpYWwgb25l
cyAoc28gdGhleSBlZmZlY3RpdmVseSBiZWNvbWUgaW5hY3RpdmUpIGFuZCB0aGVuIHdlIHNldCB0
aGUgb3JpZ2luYWwKKyAgICAgICAgdmFsdWVzIGJhY2sgYWZ0ZXIgY29tcHV0aW5nIHRoZSBiYXNl
IHNpemUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAg
ICAgICAoV2ViQ29yZTo6U2NvcGVkVW5ib3VuZGVkQm94OjpTY29wZWRVbmJvdW5kZWRCb3gpOiBO
ZXcgc2NvcGVkIGNsYXNzIHRoYXQgc2V0cyBtaW58bWF4IHNpemVzCisgICAgICAgIHRvIHRoZWly
IGluaXRpYWwgdmFsdWVzIG9uIGluc3RhbnRpYXRpb24gYW5kIHJlc3RvcmVzIHRoZSBvcmlnaW5h
bCB2YWx1ZXMgb24gZGVzdHJ1Y3Rpb24uCisgICAgICAgIChXZWJDb3JlOjpTY29wZWRVbmJvdW5k
ZWRCb3g6On5TY29wZWRVbmJvdW5kZWRCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl
eGlibGVCb3g6OmNvbnN0cnVjdEZsZXhJdGVtcyk6IFdyYXAgdGhlIGJhc2Ugc2l6ZSBjb21wdXRh
dGlvbiB3aXRoIGEKKyAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94LgorCiAyMDIxLTA2LTEzICBD
aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVsYXggInBhcmVudCBt
dXN0IGJlIGFuIEhUTUxFbGVtZW50IiByZXN0cmljdGlvbiBpbiBvdXRlckhUTUwgc2V0dGVyCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw
IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA1
NzA4YjMxYTFkODQwNWM2ODc5MTEwYWNhN2JhNmQ3OTY5OTU2NzJlLi44MDYwNDhkNzhhNWZlNTVi
ODc3YTU1ZTY5MzI4MzRkODM0YTdhYmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k
ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu
Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEzMDYsMzQgKzEzMDYsODAgQEAgTGF5b3V0VW5p
dCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yQXNwZWN0UmF0aW9Dcm9zc0F4
aXNNaW5BbmRNYXgoY28KICAgICByZXR1cm4gY2hpbGRTaXplOwogfQogCisvLyBBIHNjb3BlZCBj
bGFzcyB0aGF0IHJlc2V0cyBlaXRoZXIgbWluLXdpZHRoICYgbWF4LXdpdGRoIG9yIG1pbi1oZWln
aHQgJiBtYXgtaGVpZ2h0IChkZXBlbmRpbmcgb24gdGhlCisvLyBmbGV4IGNvbnRhaW5lciBtYWlu
IHNpemUpIHRvIHRoZWlyIGluaXRpYWwgdmFsdWVzIG9uIGluc3RhbnRpYXRpb24uIEl0IGxhdGVy
IHJlc2V0cyB0aGVtIGJhY2sgdG8gdGhlaXIKKy8vIG9yaWdpbmFsIHZhbHVlcyBvbiBkZXN0cnVj
dGlvbi4gSXQncyB1c2VkIHdoZW4gY29tcHV0aW5nIHRoZSBmbGV4IGJhc2Ugc2l6ZXMgb2YgZmxl
eCBpdGVtcyBhcyAid2hlbiBkZXRlcm1pbmluZyAKKy8vIHRoZSBmbGV4IGJhc2Ugc2l6ZSwgdGhl
IGl0ZW3igJlzIG1pbiBhbmQgbWF4IG1haW4gc2l6ZXMgYXJlIGlnbm9yZWQgKG5vIGNsYW1waW5n
IG9jY3VycykiLiBTZWUKKy8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8j
bGluZS1zaXppbmcKK2NsYXNzIFNjb3BlZFVuYm91bmRlZEJveCB7CitXVEZfTUFLRV9OT05DT1BZ
QUJMRShTY29wZWRVbmJvdW5kZWRCb3gpOworcHVibGljOgorICAgIFNjb3BlZFVuYm91bmRlZEJv
eChSZW5kZXJCb3gmIGJveCwgYm9vbCBtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKQorICAgICAg
ICA6IG1fYm94KGJveCkKKyAgICAgICAgLCBtX2lzSG9yaXpvbnRhbFdyaXRpbmdNb2RlSW5QYXJh
bGxlbEZsb3cobWFpbkF4aXNJc0NoaWxkSW5saW5lQXhpcyA9PSBib3guaXNIb3Jpem9udGFsV3Jp
dGluZ01vZGUoKSkKKyAgICB7CisgICAgICAgIG1fb3JpZ2luYWxNaW4gPSBtX2lzSG9yaXpvbnRh
bFdyaXRpbmdNb2RlSW5QYXJhbGxlbEZsb3cgPyBtX2JveC5zdHlsZSgpLm1pbldpZHRoKCkgOiBt
X2JveC5zdHlsZSgpLm1pbkhlaWdodCgpOworICAgICAgICBtX29yaWdpbmFsTWF4ID0gbV9pc0hv
cml6b250YWxXcml0aW5nTW9kZUluUGFyYWxsZWxGbG93ID8gbV9ib3guc3R5bGUoKS5tYXhXaWR0
aCgpIDogbV9ib3guc3R5bGUoKS5tYXhIZWlnaHQoKTsKKyAgICAgICAgaWYgKG1faXNIb3Jpem9u
dGFsV3JpdGluZ01vZGVJblBhcmFsbGVsRmxvdykgeworICAgICAgICAgICAgbV9ib3gubXV0YWJs
ZVN0eWxlKCkuc2V0TWluV2lkdGgoUmVuZGVyU3R5bGU6OmluaXRpYWxNaW5TaXplKCkpOworICAg
ICAgICAgICAgbV9ib3gubXV0YWJsZVN0eWxlKCkuc2V0TWF4V2lkdGgoUmVuZGVyU3R5bGU6Omlu
aXRpYWxNYXhTaXplKCkpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg
IG1fYm94Lm11dGFibGVTdHlsZSgpLnNldE1pbkhlaWdodChSZW5kZXJTdHlsZTo6aW5pdGlhbE1p
blNpemUoKSk7CisgICAgICAgIG1fYm94Lm11dGFibGVTdHlsZSgpLnNldE1heEhlaWdodChSZW5k
ZXJTdHlsZTo6aW5pdGlhbE1heFNpemUoKSk7CisgICAgfQorCisKKyAgICB+U2NvcGVkVW5ib3Vu
ZGVkQm94KCkKKyAgICB7CisgICAgICAgIGlmIChtX2lzSG9yaXpvbnRhbFdyaXRpbmdNb2RlSW5Q
YXJhbGxlbEZsb3cpIHsKKyAgICAgICAgICAgIG1fYm94Lm11dGFibGVTdHlsZSgpLnNldE1pbldp
ZHRoKFdURk1vdmUobV9vcmlnaW5hbE1pbikpOworICAgICAgICAgICAgbV9ib3gubXV0YWJsZVN0
eWxlKCkuc2V0TWF4V2lkdGgoV1RGTW92ZShtX29yaWdpbmFsTWF4KSk7CisgICAgICAgICAgICBy
ZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgbV9ib3gubXV0YWJsZVN0eWxlKCkuc2V0TWluSGVp
Z2h0KFdURk1vdmUobV9vcmlnaW5hbE1pbikpOworICAgICAgICBtX2JveC5tdXRhYmxlU3R5bGUo
KS5zZXRNYXhIZWlnaHQoV1RGTW92ZShtX29yaWdpbmFsTWF4KSk7CisgICAgfQorCitwcml2YXRl
OgorICAgIFJlbmRlckJveCYgbV9ib3g7CisgICAgYm9vbCBtX2lzSG9yaXpvbnRhbFdyaXRpbmdN
b2RlSW5QYXJhbGxlbEZsb3c7CisgICAgTGVuZ3RoIG1fb3JpZ2luYWxNaW47CisgICAgTGVuZ3Ro
IG1fb3JpZ2luYWxNYXg7Cit9OworCiBGbGV4SXRlbSBSZW5kZXJGbGV4aWJsZUJveDo6Y29uc3Ry
dWN0RmxleEl0ZW0oUmVuZGVyQm94JiBjaGlsZCwgYm9vbCByZWxheW91dENoaWxkcmVuKQogewog
ICAgIGF1dG8gY2hpbGRIYWRMYXlvdXQgPSBjaGlsZC5ldmVySGFkTGF5b3V0KCk7Ci0gICAgY2hp
bGQuY2xlYXJPdmVycmlkaW5nQ29udGVudFNpemUoKTsKLSAgICBpZiAoY2hpbGRIYXNJbnRyaW5z
aWNNYWluQXhpc1NpemUoY2hpbGQpKSB7Ci0gICAgICAgIC8vIElmIHRoaXMgY29uZGl0aW9uIGlz
IHRydWUsIHRoZW4gY29tcHV0ZU1haW5BeGlzRXh0ZW50Rm9yQ2hpbGQgd2lsbCBjYWxsCi0gICAg
ICAgIC8vIGNoaWxkLmludHJpbnNpY0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgYW5kIGNoaWxkLnNj
cm9sbGJhckxvZ2ljYWxIZWlnaHQoKSwKLSAgICAgICAgLy8gc28gaWYgdGhlIGNoaWxkIGhhcyBp
bnRyaW5zaWMgbWluL21heC9wcmVmZXJyZWQgc2l6ZSwgcnVuIGxheW91dCBvbiBpdCBub3cgdG8g
bWFrZSBzdXJlCi0gICAgICAgIC8vIGl0cyBsb2dpY2FsIGhlaWdodCBhbmQgc2Nyb2xsIGJhcnMg
YXJlIHVwIHRvIGRhdGUuCi0gICAgICAgIHVwZGF0ZUJsb2NrQ2hpbGREaXJ0eUJpdHNCZWZvcmVM
YXlvdXQocmVsYXlvdXRDaGlsZHJlbiwgY2hpbGQpOwotICAgICAgICAvLyBEb24ndCByZXNvbHZl
IHBlcmNlbnRhZ2VzIGluIGNoaWxkcmVuLiBUaGlzIGlzIGVzcGVjaWFsbHkgaW1wb3J0YW50IGZv
ciB0aGUgbWluLWhlaWdodCBjYWxjdWxhdGlvbiwKLSAgICAgICAgLy8gd2hlcmUgd2Ugd2FudCBw
ZXJjZW50YWdlcyB0byBiZSB0cmVhdGVkIGFzIGF1dG8uIEZvciBmbGV4LWJhc2lzIGl0c2VsZiwg
dGhpcyBpcyBub3QgYSBwcm9ibGVtIGJlY2F1c2UKLSAgICAgICAgLy8gYnkgZGVmaW5pdGlvbiB3
ZSBoYXZlIGFuIGluZGVmaW5pdGUgZmxleCBiYXNpcyBoZXJlIGFuZCB0aHVzIHBlcmNlbnRhZ2Vz
IHNob3VsZCBub3QgcmVzb2x2ZS4KLSAgICAgICAgaWYgKGNoaWxkLm5lZWRzTGF5b3V0KCkgfHwg
IW1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMuY29udGFpbnMoJmNoaWxkKSkgewotICAgICAg
ICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPT0gY2hpbGQuaXNIb3Jpem9udGFs
V3JpdGluZ01vZGUoKSkKLSAgICAgICAgICAgICAgICBjaGlsZC5zZXRPdmVycmlkaW5nQ29udGFp
bmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQoc3RkOjpudWxsb3B0KTsKLSAgICAgICAgICAg
IGVsc2UKLSAgICAgICAgICAgICAgICBjaGlsZC5zZXRPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2Nr
Q29udGVudExvZ2ljYWxXaWR0aChzdGQ6Om51bGxvcHQpOwotICAgICAgICAgICAgY2hpbGQuY2xl
YXJPdmVycmlkaW5nQ29udGVudFNpemUoKTsKLSAgICAgICAgICAgIGNoaWxkLnNldENoaWxkTmVl
ZHNMYXlvdXQoTWFya09ubHlUaGlzKTsKLSAgICAgICAgICAgIGNoaWxkLmxheW91dElmTmVlZGVk
KCk7Ci0gICAgICAgICAgICBjYWNoZUNoaWxkTWFpblNpemUoY2hpbGQpOwotICAgICAgICAgICAg
Y2hpbGQuY2xlYXJPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemUoKTsKKyAgICBM
YXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC5o
b3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpIDogY2hpbGQudmVydGljYWxCb3JkZXJB
bmRQYWRkaW5nRXh0ZW50KCk7CisgICAgTGF5b3V0VW5pdCBjaGlsZElubmVyRmxleEJhc2VTaXpl
OworICAgIHsKKyAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94IHVuYm91bmRlZChjaGlsZCwgbWFp
bkF4aXNJc0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpOworICAgICAgICBjaGlsZC5jbGVhck92ZXJy
aWRpbmdDb250ZW50U2l6ZSgpOworICAgICAgICBpZiAoY2hpbGRIYXNJbnRyaW5zaWNNYWluQXhp
c1NpemUoY2hpbGQpKSB7CisgICAgICAgICAgICAvLyBJZiB0aGlzIGNvbmRpdGlvbiBpcyB0cnVl
LCB0aGVuIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkIHdpbGwgY2FsbAorICAgICAgICAg
ICAgLy8gY2hpbGQuaW50cmluc2ljQ29udGVudExvZ2ljYWxIZWlnaHQoKSBhbmQgY2hpbGQuc2Ny
b2xsYmFyTG9naWNhbEhlaWdodCgpLAorICAgICAgICAgICAgLy8gc28gaWYgdGhlIGNoaWxkIGhh
cyBpbnRyaW5zaWMgbWluL21heC9wcmVmZXJyZWQgc2l6ZSwgcnVuIGxheW91dCBvbiBpdCBub3cg
dG8gbWFrZSBzdXJlCisgICAgICAgICAgICAvLyBpdHMgbG9naWNhbCBoZWlnaHQgYW5kIHNjcm9s
bCBiYXJzIGFyZSB1cCB0byBkYXRlLgorICAgICAgICAgICAgdXBkYXRlQmxvY2tDaGlsZERpcnR5
Qml0c0JlZm9yZUxheW91dChyZWxheW91dENoaWxkcmVuLCBjaGlsZCk7CisgICAgICAgICAgICAv
LyBEb24ndCByZXNvbHZlIHBlcmNlbnRhZ2VzIGluIGNoaWxkcmVuLiBUaGlzIGlzIGVzcGVjaWFs
bHkgaW1wb3J0YW50IGZvciB0aGUgbWluLWhlaWdodCBjYWxjdWxhdGlvbiwKKyAgICAgICAgICAg
IC8vIHdoZXJlIHdlIHdhbnQgcGVyY2VudGFnZXMgdG8gYmUgdHJlYXRlZCBhcyBhdXRvLiBGb3Ig
ZmxleC1iYXNpcyBpdHNlbGYsIHRoaXMgaXMgbm90IGEgcHJvYmxlbSBiZWNhdXNlCisgICAgICAg
ICAgICAvLyBieSBkZWZpbml0aW9uIHdlIGhhdmUgYW4gaW5kZWZpbml0ZSBmbGV4IGJhc2lzIGhl
cmUgYW5kIHRodXMgcGVyY2VudGFnZXMgc2hvdWxkIG5vdCByZXNvbHZlLgorICAgICAgICAgICAg
aWYgKGNoaWxkLm5lZWRzTGF5b3V0KCkgfHwgIW1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMu
Y29udGFpbnMoJmNoaWxkKSkgeworICAgICAgICAgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0
aW5nTW9kZSgpID09IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCisgICAgICAgICAg
ICAgICAgICAgIGNoaWxkLnNldE92ZXJyaWRpbmdDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNh
bEhlaWdodChzdGQ6Om51bGxvcHQpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg
ICAgICAgICAgY2hpbGQuc2V0T3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2Fs
V2lkdGgoc3RkOjpudWxsb3B0KTsKKyAgICAgICAgICAgICAgICBjaGlsZC5jbGVhck92ZXJyaWRp
bmdDb250ZW50U2l6ZSgpOworICAgICAgICAgICAgICAgIGNoaWxkLnNldENoaWxkTmVlZHNMYXlv
dXQoTWFya09ubHlUaGlzKTsKKyAgICAgICAgICAgICAgICBjaGlsZC5sYXlvdXRJZk5lZWRlZCgp
OworICAgICAgICAgICAgICAgIGNhY2hlQ2hpbGRNYWluU2l6ZShjaGlsZCk7CisgICAgICAgICAg
ICAgICAgY2hpbGQuY2xlYXJPdmVycmlkaW5nQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemUoKTsK
KyAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgICAgICBjaGlsZElubmVyRmxleEJhc2VTaXpl
ID0gY29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hpbGQoY2hpbGQsIGJvcmRlckFuZFBhZGRp
bmcpOwogICAgIH0KICAgICAKLSAgICBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmcgPSBpc0hv
cml6b250YWxGbG93KCkgPyBjaGlsZC5ob3Jpem9udGFsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgp
IDogY2hpbGQudmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCk7Ci0gICAgTGF5b3V0VW5p
dCBjaGlsZElubmVyRmxleEJhc2VTaXplID0gY29tcHV0ZUlubmVyRmxleEJhc2VTaXplRm9yQ2hp
bGQoY2hpbGQsIGJvcmRlckFuZFBhZGRpbmcpOwogICAgIExheW91dFVuaXQgY2hpbGRNaW5NYXhB
cHBsaWVkTWFpbkF4aXNFeHRlbnQgPSBhZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoY2hpbGQs
IGNoaWxkSW5uZXJGbGV4QmFzZVNpemUpOwogICAgIExheW91dFVuaXQgbWFyZ2luID0gaXNIb3Jp
em9udGFsRmxvdygpID8gY2hpbGQuaG9yaXpvbnRhbE1hcmdpbkV4dGVudCgpIDogY2hpbGQudmVy
dGljYWxNYXJnaW5FeHRlbnQoKTsKICAgICByZXR1cm4gRmxleEl0ZW0oY2hpbGQsIGNoaWxkSW5u
ZXJGbGV4QmFzZVNpemUsIGNoaWxkTWluTWF4QXBwbGllZE1haW5BeGlzRXh0ZW50LCBib3JkZXJB
bmRQYWRkaW5nLCBtYXJnaW4sIGNoaWxkSGFkTGF5b3V0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRl
c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyNTY3MmNhMTUzNjcx
MzA5MjcxMmUyOGUxMDczNGM3ZWE3MzQzMzUzLi4wMWUxZDEwYmQ4MWQ0YWUwNzBjODU1NzhlNmEw
NzI1NzMyYmFjZGY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDYtMTQgIFNlcmdpbyBW
aWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1mbGV4Ym94
XSBEbyBub3QgY2xhbXAgZmxleCBiYXNlIHNpemUgd2l0aCB7bWlufG1heH0te2hlaWdodHx3aWR0
aH0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTU5
MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBw
YXRjaCBhbGxvd3MgdXMgdG8gcGFzcyAzIG5ldyB0ZXN0cy4gV2UncmUgYWRkaW5nIHBlcmNlbnRh
Z2UtbWF4LWhlaWdodC0wMDMuaHRtbCB0bworICAgICAgICB0aGUgbGlzdCBvZiBleHBlY3RlZCBm
YWlsdXJlcyBiZWNhdXNlIHRoZXNlIGNoYW5nZXMgbWFrZSBpdCBmYWlsLiBUaGlzIGlzIG5vdCBy
ZWFsbHkgYQorICAgICAgICByZWdyZXNzaW9uIGhvd2V2ZXIgYmVjYXVzZSBhbHRob3VnaCB0aGUg
c2l6ZSBvZiB0aGUgZGVlcGVzdCBmbGV4IGl0ZW0gd2FzIGNvcnJlY3QgKGFuZCB0aHVzCisgICAg
ICAgIGFsbG93ZWQgdXMgdG8gcGFzcyB0aGUgdGVzdCkgdGhlIG90aGVyIHNpemVzIHdlcmUgY29t
cGxldGVseSB3cm9uZy4gU28gaXQncyBtb3JlIGFuIGlzc3VlCisgICAgICAgIG9mIHRoZSB0ZXN0
IG5vdCBiZWluZyBjb21wbGV0ZSBlbm91Z2ggYW5kIHBhc3NpbmcgYXJ0aWZpY2lhbGx5IHRoYW4g
YW55dGhpbmcgZWxzZS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFVuc2tpcHBlZCAz
IHRlc3RzICYgc2tpcHBlZCAxLgorCiAyMDIxLTA2LTEzICBGdWppaSBIaXJvbm9yaSAgPEhpcm9u
b3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5DYWlyb10gVW5yZXZpZXdlZCB0ZXN0
IGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xh
eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMzJhN2VjMDM5ZmZiZDI0Mjg3NDUyZDQ2
NzQ5MGMyMGQ3NjhkMTUxYy4uNWEzMjgyYzlhMjBmZDcxNjJjNDExNDQ4MmNjNmJmNWU0OWUyNWJh
YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRU
ZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xMjE0LDYgKzEyMTQsNyBAQCB3ZWJraXQub3JnL2Iv
MTM2NzU0IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2Nh
bnZhcy1keW5hbQogd2Via2l0Lm9yZy9iLzEzNjc1NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt
LXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxNS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTM2NzU0IGltcG9ydGVkL3czYy93
ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXhib3gtc2FmZS1vdmVyZmxvdy1w
b3NpdGlvbi0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzEzNjc1
NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9wZXJjZW50
YWdlLW1heC1oZWlnaHQtMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KK3dlYmtpdC5vcmcv
Yi8xMzY3NTQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gv
cGVyY2VudGFnZS1tYXgtaGVpZ2h0LTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr
aXQub3JnL2IvMjEwMjQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m
bGV4Ym94L3BlcmNlbnRhZ2Utc2l6ZS1xdWlya3MtMDAyLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtp
dC5vcmcvYi8xMzY3NTQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvc2Nyb2xsYmFycy1uby1tYXJnaW4uaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCkBA
IC0zODUzLDkgKzM4NTQsNyBAQCB3ZWJraXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWIt
cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13cml0aW5nLW1vZGVzL3ZlcnRpYwogd2Via2l0Lm9yZy9i
LzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtd3JpdGluZy1t
b2Rlcy92ZXJ0aWNhbC1hbGlnbm1lbnQtc3JsLTAzNC54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
IHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv
Y3NzLXdyaXRpbmctbW9kZXMvdmVydGljYWwtYWxpZ25tZW50LXNybC0wNDAueGh0IFsgSW1hZ2VP
bmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0
Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLWNvbHVtbi0w
MTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRl
ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRp
by1pbWctY29sdW1uLTAxNS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3JnL2Iv
MjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2Zs
ZXgtYXNwZWN0LXJhdGlvLWltZy1yb3ctMDA3Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdl
YmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz
LWZsZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMTAuaHRtbCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3MtZmxleGJveC9hc3BlY3QtcmF0aW8taW50cmluc2ljLXNpemUtMDAxLmh0bWwg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dl
Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZsZXhib3gvYXNwZWN0LXJhdGlvLWludHJpbnNpYy1z
aXplLTAwMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCkBAIC0zOTI3LDcgKzM5MjYsNiBAQCB3
ZWJraXQub3JnL2IvMjIxNDczIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nz
cy1mbGV4Ym94L3RhYmxlLWFzLWl0ZQogd2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC90YWJsZS1hcy1pdGVtLWluZmxleGli
bGUtaW4tY29sdW1uLTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIy
MTQ3MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC90YWJs
ZS1hcy1pdGVtLWluZmxleGlibGUtaW4tY29sdW1uLTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUg
XQogd2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nz
cy9jc3MtZmxleGJveC90YWJsZS1hcy1pdGVtLWluZmxleGlibGUtaW4tcm93LTIuaHRtbCBbIElt
YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mvd2ViLXBs
YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC90YWJsZS1hcy1pdGVtLW1pbi1oZWlnaHQtMS5o
dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKICMgU1ZHcyBhcyBmbGV4IGl0ZW1zLgogd2Via2l0
Lm9yZy9iLzIyMTQ3NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxl
eGJveC9zdmctcm9vdC1hcy1mbGV4LWl0ZW0tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441578</attachid>
            <date>2021-10-18 03:18:36 -0700</date>
            <delta_ts>2021-10-18 15:37:48 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-225590-20211018121834.patch</filename>
            <type>text/plain</type>
            <size>8775</size>
            <attacher name="Sergio Villar Senin">svillar</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q4ZTI1NTllZDJhNjQ0
ZGFlZjcyZWZlZTg3NWUzNTliZmI5OTcxYi4uYjQ3ZTk0YzhmM2ZmYmY0ZTUwMGY1NTNmNmM1ZTcz
ZjRiZjA2NWNiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTEwLTE1ICBTZXJn
aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl
eGJveF0gRG8gbm90IGNsYW1wIGZsZXggYmFzZSBzaXplIHdpdGgge21pbnxtYXh9LXtoZWlnaHR8
d2lkdGh9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y
MjU1OTAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc4MTAwMzI5PgorCisgICAgICAgIFJldmll
d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY29tcHV0aW5nIGZsZXggYmFz
ZSBzaXplIHdlIHNob3VsZCBub3QgY2xhbXAgaXQgd2l0aCBuZWl0aGVyIG1pbi17aGVpZ2h0fHdp
ZHRofQorICAgICAgICBub3IgbWF4LXtoZWlnaHR8d2lkdGh9LiBUaGF0IHdvdWxkIGJlIGRvbmUg
bGF0ZXIgYW5kIHdpbGwgYmUgY2FsbGVkIHRoZSBoeXBvdGhldGljYWwKKyAgICAgICAgbWFpbiBz
aXplLgorCisgICAgICAgIEZvciBtb3N0IG9mIHRoZSBjYXNlcyB3ZSB3ZXJlIGFscmVhZHkgZG9p
bmcgaXQsIGhvd2V2ZXIgdGhlcmUgYXJlIHNvbWUgcGFydGljdWxhciBjYXNlcworICAgICAgICBp
biB3aGljaCB3ZSBoYXZlIHRvIGNhbGwgdGhlIGdlbmVyaWMgbGF5b3V0IGNvZGUgd2hpY2ggZG9l
cyBjbGFtcCB0aGUgc2l6ZXMgdXNpbmcgbWluCisgICAgICAgIGFuZCBtYXggc2l6ZXMuIEluIG9y
ZGVyIHRvIG1ha2UgdGhvc2UgY29kZSBwYXRocyB3b3JrLCB3ZSByZXNldCB0aGUgbWlufG1heCB2
YWx1ZXMgdG8KKyAgICAgICAgdGhlaXIgaW5pdGlhbCBvbmVzIChzbyB0aGV5IGVmZmVjdGl2ZWx5
IGJlY29tZSBpbmFjdGl2ZSkgYW5kIHRoZW4gd2Ugc2V0IHRoZSBvcmlnaW5hbAorICAgICAgICB2
YWx1ZXMgYmFjayBhZnRlciBjb21wdXRpbmcgdGhlIGJhc2Ugc2l6ZS4KKworICAgICAgICBUaGlz
IGlzIGEgcmVsYW5kIG9mIHIyNzkyNzEgd2hpY2ggd2FzIHByZXR0eSBzaW1pbGFyIGJ1dCBjYXVz
ZWQgYSB2aXN1YWwgcmVncmVzc2lvbiBpbgorICAgICAgICBHTWFpbC4gQWZ0ZXIgcjI4NDM1OSB0
aGlzIGlzIG5vIGxvbmdlciBhIHByb2JsZW0gb2YgdGhpcyBwYXRjaC4KKworICAgICAgICBUaGlz
IGZpeGVzIDMgV1BUIGZsZXhib3ggdGVzdHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy
RmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NvcGVkVW5ib3VuZGVkQm94V2l0
aEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZTo6U2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNp
c0FzQ2hpbGRNYWluU2l6ZSk6CisgICAgICAgIHJlbmFtZWQgZnJvbSBTY29wZWRGbGV4QmFzaXNB
c0NoaWxkTWFpblNpemUuIFJlc2V0cyBtaW58bWF4LXNpemUgdG8gdGhlaXIgaW5pdGlhbCB2YWx1
ZXMuCisgICAgICAgIChXZWJDb3JlOjpTY29wZWRVbmJvdW5kZWRCb3hXaXRoRmxleEJhc2lzQXND
aGlsZE1haW5TaXplOjp+U2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRNYWlu
U2l6ZSk6CisgICAgICAgIGRpdHRvLiBSZXN0b3JlcyBtaW58bWF4LXNpemUgb3JpZ2luYWwgdmFs
dWVzLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVGbGV4QmFz
ZVNpemVGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpTY29wZWRGbGV4QmFzaXNBc0NoaWxk
TWFpblNpemU6OlNjb3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSk6IERlbGV0ZWQuCisgICAg
ICAgIChXZWJDb3JlOjpTY29wZWRGbGV4QmFzaXNBc0NoaWxkTWFpblNpemU6On5TY29wZWRGbGV4
QmFzaXNBc0NoaWxkTWFpblNpemUpOiBEZWxldGVkLgorCiAyMDIxLTA5LTI0ICBTZXJnaW8gVmls
bGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZmxleGJveF0g
SW1wcm92ZSAmIHNpbXBsaWZ5IHRoZSBmbGV4LWJhc2lzIGNvbXB1dGF0aW9uCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNl
L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA3NGUzNzY2MjE1
MzIyYWU3MWZiOGJmNDM1MTY4YzBmMzdhY2NlZDc5Li4zNWE4MzUwNmQ4MzlmMTBkYjQ4OTBkZDMy
ODQ4NmQyNGMyYWI1ZDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu
ZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG
bGV4aWJsZUJveC5jcHAKQEAgLTk5NiwxMyArOTk2LDI2IEBAIHZvaWQgUmVuZGVyRmxleGlibGVC
b3g6OmNsZWFyQ2FjaGVkTWFpblNpemVGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQog
ICAgIG1faW50cmluc2ljU2l6ZUFsb25nTWFpbkF4aXMucmVtb3ZlKCZjaGlsZCk7CiB9CiAKLS8v
IFRoaXMgaXMgYSBSQUlJIGNsYXNzIHRoYXQgaXMgdXNlZCB0byB0ZW1wb3JhcmlseSBzZXQgdGhl
IGZsZXggYmFzaXMgYXMgdGhlIGNoaWxkIHNpemUgaW4gdGhlIG1haW4gYXhpcy4KLWNsYXNzIFNj
b3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSB7CisvLyBUaGlzIGlzIGEgUkFJSSBjbGFzcyB0
aGF0IGlzIHVzZWQgdG8gdGVtcG9yYXJpbHkgc2V0IHRoZSBmbGV4IGJhc2lzIGFzIHRoZSBjaGls
ZCBzaXplIGluIHRoZSBtYWluIGF4aXMuIEFwYXJ0IGZyb20gdGhhdAorLy8gdGhlIG1pbnxtYXgt
c2l6ZSByZXN0cmljdGlvbnMgYXJlIGlnbm9yZWQgZm9yIHRoaXMgY29tcHV0YXRpb24uIFNlZSBo
dHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWZsZXhib3gvI2FsZ28tbWFpbi1pdGVtCisvLyBm
b3IgZnVydGhlciBkZXRhaWxzLgorY2xhc3MgU2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNp
c0FzQ2hpbGRNYWluU2l6ZSB7CiBwdWJsaWM6Ci0gICAgU2NvcGVkRmxleEJhc2lzQXNDaGlsZE1h
aW5TaXplKFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBmbGV4QmFzaXMsIGJvb2wgbWFpbkF4aXNJ
c0lubGluZUF4aXMpCisgICAgU2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0FzQ2hpbGRN
YWluU2l6ZShSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggZmxleEJhc2lzLCBib29sIG1haW5BeGlz
SXNJbmxpbmVBeGlzKQogICAgICAgICA6IG1fY2hpbGQoY2hpbGQpCisgICAgICAgICwgbV9pc0hv
cml6b250YWxXcml0aW5nTW9kZUluUGFyYWxsZWxGbG93KG1haW5BeGlzSXNJbmxpbmVBeGlzID09
IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgICwgbV9tYWluQXhpc0lz
SW5saW5lQXhpcyhtYWluQXhpc0lzSW5saW5lQXhpcykKICAgICB7CisgICAgICAgIG1fb3JpZ2lu
YWxNaW4gPSBtX2lzSG9yaXpvbnRhbFdyaXRpbmdNb2RlSW5QYXJhbGxlbEZsb3cgPyBtX2NoaWxk
LnN0eWxlKCkubWluV2lkdGgoKSA6IG1fY2hpbGQuc3R5bGUoKS5taW5IZWlnaHQoKTsKKyAgICAg
ICAgbV9vcmlnaW5hbE1heCA9IG1faXNIb3Jpem9udGFsV3JpdGluZ01vZGVJblBhcmFsbGVsRmxv
dyA/IG1fY2hpbGQuc3R5bGUoKS5tYXhXaWR0aCgpIDogbV9jaGlsZC5zdHlsZSgpLm1heEhlaWdo
dCgpOworICAgICAgICBpZiAobV9pc0hvcml6b250YWxXcml0aW5nTW9kZUluUGFyYWxsZWxGbG93
KSB7CisgICAgICAgICAgICBtX2NoaWxkLm11dGFibGVTdHlsZSgpLnNldE1pbldpZHRoKFJlbmRl
clN0eWxlOjppbml0aWFsTWluU2l6ZSgpKTsKKyAgICAgICAgICAgIG1fY2hpbGQubXV0YWJsZVN0
eWxlKCkuc2V0TWF4V2lkdGgoUmVuZGVyU3R5bGU6OmluaXRpYWxNYXhTaXplKCkpOworICAgICAg
ICB9IGVsc2UgeworICAgICAgICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRNaW5IZWln
aHQoUmVuZGVyU3R5bGU6OmluaXRpYWxNaW5TaXplKCkpOworICAgICAgICAgICAgbV9jaGlsZC5t
dXRhYmxlU3R5bGUoKS5zZXRNYXhIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxNYXhTaXplKCkp
OworICAgICAgICB9CisKICAgICAgICAgaWYgKG1fbWFpbkF4aXNJc0lubGluZUF4aXMpIHsKICAg
ICAgICAgICAgIG1fb3JpZ2luYWxMZW5ndGggPSBtX2NoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRo
KCk7CiAgICAgICAgICAgICBtX2NoaWxkLm11dGFibGVTdHlsZSgpLnNldExvZ2ljYWxXaWR0aChM
ZW5ndGgoZmxleEJhc2lzKSk7CkBAIC0xMDExLDggKzEwMjQsMTYgQEAgcHVibGljOgogICAgICAg
ICBtX29yaWdpbmFsTGVuZ3RoID0gbV9jaGlsZC5zdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKTsKICAg
ICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRMb2dpY2FsSGVpZ2h0KExlbmd0aChmbGV4
QmFzaXMpKTsKICAgICB9Ci0gICAgflNjb3BlZEZsZXhCYXNpc0FzQ2hpbGRNYWluU2l6ZSgpCisg
ICAgflNjb3BlZFVuYm91bmRlZEJveFdpdGhGbGV4QmFzaXNBc0NoaWxkTWFpblNpemUoKQogICAg
IHsKKyAgICAgICAgaWYgKG1faXNIb3Jpem9udGFsV3JpdGluZ01vZGVJblBhcmFsbGVsRmxvdykg
eworICAgICAgICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRNaW5XaWR0aChMZW5ndGgo
bV9vcmlnaW5hbE1pbikpOworICAgICAgICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRN
YXhXaWR0aChMZW5ndGgobV9vcmlnaW5hbE1heCkpOworICAgICAgICB9IGVsc2UgeworICAgICAg
ICAgICAgbV9jaGlsZC5tdXRhYmxlU3R5bGUoKS5zZXRNaW5IZWlnaHQoTGVuZ3RoKG1fb3JpZ2lu
YWxNaW4pKTsKKyAgICAgICAgICAgIG1fY2hpbGQubXV0YWJsZVN0eWxlKCkuc2V0TWF4SGVpZ2h0
KExlbmd0aChtX29yaWdpbmFsTWF4KSk7CisgICAgICAgIH0KKwogICAgICAgICBpZiAobV9tYWlu
QXhpc0lzSW5saW5lQXhpcykKICAgICAgICAgICAgIG1fY2hpbGQubXV0YWJsZVN0eWxlKCkuc2V0
TG9naWNhbFdpZHRoKExlbmd0aChtX29yaWdpbmFsTGVuZ3RoKSk7CiAgICAgICAgIGVsc2UKQEAg
LTEwMjAsOCArMTA0MSwxMSBAQCBwdWJsaWM6CiAgICAgfQogcHJpdmF0ZToKICAgICBSZW5kZXJC
b3gmIG1fY2hpbGQ7CisgICAgYm9vbCBtX2lzSG9yaXpvbnRhbFdyaXRpbmdNb2RlSW5QYXJhbGxl
bEZsb3c7CiAgICAgYm9vbCBtX21haW5BeGlzSXNJbmxpbmVBeGlzOwogICAgIExlbmd0aCBtX29y
aWdpbmFsTGVuZ3RoOworICAgIExlbmd0aCBtX29yaWdpbmFsTWluOworICAgIExlbmd0aCBtX29y
aWdpbmFsTWF4OwogfTsKIAogLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94
LyNhbGdvLW1haW4taXRlbQpAQCAtMTA0Myw3ICsxMDY3LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJG
bGV4aWJsZUJveDo6Y29tcHV0ZUZsZXhCYXNlU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQs
IExheW8KIAogICAgIC8vIDkuMy4yIEUuIE90aGVyd2lzZSwgc2l6ZSB0aGUgaXRlbSBpbnRvIHRo
ZSBhdmFpbGFibGUgc3BhY2UgdXNpbmcgaXRzIHVzZWQgZmxleCBiYXNpcyBpbiBwbGFjZSBvZiBp
dHMgbWFpbiBzaXplLgogICAgIHsKLSAgICAgICAgU2NvcGVkRmxleEJhc2lzQXNDaGlsZE1haW5T
aXplIGZsZXhCYXNpc1Njb3BlKGNoaWxkLCBmbGV4QmFzaXMsIG1haW5BeGlzSXNDaGlsZElubGlu
ZUF4aXMoY2hpbGQpKTsKKyAgICAgICAgU2NvcGVkVW5ib3VuZGVkQm94V2l0aEZsZXhCYXNpc0Fz
Q2hpbGRNYWluU2l6ZSBmbGV4QmFzaXNTY29wZShjaGlsZCwgZmxleEJhc2lzLCBtYWluQXhpc0lz
Q2hpbGRJbmxpbmVBeGlzKGNoaWxkKSk7CiAgICAgICAgIGlmIChtYWluQXhpc0lzQ2hpbGRJbmxp
bmVBeGlzKGNoaWxkKSkKICAgICAgICAgICAgIHJldHVybiBjaGlsZC5tYXhQcmVmZXJyZWRMb2dp
Y2FsV2lkdGgoKSAtIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZzsKIApkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDZlNzE0MzE0
NzFlZDM1MmY0Y2E1OGU1MWIzZGFmYTM2NDlkNTA2NjMuLmJhMWIxNzQxMjJhMGJhZWQ2YTA4NDFl
OTczZmZlNjFhODI1Zjg1ZDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg
Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0xMC0xNSAgU2Vy
Z2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWZs
ZXhib3hdIERvIG5vdCBjbGFtcCBmbGV4IGJhc2Ugc2l6ZSB3aXRoIHttaW58bWF4fS17aGVpZ2h0
fHdpZHRofQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjI1NTkwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODEwMDMyOT4KKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RFeHBlY3RhdGlvbnM6IFVu
c2tpcHBlZCAzIHRlc3RzIHRoYXQgYXJlIG5vdyBwYXNzaW5nLgorCiAyMDIxLTA5LTI0ICBTZXJn
aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtZmxl
eGJveF0gSW1wcm92ZSAmIHNpbXBsaWZ5IHRoZSBmbGV4LWJhc2lzIGNvbXB1dGF0aW9uCmRpZmYg
LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4
cGVjdGF0aW9ucwppbmRleCBlYzE2YWYzOTUzZjYyNGI5MDhmMTFkNzhjOTgwZDFjZmUxOTk2ZjM2
Li5jNWExN2RhMjJhMjMwNTdkYTQyMjdkZDliZTExNGFjMGE4NTcyZWU2IDEwMDY0NAotLS0gYS9M
YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh
dGlvbnMKQEAgLTQxNjIsOSArNDE2Miw3IEBAIHdlYmtpdC5vcmcvYi8yMDkwODAgaW1wb3J0ZWQv
dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXdyaXRpbmctbW9kZXMvdmVydGljCiB3ZWJr
aXQub3JnL2IvMjA5MDgwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy13
cml0aW5nLW1vZGVzL3ZlcnRpY2FsLWFsaWdubWVudC1zcmwtMDM0LnhodCBbIEltYWdlT25seUZh
aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTA4MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl
c3RzL2Nzcy9jc3Mtd3JpdGluZy1tb2Rlcy92ZXJ0aWNhbC1hbGlnbm1lbnQtc3JsLTA0MC54aHQg
WyBJbWFnZU9ubHlGYWlsdXJlIF0KIAotd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mv
d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWct
Y29sdW1uLTAxMi5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQz
IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2ZsZXgtYXNw
ZWN0LXJhdGlvLWltZy1jb2x1bW4tMDE1Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KLXdlYmtp
dC5vcmcvYi8yMTkzNDMgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWZs
ZXhib3gvZmxleC1hc3BlY3QtcmF0aW8taW1nLXJvdy0wMDcuaHRtbCBbIEltYWdlT25seUZhaWx1
cmUgXQogd2Via2l0Lm9yZy9iLzIxOTM0MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz
L2Nzcy9jc3MtZmxleGJveC9mbGV4LWFzcGVjdC1yYXRpby1pbWctcm93LTAxMC5odG1sIFsgSW1h
Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjE5MzQzIGltcG9ydGVkL3czYy93ZWItcGxh
dGZvcm0tdGVzdHMvY3NzL2Nzcy1mbGV4Ym94L2FzcGVjdC1yYXRpby1pbnRyaW5zaWMtc2l6ZS0w
MDUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogCkBAIC00MTkwLDcgKzQxODgsNiBAQCB3ZWJr
aXQub3JnL2IvMjIxNDczIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1m
bGV4Ym94L3RhYmxlLWFzLWl0ZQogd2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mvd2Vi
LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC90YWJsZS1hcy1pdGVtLWluZmxleGlibGUt
aW4tY29sdW1uLTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIyMTQ3
MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC90YWJsZS1h
cy1pdGVtLWluZmxleGlibGUtaW4tY29sdW1uLTIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQog
d2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j
c3MtZmxleGJveC90YWJsZS1hcy1pdGVtLWluZmxleGlibGUtaW4tcm93LTIuaHRtbCBbIEltYWdl
T25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyMTQ3MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm
b3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJveC90YWJsZS1hcy1pdGVtLW1pbi1oZWlnaHQtMS5odG1s
IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKICMgU1ZHcyBhcyBmbGV4IGl0ZW1zLgogd2Via2l0Lm9y
Zy9iLzIyMTQ3NCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZmxleGJv
eC9zdmctcm9vdC1hcy1mbGV4LWl0ZW0tMDAyLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K
</data>
<flag name="review"
          id="465893"
          type_id="1"
          status="+"
          setter="rego"
    />
    <flag name="commit-queue"
          id="465969"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
      

    </bug>

</bugzilla>