<?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>224549</bug_id>
          
          <creation_ts>2021-04-14 08:23:33 -0700</creation_ts>
          <short_desc>Move FocusRemovalEventsMode into FocusOptions</short_desc>
          <delta_ts>2021-04-15 15:27:58 -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>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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Manuel Rego Casasnovas">rego</reporter>
          <assigned_to name="Manuel Rego Casasnovas">rego</assigned_to>
          <cc>annulen</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>darin</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>gyuyoung.kim</cc>
    
    <cc>kangil.han</cc>
    
    <cc>rbuis</cc>
    
    <cc>ryuan.choi</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1750114</commentid>
    <comment_count>0</comment_count>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-14 08:23:33 -0700</bug_when>
    <thetext>Move FocusRemovalEventsMode into FocusOptions</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750117</commentid>
    <comment_count>1</comment_count>
      <attachid>425984</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-14 08:25:20 -0700</bug_when>
    <thetext>Created attachment 425984
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750313</commentid>
    <comment_count>2</comment_count>
      <attachid>426041</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-14 13:22:52 -0700</bug_when>
    <thetext>Created attachment 426041
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750315</commentid>
    <comment_count>3</comment_count>
      <attachid>426041</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-14 13:24:06 -0700</bug_when>
    <thetext>Comment on attachment 426041
Patch

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

&gt; Source/WebCore/dom/Document.cpp:4363
&gt; +        FocusOptions focusOptions = { };
&gt; +        focusOptions.removalEventsMode = FocusRemovalEventsMode::DoNotDispatch;
&gt; +        setFocusedElement(nullptr, focusOptions);

I&apos;ve initially used the following line here, but it doesn&apos;t build on Windows port due to the C++ version:
      setFocusedElement(nullptr, { .removalEventsMode = FocusRemovalEventsMode::DoNotDispatch });</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750389</commentid>
    <comment_count>4</comment_count>
      <attachid>426041</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-04-14 16:00:17 -0700</bug_when>
    <thetext>Comment on attachment 426041
Patch

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

&gt;&gt; Source/WebCore/dom/Document.cpp:4363
&gt;&gt; +        setFocusedElement(nullptr, focusOptions);
&gt; 
&gt; I&apos;ve initially used the following line here, but it doesn&apos;t build on Windows port due to the C++ version:
&gt;       setFocusedElement(nullptr, { .removalEventsMode = FocusRemovalEventsMode::DoNotDispatch });

Yes, I think that might be a C++20 feature and we can’t start using those yet. But soon I hope!

But maybe you could write something like this:

    setFocusedElement(nullptr, { { }, { }, { FocusRemovalEventsMode::DoNotDispatch }, { } });

While it’s not super-beautiful, there’s no chance of the FocusRemovalEventsMode ending up in the wrong structure element, nor of anything else being set to a non-default value.

&gt; Source/WebCore/dom/FocusRemovalEventsMode.h:30
&gt; +enum class FocusRemovalEventsMode { Dispatch, DoNotDispatch };

Do we really need a separate header for this? Can we just put this into FocusOptions.h and include that everywhere this is needed?

I’m willing to have a separate header for a single enumeration if it’s really helpful but it would be good to avoid if possible.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750511</commentid>
    <comment_count>5</comment_count>
      <attachid>426079</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 00:15:19 -0700</bug_when>
    <thetext>Created attachment 426079
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750512</commentid>
    <comment_count>6</comment_count>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 00:24:03 -0700</bug_when>
    <thetext>Thanks for the quick review.

(In reply to Darin Adler from comment #4)
&gt; Comment on attachment 426041 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=426041&amp;action=review
&gt; 
&gt; &gt;&gt; Source/WebCore/dom/Document.cpp:4363
&gt; &gt;&gt; +        setFocusedElement(nullptr, focusOptions);
&gt; &gt; 
&gt; &gt; I&apos;ve initially used the following line here, but it doesn&apos;t build on Windows port due to the C++ version:
&gt; &gt;       setFocusedElement(nullptr, { .removalEventsMode = FocusRemovalEventsMode::DoNotDispatch });
&gt; 
&gt; Yes, I think that might be a C++20 feature and we can’t start using those
&gt; yet. But soon I hope!
&gt; 
&gt; But maybe you could write something like this:
&gt; 
&gt;     setFocusedElement(nullptr, { { }, { }, {
&gt; FocusRemovalEventsMode::DoNotDispatch }, { } });
&gt; 
&gt; While it’s not super-beautiful, there’s no chance of the
&gt; FocusRemovalEventsMode ending up in the wrong structure element, nor of
&gt; anything else being set to a non-default value.

Yeah that works, thanks for the suggestion.

&gt; &gt; Source/WebCore/dom/FocusRemovalEventsMode.h:30
&gt; &gt; +enum class FocusRemovalEventsMode { Dispatch, DoNotDispatch };
&gt; 
&gt; Do we really need a separate header for this? Can we just put this into
&gt; FocusOptions.h and include that everywhere this is needed?
&gt; 
&gt; I’m willing to have a separate header for a single enumeration if it’s
&gt; really helpful but it would be good to avoid if possible.

Yeah I don&apos;t think it&apos;s needed, I&apos;ve merged it into FocusOptions (I was mimicking what is done for FocusDirection, but maybe that&apos;s separated just because it&apos;s older than FocusOptions).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750523</commentid>
    <comment_count>7</comment_count>
      <attachid>426081</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 01:34:48 -0700</bug_when>
    <thetext>Created attachment 426081
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750541</commentid>
    <comment_count>8</comment_count>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 02:18:51 -0700</bug_when>
    <thetext>(In reply to Manuel Rego Casasnovas from comment #6)
&gt; Thanks for the quick review.
&gt; 
&gt; (In reply to Darin Adler from comment #4)
&gt; &gt; Comment on attachment 426041 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=426041&amp;action=review
&gt; &gt; 
&gt; &gt; &gt;&gt; Source/WebCore/dom/Document.cpp:4363
&gt; &gt; &gt;&gt; +        setFocusedElement(nullptr, focusOptions);
&gt; &gt; &gt; 
&gt; &gt; &gt; I&apos;ve initially used the following line here, but it doesn&apos;t build on Windows port due to the C++ version:
&gt; &gt; &gt;       setFocusedElement(nullptr, { .removalEventsMode = FocusRemovalEventsMode::DoNotDispatch });
&gt; &gt; 
&gt; &gt; Yes, I think that might be a C++20 feature and we can’t start using those
&gt; &gt; yet. But soon I hope!
&gt; &gt; 
&gt; &gt; But maybe you could write something like this:
&gt; &gt; 
&gt; &gt;     setFocusedElement(nullptr, { { }, { }, {
&gt; &gt; FocusRemovalEventsMode::DoNotDispatch }, { } });
&gt; &gt; 
&gt; &gt; While it’s not super-beautiful, there’s no chance of the
&gt; &gt; FocusRemovalEventsMode ending up in the wrong structure element, nor of
&gt; &gt; anything else being set to a non-default value.
&gt; 
&gt; Yeah that works, thanks for the suggestion.

Actually that only worked on Linux ports, not on Mac. So I&apos;m coming back to the code in the first patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750544</commentid>
    <comment_count>9</comment_count>
      <attachid>426089</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 02:23:46 -0700</bug_when>
    <thetext>Created attachment 426089
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750561</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-15 04:01:33 -0700</bug_when>
    <thetext>Committed r276016 (236568@main): &lt;https://commits.webkit.org/236568@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 426089.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750563</commentid>
    <comment_count>11</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-04-15 04:02:34 -0700</bug_when>
    <thetext>&lt;rdar://problem/76695885&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750608</commentid>
    <comment_count>12</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-04-15 07:52:25 -0700</bug_when>
    <thetext>(In reply to Manuel Rego Casasnovas from comment #8)
&gt; Actually that only worked on Linux ports, not on Mac. So I&apos;m coming back to
&gt; the code in the first patch.

Would eventually like to know what didn’t work on Mac about this. Not important, but curious. I suppose I can try it myself.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750733</commentid>
    <comment_count>13</comment_count>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 12:49:18 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #12)
&gt; (In reply to Manuel Rego Casasnovas from comment #8)
&gt; &gt; Actually that only worked on Linux ports, not on Mac. So I&apos;m coming back to
&gt; &gt; the code in the first patch.
&gt; 
&gt; Would eventually like to know what didn’t work on Mac about this. Not
&gt; important, but curious. I suppose I can try it myself.

The error was:
./dom/Document.cpp:4360:48: error: braces around scalar initializer [-Werror,-Wbraced-scalar-init]

I&apos;ve been now testing on a Mac machine and the problem was that I was using too many braces.
This works fine on Mac:
    setFocusedElement(nullptr, { { }, { }, FocusRemovalEventsMode::DoNotDispatch, { } });

I&apos;ll upload a follow-up patch to change this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750739</commentid>
    <comment_count>14</comment_count>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 12:51:47 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750740</commentid>
    <comment_count>15</comment_count>
      <attachid>426128</attachid>
    <who name="Manuel Rego Casasnovas">rego</who>
    <bug_when>2021-04-15 12:51:53 -0700</bug_when>
    <thetext>Created attachment 426128
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1750797</commentid>
    <comment_count>16</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-04-15 15:27:54 -0700</bug_when>
    <thetext>Committed r276077 (236590@main): &lt;https://commits.webkit.org/236590@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 426128.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>425984</attachid>
            <date>2021-04-14 08:25:20 -0700</date>
            <delta_ts>2021-04-14 13:22:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224549-20210414172518.patch</filename>
            <type>text/plain</type>
            <size>16202</size>
            <attacher name="Manuel Rego Casasnovas">rego</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBjNjRjMTQ4MThkNDJh
MDE1ZmFjMTU0ZjQ5MmI0MDIwMTZmMmFlNS4uMDc5M2I0YmJiZjY5MGRhOTllZmZiODU4ZmNiYjI2
NGQwZGFlYzc1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTA0LTE0ICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZSBpbnRvIEZvY3VzT3B0aW9ucworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTQ5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBqdXN0IGEgcmVmYWN0
b3JpbmcgdGhhdCBtb3ZlcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIGVudW0gaW50byBGb2N1c09w
dGlvbnMuCisgICAgICAgIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBsaWZ5IHNvbWUgbWV0aG9kIHNp
Z25hdHVyZXMsIGFzIHRoZXknbGwganVzdCByZWNlaXZlIGEgRm9jdXNPcHRpb25zIHBhcmFtZXRl
ciwgaW5zdGVhZCBvZiB0d28gcGFyYW1ldGVycyBmb3IgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSBh
bmQgRm9jdXNEaXJlY3Rpb24uCisKKyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIG9mIGJlaGF2
aW9yLCBqdXN0IGEgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIEhlYWRlcnMuY21ha2U6
CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq
IGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9j
dXNlZE5vZGVPbk5vZGVSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRG
b2N1c2VkRWxlbWVudCk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJD
b3JlOjpEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmZvY3VzKToKKyAgICAgICAgKiBkb20v
Rm9jdXNPcHRpb25zLmg6CisgICAgICAgICogZG9tL0ZvY3VzUmVtb3ZhbEV2ZW50c01vZGUuaDog
Q29waWVkIGZyb20gU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oLgorICAgICAgICAq
IHBhZ2UvRm9jdXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJv
bGxlcjo6c2V0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVy
Lmg6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OnNldEZvY3VzZWRFbGVtZW50
KToKKwogMjAyMS0wNC0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg
ICAgIElubGluZUJveCBzaG91bGQgbm90IGhvbGQgYSByZWZlcmVuY2UgdG8gUmVuZGVyT2JqZWN0
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlIGIvU291cmNlL1dlYkNv
cmUvSGVhZGVycy5jbWFrZQppbmRleCBlMTE1MDVjZGQwZjhlNDNiMjg3M2RiN2ExZDU4MWY4ZGY5
ODRmZWIzLi42ZGMxNTk5ZDg3OTljOTg5YWZjNmZkYjhiYmExOGZjMDJhNGZkZjdjIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL0hl
YWRlcnMuY21ha2UKQEAgLTQ2OSw2ICs0NjksNyBAQCBzZXQoV2ViQ29yZV9QUklWQVRFX0ZSQU1F
V09SS19IRUFERVJTCiAgICAgZG9tL0V4Y2VwdGlvbkRhdGEuaAogICAgIGRvbS9FeGNlcHRpb25P
ci5oCiAgICAgZG9tL0ZvY3VzT3B0aW9ucy5oCisgICAgZG9tL0ZvY3VzUmVtb3ZhbEV2ZW50c01v
ZGUuaAogICAgIGRvbS9GcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24uaAogICAgIGRvbS9GdWxs
c2NyZWVuTWFuYWdlci5oCiAgICAgZG9tL0dDUmVhY2hhYmxlUmVmLmgKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9X
ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1ZjhlZTU5Yjcx
ZWU1NjQxOGFiMTU2MTQ4ODg5NjEzN2JjNDJjNzc2Li44NjcwYjA4OTIwOTliMjU2ZTFiNmU3ZDIy
ZjkwYjM2NTdiZjk2MWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl
cHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy
b2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yNzI5LDYgKzI3MjksNyBAQAogCQk4QUY0RTU1QzExREM1
QTYzMDAwRUQzREUgLyogUGVyZm9ybWFuY2VUaW1pbmcuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9
IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDhBRjRFNTU5MTFEQzVBNjMwMDBFRDNERSAvKiBQZXJm
b3JtYW5jZVRpbWluZy5oICovOyB9OwogCQk4QkQzN0E2ODIwMUJCMzlDMDAxMTczNEEgLyogUmVh
ZGFibGVTdHJlYW1DaHVuay5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm
aWxlUmVmID0gOEJEMzdBNjcyMDFCQjM5QzAwMTE3MzRBIC8qIFJlYWRhYmxlU3RyZWFtQ2h1bmsu
aCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk4RTRD
OTZERDFBRDQ0ODM1MDAzNjVBNTAgLyogSlNGZXRjaFJlc3BvbnNlLmggaW4gSGVhZGVycyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4RTRDOTZEOTFBRDQ0ODM1MDAzNjVBNTAg
LyogSlNGZXRjaFJlc3BvbnNlLmggKi87IH07CisJCThFQUY2MjQ4MjYyNzNFQ0QwMDFGREFFNCAv
KiBGb2N1c1JlbW92YWxFdmVudHNNb2RlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA4RUFGNjI0NjI2MjczRERFMDAxRkRBRTQgLyogRm9jdXNSZW1vdmFs
RXZlbnRzTW9kZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07
IH07CiAJCThFQzZDOTYzMjAxQTI1MTYwMEZCRkE1MyAvKiBHYXBMZW5ndGguaCBpbiBIZWFkZXJz
ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDhFQzZDOTYxMjAxQTI1MDEwMEZC
RkE1MyAvKiBHYXBMZW5ndGguaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl
LCApOyB9OyB9OwogCQk4RjY3NTYxQjEyODhCMTdCMDA0N0FDQTMgLyogRXZlbnRRdWV1ZS5oIGlu
IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOEY2NzU2MTkxMjg4
QjE3QjAwNDdBQ0EzIC8qIEV2ZW50UXVldWUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9
IChQcml2YXRlLCApOyB9OyB9OwogCQk5MDAxNzc0MTEyRTAzNDc4MDA2NDg0NjIgLyogT0VTU3Rh
bmRhcmREZXJpdmF0aXZlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm
aWxlUmVmID0gOTAwMTc3M0UxMkUwMzQ3ODAwNjQ4NDYyIC8qIE9FU1N0YW5kYXJkRGVyaXZhdGl2
ZXMuaCAqLzsgfTsKQEAgLTExNDE2LDYgKzExNDE3LDcgQEAKIAkJOEUzM0NEOTMyMDFBMjlDMTAw
RTM5MDkzIC8qIEdhcExlbmd0aC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh
dGggPSBHYXBMZW5ndGguY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4RTRDOTZE
ODFBRDQ0ODM1MDAzNjVBNTAgLyogSlNGZXRjaFJlc3BvbnNlLmNwcCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj
ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTRmV0Y2hSZXNwb25zZS5jcHA7IHNvdXJjZVRyZWUgPSAi
PGdyb3VwPiI7IH07CiAJCThFNEM5NkQ5MUFENDQ4MzUwMDM2NUE1MCAvKiBKU0ZldGNoUmVzcG9u
c2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0
S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNGZXRjaFJlc3BvbnNlLmg7
IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCThFQUY2MjQ2MjYyNzNEREUwMDFGREFFNCAv
KiBGb2N1c1JlbW92YWxFdmVudHNNb2RlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg
bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEZvY3VzUmVtb3ZhbEV2
ZW50c01vZGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOEVDNkM5NjEyMDFBMjUw
MTAwRkJGQTUzIC8qIEdhcExlbmd0aC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp
bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg
PSBHYXBMZW5ndGguaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOEY2NzU2MTkxMjg4
QjE3QjAwNDdBQ0EzIC8qIEV2ZW50UXVldWUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl
OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw
YXRoID0gRXZlbnRRdWV1ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4RjkzNEQ4
MzExODlGMUVFMDA1MDhENUQgLyogSlNFeGVjU3RhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm
ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu
Yy5oOyBwYXRoID0gSlNFeGVjU3RhdGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg
LTMwNDQxLDExICszMDQ0MywxMiBAQAogCQkJCTkzRDE5NjMwMUQ2Q0FCNzYwMEZDN0U0NyAvKiBF
eGNlcHRpb25Pci5oICovLAogCQkJCUU0N0UyNzY3MTYwMzZFREMwMEVFMkFGQiAvKiBFeHRlbnNp
b25TdHlsZVNoZWV0cy5jcHAgKi8sCiAJCQkJRTQ3RTI3NjQxNjAzNkVEMjAwRUUyQUZCIC8qIEV4
dGVuc2lvblN0eWxlU2hlZXRzLmggKi8sCisJCQkJQUFERUZFNDMyNUFGNEZDQjAwNDBERDY3IC8q
IEZhb2N1c09wdGlvbnMuaCAqLywKIAkJCQlCNkQ5RDIzNDE0RUFCRDI2MDA5MEQ3NUUgLyogRm9j
dXNFdmVudC5jcHAgKi8sCiAJCQkJQjZEOUQyMzMxNEVBQkQyNjAwOTBENzVFIC8qIEZvY3VzRXZl
bnQuaCAqLywKIAkJCQlCNkQ5RDI3MjE0RUFCRjAzMDA5MEQ3NUUgLyogRm9jdXNFdmVudC5pZGwg
Ki8sCi0JCQkJQUFERUZFNDMyNUFGNEZDQjAwNDBERDY3IC8qIEZvY3VzT3B0aW9ucy5oICovLAog
CQkJCUFBMkUwRDA5MjVBRjUxMDQwMDc2OTNCQSAvKiBGb2N1c09wdGlvbnMuaWRsICovLAorCQkJ
CThFQUY2MjQ2MjYyNzNEREUwMDFGREFFNCAvKiBGb2N1c1JlbW92YWxFdmVudHNNb2RlLmggKi8s
CiAJCQkJQTg1MzEyM0MxMUQwNDcxQjAwRDREMDc3IC8qIEZyYWdtZW50U2NyaXB0aW5nUGVybWlz
c2lvbi5oICovLAogCQkJCUNEOTJGNTE3MjI2MTAzODIwMEY4N0JCMyAvKiBGdWxsc2NyZWVuTWFu
YWdlci5jcHAgKi8sCiAJCQkJQ0Q5MkY1MTYyMjYxMDM4MjAwRjg3QkIzIC8qIEZ1bGxzY3JlZW5N
YW5hZ2VyLmggKi8sCkBAIC0zMjQ0Myw2ICszMjQ0Niw3IEBACiAJCQkJMDYyMjg3ODQwQjREQjMy
MjAwMEMzNERGIC8qIEZvY3VzRGlyZWN0aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQlCNkQ5RDIz
NTE0RUFCRDI2MDA5MEQ3NUUgLyogRm9jdXNFdmVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUFE
RUZFNDUyNUFGNEZENjAwNDBERDY3IC8qIEZvY3VzT3B0aW9ucy5oIGluIEhlYWRlcnMgKi8sCisJ
CQkJOEVBRjYyNDgyNjI3M0VDRDAwMUZEQUU0IC8qIEZvY3VzUmVtb3ZhbEV2ZW50c01vZGUuaCBp
biBIZWFkZXJzICovLAogCQkJCUIyQzNEQTY1MEQwMDZDRDYwMEVGNkYyNiAvKiBGb250LmggaW4g
SGVhZGVycyAqLywKIAkJCQkxQUMyRDg5RDFCMUUyOTFGMDBENTJFODcgLyogRm9udEFudGlhbGlh
c2luZ1N0YXRlU2F2ZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUY0RTU3RURDMjEzRjNGNUYwMDRF
QTk4RSAvKiBGb250QXR0cmlidXRlQ2hhbmdlcy5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv
Y3VtZW50LmNwcAppbmRleCBmNzZhOGMxYmJhOTJjM2Q0NjhlYmY5ZGZmYjljMTdjNmVhZTRlMmQw
Li5mNzdmZTRmMTUwZWE4MGQ5OTY0N2Q4MTc0Mzk0MjQ1OGZjMTI4MDI1IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E
b2N1bWVudC5jcHAKQEAgLTc0LDcgKzc0LDkgQEAKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIK
ICNpbmNsdWRlICJFeHRlbnNpb25TdHlsZVNoZWV0cy5oIgogI2luY2x1ZGUgIkZvY3VzQ29udHJv
bGxlci5oIgorI2luY2x1ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCiAjaW5jbHVkZSAiRm9jdXNFdmVu
dC5oIgorI2luY2x1ZGUgIkZvY3VzUmVtb3ZhbEV2ZW50c01vZGUuaCIKICNpbmNsdWRlICJGb250
RmFjZVNldC5oIgogI2luY2x1ZGUgIkZvcm1Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUu
aCIKQEAgLTQzNTYsNyArNDM1OCw3IEBAIHZvaWQgRG9jdW1lbnQ6OmFkanVzdEZvY3VzZWROb2Rl
T25Ob2RlUmVtb3ZhbChOb2RlJiBub2RlLCBOb2RlUmVtb3ZhbCBub2RlUmVtb3ZhCiAgICAgICAg
IC8vIEZJWE1FOiBXZSBzaG91bGQgYXZvaWQgc3luY2hyb25vdXNseSB1cGRhdGluZyB0aGUgc3R5
bGUgaW5zaWRlIHNldEZvY3VzZWRFbGVtZW50LgogICAgICAgICAvLyBGSVhNRTogT2JqZWN0IGVs
ZW1lbnRzIHNob3VsZCBhdm9pZCBsb2FkaW5nIGEgZnJhbWUgc3luY2hyb25vdXNseSBpbiBhIHBv
c3Qgc3R5bGUgcmVjYWxjIGNhbGxiYWNrLgogICAgICAgICBTdWJmcmFtZUxvYWRpbmdEaXNhYmxl
ciBkaXNhYmxlcihpczxDb250YWluZXJOb2RlPihub2RlKSA/ICZkb3duY2FzdDxDb250YWluZXJO
b2RlPihub2RlKSA6IG51bGxwdHIpOwotICAgICAgICBzZXRGb2N1c2VkRWxlbWVudChudWxscHRy
LCBGb2N1c0RpcmVjdGlvbjo6Tm9uZSwgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RG9Ob3REaXNw
YXRjaCk7CisgICAgICAgIHNldEZvY3VzZWRFbGVtZW50KG51bGxwdHIsIHsgLnJlbW92YWxFdmVu
dHNNb2RlID0gRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RG9Ob3REaXNwYXRjaCB9KTsKICAgICAg
ICAgLy8gU2V0IHRoZSBmb2N1cyBuYXZpZ2F0aW9uIHN0YXJ0aW5nIG5vZGUgdG8gdGhlIHByZXZp
b3VzIGZvY3VzZWQgZWxlbWVudCBzbyB0aGF0CiAgICAgICAgIC8vIHdlIGNhbiBmYWxsYmFjayB0
byB0aGUgc2libGluZ3Mgb3IgcGFyZW50IG5vZGUgZm9yIHRoZSBuZXh0IHNlYXJjaC4KICAgICAg
ICAgLy8gQWxzbyB3ZSBuZWVkIHRvIGNhbGwgcmVtb3ZlRm9jdXNOYXZpZ2F0aW9uTm9kZU9mU3Vi
dHJlZSBhZnRlciB0aGlzIGZ1bmN0aW9uIGJlY2F1c2UKQEAgLTQ0MzgsNyArNDQ0MCw3IEBAIHZv
aWQgRG9jdW1lbnQ6OmludmFsaWRhdGVSZW5kZXJpbmdEZXBlbmRlbnRSZWdpb25zKCkKICNlbmRp
ZgogfQogCi1ib29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBlbGVtZW50
LCBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvY3VzUmVtb3ZhbEV2ZW50c01vZGUgZXZlbnRz
TW9kZSkKK2Jvb2wgRG9jdW1lbnQ6OnNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQs
IGNvbnN0IEZvY3VzT3B0aW9ucyYgb3B0aW9ucykKIHsKICAgICBSZWZQdHI8RWxlbWVudD4gbmV3
Rm9jdXNlZEVsZW1lbnQgPSBlbGVtZW50OwogICAgIC8vIE1ha2Ugc3VyZSBuZXdGb2N1c2VkRWxl
bWVudCBpcyBhY3R1YWxseSBpbiB0aGlzIGRvY3VtZW50CkBAIC00NDYwLDcgKzQ0NjIsNyBAQCBi
b29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBlbGVtZW50LCBGb2N1c0Rp
cmVjdGlvbiBkaXJlY3Rpb24sIEZvYwogICAgICAgICBvbGRGb2N1c2VkRWxlbWVudC0+c2V0Rm9j
dXMoZmFsc2UpOwogICAgICAgICBzZXRGb2N1c05hdmlnYXRpb25TdGFydGluZ05vZGUobnVsbHB0
cik7CiAKLSAgICAgICAgaWYgKGV2ZW50c01vZGUgPT0gRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6
RGlzcGF0Y2gpIHsKKyAgICAgICAgaWYgKG9wdGlvbnMucmVtb3ZhbEV2ZW50c01vZGUgPT0gRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2gpIHsKICAgICAgICAgICAgIC8vIERpc3BhdGNo
IGEgY2hhbmdlIGV2ZW50IGZvciBmb3JtIGNvbnRyb2wgZWxlbWVudHMgdGhhdCBoYXZlIGJlZW4g
ZWRpdGVkLgogICAgICAgICAgICAgaWYgKGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KCpvbGRG
b2N1c2VkRWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICBIVE1MRm9ybUNvbnRyb2xFbGVtZW50
JiBmb3JtQ29udHJvbEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Pigq
b2xkRm9jdXNlZEVsZW1lbnQpOwpAQCAtNDUzNyw3ICs0NTM5LDcgQEAgYm9vbCBEb2N1bWVudDo6
c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCwgRm9jdXNEaXJlY3Rpb24gZGlyZWN0
aW9uLCBGb2MKICAgICAgICAgfQogCiAgICAgICAgIC8vIERpc3BhdGNoIHRoZSBmb2N1cyBldmVu
dCBhbmQgbGV0IHRoZSBub2RlIGRvIGFueSBvdGhlciBmb2N1cyByZWxhdGVkIGFjdGl2aXRpZXMg
KGltcG9ydGFudCBmb3IgdGV4dCBmaWVsZHMpCi0gICAgICAgIG1fZm9jdXNlZEVsZW1lbnQtPmRp
c3BhdGNoRm9jdXNFdmVudChvbGRGb2N1c2VkRWxlbWVudC5jb3B5UmVmKCksIGRpcmVjdGlvbik7
CisgICAgICAgIG1fZm9jdXNlZEVsZW1lbnQtPmRpc3BhdGNoRm9jdXNFdmVudChvbGRGb2N1c2Vk
RWxlbWVudC5jb3B5UmVmKCksIG9wdGlvbnMuZGlyZWN0aW9uKTsKIAogICAgICAgICBpZiAobV9m
b2N1c2VkRWxlbWVudCAhPSBuZXdGb2N1c2VkRWxlbWVudCkgewogICAgICAgICAgICAgLy8gaGFu
ZGxlciBzaGlmdGVkIGZvY3VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l
bnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDFlNjhjNTc5NzQxNzRm
ODYyZmUzOWE2OWI4OTAzYzI2MDg2NTE4ZjIuLmJhZWFmYjE2YzMyNzRkNjA1Y2ZjZDVlYjVjNGEw
MGViMWE3ZDJmODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisr
KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0zNiw3ICszNiw3IEBACiAjaW5j
bHVkZSAiRG9jdW1lbnRUaW1lbGluZXNDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRU
aW1pbmcuaCIKICNpbmNsdWRlICJFbGVtZW50SWRlbnRpZmllci5oIgotI2luY2x1ZGUgIkZvY3Vz
RGlyZWN0aW9uLmgiCisjaW5jbHVkZSAiRm9jdXNPcHRpb25zLmgiCiAjaW5jbHVkZSAiRm9udFNl
bGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWVEZXN0cnVjdGlvbk9ic2VydmVyLmgiCiAj
aW5jbHVkZSAiRnJhbWVJZGVudGlmaWVyLmgiCkBAIC03NTcsMTIgKzc1Nyw5IEBAIHB1YmxpYzoK
ICAgICBWaXNpdGVkTGlua1N0YXRlJiB2aXNpdGVkTGlua1N0YXRlKCkgY29uc3QgeyByZXR1cm4g
Km1fdmlzaXRlZExpbmtTdGF0ZTsgfQogCiAgICAgTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0
cyBwcmVwYXJlTW91c2VFdmVudChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIGNvbnN0IExheW91dFBv
aW50JiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jik7Ci0KLSAgICBlbnVtIGNsYXNzIEZvY3Vz
UmVtb3ZhbEV2ZW50c01vZGUgeyBEaXNwYXRjaCwgRG9Ob3REaXNwYXRjaCB9OwogICAgIC8vIFJl
dHVybnMgd2hldGhlciBmb2N1cyB3YXMgYmxvY2tlZC4gQSB0cnVlIHZhbHVlIGRvZXMgbm90IG5l
Y2Vzc2FyaWx5IG1lYW4gdGhlIGVsZW1lbnQgd2FzIGZvY3VzZWQuCiAgICAgLy8gVGhlIGVsZW1l
bnQgY291bGQgaGF2ZSBhbHJlYWR5IGJlZW4gZm9jdXNlZCBvciBtYXkgbm90IGJlIGZvY3VzYWJs
ZSAoZS5nLiA8aW5wdXQgZGlzYWJsZWQ+KS4KLSAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNldEZv
Y3VzZWRFbGVtZW50KEVsZW1lbnQqLCBGb2N1c0RpcmVjdGlvbiA9IEZvY3VzRGlyZWN0aW9uOjpO
b25lLAotICAgICAgICBGb2N1c1JlbW92YWxFdmVudHNNb2RlID0gRm9jdXNSZW1vdmFsRXZlbnRz
TW9kZTo6RGlzcGF0Y2gpOworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0Rm9jdXNlZEVsZW1l
bnQoRWxlbWVudCosIGNvbnN0IEZvY3VzT3B0aW9ucyYgPSB7IH0pOwogICAgIEVsZW1lbnQqIGZv
Y3VzZWRFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9mb2N1c2VkRWxlbWVudC5nZXQoKTsgfQog
ICAgIFVzZXJBY3Rpb25FbGVtZW50U2V0JiB1c2VyQWN0aW9uRWxlbWVudHMoKSAgeyByZXR1cm4g
bV91c2VyQWN0aW9uRWxlbWVudHM7IH0KICAgICBjb25zdCBVc2VyQWN0aW9uRWxlbWVudFNldCYg
dXNlckFjdGlvbkVsZW1lbnRzKCkgY29uc3QgeyByZXR1cm4gbV91c2VyQWN0aW9uRWxlbWVudHM7
IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCA1YzQxZDI4YzI4NDQ3Yzg1NjQwMmVhMzE3MmRi
N2QyOWIxMWE2OTk3Li5hZDU3YjY0YmIxYzdmMzJmYjJiY2VmNzQ2NDI4ZmM3YjZlMjAwMzc1IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl
YkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0zMDgxLDcgKzMwODEsNyBAQCB2b2lkIEVsZW1lbnQ6
OmZvY3VzKGNvbnN0IEZvY3VzT3B0aW9ucyYgb3B0aW9ucykKICAgICAgICAgLy8gRm9jdXMgYW5k
IGNoYW5nZSBldmVudCBoYW5kbGVycyBjYW4gY2F1c2UgdXMgdG8gbG9zZSBvdXIgbGFzdCByZWYu
CiAgICAgICAgIC8vIElmIGEgZm9jdXMgZXZlbnQgaGFuZGxlciBjaGFuZ2VzIHRoZSBmb2N1cyB0
byBhIGRpZmZlcmVudCBub2RlIGl0CiAgICAgICAgIC8vIGRvZXMgbm90IG1ha2Ugc2Vuc2UgdG8g
Y29udGludWUgYW5kIHVwZGF0ZSBhcHBlYXJlbmNlLgotICAgICAgICBpZiAoIXBhZ2UtPmZvY3Vz
Q29udHJvbGxlcigpLnNldEZvY3VzZWRFbGVtZW50KG5ld1RhcmdldC5nZXQoKSwgKmRvY3VtZW50
LT5mcmFtZSgpLCBvcHRpb25zLmRpcmVjdGlvbikpCisgICAgICAgIGlmICghcGFnZS0+Zm9jdXND
b250cm9sbGVyKCkuc2V0Rm9jdXNlZEVsZW1lbnQobmV3VGFyZ2V0LmdldCgpLCAqZG9jdW1lbnQt
PmZyYW1lKCksIG9wdGlvbnMpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUv
ZG9tL0ZvY3VzT3B0aW9ucy5oCmluZGV4IDAwYWE2ZGQzYTMzZTIyZTM5NDM3YWVlYjBmMmFlMzNm
MWU1NjRjNTcuLmY1NDA2MDkwNjYyYWJjZDJhYjJiZGM1MmY5YWMzMGE2OGRhNjZkMTkgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c09wdGlvbnMuaAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9kb20vRm9jdXNPcHRpb25zLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFnbWEgb25jZQog
CiAjaW5jbHVkZSAiRm9jdXNEaXJlY3Rpb24uaCIKKyNpbmNsdWRlICJGb2N1c1JlbW92YWxFdmVu
dHNNb2RlLmgiCiAjaW5jbHVkZSAiU2VsZWN0aW9uUmVzdG9yYXRpb25Nb2RlLmgiCiAKIG5hbWVz
cGFjZSBXZWJDb3JlIHsKQEAgLTMzLDYgKzM0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3Ry
dWN0IEZvY3VzT3B0aW9ucyB7CiAgICAgU2VsZWN0aW9uUmVzdG9yYXRpb25Nb2RlIHNlbGVjdGlv
blJlc3RvcmF0aW9uTW9kZSB7IFNlbGVjdGlvblJlc3RvcmF0aW9uTW9kZTo6UmVzdG9yZU9yU2Vs
ZWN0QWxsIH07CiAgICAgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uIHsgRm9jdXNEaXJlY3Rpb246
Ok5vbmUgfTsKKyAgICBGb2N1c1JlbW92YWxFdmVudHNNb2RlIHJlbW92YWxFdmVudHNNb2RlIHsg
Rm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2ggfTsKICAgICBib29sIHByZXZlbnRTY3Jv
bGwgeyBmYWxzZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3Vz
UmVtb3ZhbEV2ZW50c01vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c1JlbW92YWxFdmVu
dHNNb2RlLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMC4uODkzM2IyYzY2N2UzOWIxMGY0ZWFiZDE5OTlkMzVhM2VmNWIy
YmRiMQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c1JlbW92YWxF
dmVudHNNb2RlLmgKQEAgLTAsMCArMSwzMiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMSBJ
Z2FsaWEgUy5MLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFu
ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9k
aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k
aXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl
IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0
IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlz
dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp
Z2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93
aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt
YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09G
VFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQ
UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP
LCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F
U1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVW
RU5UIFNIQUxMIEFQUExFIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFO
WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBP
UiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAor
ICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV
U0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VW
RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4g
Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElH
RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICog
T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT
VUNIIERBTUFHRS4KKyAqLworCisjcHJhZ21hIG9uY2UKKworbmFtZXNwYWNlIFdlYkNvcmUgewor
CitlbnVtIGNsYXNzIEZvY3VzUmVtb3ZhbEV2ZW50c01vZGUgeyBEaXNwYXRjaCwgRG9Ob3REaXNw
YXRjaCB9OworCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
Q29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3Vz
Q29udHJvbGxlci5jcHAKaW5kZXggZjFkMjg5NDRjMjczNmNjMjg0YTZlN2M3NWIxOGY4ZjE0Zjc3
ZmI2OC4uZWM3MzA3ZDlkYTAzZDhiOGNmZGYzZWI0OTA4ZWE4YzZlNGQ1NWU5MSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcApAQCAtMzksNiArMzksNyBAQAogI2luY2x1
ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnRIYW5kbGVyLmgiCiAjaW5jbHVkZSAiRXZlbnRO
YW1lcy5oIgorI2luY2x1ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIK
ICNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgogI2luY2x1ZGUgIkZyYW1lVHJlZS5oIgpAQCAt
ODI3LDcgKzgyOCw3IEBAIHN0YXRpYyBib29sIHNob3VsZENsZWFyU2VsZWN0aW9uV2hlbkNoYW5n
aW5nRm9jdXNlZEVsZW1lbnQoY29uc3QgUGFnZSYgcGFnZSwgUmVmCiAgICAgcmV0dXJuIHRydWU7
CiB9CiAKLWJvb2wgRm9jdXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBl
bGVtZW50LCBGcmFtZSYgbmV3Rm9jdXNlZEZyYW1lLCBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24p
Citib29sIEZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVu
dCwgRnJhbWUmIG5ld0ZvY3VzZWRGcmFtZSwgY29uc3QgRm9jdXNPcHRpb25zJiBvcHRpb25zKQog
ewogICAgIFJlZjxGcmFtZT4gcHJvdGVjdGVkTmV3Rm9jdXNlZEZyYW1lID0gbmV3Rm9jdXNlZEZy
YW1lOwogICAgIFJlZlB0cjxGcmFtZT4gb2xkRm9jdXNlZEZyYW1lID0gZm9jdXNlZEZyYW1lKCk7
CkBAIC04NzQsNyArODc1LDcgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OnNldEZvY3VzZWRFbGVt
ZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZyYW1lJiBuZXdGb2N1c2VkRnJhbWUKIAogICAgIFJlZjxF
bGVtZW50PiBwcm90ZWN0KCplbGVtZW50KTsKIAotICAgIGJvb2wgc3VjY2Vzc2Z1bGx5Rm9jdXNl
ZCA9IG5ld0RvY3VtZW50LT5zZXRGb2N1c2VkRWxlbWVudChlbGVtZW50LCBkaXJlY3Rpb24pOwor
ICAgIGJvb2wgc3VjY2Vzc2Z1bGx5Rm9jdXNlZCA9IG5ld0RvY3VtZW50LT5zZXRGb2N1c2VkRWxl
bWVudChlbGVtZW50LCBvcHRpb25zKTsKICAgICBpZiAoIXN1Y2Nlc3NmdWxseUZvY3VzZWQpCiAg
ICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9G
b2N1c0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgK
aW5kZXggMjk3ODVkMTllZGJkM2NiNjY2NjJhY2YyYjlhMTlmMTRhMmVjYWIyYy4uZDcxZmFmMzM3
ZjUxN2E2NDBjODVkMWYyOTIyNDQ1Zjc0YmNkMzhjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3Vz
Q29udHJvbGxlci5oCkBAIC0yNiw3ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUg
IkFjdGl2aXR5U3RhdGUuaCIKLSNpbmNsdWRlICJGb2N1c0RpcmVjdGlvbi5oIgorI2luY2x1ZGUg
IkZvY3VzT3B0aW9ucy5oIgogI2luY2x1ZGUgIkxheW91dFJlY3QuaCIKICNpbmNsdWRlICJUaW1l
ci5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC01OSw3ICs1OSw3IEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNldEluaXRpYWxGb2N1cyhGb2N1c0RpcmVjdGlvbiwg
S2V5Ym9hcmRFdmVudCopOwogICAgIGJvb2wgYWR2YW5jZUZvY3VzKEZvY3VzRGlyZWN0aW9uLCBL
ZXlib2FyZEV2ZW50KiwgYm9vbCBpbml0aWFsRm9jdXMgPSBmYWxzZSk7CiAKLSAgICBXRUJDT1JF
X0VYUE9SVCBib29sIHNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqLCBGcmFtZSYsIEZvY3VzRGly
ZWN0aW9uID0gRm9jdXNEaXJlY3Rpb246Ok5vbmUpOworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wg
c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCosIEZyYW1lJiwgY29uc3QgRm9jdXNPcHRpb25zJiA9
IHsgfSk7CiAKICAgICB2b2lkIHNldEFjdGl2aXR5U3RhdGUoT3B0aW9uU2V0PEFjdGl2aXR5U3Rh
dGU6OkZsYWc+KTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426041</attachid>
            <date>2021-04-14 13:22:52 -0700</date>
            <delta_ts>2021-04-15 00:15:11 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224549-20210414222251.patch</filename>
            <type>text/plain</type>
            <size>16275</size>
            <attacher name="Manuel Rego Casasnovas">rego</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBjNjRjMTQ4MThkNDJh
MDE1ZmFjMTU0ZjQ5MmI0MDIwMTZmMmFlNS4uMDc5M2I0YmJiZjY5MGRhOTllZmZiODU4ZmNiYjI2
NGQwZGFlYzc1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTA0LTE0ICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZSBpbnRvIEZvY3VzT3B0aW9ucworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTQ5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBqdXN0IGEgcmVmYWN0
b3JpbmcgdGhhdCBtb3ZlcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIGVudW0gaW50byBGb2N1c09w
dGlvbnMuCisgICAgICAgIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBsaWZ5IHNvbWUgbWV0aG9kIHNp
Z25hdHVyZXMsIGFzIHRoZXknbGwganVzdCByZWNlaXZlIGEgRm9jdXNPcHRpb25zIHBhcmFtZXRl
ciwgaW5zdGVhZCBvZiB0d28gcGFyYW1ldGVycyBmb3IgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSBh
bmQgRm9jdXNEaXJlY3Rpb24uCisKKyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIG9mIGJlaGF2
aW9yLCBqdXN0IGEgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIEhlYWRlcnMuY21ha2U6
CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAq
IGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9j
dXNlZE5vZGVPbk5vZGVSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRG
b2N1c2VkRWxlbWVudCk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJD
b3JlOjpEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmZvY3VzKToKKyAgICAgICAgKiBkb20v
Rm9jdXNPcHRpb25zLmg6CisgICAgICAgICogZG9tL0ZvY3VzUmVtb3ZhbEV2ZW50c01vZGUuaDog
Q29waWVkIGZyb20gU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oLgorICAgICAgICAq
IHBhZ2UvRm9jdXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJv
bGxlcjo6c2V0Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVy
Lmg6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OnNldEZvY3VzZWRFbGVtZW50
KToKKwogMjAyMS0wNC0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg
ICAgIElubGluZUJveCBzaG91bGQgbm90IGhvbGQgYSByZWZlcmVuY2UgdG8gUmVuZGVyT2JqZWN0
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlIGIvU291cmNlL1dlYkNv
cmUvSGVhZGVycy5jbWFrZQppbmRleCBlMTE1MDVjZGQwZjhlNDNiMjg3M2RiN2ExZDU4MWY4ZGY5
ODRmZWIzLi42ZGMxNTk5ZDg3OTljOTg5YWZjNmZkYjhiYmExOGZjMDJhNGZkZjdjIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9IZWFkZXJzLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL0hl
YWRlcnMuY21ha2UKQEAgLTQ2OSw2ICs0NjksNyBAQCBzZXQoV2ViQ29yZV9QUklWQVRFX0ZSQU1F
V09SS19IRUFERVJTCiAgICAgZG9tL0V4Y2VwdGlvbkRhdGEuaAogICAgIGRvbS9FeGNlcHRpb25P
ci5oCiAgICAgZG9tL0ZvY3VzT3B0aW9ucy5oCisgICAgZG9tL0ZvY3VzUmVtb3ZhbEV2ZW50c01v
ZGUuaAogICAgIGRvbS9GcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24uaAogICAgIGRvbS9GdWxs
c2NyZWVuTWFuYWdlci5oCiAgICAgZG9tL0dDUmVhY2hhYmxlUmVmLmgKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9X
ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1ZjhlZTU5Yjcx
ZWU1NjQxOGFiMTU2MTQ4ODg5NjEzN2JjNDJjNzc2Li44NjcwYjA4OTIwOTliMjU2ZTFiNmU3ZDIy
ZjkwYjM2NTdiZjk2MWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl
cHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy
b2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yNzI5LDYgKzI3MjksNyBAQAogCQk4QUY0RTU1QzExREM1
QTYzMDAwRUQzREUgLyogUGVyZm9ybWFuY2VUaW1pbmcuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9
IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDhBRjRFNTU5MTFEQzVBNjMwMDBFRDNERSAvKiBQZXJm
b3JtYW5jZVRpbWluZy5oICovOyB9OwogCQk4QkQzN0E2ODIwMUJCMzlDMDAxMTczNEEgLyogUmVh
ZGFibGVTdHJlYW1DaHVuay5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm
aWxlUmVmID0gOEJEMzdBNjcyMDFCQjM5QzAwMTE3MzRBIC8qIFJlYWRhYmxlU3RyZWFtQ2h1bmsu
aCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk4RTRD
OTZERDFBRDQ0ODM1MDAzNjVBNTAgLyogSlNGZXRjaFJlc3BvbnNlLmggaW4gSGVhZGVycyAqLyA9
IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4RTRDOTZEOTFBRDQ0ODM1MDAzNjVBNTAg
LyogSlNGZXRjaFJlc3BvbnNlLmggKi87IH07CisJCThFQUY2MjQ4MjYyNzNFQ0QwMDFGREFFNCAv
KiBGb2N1c1JlbW92YWxFdmVudHNNb2RlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls
ZEZpbGU7IGZpbGVSZWYgPSA4RUFGNjI0NjI2MjczRERFMDAxRkRBRTQgLyogRm9jdXNSZW1vdmFs
RXZlbnRzTW9kZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07
IH07CiAJCThFQzZDOTYzMjAxQTI1MTYwMEZCRkE1MyAvKiBHYXBMZW5ndGguaCBpbiBIZWFkZXJz
ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDhFQzZDOTYxMjAxQTI1MDEwMEZC
RkE1MyAvKiBHYXBMZW5ndGguaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl
LCApOyB9OyB9OwogCQk4RjY3NTYxQjEyODhCMTdCMDA0N0FDQTMgLyogRXZlbnRRdWV1ZS5oIGlu
IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOEY2NzU2MTkxMjg4
QjE3QjAwNDdBQ0EzIC8qIEV2ZW50UXVldWUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9
IChQcml2YXRlLCApOyB9OyB9OwogCQk5MDAxNzc0MTEyRTAzNDc4MDA2NDg0NjIgLyogT0VTU3Rh
bmRhcmREZXJpdmF0aXZlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm
aWxlUmVmID0gOTAwMTc3M0UxMkUwMzQ3ODAwNjQ4NDYyIC8qIE9FU1N0YW5kYXJkRGVyaXZhdGl2
ZXMuaCAqLzsgfTsKQEAgLTExNDE2LDYgKzExNDE3LDcgQEAKIAkJOEUzM0NEOTMyMDFBMjlDMTAw
RTM5MDkzIC8qIEdhcExlbmd0aC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls
ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh
dGggPSBHYXBMZW5ndGguY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4RTRDOTZE
ODFBRDQ0ODM1MDAzNjVBNTAgLyogSlNGZXRjaFJlc3BvbnNlLmNwcCAqLyA9IHtpc2EgPSBQQlhG
aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj
ZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpTRmV0Y2hSZXNwb25zZS5jcHA7IHNvdXJjZVRyZWUgPSAi
PGdyb3VwPiI7IH07CiAJCThFNEM5NkQ5MUFENDQ4MzUwMDM2NUE1MCAvKiBKU0ZldGNoUmVzcG9u
c2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0
S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSlNGZXRjaFJlc3BvbnNlLmg7
IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCThFQUY2MjQ2MjYyNzNEREUwMDFGREFFNCAv
KiBGb2N1c1JlbW92YWxFdmVudHNNb2RlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg
bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEZvY3VzUmVtb3ZhbEV2
ZW50c01vZGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOEVDNkM5NjEyMDFBMjUw
MTAwRkJGQTUzIC8qIEdhcExlbmd0aC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp
bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg
PSBHYXBMZW5ndGguaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOEY2NzU2MTkxMjg4
QjE3QjAwNDdBQ0EzIC8qIEV2ZW50UXVldWUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl
OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw
YXRoID0gRXZlbnRRdWV1ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4RjkzNEQ4
MzExODlGMUVFMDA1MDhENUQgLyogSlNFeGVjU3RhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm
ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu
Yy5oOyBwYXRoID0gSlNFeGVjU3RhdGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAg
LTMwNDQxLDExICszMDQ0MywxMiBAQAogCQkJCTkzRDE5NjMwMUQ2Q0FCNzYwMEZDN0U0NyAvKiBF
eGNlcHRpb25Pci5oICovLAogCQkJCUU0N0UyNzY3MTYwMzZFREMwMEVFMkFGQiAvKiBFeHRlbnNp
b25TdHlsZVNoZWV0cy5jcHAgKi8sCiAJCQkJRTQ3RTI3NjQxNjAzNkVEMjAwRUUyQUZCIC8qIEV4
dGVuc2lvblN0eWxlU2hlZXRzLmggKi8sCisJCQkJQUFERUZFNDMyNUFGNEZDQjAwNDBERDY3IC8q
IEZhb2N1c09wdGlvbnMuaCAqLywKIAkJCQlCNkQ5RDIzNDE0RUFCRDI2MDA5MEQ3NUUgLyogRm9j
dXNFdmVudC5jcHAgKi8sCiAJCQkJQjZEOUQyMzMxNEVBQkQyNjAwOTBENzVFIC8qIEZvY3VzRXZl
bnQuaCAqLywKIAkJCQlCNkQ5RDI3MjE0RUFCRjAzMDA5MEQ3NUUgLyogRm9jdXNFdmVudC5pZGwg
Ki8sCi0JCQkJQUFERUZFNDMyNUFGNEZDQjAwNDBERDY3IC8qIEZvY3VzT3B0aW9ucy5oICovLAog
CQkJCUFBMkUwRDA5MjVBRjUxMDQwMDc2OTNCQSAvKiBGb2N1c09wdGlvbnMuaWRsICovLAorCQkJ
CThFQUY2MjQ2MjYyNzNEREUwMDFGREFFNCAvKiBGb2N1c1JlbW92YWxFdmVudHNNb2RlLmggKi8s
CiAJCQkJQTg1MzEyM0MxMUQwNDcxQjAwRDREMDc3IC8qIEZyYWdtZW50U2NyaXB0aW5nUGVybWlz
c2lvbi5oICovLAogCQkJCUNEOTJGNTE3MjI2MTAzODIwMEY4N0JCMyAvKiBGdWxsc2NyZWVuTWFu
YWdlci5jcHAgKi8sCiAJCQkJQ0Q5MkY1MTYyMjYxMDM4MjAwRjg3QkIzIC8qIEZ1bGxzY3JlZW5N
YW5hZ2VyLmggKi8sCkBAIC0zMjQ0Myw2ICszMjQ0Niw3IEBACiAJCQkJMDYyMjg3ODQwQjREQjMy
MjAwMEMzNERGIC8qIEZvY3VzRGlyZWN0aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQlCNkQ5RDIz
NTE0RUFCRDI2MDA5MEQ3NUUgLyogRm9jdXNFdmVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQUFE
RUZFNDUyNUFGNEZENjAwNDBERDY3IC8qIEZvY3VzT3B0aW9ucy5oIGluIEhlYWRlcnMgKi8sCisJ
CQkJOEVBRjYyNDgyNjI3M0VDRDAwMUZEQUU0IC8qIEZvY3VzUmVtb3ZhbEV2ZW50c01vZGUuaCBp
biBIZWFkZXJzICovLAogCQkJCUIyQzNEQTY1MEQwMDZDRDYwMEVGNkYyNiAvKiBGb250LmggaW4g
SGVhZGVycyAqLywKIAkJCQkxQUMyRDg5RDFCMUUyOTFGMDBENTJFODcgLyogRm9udEFudGlhbGlh
c2luZ1N0YXRlU2F2ZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUY0RTU3RURDMjEzRjNGNUYwMDRF
QTk4RSAvKiBGb250QXR0cmlidXRlQ2hhbmdlcy5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv
Y3VtZW50LmNwcAppbmRleCBmNzZhOGMxYmJhOTJjM2Q0NjhlYmY5ZGZmYjljMTdjNmVhZTRlMmQw
Li5mMDFjNDllMDczYjcxMDBmNzBlZTI2MTg4ODI1NzIyNGQ1MWI5NTFlIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E
b2N1bWVudC5jcHAKQEAgLTc0LDcgKzc0LDkgQEAKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIK
ICNpbmNsdWRlICJFeHRlbnNpb25TdHlsZVNoZWV0cy5oIgogI2luY2x1ZGUgIkZvY3VzQ29udHJv
bGxlci5oIgorI2luY2x1ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCiAjaW5jbHVkZSAiRm9jdXNFdmVu
dC5oIgorI2luY2x1ZGUgIkZvY3VzUmVtb3ZhbEV2ZW50c01vZGUuaCIKICNpbmNsdWRlICJGb250
RmFjZVNldC5oIgogI2luY2x1ZGUgIkZvcm1Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUu
aCIKQEAgLTQzNTYsNyArNDM1OCw5IEBAIHZvaWQgRG9jdW1lbnQ6OmFkanVzdEZvY3VzZWROb2Rl
T25Ob2RlUmVtb3ZhbChOb2RlJiBub2RlLCBOb2RlUmVtb3ZhbCBub2RlUmVtb3ZhCiAgICAgICAg
IC8vIEZJWE1FOiBXZSBzaG91bGQgYXZvaWQgc3luY2hyb25vdXNseSB1cGRhdGluZyB0aGUgc3R5
bGUgaW5zaWRlIHNldEZvY3VzZWRFbGVtZW50LgogICAgICAgICAvLyBGSVhNRTogT2JqZWN0IGVs
ZW1lbnRzIHNob3VsZCBhdm9pZCBsb2FkaW5nIGEgZnJhbWUgc3luY2hyb25vdXNseSBpbiBhIHBv
c3Qgc3R5bGUgcmVjYWxjIGNhbGxiYWNrLgogICAgICAgICBTdWJmcmFtZUxvYWRpbmdEaXNhYmxl
ciBkaXNhYmxlcihpczxDb250YWluZXJOb2RlPihub2RlKSA/ICZkb3duY2FzdDxDb250YWluZXJO
b2RlPihub2RlKSA6IG51bGxwdHIpOwotICAgICAgICBzZXRGb2N1c2VkRWxlbWVudChudWxscHRy
LCBGb2N1c0RpcmVjdGlvbjo6Tm9uZSwgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RG9Ob3REaXNw
YXRjaCk7CisgICAgICAgIEZvY3VzT3B0aW9ucyBmb2N1c09wdGlvbnMgPSB7IH07CisgICAgICAg
IGZvY3VzT3B0aW9ucy5yZW1vdmFsRXZlbnRzTW9kZSA9IEZvY3VzUmVtb3ZhbEV2ZW50c01vZGU6
OkRvTm90RGlzcGF0Y2g7CisgICAgICAgIHNldEZvY3VzZWRFbGVtZW50KG51bGxwdHIsIGZvY3Vz
T3B0aW9ucyk7CiAgICAgICAgIC8vIFNldCB0aGUgZm9jdXMgbmF2aWdhdGlvbiBzdGFydGluZyBu
b2RlIHRvIHRoZSBwcmV2aW91cyBmb2N1c2VkIGVsZW1lbnQgc28gdGhhdAogICAgICAgICAvLyB3
ZSBjYW4gZmFsbGJhY2sgdG8gdGhlIHNpYmxpbmdzIG9yIHBhcmVudCBub2RlIGZvciB0aGUgbmV4
dCBzZWFyY2guCiAgICAgICAgIC8vIEFsc28gd2UgbmVlZCB0byBjYWxsIHJlbW92ZUZvY3VzTmF2
aWdhdGlvbk5vZGVPZlN1YnRyZWUgYWZ0ZXIgdGhpcyBmdW5jdGlvbiBiZWNhdXNlCkBAIC00NDM4
LDcgKzQ0NDIsNyBAQCB2b2lkIERvY3VtZW50OjppbnZhbGlkYXRlUmVuZGVyaW5nRGVwZW5kZW50
UmVnaW9ucygpCiAjZW5kaWYKIH0KIAotYm9vbCBEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQo
RWxlbWVudCogZWxlbWVudCwgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBGb2N1c1JlbW92YWxF
dmVudHNNb2RlIGV2ZW50c01vZGUpCitib29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudChF
bGVtZW50KiBlbGVtZW50LCBjb25zdCBGb2N1c09wdGlvbnMmIG9wdGlvbnMpCiB7CiAgICAgUmVm
UHRyPEVsZW1lbnQ+IG5ld0ZvY3VzZWRFbGVtZW50ID0gZWxlbWVudDsKICAgICAvLyBNYWtlIHN1
cmUgbmV3Rm9jdXNlZEVsZW1lbnQgaXMgYWN0dWFsbHkgaW4gdGhpcyBkb2N1bWVudApAQCAtNDQ2
MCw3ICs0NDY0LDcgQEAgYm9vbCBEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCog
ZWxlbWVudCwgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBGb2MKICAgICAgICAgb2xkRm9jdXNl
ZEVsZW1lbnQtPnNldEZvY3VzKGZhbHNlKTsKICAgICAgICAgc2V0Rm9jdXNOYXZpZ2F0aW9uU3Rh
cnRpbmdOb2RlKG51bGxwdHIpOwogCi0gICAgICAgIGlmIChldmVudHNNb2RlID09IEZvY3VzUmVt
b3ZhbEV2ZW50c01vZGU6OkRpc3BhdGNoKSB7CisgICAgICAgIGlmIChvcHRpb25zLnJlbW92YWxF
dmVudHNNb2RlID09IEZvY3VzUmVtb3ZhbEV2ZW50c01vZGU6OkRpc3BhdGNoKSB7CiAgICAgICAg
ICAgICAvLyBEaXNwYXRjaCBhIGNoYW5nZSBldmVudCBmb3IgZm9ybSBjb250cm9sIGVsZW1lbnRz
IHRoYXQgaGF2ZSBiZWVuIGVkaXRlZC4KICAgICAgICAgICAgIGlmIChpczxIVE1MRm9ybUNvbnRy
b2xFbGVtZW50Pigqb2xkRm9jdXNlZEVsZW1lbnQpKSB7CiAgICAgICAgICAgICAgICAgSFRNTEZv
cm1Db250cm9sRWxlbWVudCYgZm9ybUNvbnRyb2xFbGVtZW50ID0gZG93bmNhc3Q8SFRNTEZvcm1D
b250cm9sRWxlbWVudD4oKm9sZEZvY3VzZWRFbGVtZW50KTsKQEAgLTQ1MzcsNyArNDU0MSw3IEBA
IGJvb2wgRG9jdW1lbnQ6OnNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZvY3Vz
RGlyZWN0aW9uIGRpcmVjdGlvbiwgRm9jCiAgICAgICAgIH0KIAogICAgICAgICAvLyBEaXNwYXRj
aCB0aGUgZm9jdXMgZXZlbnQgYW5kIGxldCB0aGUgbm9kZSBkbyBhbnkgb3RoZXIgZm9jdXMgcmVs
YXRlZCBhY3Rpdml0aWVzIChpbXBvcnRhbnQgZm9yIHRleHQgZmllbGRzKQotICAgICAgICBtX2Zv
Y3VzZWRFbGVtZW50LT5kaXNwYXRjaEZvY3VzRXZlbnQob2xkRm9jdXNlZEVsZW1lbnQuY29weVJl
ZigpLCBkaXJlY3Rpb24pOworICAgICAgICBtX2ZvY3VzZWRFbGVtZW50LT5kaXNwYXRjaEZvY3Vz
RXZlbnQob2xkRm9jdXNlZEVsZW1lbnQuY29weVJlZigpLCBvcHRpb25zLmRpcmVjdGlvbik7CiAK
ICAgICAgICAgaWYgKG1fZm9jdXNlZEVsZW1lbnQgIT0gbmV3Rm9jdXNlZEVsZW1lbnQpIHsKICAg
ICAgICAgICAgIC8vIGhhbmRsZXIgc2hpZnRlZCBmb2N1cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvZG9tL0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRl
eCAxZTY4YzU3OTc0MTc0Zjg2MmZlMzlhNjliODkwM2MyNjA4NjUxOGYyLi5iYWVhZmIxNmMzMjc0
ZDYwNWNmY2Q1ZWI1YzRhMDBlYjFhN2QyZjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtMzYs
NyArMzYsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50VGltZWxpbmVzQ29udHJvbGxlci5oIgogI2lu
Y2x1ZGUgIkRvY3VtZW50VGltaW5nLmgiCiAjaW5jbHVkZSAiRWxlbWVudElkZW50aWZpZXIuaCIK
LSNpbmNsdWRlICJGb2N1c0RpcmVjdGlvbi5oIgorI2luY2x1ZGUgIkZvY3VzT3B0aW9ucy5oIgog
I2luY2x1ZGUgIkZvbnRTZWxlY3RvckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lRGVzdHJ1Y3Rp
b25PYnNlcnZlci5oIgogI2luY2x1ZGUgIkZyYW1lSWRlbnRpZmllci5oIgpAQCAtNzU3LDEyICs3
NTcsOSBAQCBwdWJsaWM6CiAgICAgVmlzaXRlZExpbmtTdGF0ZSYgdmlzaXRlZExpbmtTdGF0ZSgp
IGNvbnN0IHsgcmV0dXJuICptX3Zpc2l0ZWRMaW5rU3RhdGU7IH0KIAogICAgIE1vdXNlRXZlbnRX
aXRoSGl0VGVzdFJlc3VsdHMgcHJlcGFyZU1vdXNlRXZlbnQoY29uc3QgSGl0VGVzdFJlcXVlc3Qm
LCBjb25zdCBMYXlvdXRQb2ludCYsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwotCi0gICAg
ZW51bSBjbGFzcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIHsgRGlzcGF0Y2gsIERvTm90RGlzcGF0
Y2ggfTsKICAgICAvLyBSZXR1cm5zIHdoZXRoZXIgZm9jdXMgd2FzIGJsb2NrZWQuIEEgdHJ1ZSB2
YWx1ZSBkb2VzIG5vdCBuZWNlc3NhcmlseSBtZWFuIHRoZSBlbGVtZW50IHdhcyBmb2N1c2VkLgog
ICAgIC8vIFRoZSBlbGVtZW50IGNvdWxkIGhhdmUgYWxyZWFkeSBiZWVuIGZvY3VzZWQgb3IgbWF5
IG5vdCBiZSBmb2N1c2FibGUgKGUuZy4gPGlucHV0IGRpc2FibGVkPikuCi0gICAgV0VCQ09SRV9F
WFBPUlQgYm9vbCBzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiwgRm9jdXNEaXJlY3Rpb24gPSBG
b2N1c0RpcmVjdGlvbjo6Tm9uZSwKLSAgICAgICAgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSA9IEZv
Y3VzUmVtb3ZhbEV2ZW50c01vZGU6OkRpc3BhdGNoKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBib29s
IHNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqLCBjb25zdCBGb2N1c09wdGlvbnMmID0geyB9KTsK
ICAgICBFbGVtZW50KiBmb2N1c2VkRWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9jdXNlZEVs
ZW1lbnQuZ2V0KCk7IH0KICAgICBVc2VyQWN0aW9uRWxlbWVudFNldCYgdXNlckFjdGlvbkVsZW1l
bnRzKCkgIHsgcmV0dXJuIG1fdXNlckFjdGlvbkVsZW1lbnRzOyB9CiAgICAgY29uc3QgVXNlckFj
dGlvbkVsZW1lbnRTZXQmIHVzZXJBY3Rpb25FbGVtZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fdXNl
ckFjdGlvbkVsZW1lbnRzOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu
dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggNWM0MWQyOGMyODQ0
N2M4NTY0MDJlYTMxNzJkYjdkMjliMTFhNjk5Ny4uYWQ1N2I2NGJiMWM3ZjMyZmIyYmNlZjc0NjQy
OGZjN2I2ZTIwMDM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3Bw
CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMzA4MSw3ICszMDgxLDcg
QEAgdm9pZCBFbGVtZW50Ojpmb2N1cyhjb25zdCBGb2N1c09wdGlvbnMmIG9wdGlvbnMpCiAgICAg
ICAgIC8vIEZvY3VzIGFuZCBjaGFuZ2UgZXZlbnQgaGFuZGxlcnMgY2FuIGNhdXNlIHVzIHRvIGxv
c2Ugb3VyIGxhc3QgcmVmLgogICAgICAgICAvLyBJZiBhIGZvY3VzIGV2ZW50IGhhbmRsZXIgY2hh
bmdlcyB0aGUgZm9jdXMgdG8gYSBkaWZmZXJlbnQgbm9kZSBpdAogICAgICAgICAvLyBkb2VzIG5v
dCBtYWtlIHNlbnNlIHRvIGNvbnRpbnVlIGFuZCB1cGRhdGUgYXBwZWFyZW5jZS4KLSAgICAgICAg
aWYgKCFwYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5zZXRGb2N1c2VkRWxlbWVudChuZXdUYXJnZXQu
Z2V0KCksICpkb2N1bWVudC0+ZnJhbWUoKSwgb3B0aW9ucy5kaXJlY3Rpb24pKQorICAgICAgICBp
ZiAoIXBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRFbGVtZW50KG5ld1RhcmdldC5n
ZXQoKSwgKmRvY3VtZW50LT5mcmFtZSgpLCBvcHRpb25zKSkKICAgICAgICAgICAgIHJldHVybjsK
ICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c09wdGlvbnMuaCBi
L1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c09wdGlvbnMuaAppbmRleCAwMGFhNmRkM2EzM2UyMmUz
OTQzN2FlZWIwZjJhZTMzZjFlNTY0YzU3Li5mNTQwNjA5MDY2MmFiY2QyYWIyYmRjNTJmOWFjMzBh
NjhkYTY2ZDE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNPcHRpb25zLmgK
KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oCkBAIC0yNiw2ICsyNiw3IEBA
CiAjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCisjaW5jbHVkZSAi
Rm9jdXNSZW1vdmFsRXZlbnRzTW9kZS5oIgogI2luY2x1ZGUgIlNlbGVjdGlvblJlc3RvcmF0aW9u
TW9kZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0zMyw2ICszNCw3IEBAIG5hbWVzcGFj
ZSBXZWJDb3JlIHsKIHN0cnVjdCBGb2N1c09wdGlvbnMgewogICAgIFNlbGVjdGlvblJlc3RvcmF0
aW9uTW9kZSBzZWxlY3Rpb25SZXN0b3JhdGlvbk1vZGUgeyBTZWxlY3Rpb25SZXN0b3JhdGlvbk1v
ZGU6OlJlc3RvcmVPclNlbGVjdEFsbCB9OwogICAgIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiB7
IEZvY3VzRGlyZWN0aW9uOjpOb25lIH07CisgICAgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSByZW1v
dmFsRXZlbnRzTW9kZSB7IEZvY3VzUmVtb3ZhbEV2ZW50c01vZGU6OkRpc3BhdGNoIH07CiAgICAg
Ym9vbCBwcmV2ZW50U2Nyb2xsIHsgZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL2RvbS9Gb2N1c1JlbW92YWxFdmVudHNNb2RlLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v
Rm9jdXNSZW1vdmFsRXZlbnRzTW9kZS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw
MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg5MzNiMmM2NjdlMzliMTBmNGVh
YmQxOTk5ZDM1YTNlZjViMmJkYjEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9k
b20vRm9jdXNSZW1vdmFsRXZlbnRzTW9kZS5oCkBAIC0wLDAgKzEsMzIgQEAKKy8qCisgKiBDb3B5
cmlnaHQgKEMpIDIwMjEgSWdhbGlhIFMuTC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS
ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y
IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo
ZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9u
cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBu
b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt
ZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug
dGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u
cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlv
biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K
KyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycn
IEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV
VCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB
QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM
QUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMg
QkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwK
KyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBO
T1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS
VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5U
RVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklM
SVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAo
SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU
IE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg
UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3ByYWdtYSBvbmNlCisKK25hbWVz
cGFjZSBXZWJDb3JlIHsKKworZW51bSBjbGFzcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIHsgRGlz
cGF0Y2gsIERvTm90RGlzcGF0Y2ggfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl
YkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCmluZGV4IGYxZDI4OTQ0YzI3MzZjYzI4NGE2
ZTdjNzViMThmOGYxNGY3N2ZiNjguLmVjNzMwN2Q5ZGEwM2Q4YjhjZmRmM2ViNDkwOGVhOGM2ZTRk
NTVlOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKQEAgLTM5LDYg
KzM5LDcgQEAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkV2ZW50SGFuZGxlci5oIgog
I2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKKyNpbmNsdWRlICJGb2N1c0RpcmVjdGlvbi5oIgogI2lu
Y2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKICNpbmNsdWRlICJG
cmFtZVRyZWUuaCIKQEAgLTgyNyw3ICs4MjgsNyBAQCBzdGF0aWMgYm9vbCBzaG91bGRDbGVhclNl
bGVjdGlvbldoZW5DaGFuZ2luZ0ZvY3VzZWRFbGVtZW50KGNvbnN0IFBhZ2UmIHBhZ2UsIFJlZgog
ICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNlZEVs
ZW1lbnQoRWxlbWVudCogZWxlbWVudCwgRnJhbWUmIG5ld0ZvY3VzZWRGcmFtZSwgRm9jdXNEaXJl
Y3Rpb24gZGlyZWN0aW9uKQorYm9vbCBGb2N1c0NvbnRyb2xsZXI6OnNldEZvY3VzZWRFbGVtZW50
KEVsZW1lbnQqIGVsZW1lbnQsIEZyYW1lJiBuZXdGb2N1c2VkRnJhbWUsIGNvbnN0IEZvY3VzT3B0
aW9ucyYgb3B0aW9ucykKIHsKICAgICBSZWY8RnJhbWU+IHByb3RlY3RlZE5ld0ZvY3VzZWRGcmFt
ZSA9IG5ld0ZvY3VzZWRGcmFtZTsKICAgICBSZWZQdHI8RnJhbWU+IG9sZEZvY3VzZWRGcmFtZSA9
IGZvY3VzZWRGcmFtZSgpOwpAQCAtODc0LDcgKzg3NSw3IEBAIGJvb2wgRm9jdXNDb250cm9sbGVy
OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBlbGVtZW50LCBGcmFtZSYgbmV3Rm9jdXNlZEZy
YW1lCiAKICAgICBSZWY8RWxlbWVudD4gcHJvdGVjdCgqZWxlbWVudCk7CiAKLSAgICBib29sIHN1
Y2Nlc3NmdWxseUZvY3VzZWQgPSBuZXdEb2N1bWVudC0+c2V0Rm9jdXNlZEVsZW1lbnQoZWxlbWVu
dCwgZGlyZWN0aW9uKTsKKyAgICBib29sIHN1Y2Nlc3NmdWxseUZvY3VzZWQgPSBuZXdEb2N1bWVu
dC0+c2V0Rm9jdXNlZEVsZW1lbnQoZWxlbWVudCwgb3B0aW9ucyk7CiAgICAgaWYgKCFzdWNjZXNz
ZnVsbHlGb2N1c2VkKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zv
Y3VzQ29udHJvbGxlci5oCmluZGV4IDI5Nzg1ZDE5ZWRiZDNjYjY2NjYyYWNmMmI5YTE5ZjE0YTJl
Y2FiMmMuLmQ3MWZhZjMzN2Y1MTdhNjQwYzg1ZDFmMjkyMjQ0NWY3NGJjZDM4YzcgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaApAQCAtMjYsNyArMjYsNyBAQAogI3ByYWdtYSBv
bmNlCiAKICNpbmNsdWRlICJBY3Rpdml0eVN0YXRlLmgiCi0jaW5jbHVkZSAiRm9jdXNEaXJlY3Rp
b24uaCIKKyNpbmNsdWRlICJGb2N1c09wdGlvbnMuaCIKICNpbmNsdWRlICJMYXlvdXRSZWN0Lmgi
CiAjaW5jbHVkZSAiVGltZXIuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgpAQCAtNTksNyAr
NTksNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzZXRJbml0aWFsRm9jdXMo
Rm9jdXNEaXJlY3Rpb24sIEtleWJvYXJkRXZlbnQqKTsKICAgICBib29sIGFkdmFuY2VGb2N1cyhG
b2N1c0RpcmVjdGlvbiwgS2V5Ym9hcmRFdmVudCosIGJvb2wgaW5pdGlhbEZvY3VzID0gZmFsc2Up
OwogCi0gICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50Kiwg
RnJhbWUmLCBGb2N1c0RpcmVjdGlvbiA9IEZvY3VzRGlyZWN0aW9uOjpOb25lKTsKKyAgICBXRUJD
T1JFX0VYUE9SVCBib29sIHNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqLCBGcmFtZSYsIGNvbnN0
IEZvY3VzT3B0aW9ucyYgPSB7IH0pOwogCiAgICAgdm9pZCBzZXRBY3Rpdml0eVN0YXRlKE9wdGlv
blNldDxBY3Rpdml0eVN0YXRlOjpGbGFnPik7CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426079</attachid>
            <date>2021-04-15 00:15:19 -0700</date>
            <delta_ts>2021-04-15 01:34:32 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-224549-20210415091517.patch</filename>
            <type>text/plain</type>
            <size>9488</size>
            <attacher name="Manuel Rego Casasnovas">rego</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBjNjRjMTQ4MThkNDJh
MDE1ZmFjMTU0ZjQ5MmI0MDIwMTZmMmFlNS4uZGI5MzkyMzQ3Mjc1ZjNlOTk1YWExZWNmYzFkY2E1
ZGZlMzQ0MDE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA0LTE1ICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZSBpbnRvIEZvY3VzT3B0aW9ucworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTQ5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBqdXN0IGEgcmVmYWN0b3Jp
bmcgdGhhdCBtb3ZlcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIGVudW0gaW50byBGb2N1c09wdGlv
bnMuCisgICAgICAgIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBsaWZ5IHNvbWUgbWV0aG9kIHNpZ25h
dHVyZXMsIGFzIHRoZXknbGwganVzdCByZWNlaXZlIGEgRm9jdXNPcHRpb25zIHBhcmFtZXRlciwg
aW5zdGVhZCBvZiB0d28gcGFyYW1ldGVycyBmb3IgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSBhbmQg
Rm9jdXNEaXJlY3Rpb24uCisKKyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIG9mIGJlaGF2aW9y
LCBqdXN0IGEgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9jdXNlZE5vZGVPbk5vZGVSZW1v
dmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudCk6Cisg
ICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0
Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OkVsZW1lbnQ6OmZvY3VzKToKKyAgICAgICAgKiBkb20vRm9jdXNPcHRpb25zLmg6Cisg
ICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9j
dXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRWxlbWVudCk6CisgICAgICAgICogcGFnZS9Gb2N1c0Nv
bnRyb2xsZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNl
ZEVsZW1lbnQpOgorCiAyMDIxLTA0LTE0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+
CiAKICAgICAgICAgSW5saW5lQm94IHNob3VsZCBub3QgaG9sZCBhIHJlZmVyZW5jZSB0byBSZW5k
ZXJPYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGY3NmE4YzFiYmE5MmMzZDQ2OGVi
ZjlkZmZiOWMxN2M2ZWFlNGUyZDAuLmY4NTVmMjZhNGNhOWYwMTE5NzdkNjRlNWE3MTA3ZDE0ZGEy
Nzc4MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNzUsNiArNzUsNyBAQAogI2luY2x1
ZGUgIkV4dGVuc2lvblN0eWxlU2hlZXRzLmgiCiAjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVyLmgi
CiAjaW5jbHVkZSAiRm9jdXNFdmVudC5oIgorI2luY2x1ZGUgIkZvY3VzT3B0aW9ucy5oIgogI2lu
Y2x1ZGUgIkZvbnRGYWNlU2V0LmgiCiAjaW5jbHVkZSAiRm9ybUNvbnRyb2xsZXIuaCIKICNpbmNs
dWRlICJGcmFtZS5oIgpAQCAtNDM1Niw3ICs0MzU3LDcgQEAgdm9pZCBEb2N1bWVudDo6YWRqdXN0
Rm9jdXNlZE5vZGVPbk5vZGVSZW1vdmFsKE5vZGUmIG5vZGUsIE5vZGVSZW1vdmFsIG5vZGVSZW1v
dmEKICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhdm9pZCBzeW5jaHJvbm91c2x5IHVwZGF0
aW5nIHRoZSBzdHlsZSBpbnNpZGUgc2V0Rm9jdXNlZEVsZW1lbnQuCiAgICAgICAgIC8vIEZJWE1F
OiBPYmplY3QgZWxlbWVudHMgc2hvdWxkIGF2b2lkIGxvYWRpbmcgYSBmcmFtZSBzeW5jaHJvbm91
c2x5IGluIGEgcG9zdCBzdHlsZSByZWNhbGMgY2FsbGJhY2suCiAgICAgICAgIFN1YmZyYW1lTG9h
ZGluZ0Rpc2FibGVyIGRpc2FibGVyKGlzPENvbnRhaW5lck5vZGU+KG5vZGUpID8gJmRvd25jYXN0
PENvbnRhaW5lck5vZGU+KG5vZGUpIDogbnVsbHB0cik7Ci0gICAgICAgIHNldEZvY3VzZWRFbGVt
ZW50KG51bGxwdHIsIEZvY3VzRGlyZWN0aW9uOjpOb25lLCBGb2N1c1JlbW92YWxFdmVudHNNb2Rl
OjpEb05vdERpc3BhdGNoKTsKKyAgICAgICAgc2V0Rm9jdXNlZEVsZW1lbnQobnVsbHB0ciwgeyB7
IH0sIHsgfSwgeyBGb2N1c1JlbW92YWxFdmVudHNNb2RlOjpEb05vdERpc3BhdGNoIH0gfSk7CiAg
ICAgICAgIC8vIFNldCB0aGUgZm9jdXMgbmF2aWdhdGlvbiBzdGFydGluZyBub2RlIHRvIHRoZSBw
cmV2aW91cyBmb2N1c2VkIGVsZW1lbnQgc28gdGhhdAogICAgICAgICAvLyB3ZSBjYW4gZmFsbGJh
Y2sgdG8gdGhlIHNpYmxpbmdzIG9yIHBhcmVudCBub2RlIGZvciB0aGUgbmV4dCBzZWFyY2guCiAg
ICAgICAgIC8vIEFsc28gd2UgbmVlZCB0byBjYWxsIHJlbW92ZUZvY3VzTmF2aWdhdGlvbk5vZGVP
ZlN1YnRyZWUgYWZ0ZXIgdGhpcyBmdW5jdGlvbiBiZWNhdXNlCkBAIC00NDM4LDcgKzQ0MzksNyBA
QCB2b2lkIERvY3VtZW50OjppbnZhbGlkYXRlUmVuZGVyaW5nRGVwZW5kZW50UmVnaW9ucygpCiAj
ZW5kaWYKIH0KIAotYm9vbCBEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxl
bWVudCwgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBGb2N1c1JlbW92YWxFdmVudHNNb2RlIGV2
ZW50c01vZGUpCitib29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBlbGVt
ZW50LCBjb25zdCBGb2N1c09wdGlvbnMmIG9wdGlvbnMpCiB7CiAgICAgUmVmUHRyPEVsZW1lbnQ+
IG5ld0ZvY3VzZWRFbGVtZW50ID0gZWxlbWVudDsKICAgICAvLyBNYWtlIHN1cmUgbmV3Rm9jdXNl
ZEVsZW1lbnQgaXMgYWN0dWFsbHkgaW4gdGhpcyBkb2N1bWVudApAQCAtNDQ2MCw3ICs0NDYxLDcg
QEAgYm9vbCBEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCwgRm9j
dXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBGb2MKICAgICAgICAgb2xkRm9jdXNlZEVsZW1lbnQtPnNl
dEZvY3VzKGZhbHNlKTsKICAgICAgICAgc2V0Rm9jdXNOYXZpZ2F0aW9uU3RhcnRpbmdOb2RlKG51
bGxwdHIpOwogCi0gICAgICAgIGlmIChldmVudHNNb2RlID09IEZvY3VzUmVtb3ZhbEV2ZW50c01v
ZGU6OkRpc3BhdGNoKSB7CisgICAgICAgIGlmIChvcHRpb25zLnJlbW92YWxFdmVudHNNb2RlID09
IEZvY3VzUmVtb3ZhbEV2ZW50c01vZGU6OkRpc3BhdGNoKSB7CiAgICAgICAgICAgICAvLyBEaXNw
YXRjaCBhIGNoYW5nZSBldmVudCBmb3IgZm9ybSBjb250cm9sIGVsZW1lbnRzIHRoYXQgaGF2ZSBi
ZWVuIGVkaXRlZC4KICAgICAgICAgICAgIGlmIChpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Pigq
b2xkRm9jdXNlZEVsZW1lbnQpKSB7CiAgICAgICAgICAgICAgICAgSFRNTEZvcm1Db250cm9sRWxl
bWVudCYgZm9ybUNvbnRyb2xFbGVtZW50ID0gZG93bmNhc3Q8SFRNTEZvcm1Db250cm9sRWxlbWVu
dD4oKm9sZEZvY3VzZWRFbGVtZW50KTsKQEAgLTQ1MzcsNyArNDUzOCw3IEBAIGJvb2wgRG9jdW1l
bnQ6OnNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZvY3VzRGlyZWN0aW9uIGRp
cmVjdGlvbiwgRm9jCiAgICAgICAgIH0KIAogICAgICAgICAvLyBEaXNwYXRjaCB0aGUgZm9jdXMg
ZXZlbnQgYW5kIGxldCB0aGUgbm9kZSBkbyBhbnkgb3RoZXIgZm9jdXMgcmVsYXRlZCBhY3Rpdml0
aWVzIChpbXBvcnRhbnQgZm9yIHRleHQgZmllbGRzKQotICAgICAgICBtX2ZvY3VzZWRFbGVtZW50
LT5kaXNwYXRjaEZvY3VzRXZlbnQob2xkRm9jdXNlZEVsZW1lbnQuY29weVJlZigpLCBkaXJlY3Rp
b24pOworICAgICAgICBtX2ZvY3VzZWRFbGVtZW50LT5kaXNwYXRjaEZvY3VzRXZlbnQob2xkRm9j
dXNlZEVsZW1lbnQuY29weVJlZigpLCBvcHRpb25zLmRpcmVjdGlvbik7CiAKICAgICAgICAgaWYg
KG1fZm9jdXNlZEVsZW1lbnQgIT0gbmV3Rm9jdXNlZEVsZW1lbnQpIHsKICAgICAgICAgICAgIC8v
IGhhbmRsZXIgc2hpZnRlZCBmb2N1cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0Rv
Y3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCAxZTY4YzU3OTc0
MTc0Zjg2MmZlMzlhNjliODkwM2MyNjA4NjUxOGYyLi5iYWVhZmIxNmMzMjc0ZDYwNWNmY2Q1ZWI1
YzRhMDBlYjFhN2QyZjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtMzYsNyArMzYsNyBAQAog
I2luY2x1ZGUgIkRvY3VtZW50VGltZWxpbmVzQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkRvY3Vt
ZW50VGltaW5nLmgiCiAjaW5jbHVkZSAiRWxlbWVudElkZW50aWZpZXIuaCIKLSNpbmNsdWRlICJG
b2N1c0RpcmVjdGlvbi5oIgorI2luY2x1ZGUgIkZvY3VzT3B0aW9ucy5oIgogI2luY2x1ZGUgIkZv
bnRTZWxlY3RvckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlci5o
IgogI2luY2x1ZGUgIkZyYW1lSWRlbnRpZmllci5oIgpAQCAtNzU3LDEyICs3NTcsOSBAQCBwdWJs
aWM6CiAgICAgVmlzaXRlZExpbmtTdGF0ZSYgdmlzaXRlZExpbmtTdGF0ZSgpIGNvbnN0IHsgcmV0
dXJuICptX3Zpc2l0ZWRMaW5rU3RhdGU7IH0KIAogICAgIE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJl
c3VsdHMgcHJlcGFyZU1vdXNlRXZlbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBjb25zdCBMYXlv
dXRQb2ludCYsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYpOwotCi0gICAgZW51bSBjbGFzcyBG
b2N1c1JlbW92YWxFdmVudHNNb2RlIHsgRGlzcGF0Y2gsIERvTm90RGlzcGF0Y2ggfTsKICAgICAv
LyBSZXR1cm5zIHdoZXRoZXIgZm9jdXMgd2FzIGJsb2NrZWQuIEEgdHJ1ZSB2YWx1ZSBkb2VzIG5v
dCBuZWNlc3NhcmlseSBtZWFuIHRoZSBlbGVtZW50IHdhcyBmb2N1c2VkLgogICAgIC8vIFRoZSBl
bGVtZW50IGNvdWxkIGhhdmUgYWxyZWFkeSBiZWVuIGZvY3VzZWQgb3IgbWF5IG5vdCBiZSBmb2N1
c2FibGUgKGUuZy4gPGlucHV0IGRpc2FibGVkPikuCi0gICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBz
ZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiwgRm9jdXNEaXJlY3Rpb24gPSBGb2N1c0RpcmVjdGlv
bjo6Tm9uZSwKLSAgICAgICAgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSA9IEZvY3VzUmVtb3ZhbEV2
ZW50c01vZGU6OkRpc3BhdGNoKTsKKyAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNldEZvY3VzZWRF
bGVtZW50KEVsZW1lbnQqLCBjb25zdCBGb2N1c09wdGlvbnMmID0geyB9KTsKICAgICBFbGVtZW50
KiBmb2N1c2VkRWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9jdXNlZEVsZW1lbnQuZ2V0KCk7
IH0KICAgICBVc2VyQWN0aW9uRWxlbWVudFNldCYgdXNlckFjdGlvbkVsZW1lbnRzKCkgIHsgcmV0
dXJuIG1fdXNlckFjdGlvbkVsZW1lbnRzOyB9CiAgICAgY29uc3QgVXNlckFjdGlvbkVsZW1lbnRT
ZXQmIHVzZXJBY3Rpb25FbGVtZW50cygpIGNvbnN0IHsgcmV0dXJuIG1fdXNlckFjdGlvbkVsZW1l
bnRzOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3Vy
Y2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggNWM0MWQyOGMyODQ0N2M4NTY0MDJlYTMx
NzJkYjdkMjliMTFhNjk5Ny4uYWQ1N2I2NGJiMWM3ZjMyZmIyYmNlZjc0NjQyOGZjN2I2ZTIwMDM3
NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMzA4MSw3ICszMDgxLDcgQEAgdm9pZCBFbGVt
ZW50Ojpmb2N1cyhjb25zdCBGb2N1c09wdGlvbnMmIG9wdGlvbnMpCiAgICAgICAgIC8vIEZvY3Vz
IGFuZCBjaGFuZ2UgZXZlbnQgaGFuZGxlcnMgY2FuIGNhdXNlIHVzIHRvIGxvc2Ugb3VyIGxhc3Qg
cmVmLgogICAgICAgICAvLyBJZiBhIGZvY3VzIGV2ZW50IGhhbmRsZXIgY2hhbmdlcyB0aGUgZm9j
dXMgdG8gYSBkaWZmZXJlbnQgbm9kZSBpdAogICAgICAgICAvLyBkb2VzIG5vdCBtYWtlIHNlbnNl
IHRvIGNvbnRpbnVlIGFuZCB1cGRhdGUgYXBwZWFyZW5jZS4KLSAgICAgICAgaWYgKCFwYWdlLT5m
b2N1c0NvbnRyb2xsZXIoKS5zZXRGb2N1c2VkRWxlbWVudChuZXdUYXJnZXQuZ2V0KCksICpkb2N1
bWVudC0+ZnJhbWUoKSwgb3B0aW9ucy5kaXJlY3Rpb24pKQorICAgICAgICBpZiAoIXBhZ2UtPmZv
Y3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRFbGVtZW50KG5ld1RhcmdldC5nZXQoKSwgKmRvY3Vt
ZW50LT5mcmFtZSgpLCBvcHRpb25zKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9CiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c09wdGlvbnMuaCBiL1NvdXJjZS9XZWJD
b3JlL2RvbS9Gb2N1c09wdGlvbnMuaAppbmRleCAwMGFhNmRkM2EzM2UyMmUzOTQzN2FlZWIwZjJh
ZTMzZjFlNTY0YzU3Li5lYzgwNGYyNGJlODU5YjBmZjJiM2UwOWNiNTRmMTM0NDc0MzI2YTJlIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNPcHRpb25zLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oCkBAIC0zMCw5ICszMCwxMiBAQAogCiBuYW1lc3Bh
Y2UgV2ViQ29yZSB7CiAKK2VudW0gY2xhc3MgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSB7IERpc3Bh
dGNoLCBEb05vdERpc3BhdGNoIH07CisKIHN0cnVjdCBGb2N1c09wdGlvbnMgewogICAgIFNlbGVj
dGlvblJlc3RvcmF0aW9uTW9kZSBzZWxlY3Rpb25SZXN0b3JhdGlvbk1vZGUgeyBTZWxlY3Rpb25S
ZXN0b3JhdGlvbk1vZGU6OlJlc3RvcmVPclNlbGVjdEFsbCB9OwogICAgIEZvY3VzRGlyZWN0aW9u
IGRpcmVjdGlvbiB7IEZvY3VzRGlyZWN0aW9uOjpOb25lIH07CisgICAgRm9jdXNSZW1vdmFsRXZl
bnRzTW9kZSByZW1vdmFsRXZlbnRzTW9kZSB7IEZvY3VzUmVtb3ZhbEV2ZW50c01vZGU6OkRpc3Bh
dGNoIH07CiAgICAgYm9vbCBwcmV2ZW50U2Nyb2xsIHsgZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAppbmRleCBmMWQyODk0NGMyNzM2Y2MyODRhNmU3
Yzc1YjE4ZjhmMTRmNzdmYjY4Li4wYWRkODU3MTJmZDI4NzJmMzNlYjMzNGVkNDBiZGZiMjQwMjg2
YTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAK
KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCkBAIC0zOSw2ICsz
OSw3IEBACiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKICNp
bmNsdWRlICJFdmVudE5hbWVzLmgiCisjaW5jbHVkZSAiRm9jdXNPcHRpb25zLmgiCiAjaW5jbHVk
ZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgogI2luY2x1ZGUgIkZyYW1l
VHJlZS5oIgpAQCAtODI3LDcgKzgyOCw3IEBAIHN0YXRpYyBib29sIHNob3VsZENsZWFyU2VsZWN0
aW9uV2hlbkNoYW5naW5nRm9jdXNlZEVsZW1lbnQoY29uc3QgUGFnZSYgcGFnZSwgUmVmCiAgICAg
cmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgRm9jdXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRWxlbWVu
dChFbGVtZW50KiBlbGVtZW50LCBGcmFtZSYgbmV3Rm9jdXNlZEZyYW1lLCBGb2N1c0RpcmVjdGlv
biBkaXJlY3Rpb24pCitib29sIEZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxl
bWVudCogZWxlbWVudCwgRnJhbWUmIG5ld0ZvY3VzZWRGcmFtZSwgY29uc3QgRm9jdXNPcHRpb25z
JiBvcHRpb25zKQogewogICAgIFJlZjxGcmFtZT4gcHJvdGVjdGVkTmV3Rm9jdXNlZEZyYW1lID0g
bmV3Rm9jdXNlZEZyYW1lOwogICAgIFJlZlB0cjxGcmFtZT4gb2xkRm9jdXNlZEZyYW1lID0gZm9j
dXNlZEZyYW1lKCk7CkBAIC04NzQsNyArODc1LDcgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OnNl
dEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZyYW1lJiBuZXdGb2N1c2VkRnJhbWUK
IAogICAgIFJlZjxFbGVtZW50PiBwcm90ZWN0KCplbGVtZW50KTsKIAotICAgIGJvb2wgc3VjY2Vz
c2Z1bGx5Rm9jdXNlZCA9IG5ld0RvY3VtZW50LT5zZXRGb2N1c2VkRWxlbWVudChlbGVtZW50LCBk
aXJlY3Rpb24pOworICAgIGJvb2wgc3VjY2Vzc2Z1bGx5Rm9jdXNlZCA9IG5ld0RvY3VtZW50LT5z
ZXRGb2N1c2VkRWxlbWVudChlbGVtZW50LCBvcHRpb25zKTsKICAgICBpZiAoIXN1Y2Nlc3NmdWxs
eUZvY3VzZWQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXND
b250cm9sbGVyLmgKaW5kZXggMjk3ODVkMTllZGJkM2NiNjY2NjJhY2YyYjlhMTlmMTRhMmVjYWIy
Yy4uZDcxZmFmMzM3ZjUxN2E2NDBjODVkMWYyOTIyNDQ1Zjc0YmNkMzhjNyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oCkBAIC0yNiw3ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UK
IAogI2luY2x1ZGUgIkFjdGl2aXR5U3RhdGUuaCIKLSNpbmNsdWRlICJGb2N1c0RpcmVjdGlvbi5o
IgorI2luY2x1ZGUgIkZvY3VzT3B0aW9ucy5oIgogI2luY2x1ZGUgIkxheW91dFJlY3QuaCIKICNp
bmNsdWRlICJUaW1lci5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CkBAIC01OSw3ICs1OSw3
IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNldEluaXRpYWxGb2N1cyhGb2N1
c0RpcmVjdGlvbiwgS2V5Ym9hcmRFdmVudCopOwogICAgIGJvb2wgYWR2YW5jZUZvY3VzKEZvY3Vz
RGlyZWN0aW9uLCBLZXlib2FyZEV2ZW50KiwgYm9vbCBpbml0aWFsRm9jdXMgPSBmYWxzZSk7CiAK
LSAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqLCBGcmFt
ZSYsIEZvY3VzRGlyZWN0aW9uID0gRm9jdXNEaXJlY3Rpb246Ok5vbmUpOworICAgIFdFQkNPUkVf
RVhQT1JUIGJvb2wgc2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCosIEZyYW1lJiwgY29uc3QgRm9j
dXNPcHRpb25zJiA9IHsgfSk7CiAKICAgICB2b2lkIHNldEFjdGl2aXR5U3RhdGUoT3B0aW9uU2V0
PEFjdGl2aXR5U3RhdGU6OkZsYWc+KTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426081</attachid>
            <date>2021-04-15 01:34:48 -0700</date>
            <delta_ts>2021-04-15 02:23:45 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-224549-20210415103446.patch</filename>
            <type>text/plain</type>
            <size>9493</size>
            <attacher name="Manuel Rego Casasnovas">rego</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBjNjRjMTQ4MThkNDJh
MDE1ZmFjMTU0ZjQ5MmI0MDIwMTZmMmFlNS4uZGI5MzkyMzQ3Mjc1ZjNlOTk1YWExZWNmYzFkY2E1
ZGZlMzQ0MDE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA0LTE1ICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZSBpbnRvIEZvY3VzT3B0aW9ucworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTQ5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBqdXN0IGEgcmVmYWN0b3Jp
bmcgdGhhdCBtb3ZlcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIGVudW0gaW50byBGb2N1c09wdGlv
bnMuCisgICAgICAgIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBsaWZ5IHNvbWUgbWV0aG9kIHNpZ25h
dHVyZXMsIGFzIHRoZXknbGwganVzdCByZWNlaXZlIGEgRm9jdXNPcHRpb25zIHBhcmFtZXRlciwg
aW5zdGVhZCBvZiB0d28gcGFyYW1ldGVycyBmb3IgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSBhbmQg
Rm9jdXNEaXJlY3Rpb24uCisKKyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIG9mIGJlaGF2aW9y
LCBqdXN0IGEgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9jdXNlZE5vZGVPbk5vZGVSZW1v
dmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudCk6Cisg
ICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0
Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OkVsZW1lbnQ6OmZvY3VzKToKKyAgICAgICAgKiBkb20vRm9jdXNPcHRpb25zLmg6Cisg
ICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9j
dXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRWxlbWVudCk6CisgICAgICAgICogcGFnZS9Gb2N1c0Nv
bnRyb2xsZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNl
ZEVsZW1lbnQpOgorCiAyMDIxLTA0LTE0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+
CiAKICAgICAgICAgSW5saW5lQm94IHNob3VsZCBub3QgaG9sZCBhIHJlZmVyZW5jZSB0byBSZW5k
ZXJPYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGY3NmE4YzFiYmE5MmMzZDQ2OGVi
ZjlkZmZiOWMxN2M2ZWFlNGUyZDAuLjgzODM2ZGU5ZDFjMWE0YjdiOWU1Y2ZkNzg4N2U4MGYzMWVh
NDcxZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNzUsNiArNzUsNyBAQAogI2luY2x1
ZGUgIkV4dGVuc2lvblN0eWxlU2hlZXRzLmgiCiAjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVyLmgi
CiAjaW5jbHVkZSAiRm9jdXNFdmVudC5oIgorI2luY2x1ZGUgIkZvY3VzT3B0aW9ucy5oIgogI2lu
Y2x1ZGUgIkZvbnRGYWNlU2V0LmgiCiAjaW5jbHVkZSAiRm9ybUNvbnRyb2xsZXIuaCIKICNpbmNs
dWRlICJGcmFtZS5oIgpAQCAtNDM1Niw3ICs0MzU3LDcgQEAgdm9pZCBEb2N1bWVudDo6YWRqdXN0
Rm9jdXNlZE5vZGVPbk5vZGVSZW1vdmFsKE5vZGUmIG5vZGUsIE5vZGVSZW1vdmFsIG5vZGVSZW1v
dmEKICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhdm9pZCBzeW5jaHJvbm91c2x5IHVwZGF0
aW5nIHRoZSBzdHlsZSBpbnNpZGUgc2V0Rm9jdXNlZEVsZW1lbnQuCiAgICAgICAgIC8vIEZJWE1F
OiBPYmplY3QgZWxlbWVudHMgc2hvdWxkIGF2b2lkIGxvYWRpbmcgYSBmcmFtZSBzeW5jaHJvbm91
c2x5IGluIGEgcG9zdCBzdHlsZSByZWNhbGMgY2FsbGJhY2suCiAgICAgICAgIFN1YmZyYW1lTG9h
ZGluZ0Rpc2FibGVyIGRpc2FibGVyKGlzPENvbnRhaW5lck5vZGU+KG5vZGUpID8gJmRvd25jYXN0
PENvbnRhaW5lck5vZGU+KG5vZGUpIDogbnVsbHB0cik7Ci0gICAgICAgIHNldEZvY3VzZWRFbGVt
ZW50KG51bGxwdHIsIEZvY3VzRGlyZWN0aW9uOjpOb25lLCBGb2N1c1JlbW92YWxFdmVudHNNb2Rl
OjpEb05vdERpc3BhdGNoKTsKKyAgICAgICAgc2V0Rm9jdXNlZEVsZW1lbnQobnVsbHB0ciwgeyB7
IH0sIHsgfSwgeyBGb2N1c1JlbW92YWxFdmVudHNNb2RlOjpEb05vdERpc3BhdGNoIH0sIHsgfSB9
KTsKICAgICAgICAgLy8gU2V0IHRoZSBmb2N1cyBuYXZpZ2F0aW9uIHN0YXJ0aW5nIG5vZGUgdG8g
dGhlIHByZXZpb3VzIGZvY3VzZWQgZWxlbWVudCBzbyB0aGF0CiAgICAgICAgIC8vIHdlIGNhbiBm
YWxsYmFjayB0byB0aGUgc2libGluZ3Mgb3IgcGFyZW50IG5vZGUgZm9yIHRoZSBuZXh0IHNlYXJj
aC4KICAgICAgICAgLy8gQWxzbyB3ZSBuZWVkIHRvIGNhbGwgcmVtb3ZlRm9jdXNOYXZpZ2F0aW9u
Tm9kZU9mU3VidHJlZSBhZnRlciB0aGlzIGZ1bmN0aW9uIGJlY2F1c2UKQEAgLTQ0MzgsNyArNDQz
OSw3IEBAIHZvaWQgRG9jdW1lbnQ6OmludmFsaWRhdGVSZW5kZXJpbmdEZXBlbmRlbnRSZWdpb25z
KCkKICNlbmRpZgogfQogCi1ib29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50
KiBlbGVtZW50LCBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvY3VzUmVtb3ZhbEV2ZW50c01v
ZGUgZXZlbnRzTW9kZSkKK2Jvb2wgRG9jdW1lbnQ6OnNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQq
IGVsZW1lbnQsIGNvbnN0IEZvY3VzT3B0aW9ucyYgb3B0aW9ucykKIHsKICAgICBSZWZQdHI8RWxl
bWVudD4gbmV3Rm9jdXNlZEVsZW1lbnQgPSBlbGVtZW50OwogICAgIC8vIE1ha2Ugc3VyZSBuZXdG
b2N1c2VkRWxlbWVudCBpcyBhY3R1YWxseSBpbiB0aGlzIGRvY3VtZW50CkBAIC00NDYwLDcgKzQ0
NjEsNyBAQCBib29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBlbGVtZW50
LCBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvYwogICAgICAgICBvbGRGb2N1c2VkRWxlbWVu
dC0+c2V0Rm9jdXMoZmFsc2UpOwogICAgICAgICBzZXRGb2N1c05hdmlnYXRpb25TdGFydGluZ05v
ZGUobnVsbHB0cik7CiAKLSAgICAgICAgaWYgKGV2ZW50c01vZGUgPT0gRm9jdXNSZW1vdmFsRXZl
bnRzTW9kZTo6RGlzcGF0Y2gpIHsKKyAgICAgICAgaWYgKG9wdGlvbnMucmVtb3ZhbEV2ZW50c01v
ZGUgPT0gRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2gpIHsKICAgICAgICAgICAgIC8v
IERpc3BhdGNoIGEgY2hhbmdlIGV2ZW50IGZvciBmb3JtIGNvbnRyb2wgZWxlbWVudHMgdGhhdCBo
YXZlIGJlZW4gZWRpdGVkLgogICAgICAgICAgICAgaWYgKGlzPEhUTUxGb3JtQ29udHJvbEVsZW1l
bnQ+KCpvbGRGb2N1c2VkRWxlbWVudCkpIHsKICAgICAgICAgICAgICAgICBIVE1MRm9ybUNvbnRy
b2xFbGVtZW50JiBmb3JtQ29udHJvbEVsZW1lbnQgPSBkb3duY2FzdDxIVE1MRm9ybUNvbnRyb2xF
bGVtZW50Pigqb2xkRm9jdXNlZEVsZW1lbnQpOwpAQCAtNDUzNyw3ICs0NTM4LDcgQEAgYm9vbCBE
b2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCwgRm9jdXNEaXJlY3Rp
b24gZGlyZWN0aW9uLCBGb2MKICAgICAgICAgfQogCiAgICAgICAgIC8vIERpc3BhdGNoIHRoZSBm
b2N1cyBldmVudCBhbmQgbGV0IHRoZSBub2RlIGRvIGFueSBvdGhlciBmb2N1cyByZWxhdGVkIGFj
dGl2aXRpZXMgKGltcG9ydGFudCBmb3IgdGV4dCBmaWVsZHMpCi0gICAgICAgIG1fZm9jdXNlZEVs
ZW1lbnQtPmRpc3BhdGNoRm9jdXNFdmVudChvbGRGb2N1c2VkRWxlbWVudC5jb3B5UmVmKCksIGRp
cmVjdGlvbik7CisgICAgICAgIG1fZm9jdXNlZEVsZW1lbnQtPmRpc3BhdGNoRm9jdXNFdmVudChv
bGRGb2N1c2VkRWxlbWVudC5jb3B5UmVmKCksIG9wdGlvbnMuZGlyZWN0aW9uKTsKIAogICAgICAg
ICBpZiAobV9mb2N1c2VkRWxlbWVudCAhPSBuZXdGb2N1c2VkRWxlbWVudCkgewogICAgICAgICAg
ICAgLy8gaGFuZGxlciBzaGlmdGVkIGZvY3VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k
b20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDFlNjhj
NTc5NzQxNzRmODYyZmUzOWE2OWI4OTAzYzI2MDg2NTE4ZjIuLmJhZWFmYjE2YzMyNzRkNjA1Y2Zj
ZDVlYjVjNGEwMGViMWE3ZDJmODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1
bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0zNiw3ICszNiw3
IEBACiAjaW5jbHVkZSAiRG9jdW1lbnRUaW1lbGluZXNDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAi
RG9jdW1lbnRUaW1pbmcuaCIKICNpbmNsdWRlICJFbGVtZW50SWRlbnRpZmllci5oIgotI2luY2x1
ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCisjaW5jbHVkZSAiRm9jdXNPcHRpb25zLmgiCiAjaW5jbHVk
ZSAiRm9udFNlbGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJhbWVEZXN0cnVjdGlvbk9ic2Vy
dmVyLmgiCiAjaW5jbHVkZSAiRnJhbWVJZGVudGlmaWVyLmgiCkBAIC03NTcsMTIgKzc1Nyw5IEBA
IHB1YmxpYzoKICAgICBWaXNpdGVkTGlua1N0YXRlJiB2aXNpdGVkTGlua1N0YXRlKCkgY29uc3Qg
eyByZXR1cm4gKm1fdmlzaXRlZExpbmtTdGF0ZTsgfQogCiAgICAgTW91c2VFdmVudFdpdGhIaXRU
ZXN0UmVzdWx0cyBwcmVwYXJlTW91c2VFdmVudChjb25zdCBIaXRUZXN0UmVxdWVzdCYsIGNvbnN0
IExheW91dFBvaW50JiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50Jik7Ci0KLSAgICBlbnVtIGNs
YXNzIEZvY3VzUmVtb3ZhbEV2ZW50c01vZGUgeyBEaXNwYXRjaCwgRG9Ob3REaXNwYXRjaCB9Owog
ICAgIC8vIFJldHVybnMgd2hldGhlciBmb2N1cyB3YXMgYmxvY2tlZC4gQSB0cnVlIHZhbHVlIGRv
ZXMgbm90IG5lY2Vzc2FyaWx5IG1lYW4gdGhlIGVsZW1lbnQgd2FzIGZvY3VzZWQuCiAgICAgLy8g
VGhlIGVsZW1lbnQgY291bGQgaGF2ZSBhbHJlYWR5IGJlZW4gZm9jdXNlZCBvciBtYXkgbm90IGJl
IGZvY3VzYWJsZSAoZS5nLiA8aW5wdXQgZGlzYWJsZWQ+KS4KLSAgICBXRUJDT1JFX0VYUE9SVCBi
b29sIHNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqLCBGb2N1c0RpcmVjdGlvbiA9IEZvY3VzRGly
ZWN0aW9uOjpOb25lLAotICAgICAgICBGb2N1c1JlbW92YWxFdmVudHNNb2RlID0gRm9jdXNSZW1v
dmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2gpOworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0Rm9j
dXNlZEVsZW1lbnQoRWxlbWVudCosIGNvbnN0IEZvY3VzT3B0aW9ucyYgPSB7IH0pOwogICAgIEVs
ZW1lbnQqIGZvY3VzZWRFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9mb2N1c2VkRWxlbWVudC5n
ZXQoKTsgfQogICAgIFVzZXJBY3Rpb25FbGVtZW50U2V0JiB1c2VyQWN0aW9uRWxlbWVudHMoKSAg
eyByZXR1cm4gbV91c2VyQWN0aW9uRWxlbWVudHM7IH0KICAgICBjb25zdCBVc2VyQWN0aW9uRWxl
bWVudFNldCYgdXNlckFjdGlvbkVsZW1lbnRzKCkgY29uc3QgeyByZXR1cm4gbV91c2VyQWN0aW9u
RWxlbWVudHM7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBi
L1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCA1YzQxZDI4YzI4NDQ3Yzg1NjQw
MmVhMzE3MmRiN2QyOWIxMWE2OTk3Li5hZDU3YjY0YmIxYzdmMzJmYjJiY2VmNzQ2NDI4ZmM3YjZl
MjAwMzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0zMDgxLDcgKzMwODEsNyBAQCB2b2lk
IEVsZW1lbnQ6OmZvY3VzKGNvbnN0IEZvY3VzT3B0aW9ucyYgb3B0aW9ucykKICAgICAgICAgLy8g
Rm9jdXMgYW5kIGNoYW5nZSBldmVudCBoYW5kbGVycyBjYW4gY2F1c2UgdXMgdG8gbG9zZSBvdXIg
bGFzdCByZWYuCiAgICAgICAgIC8vIElmIGEgZm9jdXMgZXZlbnQgaGFuZGxlciBjaGFuZ2VzIHRo
ZSBmb2N1cyB0byBhIGRpZmZlcmVudCBub2RlIGl0CiAgICAgICAgIC8vIGRvZXMgbm90IG1ha2Ug
c2Vuc2UgdG8gY29udGludWUgYW5kIHVwZGF0ZSBhcHBlYXJlbmNlLgotICAgICAgICBpZiAoIXBh
Z2UtPmZvY3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRFbGVtZW50KG5ld1RhcmdldC5nZXQoKSwg
KmRvY3VtZW50LT5mcmFtZSgpLCBvcHRpb25zLmRpcmVjdGlvbikpCisgICAgICAgIGlmICghcGFn
ZS0+Zm9jdXNDb250cm9sbGVyKCkuc2V0Rm9jdXNlZEVsZW1lbnQobmV3VGFyZ2V0LmdldCgpLCAq
ZG9jdW1lbnQtPmZyYW1lKCksIG9wdGlvbnMpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgIH0K
IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oIGIvU291cmNl
L1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oCmluZGV4IDAwYWE2ZGQzYTMzZTIyZTM5NDM3YWVl
YjBmMmFlMzNmMWU1NjRjNTcuLmVjODA0ZjI0YmU4NTliMGZmMmIzZTA5Y2I1NGYxMzQ0NzQzMjZh
MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c09wdGlvbnMuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9kb20vRm9jdXNPcHRpb25zLmgKQEAgLTMwLDkgKzMwLDEyIEBACiAKIG5h
bWVzcGFjZSBXZWJDb3JlIHsKIAorZW51bSBjbGFzcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIHsg
RGlzcGF0Y2gsIERvTm90RGlzcGF0Y2ggfTsKKwogc3RydWN0IEZvY3VzT3B0aW9ucyB7CiAgICAg
U2VsZWN0aW9uUmVzdG9yYXRpb25Nb2RlIHNlbGVjdGlvblJlc3RvcmF0aW9uTW9kZSB7IFNlbGVj
dGlvblJlc3RvcmF0aW9uTW9kZTo6UmVzdG9yZU9yU2VsZWN0QWxsIH07CiAgICAgRm9jdXNEaXJl
Y3Rpb24gZGlyZWN0aW9uIHsgRm9jdXNEaXJlY3Rpb246Ok5vbmUgfTsKKyAgICBGb2N1c1JlbW92
YWxFdmVudHNNb2RlIHJlbW92YWxFdmVudHNNb2RlIHsgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6
RGlzcGF0Y2ggfTsKICAgICBib29sIHByZXZlbnRTY3JvbGwgeyBmYWxzZSB9OwogfTsKIApkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCmluZGV4IGYxZDI4OTQ0YzI3MzZjYzI4
NGE2ZTdjNzViMThmOGYxNGY3N2ZiNjguLjBhZGQ4NTcxMmZkMjg3MmYzM2ViMzM0ZWQ0MGJkZmIy
NDAyODZhNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVy
LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKQEAgLTM5
LDYgKzM5LDcgQEAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkV2ZW50SGFuZGxlci5o
IgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKKyNpbmNsdWRlICJGb2N1c09wdGlvbnMuaCIKICNp
bmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lU2VsZWN0aW9uLmgiCiAjaW5jbHVkZSAi
RnJhbWVUcmVlLmgiCkBAIC04MjcsNyArODI4LDcgQEAgc3RhdGljIGJvb2wgc2hvdWxkQ2xlYXJT
ZWxlY3Rpb25XaGVuQ2hhbmdpbmdGb2N1c2VkRWxlbWVudChjb25zdCBQYWdlJiBwYWdlLCBSZWYK
ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBGb2N1c0NvbnRyb2xsZXI6OnNldEZvY3VzZWRF
bGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZyYW1lJiBuZXdGb2N1c2VkRnJhbWUsIEZvY3VzRGly
ZWN0aW9uIGRpcmVjdGlvbikKK2Jvb2wgRm9jdXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRWxlbWVu
dChFbGVtZW50KiBlbGVtZW50LCBGcmFtZSYgbmV3Rm9jdXNlZEZyYW1lLCBjb25zdCBGb2N1c09w
dGlvbnMmIG9wdGlvbnMpCiB7CiAgICAgUmVmPEZyYW1lPiBwcm90ZWN0ZWROZXdGb2N1c2VkRnJh
bWUgPSBuZXdGb2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPEZyYW1lPiBvbGRGb2N1c2VkRnJhbWUg
PSBmb2N1c2VkRnJhbWUoKTsKQEAgLTg3NCw3ICs4NzUsNyBAQCBib29sIEZvY3VzQ29udHJvbGxl
cjo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCwgRnJhbWUmIG5ld0ZvY3VzZWRG
cmFtZQogCiAgICAgUmVmPEVsZW1lbnQ+IHByb3RlY3QoKmVsZW1lbnQpOwogCi0gICAgYm9vbCBz
dWNjZXNzZnVsbHlGb2N1c2VkID0gbmV3RG9jdW1lbnQtPnNldEZvY3VzZWRFbGVtZW50KGVsZW1l
bnQsIGRpcmVjdGlvbik7CisgICAgYm9vbCBzdWNjZXNzZnVsbHlGb2N1c2VkID0gbmV3RG9jdW1l
bnQtPnNldEZvY3VzZWRFbGVtZW50KGVsZW1lbnQsIG9wdGlvbnMpOwogICAgIGlmICghc3VjY2Vz
c2Z1bGx5Rm9jdXNlZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G
b2N1c0NvbnRyb2xsZXIuaAppbmRleCAyOTc4NWQxOWVkYmQzY2I2NjY2MmFjZjJiOWExOWYxNGEy
ZWNhYjJjLi5kNzFmYWYzMzdmNTE3YTY0MGM4NWQxZjI5MjI0NDVmNzRiY2QzOGM3IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKQEAgLTI2LDcgKzI2LDcgQEAKICNwcmFnbWEg
b25jZQogCiAjaW5jbHVkZSAiQWN0aXZpdHlTdGF0ZS5oIgotI2luY2x1ZGUgIkZvY3VzRGlyZWN0
aW9uLmgiCisjaW5jbHVkZSAiRm9jdXNPcHRpb25zLmgiCiAjaW5jbHVkZSAiTGF5b3V0UmVjdC5o
IgogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTU5LDcg
KzU5LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0SW5pdGlhbEZvY3Vz
KEZvY3VzRGlyZWN0aW9uLCBLZXlib2FyZEV2ZW50Kik7CiAgICAgYm9vbCBhZHZhbmNlRm9jdXMo
Rm9jdXNEaXJlY3Rpb24sIEtleWJvYXJkRXZlbnQqLCBib29sIGluaXRpYWxGb2N1cyA9IGZhbHNl
KTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCos
IEZyYW1lJiwgRm9jdXNEaXJlY3Rpb24gPSBGb2N1c0RpcmVjdGlvbjo6Tm9uZSk7CisgICAgV0VC
Q09SRV9FWFBPUlQgYm9vbCBzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiwgRnJhbWUmLCBjb25z
dCBGb2N1c09wdGlvbnMmID0geyB9KTsKIAogICAgIHZvaWQgc2V0QWN0aXZpdHlTdGF0ZShPcHRp
b25TZXQ8QWN0aXZpdHlTdGF0ZTo6RmxhZz4pOwogCg==
</data>
<flag name="commit-queue"
          id="446278"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426089</attachid>
            <date>2021-04-15 02:23:46 -0700</date>
            <delta_ts>2021-04-15 12:51:40 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-224549-20210415112344.patch</filename>
            <type>text/plain</type>
            <size>9568</size>
            <attacher name="Manuel Rego Casasnovas">rego</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBjNjRjMTQ4MThkNDJh
MDE1ZmFjMTU0ZjQ5MmI0MDIwMTZmMmFlNS4uZGI5MzkyMzQ3Mjc1ZjNlOTk1YWExZWNmYzFkY2E1
ZGZlMzQ0MDE2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA0LTE1ICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZSBpbnRvIEZvY3VzT3B0aW9ucworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTQ5CisKKyAgICAgICAgUmV2aWV3ZWQg
YnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyBqdXN0IGEgcmVmYWN0b3Jp
bmcgdGhhdCBtb3ZlcyBGb2N1c1JlbW92YWxFdmVudHNNb2RlIGVudW0gaW50byBGb2N1c09wdGlv
bnMuCisgICAgICAgIFRoaXMgYWxsb3dzIHVzIHRvIHNpbXBsaWZ5IHNvbWUgbWV0aG9kIHNpZ25h
dHVyZXMsIGFzIHRoZXknbGwganVzdCByZWNlaXZlIGEgRm9jdXNPcHRpb25zIHBhcmFtZXRlciwg
aW5zdGVhZCBvZiB0d28gcGFyYW1ldGVycyBmb3IgRm9jdXNSZW1vdmFsRXZlbnRzTW9kZSBhbmQg
Rm9jdXNEaXJlY3Rpb24uCisKKyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIG9mIGJlaGF2aW9y
LCBqdXN0IGEgY29kZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6
CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YWRqdXN0Rm9jdXNlZE5vZGVPbk5vZGVSZW1v
dmFsKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVudCk6Cisg
ICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0
Rm9jdXNlZEVsZW1lbnQpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdl
YkNvcmU6OkVsZW1lbnQ6OmZvY3VzKToKKyAgICAgICAgKiBkb20vRm9jdXNPcHRpb25zLmg6Cisg
ICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9j
dXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRWxlbWVudCk6CisgICAgICAgICogcGFnZS9Gb2N1c0Nv
bnRyb2xsZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNl
ZEVsZW1lbnQpOgorCiAyMDIxLTA0LTE0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+
CiAKICAgICAgICAgSW5saW5lQm94IHNob3VsZCBub3QgaG9sZCBhIHJlZmVyZW5jZSB0byBSZW5k
ZXJPYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IGY3NmE4YzFiYmE5MmMzZDQ2OGVi
ZjlkZmZiOWMxN2M2ZWFlNGUyZDAuLmQ1YzNlMzZlMzlhMTRlYWUzOTEyZjc5ZDc3NzRmM2Y3OGY1
MzAzMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNzUsNiArNzUsNyBAQAogI2luY2x1
ZGUgIkV4dGVuc2lvblN0eWxlU2hlZXRzLmgiCiAjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVyLmgi
CiAjaW5jbHVkZSAiRm9jdXNFdmVudC5oIgorI2luY2x1ZGUgIkZvY3VzT3B0aW9ucy5oIgogI2lu
Y2x1ZGUgIkZvbnRGYWNlU2V0LmgiCiAjaW5jbHVkZSAiRm9ybUNvbnRyb2xsZXIuaCIKICNpbmNs
dWRlICJGcmFtZS5oIgpAQCAtNDM1Niw3ICs0MzU3LDkgQEAgdm9pZCBEb2N1bWVudDo6YWRqdXN0
Rm9jdXNlZE5vZGVPbk5vZGVSZW1vdmFsKE5vZGUmIG5vZGUsIE5vZGVSZW1vdmFsIG5vZGVSZW1v
dmEKICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBhdm9pZCBzeW5jaHJvbm91c2x5IHVwZGF0
aW5nIHRoZSBzdHlsZSBpbnNpZGUgc2V0Rm9jdXNlZEVsZW1lbnQuCiAgICAgICAgIC8vIEZJWE1F
OiBPYmplY3QgZWxlbWVudHMgc2hvdWxkIGF2b2lkIGxvYWRpbmcgYSBmcmFtZSBzeW5jaHJvbm91
c2x5IGluIGEgcG9zdCBzdHlsZSByZWNhbGMgY2FsbGJhY2suCiAgICAgICAgIFN1YmZyYW1lTG9h
ZGluZ0Rpc2FibGVyIGRpc2FibGVyKGlzPENvbnRhaW5lck5vZGU+KG5vZGUpID8gJmRvd25jYXN0
PENvbnRhaW5lck5vZGU+KG5vZGUpIDogbnVsbHB0cik7Ci0gICAgICAgIHNldEZvY3VzZWRFbGVt
ZW50KG51bGxwdHIsIEZvY3VzRGlyZWN0aW9uOjpOb25lLCBGb2N1c1JlbW92YWxFdmVudHNNb2Rl
OjpEb05vdERpc3BhdGNoKTsKKyAgICAgICAgRm9jdXNPcHRpb25zIGZvY3VzT3B0aW9ucyA9IHsg
fTsKKyAgICAgICAgZm9jdXNPcHRpb25zLnJlbW92YWxFdmVudHNNb2RlID0gRm9jdXNSZW1vdmFs
RXZlbnRzTW9kZTo6RG9Ob3REaXNwYXRjaDsKKyAgICAgICAgc2V0Rm9jdXNlZEVsZW1lbnQobnVs
bHB0ciwgZm9jdXNPcHRpb25zKTsKICAgICAgICAgLy8gU2V0IHRoZSBmb2N1cyBuYXZpZ2F0aW9u
IHN0YXJ0aW5nIG5vZGUgdG8gdGhlIHByZXZpb3VzIGZvY3VzZWQgZWxlbWVudCBzbyB0aGF0CiAg
ICAgICAgIC8vIHdlIGNhbiBmYWxsYmFjayB0byB0aGUgc2libGluZ3Mgb3IgcGFyZW50IG5vZGUg
Zm9yIHRoZSBuZXh0IHNlYXJjaC4KICAgICAgICAgLy8gQWxzbyB3ZSBuZWVkIHRvIGNhbGwgcmVt
b3ZlRm9jdXNOYXZpZ2F0aW9uTm9kZU9mU3VidHJlZSBhZnRlciB0aGlzIGZ1bmN0aW9uIGJlY2F1
c2UKQEAgLTQ0MzgsNyArNDQ0MSw3IEBAIHZvaWQgRG9jdW1lbnQ6OmludmFsaWRhdGVSZW5kZXJp
bmdEZXBlbmRlbnRSZWdpb25zKCkKICNlbmRpZgogfQogCi1ib29sIERvY3VtZW50OjpzZXRGb2N1
c2VkRWxlbWVudChFbGVtZW50KiBlbGVtZW50LCBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZv
Y3VzUmVtb3ZhbEV2ZW50c01vZGUgZXZlbnRzTW9kZSkKK2Jvb2wgRG9jdW1lbnQ6OnNldEZvY3Vz
ZWRFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEZvY3VzT3B0aW9ucyYgb3B0aW9ucykK
IHsKICAgICBSZWZQdHI8RWxlbWVudD4gbmV3Rm9jdXNlZEVsZW1lbnQgPSBlbGVtZW50OwogICAg
IC8vIE1ha2Ugc3VyZSBuZXdGb2N1c2VkRWxlbWVudCBpcyBhY3R1YWxseSBpbiB0aGlzIGRvY3Vt
ZW50CkBAIC00NDYwLDcgKzQ0NjMsNyBAQCBib29sIERvY3VtZW50OjpzZXRGb2N1c2VkRWxlbWVu
dChFbGVtZW50KiBlbGVtZW50LCBGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvYwogICAgICAg
ICBvbGRGb2N1c2VkRWxlbWVudC0+c2V0Rm9jdXMoZmFsc2UpOwogICAgICAgICBzZXRGb2N1c05h
dmlnYXRpb25TdGFydGluZ05vZGUobnVsbHB0cik7CiAKLSAgICAgICAgaWYgKGV2ZW50c01vZGUg
PT0gRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2gpIHsKKyAgICAgICAgaWYgKG9wdGlv
bnMucmVtb3ZhbEV2ZW50c01vZGUgPT0gRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2gp
IHsKICAgICAgICAgICAgIC8vIERpc3BhdGNoIGEgY2hhbmdlIGV2ZW50IGZvciBmb3JtIGNvbnRy
b2wgZWxlbWVudHMgdGhhdCBoYXZlIGJlZW4gZWRpdGVkLgogICAgICAgICAgICAgaWYgKGlzPEhU
TUxGb3JtQ29udHJvbEVsZW1lbnQ+KCpvbGRGb2N1c2VkRWxlbWVudCkpIHsKICAgICAgICAgICAg
ICAgICBIVE1MRm9ybUNvbnRyb2xFbGVtZW50JiBmb3JtQ29udHJvbEVsZW1lbnQgPSBkb3duY2Fz
dDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Pigqb2xkRm9jdXNlZEVsZW1lbnQpOwpAQCAtNDUzNyw3
ICs0NTQwLDcgQEAgYm9vbCBEb2N1bWVudDo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxl
bWVudCwgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBGb2MKICAgICAgICAgfQogCiAgICAgICAg
IC8vIERpc3BhdGNoIHRoZSBmb2N1cyBldmVudCBhbmQgbGV0IHRoZSBub2RlIGRvIGFueSBvdGhl
ciBmb2N1cyByZWxhdGVkIGFjdGl2aXRpZXMgKGltcG9ydGFudCBmb3IgdGV4dCBmaWVsZHMpCi0g
ICAgICAgIG1fZm9jdXNlZEVsZW1lbnQtPmRpc3BhdGNoRm9jdXNFdmVudChvbGRGb2N1c2VkRWxl
bWVudC5jb3B5UmVmKCksIGRpcmVjdGlvbik7CisgICAgICAgIG1fZm9jdXNlZEVsZW1lbnQtPmRp
c3BhdGNoRm9jdXNFdmVudChvbGRGb2N1c2VkRWxlbWVudC5jb3B5UmVmKCksIG9wdGlvbnMuZGly
ZWN0aW9uKTsKIAogICAgICAgICBpZiAobV9mb2N1c2VkRWxlbWVudCAhPSBuZXdGb2N1c2VkRWxl
bWVudCkgewogICAgICAgICAgICAgLy8gaGFuZGxlciBzaGlmdGVkIGZvY3VzCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1
bWVudC5oCmluZGV4IDFlNjhjNTc5NzQxNzRmODYyZmUzOWE2OWI4OTAzYzI2MDg2NTE4ZjIuLmJh
ZWFmYjE2YzMyNzRkNjA1Y2ZjZDVlYjVjNGEwMGViMWE3ZDJmODUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu
dC5oCkBAIC0zNiw3ICszNiw3IEBACiAjaW5jbHVkZSAiRG9jdW1lbnRUaW1lbGluZXNDb250cm9s
bGVyLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRUaW1pbmcuaCIKICNpbmNsdWRlICJFbGVtZW50SWRl
bnRpZmllci5oIgotI2luY2x1ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCisjaW5jbHVkZSAiRm9jdXNP
cHRpb25zLmgiCiAjaW5jbHVkZSAiRm9udFNlbGVjdG9yQ2xpZW50LmgiCiAjaW5jbHVkZSAiRnJh
bWVEZXN0cnVjdGlvbk9ic2VydmVyLmgiCiAjaW5jbHVkZSAiRnJhbWVJZGVudGlmaWVyLmgiCkBA
IC03NTcsMTIgKzc1Nyw5IEBAIHB1YmxpYzoKICAgICBWaXNpdGVkTGlua1N0YXRlJiB2aXNpdGVk
TGlua1N0YXRlKCkgY29uc3QgeyByZXR1cm4gKm1fdmlzaXRlZExpbmtTdGF0ZTsgfQogCiAgICAg
TW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cyBwcmVwYXJlTW91c2VFdmVudChjb25zdCBIaXRU
ZXN0UmVxdWVzdCYsIGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50
Jik7Ci0KLSAgICBlbnVtIGNsYXNzIEZvY3VzUmVtb3ZhbEV2ZW50c01vZGUgeyBEaXNwYXRjaCwg
RG9Ob3REaXNwYXRjaCB9OwogICAgIC8vIFJldHVybnMgd2hldGhlciBmb2N1cyB3YXMgYmxvY2tl
ZC4gQSB0cnVlIHZhbHVlIGRvZXMgbm90IG5lY2Vzc2FyaWx5IG1lYW4gdGhlIGVsZW1lbnQgd2Fz
IGZvY3VzZWQuCiAgICAgLy8gVGhlIGVsZW1lbnQgY291bGQgaGF2ZSBhbHJlYWR5IGJlZW4gZm9j
dXNlZCBvciBtYXkgbm90IGJlIGZvY3VzYWJsZSAoZS5nLiA8aW5wdXQgZGlzYWJsZWQ+KS4KLSAg
ICBXRUJDT1JFX0VYUE9SVCBib29sIHNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqLCBGb2N1c0Rp
cmVjdGlvbiA9IEZvY3VzRGlyZWN0aW9uOjpOb25lLAotICAgICAgICBGb2N1c1JlbW92YWxFdmVu
dHNNb2RlID0gRm9jdXNSZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2gpOworICAgIFdFQkNPUkVf
RVhQT1JUIGJvb2wgc2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCosIGNvbnN0IEZvY3VzT3B0aW9u
cyYgPSB7IH0pOwogICAgIEVsZW1lbnQqIGZvY3VzZWRFbGVtZW50KCkgY29uc3QgeyByZXR1cm4g
bV9mb2N1c2VkRWxlbWVudC5nZXQoKTsgfQogICAgIFVzZXJBY3Rpb25FbGVtZW50U2V0JiB1c2Vy
QWN0aW9uRWxlbWVudHMoKSAgeyByZXR1cm4gbV91c2VyQWN0aW9uRWxlbWVudHM7IH0KICAgICBj
b25zdCBVc2VyQWN0aW9uRWxlbWVudFNldCYgdXNlckFjdGlvbkVsZW1lbnRzKCkgY29uc3QgeyBy
ZXR1cm4gbV91c2VyQWN0aW9uRWxlbWVudHM7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCA1
YzQxZDI4YzI4NDQ3Yzg1NjQwMmVhMzE3MmRiN2QyOWIxMWE2OTk3Li5hZDU3YjY0YmIxYzdmMzJm
YjJiY2VmNzQ2NDI4ZmM3YjZlMjAwMzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v
RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0zMDgx
LDcgKzMwODEsNyBAQCB2b2lkIEVsZW1lbnQ6OmZvY3VzKGNvbnN0IEZvY3VzT3B0aW9ucyYgb3B0
aW9ucykKICAgICAgICAgLy8gRm9jdXMgYW5kIGNoYW5nZSBldmVudCBoYW5kbGVycyBjYW4gY2F1
c2UgdXMgdG8gbG9zZSBvdXIgbGFzdCByZWYuCiAgICAgICAgIC8vIElmIGEgZm9jdXMgZXZlbnQg
aGFuZGxlciBjaGFuZ2VzIHRoZSBmb2N1cyB0byBhIGRpZmZlcmVudCBub2RlIGl0CiAgICAgICAg
IC8vIGRvZXMgbm90IG1ha2Ugc2Vuc2UgdG8gY29udGludWUgYW5kIHVwZGF0ZSBhcHBlYXJlbmNl
LgotICAgICAgICBpZiAoIXBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRFbGVtZW50
KG5ld1RhcmdldC5nZXQoKSwgKmRvY3VtZW50LT5mcmFtZSgpLCBvcHRpb25zLmRpcmVjdGlvbikp
CisgICAgICAgIGlmICghcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuc2V0Rm9jdXNlZEVsZW1lbnQo
bmV3VGFyZ2V0LmdldCgpLCAqZG9jdW1lbnQtPmZyYW1lKCksIG9wdGlvbnMpKQogICAgICAgICAg
ICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3Vz
T3B0aW9ucy5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzT3B0aW9ucy5oCmluZGV4IDAwYWE2
ZGQzYTMzZTIyZTM5NDM3YWVlYjBmMmFlMzNmMWU1NjRjNTcuLmVjODA0ZjI0YmU4NTliMGZmMmIz
ZTA5Y2I1NGYxMzQ0NzQzMjZhMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1
c09wdGlvbnMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNPcHRpb25zLmgKQEAgLTMw
LDkgKzMwLDEyIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorZW51bSBjbGFzcyBGb2N1c1Jl
bW92YWxFdmVudHNNb2RlIHsgRGlzcGF0Y2gsIERvTm90RGlzcGF0Y2ggfTsKKwogc3RydWN0IEZv
Y3VzT3B0aW9ucyB7CiAgICAgU2VsZWN0aW9uUmVzdG9yYXRpb25Nb2RlIHNlbGVjdGlvblJlc3Rv
cmF0aW9uTW9kZSB7IFNlbGVjdGlvblJlc3RvcmF0aW9uTW9kZTo6UmVzdG9yZU9yU2VsZWN0QWxs
IH07CiAgICAgRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uIHsgRm9jdXNEaXJlY3Rpb246Ok5vbmUg
fTsKKyAgICBGb2N1c1JlbW92YWxFdmVudHNNb2RlIHJlbW92YWxFdmVudHNNb2RlIHsgRm9jdXNS
ZW1vdmFsRXZlbnRzTW9kZTo6RGlzcGF0Y2ggfTsKICAgICBib29sIHByZXZlbnRTY3JvbGwgeyBm
YWxzZSB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRy
b2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCmluZGV4
IGYxZDI4OTQ0YzI3MzZjYzI4NGE2ZTdjNzViMThmOGYxNGY3N2ZiNjguLjBhZGQ4NTcxMmZkMjg3
MmYzM2ViMzM0ZWQ0MGJkZmIyNDAyODZhNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvRm9jdXNDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29u
dHJvbGxlci5jcHAKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1
ZGUgIkV2ZW50SGFuZGxlci5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIKKyNpbmNsdWRlICJG
b2N1c09wdGlvbnMuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lU2VsZWN0
aW9uLmgiCiAjaW5jbHVkZSAiRnJhbWVUcmVlLmgiCkBAIC04MjcsNyArODI4LDcgQEAgc3RhdGlj
IGJvb2wgc2hvdWxkQ2xlYXJTZWxlY3Rpb25XaGVuQ2hhbmdpbmdGb2N1c2VkRWxlbWVudChjb25z
dCBQYWdlJiBwYWdlLCBSZWYKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBGb2N1c0NvbnRy
b2xsZXI6OnNldEZvY3VzZWRFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZyYW1lJiBuZXdGb2N1
c2VkRnJhbWUsIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbikKK2Jvb2wgRm9jdXNDb250cm9sbGVy
OjpzZXRGb2N1c2VkRWxlbWVudChFbGVtZW50KiBlbGVtZW50LCBGcmFtZSYgbmV3Rm9jdXNlZEZy
YW1lLCBjb25zdCBGb2N1c09wdGlvbnMmIG9wdGlvbnMpCiB7CiAgICAgUmVmPEZyYW1lPiBwcm90
ZWN0ZWROZXdGb2N1c2VkRnJhbWUgPSBuZXdGb2N1c2VkRnJhbWU7CiAgICAgUmVmUHRyPEZyYW1l
PiBvbGRGb2N1c2VkRnJhbWUgPSBmb2N1c2VkRnJhbWUoKTsKQEAgLTg3NCw3ICs4NzUsNyBAQCBi
b29sIEZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNlZEVsZW1lbnQoRWxlbWVudCogZWxlbWVudCwg
RnJhbWUmIG5ld0ZvY3VzZWRGcmFtZQogCiAgICAgUmVmPEVsZW1lbnQ+IHByb3RlY3QoKmVsZW1l
bnQpOwogCi0gICAgYm9vbCBzdWNjZXNzZnVsbHlGb2N1c2VkID0gbmV3RG9jdW1lbnQtPnNldEZv
Y3VzZWRFbGVtZW50KGVsZW1lbnQsIGRpcmVjdGlvbik7CisgICAgYm9vbCBzdWNjZXNzZnVsbHlG
b2N1c2VkID0gbmV3RG9jdW1lbnQtPnNldEZvY3VzZWRFbGVtZW50KGVsZW1lbnQsIG9wdGlvbnMp
OwogICAgIGlmICghc3VjY2Vzc2Z1bGx5Rm9jdXNlZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oIGIvU291
cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaAppbmRleCAyOTc4NWQxOWVkYmQzY2I2
NjY2MmFjZjJiOWExOWYxNGEyZWNhYjJjLi5kNzFmYWYzMzdmNTE3YTY0MGM4NWQxZjI5MjI0NDVm
NzRiY2QzOGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxl
ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKQEAgLTI2LDcg
KzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAiQWN0aXZpdHlTdGF0ZS5oIgotI2lu
Y2x1ZGUgIkZvY3VzRGlyZWN0aW9uLmgiCisjaW5jbHVkZSAiRm9jdXNPcHRpb25zLmgiCiAjaW5j
bHVkZSAiTGF5b3V0UmVjdC5oIgogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSA8d3RmL0Zv
cndhcmQuaD4KQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGJv
b2wgc2V0SW5pdGlhbEZvY3VzKEZvY3VzRGlyZWN0aW9uLCBLZXlib2FyZEV2ZW50Kik7CiAgICAg
Ym9vbCBhZHZhbmNlRm9jdXMoRm9jdXNEaXJlY3Rpb24sIEtleWJvYXJkRXZlbnQqLCBib29sIGlu
aXRpYWxGb2N1cyA9IGZhbHNlKTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0Rm9jdXNl
ZEVsZW1lbnQoRWxlbWVudCosIEZyYW1lJiwgRm9jdXNEaXJlY3Rpb24gPSBGb2N1c0RpcmVjdGlv
bjo6Tm9uZSk7CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBzZXRGb2N1c2VkRWxlbWVudChFbGVt
ZW50KiwgRnJhbWUmLCBjb25zdCBGb2N1c09wdGlvbnMmID0geyB9KTsKIAogICAgIHZvaWQgc2V0
QWN0aXZpdHlTdGF0ZShPcHRpb25TZXQ8QWN0aXZpdHlTdGF0ZTo6RmxhZz4pOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>426128</attachid>
            <date>2021-04-15 12:51:53 -0700</date>
            <delta_ts>2021-04-15 15:27:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-224549-20210415215151.patch</filename>
            <type>text/plain</type>
            <size>2023</size>
            <attacher name="Manuel Rego Casasnovas">rego</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGY0NDVlNTYyNTA2MWE2
OWExOWUzMDZmOTQ2MWY3MTAzYTI5Yzg1MC4uMDI4ODZlM2VlODAyZDQ2ZTUwYTIyNDNkNjE5YTkx
ZDU3MzA1OGI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTE1ICBNYW51
ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1vdmUgRm9j
dXNSZW1vdmFsRXZlbnRzTW9kZSBpbnRvIEZvY3VzT3B0aW9ucworICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTQ5CisgICAgICAgIDxyZGFyOi8vcHJv
YmxlbS83NjY5NTg4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor
ICAgICAgICBGb2xsb3ctdXAgcGF0Y2ggdG8gdXNlIGJyYWNlcyBpbml0aWFsaXplciBmb3IgRm9j
dXNPcHRpb25zIHN0cnVjdCBhbmQgc2ltcGxpZnkgdGhlIGNvZGUuCisKKyAgICAgICAgKiBkb20v
RG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmFkanVzdEZvY3VzZWRO
b2RlT25Ob2RlUmVtb3ZhbCk6CisKIDIwMjEtMDQtMTUgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMg
IDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAgTW92ZSBGb2N1c1JlbW92YWxFdmVudHNNb2Rl
IGludG8gRm9jdXNPcHRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l
bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBkNWMzZTM2ZTM5
YTE0ZWFlMzkxMmY3OWQ3Nzc0ZjNmNzhmNTMwMzBjLi5iNmM4YWU0MWVmYjNiZGRjYTI3ODVlZjlk
NTJkOGRjNjFkMzk1ZjNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTQzNTcsOSArNDM1
Nyw3IEBAIHZvaWQgRG9jdW1lbnQ6OmFkanVzdEZvY3VzZWROb2RlT25Ob2RlUmVtb3ZhbChOb2Rl
JiBub2RlLCBOb2RlUmVtb3ZhbCBub2RlUmVtb3ZhCiAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91
bGQgYXZvaWQgc3luY2hyb25vdXNseSB1cGRhdGluZyB0aGUgc3R5bGUgaW5zaWRlIHNldEZvY3Vz
ZWRFbGVtZW50LgogICAgICAgICAvLyBGSVhNRTogT2JqZWN0IGVsZW1lbnRzIHNob3VsZCBhdm9p
ZCBsb2FkaW5nIGEgZnJhbWUgc3luY2hyb25vdXNseSBpbiBhIHBvc3Qgc3R5bGUgcmVjYWxjIGNh
bGxiYWNrLgogICAgICAgICBTdWJmcmFtZUxvYWRpbmdEaXNhYmxlciBkaXNhYmxlcihpczxDb250
YWluZXJOb2RlPihub2RlKSA/ICZkb3duY2FzdDxDb250YWluZXJOb2RlPihub2RlKSA6IG51bGxw
dHIpOwotICAgICAgICBGb2N1c09wdGlvbnMgZm9jdXNPcHRpb25zID0geyB9OwotICAgICAgICBm
b2N1c09wdGlvbnMucmVtb3ZhbEV2ZW50c01vZGUgPSBGb2N1c1JlbW92YWxFdmVudHNNb2RlOjpE
b05vdERpc3BhdGNoOwotICAgICAgICBzZXRGb2N1c2VkRWxlbWVudChudWxscHRyLCBmb2N1c09w
dGlvbnMpOworICAgICAgICBzZXRGb2N1c2VkRWxlbWVudChudWxscHRyLCB7IHsgfSwgeyB9LCBG
b2N1c1JlbW92YWxFdmVudHNNb2RlOjpEb05vdERpc3BhdGNoLCB7IH0gfSk7CiAgICAgICAgIC8v
IFNldCB0aGUgZm9jdXMgbmF2aWdhdGlvbiBzdGFydGluZyBub2RlIHRvIHRoZSBwcmV2aW91cyBm
b2N1c2VkIGVsZW1lbnQgc28gdGhhdAogICAgICAgICAvLyB3ZSBjYW4gZmFsbGJhY2sgdG8gdGhl
IHNpYmxpbmdzIG9yIHBhcmVudCBub2RlIGZvciB0aGUgbmV4dCBzZWFyY2guCiAgICAgICAgIC8v
IEFsc28gd2UgbmVlZCB0byBjYWxsIHJlbW92ZUZvY3VzTmF2aWdhdGlvbk5vZGVPZlN1YnRyZWUg
YWZ0ZXIgdGhpcyBmdW5jdGlvbiBiZWNhdXNlCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>