<?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>234138</bug_id>
          
          <creation_ts>2021-12-10 03:40:40 -0800</creation_ts>
          <short_desc>[GPUP] Create WebGL context with task id token</short_desc>
          <delta_ts>2021-12-16 10:17:18 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</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="John Cunningham">johncunningham</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>darin</cc>
    
    <cc>dino</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>kkinnunen</cc>
    
    <cc>kondapallykalyan</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1822634</commentid>
    <comment_count>0</comment_count>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 03:40:40 -0800</bug_when>
    <thetext>Use EGL_ANGLE_metal_create_context_ownership_identity to create a WebGL context when GPUP and WebGL in GPUP is enabled</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822635</commentid>
    <comment_count>1</comment_count>
      <attachid>446707</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 03:43:15 -0800</bug_when>
    <thetext>Created attachment 446707
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822855</commentid>
    <comment_count>2</comment_count>
      <attachid>446772</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 11:46:52 -0800</bug_when>
    <thetext>Created attachment 446772
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822881</commentid>
    <comment_count>3</comment_count>
      <attachid>446781</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 12:18:25 -0800</bug_when>
    <thetext>Created attachment 446781
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822885</commentid>
    <comment_count>4</comment_count>
      <attachid>446781</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-12-10 12:27:36 -0800</bug_when>
    <thetext>Comment on attachment 446781
Patch

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

A few coding style tweaks

&gt; Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h:367
&gt; +    GraphicsContextGLANGLE(GraphicsContextGLAttributes, ProcessIdentity&amp;);

Could this be &quot;const ProcessIdentity&amp;&quot;? It’s a bit unusual to pass a non-constant lvalue reference and I don’t see why we need to.

&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:204
&gt; +GraphicsContextGLCocoa::GraphicsContextGLCocoa(GraphicsContextGLAttributes &amp;&amp;creationAttributes, ProcessIdentity &amp;&amp;resourceOwner)

Why moving these &quot;&amp;&amp;&quot;? WebKit coding style calls for the way we had it already.

&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:336
&gt; +    const char *displayExtensions = EGL_QueryString(m_displayObj, EGL_EXTENSIONS);

WebKit coding style calls for &quot;const char*&quot; or &quot;auto&quot;.

&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:340
&gt; +        task_id_token_t ownerTaskIdToken = resourceOwner.taskIdToken();

Seems like we don’t need this local variable.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822917</commentid>
    <comment_count>5</comment_count>
      <attachid>446781</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 13:08:50 -0800</bug_when>
    <thetext>Comment on attachment 446781
Patch

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

&gt;&gt; Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.h:367
&gt;&gt; +    GraphicsContextGLANGLE(GraphicsContextGLAttributes, ProcessIdentity&amp;);
&gt; 
&gt; Could this be &quot;const ProcessIdentity&amp;&quot;? It’s a bit unusual to pass a non-constant lvalue reference and I don’t see why we need to.

I&apos;ll change it to const. I don&apos;t believe leaving it as &amp;&amp; would work as that would lead to a use after move bug at GraphicsContextGLCocoa.mm:215. Once the fix there is resolved, it would be good to remove this workaround and keep it as &amp;&amp;.

&gt;&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:204
&gt;&gt; +GraphicsContextGLCocoa::GraphicsContextGLCocoa(GraphicsContextGLAttributes &amp;&amp;creationAttributes, ProcessIdentity &amp;&amp;resourceOwner)
&gt; 
&gt; Why moving these &quot;&amp;&amp;&quot;? WebKit coding style calls for the way we had it already.

Above comment

&gt;&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:336
&gt;&gt; +    const char *displayExtensions = EGL_QueryString(m_displayObj, EGL_EXTENSIONS);
&gt; 
&gt; WebKit coding style calls for &quot;const char*&quot; or &quot;auto&quot;.

&apos;webkit-patch format&apos; changes it from &quot;const char* &quot; to &quot;const char *&quot;, but I&apos;m also happy to just use auto here.

&gt;&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:340
&gt;&gt; +        task_id_token_t ownerTaskIdToken = resourceOwner.taskIdToken();
&gt; 
&gt; Seems like we don’t need this local variable.

Done</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822947</commentid>
    <comment_count>6</comment_count>
      <attachid>446803</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 13:33:57 -0800</bug_when>
    <thetext>Created attachment 446803
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822948</commentid>
    <comment_count>7</comment_count>
      <attachid>446781</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-12-10 13:34:11 -0800</bug_when>
    <thetext>Comment on attachment 446781
Patch

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

&gt;&gt;&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:204
&gt;&gt;&gt; +GraphicsContextGLCocoa::GraphicsContextGLCocoa(GraphicsContextGLAttributes &amp;&amp;creationAttributes, ProcessIdentity &amp;&amp;resourceOwner)
&gt;&gt; 
&gt;&gt; Why moving these &quot;&amp;&amp;&quot;? WebKit coding style calls for the way we had it already.
&gt; 
&gt; Above comment

What does that comment have to do with space character placement?

I meant why are you touching this line of code at all, changing &quot;GraphicsContextGLAttributes&amp;&amp; creationAttributes&quot; to &quot;GraphicsContextGLAttributes &amp;&amp;creationAttributes&quot;, which has no effect but goes against WebKit coding style?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822949</commentid>
    <comment_count>8</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-12-10 13:34:49 -0800</bug_when>
    <thetext>(In reply to John Cunningham from comment #5)
&gt; &apos;webkit-patch format&apos; changes it from &quot;const char* &quot; to &quot;const char *&quot;

Incredible! Why would it?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822951</commentid>
    <comment_count>9</comment_count>
      <attachid>446804</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 13:46:06 -0800</bug_when>
    <thetext>Created attachment 446804
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1822952</commentid>
    <comment_count>10</comment_count>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-10 13:46:34 -0800</bug_when>
    <thetext>(In reply to Darin Adler from comment #7)
&gt; Comment on attachment 446781 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=446781&amp;action=review
&gt; 
&gt; &gt;&gt;&gt; Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm:204
&gt; &gt;&gt;&gt; +GraphicsContextGLCocoa::GraphicsContextGLCocoa(GraphicsContextGLAttributes &amp;&amp;creationAttributes, ProcessIdentity &amp;&amp;resourceOwner)
&gt; &gt;&gt; 
&gt; &gt;&gt; Why moving these &quot;&amp;&amp;&quot;? WebKit coding style calls for the way we had it already.
&gt; &gt; 
&gt; &gt; Above comment
&gt; 
&gt; What does that comment have to do with space character placement?
&gt; 
&gt; I meant why are you touching this line of code at all, changing
&gt; &quot;GraphicsContextGLAttributes&amp;&amp; creationAttributes&quot; to
&gt; &quot;GraphicsContextGLAttributes &amp;&amp;creationAttributes&quot;, which has no effect but
&gt; goes against WebKit coding style?

Understood now, unsure of what is going on with automated formatting, but for now I have manually changed to webkit&apos;s style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1823421</commentid>
    <comment_count>11</comment_count>
    <who name="Kimmo Kinnunen">kkinnunen</who>
    <bug_when>2021-12-13 00:26:22 -0800</bug_when>
    <thetext>(In reply to Darin Adler from comment #8)
&gt; (In reply to John Cunningham from comment #5)
&gt; &gt; &apos;webkit-patch format&apos; changes it from &quot;const char* &quot; to &quot;const char *&quot;
&gt; 
&gt; Incredible! Why would it?

So the code is Objective C++. I think the tool is correct but the WebKit development practice does not adhere to its own rules.

https://webkit.org/code-style-guidelines/#pointers-non-cpp

  Pointer types in non-C++ code
  Pointer types should be written with a space between the type and the * (so the * is adjacent to the following identifier if any).

Of course it&apos;s matter of interpretation, as to whether that &quot;non-C++&quot; refers to &quot;Objective C&quot; only or &quot;Objective C and Objective C++&quot;. However, since there are very few .m files, I&apos;d imagine if that rule exists, that covers .mm files, .m files and .h files intended to be used from .m and .mm files.


&gt;&gt; What does that comment have to do with space character placement?
&gt;&gt; 
&gt;&gt; I meant why are you touching this line of code at all, changing
&gt;&gt; &quot;GraphicsContextGLAttributes&amp;&amp; creationAttributes&quot; to
&gt;&gt; &quot;GraphicsContextGLAttributes &amp;&amp;creationAttributes&quot;, which has no effect but
&gt;&gt; goes against WebKit coding style?


&gt; Understood now, unsure of what is going on with automated formatting, but for now I &gt; have manually changed to webkit&apos;s style.

My bad, I instructed John to use webkit-patch format for ANGLE code, where it works because that code conforms to the Google coding style. I did not explain that currently the automatic formatting is not working as expected for WebKit code.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1824049</commentid>
    <comment_count>12</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-12-14 10:44:37 -0800</bug_when>
    <thetext>(In reply to Kimmo Kinnunen from comment #11)
&gt; So the code is Objective C++. I think the tool is correct but the WebKit
&gt; development practice does not adhere to its own rules.

The style document is wrong. That should be fixed. Please don’t enforce inaccurate things from the style document. We, the WebKit community, will help you figure out the mistakes there. We even have the collective power to change our style. But this is unambiguously an error in how that document was written, please don’t change our style by interpreting that document as &quot;truth&quot;.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1824386</commentid>
    <comment_count>13</comment_count>
      <attachid>447243</attachid>
    <who name="John Cunningham">johncunningham</who>
    <bug_when>2021-12-15 09:29:34 -0800</bug_when>
    <thetext>Created attachment 447243
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1824802</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-12-16 10:16:02 -0800</bug_when>
    <thetext>Committed r287144 (245328@main): &lt;https://commits.webkit.org/245328@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 447243.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1824803</commentid>
    <comment_count>15</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-12-16 10:17:18 -0800</bug_when>
    <thetext>&lt;rdar://problem/86583119&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446707</attachid>
            <date>2021-12-10 03:43:15 -0800</date>
            <delta_ts>2021-12-10 11:46:49 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234138-20211210034314.patch</filename>
            <type>text/plain</type>
            <size>2059</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcyOTUzNTU0OTEwMzk4
Y2ZiZTk1YzMzM2U5NzkwZmUyY2IzMTQyZS4uYTc5NjRmN2I0YWExN2U4NDM4Njg0NTcwMmE4MTJj
NzFlMmMwMjBjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTEwICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ3JlYXRl
IFdlYkdMIGNvbnRleHQgd2l0aCB0YXNrIGlkIHRva2VuCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQxMzgKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRHTENvY29hLm1tOgorICAgICAgICAo
V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3NDb250ZXh0R0xBTkdMRSk6
CisKIDIwMjEtMTItMTAgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAog
ICAgICAgICBJT1N1cmZhY2UgbWVtb3J5IGF0dHJpYnV0aW9uIGlzIGhhcmQgdG8gdXNlIGluIGNv
bnN0cnVjdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv
Y29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdMQ29jb2EubW0KaW5kZXggOWFiMmQ3NDQx
MGEwNmJjMGRlNjQxNTBlOGUxMjAzZTA1M2FkNTk0Yi4uMzNlOGQ5NDRkMGIyMzk4OWJlN2ViYmY0
YTgxNzA5ZjZlMGVmYTI2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRHTENvY29hLm1tCkBAIC0z
MjMsNiArMzIzLDE2IEBAIEdyYXBoaWNzQ29udGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdM
QU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzIGF0dHJzCiAgICAgZWdsQ29udGV4dEF0
dHJpYnV0ZXMuYXBwZW5kKEVHTF9DT05URVhUX0JJTkRfR0VORVJBVEVTX1JFU09VUkNFX0NIUk9N
SVVNKTsKICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX0ZBTFNFKTsKIAorI2lm
IEhBVkUoVEFTS19JREVOVElUWV9UT0tFTikKKyAgICBjb25zdCBjaGFyICpkaXNwbGF5RXh0ZW5z
aW9ucyA9IEVHTF9RdWVyeVN0cmluZyhtX2Rpc3BsYXlPYmosIEVHTF9FWFRFTlNJT05TKTsKKyAg
ICBib29sIHN1cHBvcnRzT3duZXJzaGlwSWRlbnRpdHkgPSBzdHJzdHIoZGlzcGxheUV4dGVuc2lv
bnMsICJFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50aXR5Iik7
CisgICAgaWYgKGF0dHJzLnVzZU1ldGFsICYmIG1fcmVzb3VyY2VPd25lciAmJiBzdXBwb3J0c093
bmVyc2hpcElkZW50aXR5KSB7CisgICAgICAgIHRhc2tfaWRfdG9rZW5fdCBvd25lclRhc2tJZFRv
a2VuID0gbV9yZXNvdXJjZU93bmVyLnRhc2tJZFRva2VuKCk7CisgICAgICAgIGVnbENvbnRleHRB
dHRyaWJ1dGVzLmFwcGVuZChFR0xfQ09OVEVYVF9NRVRBTF9PV05FUlNISVBfSURFTlRJVFlfQU5H
TEUpOworICAgICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQob3duZXJUYXNrSWRUb2tl
bik7CisgICAgfQorI2VuZGlmCisKICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdM
X05PTkUpOwogCiAgICAgbV9jb250ZXh0T2JqID0gRUdMX0NyZWF0ZUNvbnRleHQobV9kaXNwbGF5
T2JqLCBtX2NvbmZpZ09iaiwgRUdMX05PX0NPTlRFWFQsIGVnbENvbnRleHRBdHRyaWJ1dGVzLmRh
dGEoKSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446772</attachid>
            <date>2021-12-10 11:46:52 -0800</date>
            <delta_ts>2021-12-10 12:25:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234138-20211210114651.patch</filename>
            <type>text/plain</type>
            <size>3109</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJkNmNkZGFkNzMyZDdm
YTI0NmNkNTA5ZGE1MDdkZTFkNDg0MzkxZC4uYTFkNzc3MDlkNTk1MGM0Y2QxMzM1MTVmNDU1M2Qw
OThjYjRhMjNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEyLTEwICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBd
IENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBpZCB0b2tlbgorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTM4CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgS2ltbW8gS2lubnVuZW4uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAg
IFVzZSBFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50aXR5IHRv
IGNyZWF0ZQorICAgICAgICBhIFdlYkdMIGNvbnRleHQgd2hlbiBHUFVQIGFuZCBXZWJHTCBpbiBH
UFVQIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFw
aGljc0NvbnRleHRHTEFOR0xFLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev
R3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u
dGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUpOgorCiAyMDIxLTEyLTEwICBHYWJy
aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIG51bGxw
dHIgZGVyZWYgaW4gQ29tcHV0ZUZsb2F0T2Zmc2V0Rm9yTGluZUxheW91dEFkYXB0ZXI8RmxvYXRp
bmdPYmplY3Q6OkZsb2F0TGVmdD46OnVwZGF0ZU9mZnNldElmTmVlZGVkCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFO
R0xFLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0Nv
bnRleHRHTEFOR0xFLmgKaW5kZXggOTc0ZWJiMzUxZmM2M2QzODRmZDRhN2M5OTc5YWYwZDI2NDU4
MzljMC4uNGIzZTk1MjRiNjhhZGZmODc3ODI0MTFiZTY1M2RhYjk2Y2NjZjBhMSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0
R0xBTkdMRS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dy
YXBoaWNzQ29udGV4dEdMQU5HTEUuaApAQCAtMzYzLDcgKzM2Myw3IEBAIHB1YmxpYzoKICNlbmRp
ZgogCiBwcm90ZWN0ZWQ6Ci0gICAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRl
eHRHTEF0dHJpYnV0ZXMpOworICAgIEdyYXBoaWNzQ29udGV4dEdMQU5HTEUoR3JhcGhpY3NDb250
ZXh0R0xBdHRyaWJ1dGVzLCBQcm9jZXNzSWRlbnRpdHkmKTsKICAgICAvLyBDYWxsZWQgb25jZSBi
eSBhbGwgdGhlIHB1YmxpYyBlbnRyeSBwb2ludHMgdGhhdCBldmVudHVhbGx5IGNhbGwgT3BlbkdM
LgogICAgIC8vIENhbGxlZCBvbmNlIGJ5IGFsbCB0aGUgcHVibGljIGVudHJ5IHBvaW50cyBvZiBF
eHRlbnNpb25zR0wgdGhhdCBldmVudHVhbGx5IGNhbGwgT3BlbkdMLgogICAgIGJvb2wgbWFrZUNv
bnRleHRDdXJyZW50KCkgV0FSTl9VTlVTRURfUkVUVVJOOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbSBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdM
Q29jb2EubW0KaW5kZXggOWFiMmQ3NDQxMGEwNmJjMGRlNjQxNTBlOGUxMjAzZTA1M2FkNTk0Yi4u
MzNlOGQ5NDRkMGIyMzk4OWJlN2ViYmY0YTgxNzA5ZjZlMGVmYTI2NSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2Nv
YS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGlj
c0NvbnRleHRHTENvY29hLm1tCkBAIC0zMjMsNiArMzIzLDE2IEBAIEdyYXBoaWNzQ29udGV4dEdM
QU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVz
IGF0dHJzCiAgICAgZWdsQ29udGV4dEF0dHJpYnV0ZXMuYXBwZW5kKEVHTF9DT05URVhUX0JJTkRf
R0VORVJBVEVTX1JFU09VUkNFX0NIUk9NSVVNKTsKICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5h
cHBlbmQoRUdMX0ZBTFNFKTsKIAorI2lmIEhBVkUoVEFTS19JREVOVElUWV9UT0tFTikKKyAgICBj
b25zdCBjaGFyICpkaXNwbGF5RXh0ZW5zaW9ucyA9IEVHTF9RdWVyeVN0cmluZyhtX2Rpc3BsYXlP
YmosIEVHTF9FWFRFTlNJT05TKTsKKyAgICBib29sIHN1cHBvcnRzT3duZXJzaGlwSWRlbnRpdHkg
PSBzdHJzdHIoZGlzcGxheUV4dGVuc2lvbnMsICJFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRl
eHRfb3duZXJzaGlwX2lkZW50aXR5Iik7CisgICAgaWYgKGF0dHJzLnVzZU1ldGFsICYmIG1fcmVz
b3VyY2VPd25lciAmJiBzdXBwb3J0c093bmVyc2hpcElkZW50aXR5KSB7CisgICAgICAgIHRhc2tf
aWRfdG9rZW5fdCBvd25lclRhc2tJZFRva2VuID0gbV9yZXNvdXJjZU93bmVyLnRhc2tJZFRva2Vu
KCk7CisgICAgICAgIGVnbENvbnRleHRBdHRyaWJ1dGVzLmFwcGVuZChFR0xfQ09OVEVYVF9NRVRB
TF9PV05FUlNISVBfSURFTlRJVFlfQU5HTEUpOworICAgICAgICBlZ2xDb250ZXh0QXR0cmlidXRl
cy5hcHBlbmQob3duZXJUYXNrSWRUb2tlbik7CisgICAgfQorI2VuZGlmCisKICAgICBlZ2xDb250
ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX05PTkUpOwogCiAgICAgbV9jb250ZXh0T2JqID0gRUdM
X0NyZWF0ZUNvbnRleHQobV9kaXNwbGF5T2JqLCBtX2NvbmZpZ09iaiwgRUdMX05PX0NPTlRFWFQs
IGVnbENvbnRleHRBdHRyaWJ1dGVzLmRhdGEoKSk7Cg==
</data>
<flag name="commit-queue"
          id="472261"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446781</attachid>
            <date>2021-12-10 12:18:25 -0800</date>
            <delta_ts>2021-12-10 13:34:22 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234138-20211210121824.patch</filename>
            <type>text/plain</type>
            <size>4438</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJkNmNkZGFkNzMyZDdm
YTI0NmNkNTA5ZGE1MDdkZTFkNDg0MzkxZC4uYTFkNzc3MDlkNTk1MGM0Y2QxMzM1MTVmNDU1M2Qw
OThjYjRhMjNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEyLTEwICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBd
IENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBpZCB0b2tlbgorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTM4CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgS2ltbW8gS2lubnVuZW4uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAg
IFVzZSBFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50aXR5IHRv
IGNyZWF0ZQorICAgICAgICBhIFdlYkdMIGNvbnRleHQgd2hlbiBHUFVQIGFuZCBXZWJHTCBpbiBH
UFVQIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFw
aGljc0NvbnRleHRHTEFOR0xFLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev
R3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u
dGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUpOgorCiAyMDIxLTEyLTEwICBHYWJy
aWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIG51bGxw
dHIgZGVyZWYgaW4gQ29tcHV0ZUZsb2F0T2Zmc2V0Rm9yTGluZUxheW91dEFkYXB0ZXI8RmxvYXRp
bmdPYmplY3Q6OkZsb2F0TGVmdD46OnVwZGF0ZU9mZnNldElmTmVlZGVkCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFO
R0xFLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0Nv
bnRleHRHTEFOR0xFLmgKaW5kZXggOTc0ZWJiMzUxZmM2M2QzODRmZDRhN2M5OTc5YWYwZDI2NDU4
MzljMC4uZTk5ODc4MWRiYTFlZTliMGU3ZDdjMDljMDhhNTI4ZWUyMzllNmE5MyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0
R0xBTkdMRS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dy
YXBoaWNzQ29udGV4dEdMQU5HTEUuaApAQCAtMzYzLDcgKzM2MywxMSBAQCBwdWJsaWM6CiAjZW5k
aWYKIAogcHJvdGVjdGVkOgorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIEdyYXBoaWNzQ29udGV4
dEdMQU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzLCBQcm9jZXNzSWRlbnRpdHkmKTsK
KyNlbHNlCiAgICAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJp
YnV0ZXMpOworI2VuZGlmCiAgICAgLy8gQ2FsbGVkIG9uY2UgYnkgYWxsIHRoZSBwdWJsaWMgZW50
cnkgcG9pbnRzIHRoYXQgZXZlbnR1YWxseSBjYWxsIE9wZW5HTC4KICAgICAvLyBDYWxsZWQgb25j
ZSBieSBhbGwgdGhlIHB1YmxpYyBlbnRyeSBwb2ludHMgb2YgRXh0ZW5zaW9uc0dMIHRoYXQgZXZl
bnR1YWxseSBjYWxsIE9wZW5HTC4KICAgICBib29sIG1ha2VDb250ZXh0Q3VycmVudCgpIFdBUk5f
VU5VU0VEX1JFVFVSTjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdMQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRHTENvY29hLm1tCmluZGV4IDlhYjJk
NzQ0MTBhMDZiYzBkZTY0MTUwZThlMTIwM2UwNTNhZDU5NGIuLmQ5Njg1YThhODUzZjEwOWVlYTkx
ZDIxOWM2YmYyZjdmMTZjMzc2MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdMQ29jb2EubW0KKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbQpA
QCAtMjAxLDggKzIwMSwxMyBAQCBSZWZQdHI8R3JhcGhpY3NDb250ZXh0R0xDb2NvYT4gR3JhcGhp
Y3NDb250ZXh0R0xDb2NvYTo6Y3JlYXRlKEdyYXBoaWNzQ29udGV4dEdMQQogICAgIHJldHVybiBj
b250ZXh0OwogfQogCi1HcmFwaGljc0NvbnRleHRHTENvY29hOjpHcmFwaGljc0NvbnRleHRHTENv
Y29hKEdyYXBoaWNzQ29udGV4dEdMQXR0cmlidXRlcyYmIGNyZWF0aW9uQXR0cmlidXRlcywgUHJv
Y2Vzc0lkZW50aXR5JiYgcmVzb3VyY2VPd25lcikKLSAgICA6IEdyYXBoaWNzQ29udGV4dEdMQU5H
TEUoV1RGTW92ZShjcmVhdGlvbkF0dHJpYnV0ZXMpKQorR3JhcGhpY3NDb250ZXh0R0xDb2NvYTo6
R3JhcGhpY3NDb250ZXh0R0xDb2NvYShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgJiZjcmVh
dGlvbkF0dHJpYnV0ZXMsIFByb2Nlc3NJZGVudGl0eSAmJnJlc291cmNlT3duZXIpCisgICAgOgor
I2lmIFBMQVRGT1JNKENPQ09BKQorICAgIEdyYXBoaWNzQ29udGV4dEdMQU5HTEUoV1RGTW92ZShj
cmVhdGlvbkF0dHJpYnV0ZXMpLCByZXNvdXJjZU93bmVyKQorI2Vsc2UKKyAgICBHcmFwaGljc0Nv
bnRleHRHTEFOR0xFKFdURk1vdmUoY3JlYXRpb25BdHRyaWJ1dGVzKSkKKyNlbmRpZgogewogICAg
IGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CkBAIC0yMzAsNyArMjM1LDExIEBAIHZv
aWQgR3JhcGhpY3NDb250ZXh0R0xDb2NvYTo6bWFya0Rpc3BsYXlCdWZmZXJJblVzZSgpCiAKIC8v
IEZJWE1FOiBCZWxvdyBpcyBmdW5jdGlvbmFsaXR5IHRoYXQgc2hvdWxkIGJlIG1vdmVkIHRvIEdy
YXBoaWNzQ29udGV4dEdMQ29jb2EgdG8gc2ltcGxpZnkgdGhlIGJhc2UgY2xhc3MuCiAKKyNpZiBQ
TEFURk9STShDT0NPQSkKK0dyYXBoaWNzQ29udGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdM
QU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzIGF0dHJzLCBQcm9jZXNzSWRlbnRpdHkg
JnJlc291cmNlT3duZXIpCisjZWxzZQogR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3ND
b250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgYXR0cnMpCisjZW5kaWYK
ICAgICA6IEdyYXBoaWNzQ29udGV4dEdMKGF0dHJzKQogewogICAgIG1faXNGb3JXZWJHTDIgPSBh
dHRycy53ZWJHTFZlcnNpb24gPT0gR3JhcGhpY3NDb250ZXh0R0xXZWJHTFZlcnNpb246OldlYkdM
MjsKQEAgLTMyMyw2ICszMzIsMTcgQEAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3ND
b250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgYXR0cnMKICAgICBlZ2xD
b250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX0NPTlRFWFRfQklORF9HRU5FUkFURVNfUkVTT1VS
Q0VfQ0hST01JVU0pOwogICAgIGVnbENvbnRleHRBdHRyaWJ1dGVzLmFwcGVuZChFR0xfRkFMU0Up
OwogCisjaWYgUExBVEZPUk0oQ09DT0EpICYmIEhBVkUoVEFTS19JREVOVElUWV9UT0tFTikKKyAg
ICBjb25zdCBjaGFyICpkaXNwbGF5RXh0ZW5zaW9ucyA9IEVHTF9RdWVyeVN0cmluZyhtX2Rpc3Bs
YXlPYmosIEVHTF9FWFRFTlNJT05TKTsKKyAgICBib29sIHN1cHBvcnRzT3duZXJzaGlwSWRlbnRp
dHkgPSBzdHJzdHIoZGlzcGxheUV4dGVuc2lvbnMsICJFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2Nv
bnRleHRfb3duZXJzaGlwX2lkZW50aXR5Iik7CisgICAgLy8gRklYTUU6IFVzZSBtX3Jlc291cmNl
T3duZXIgb25jZSBpdCBtb3ZlcyB0byBHcmFwaGljc0NvbnRleHRHTENvY29hLgorICAgIGlmIChh
dHRycy51c2VNZXRhbCAmJiByZXNvdXJjZU93bmVyICYmIHN1cHBvcnRzT3duZXJzaGlwSWRlbnRp
dHkpIHsKKyAgICAgICAgdGFza19pZF90b2tlbl90IG93bmVyVGFza0lkVG9rZW4gPSByZXNvdXJj
ZU93bmVyLnRhc2tJZFRva2VuKCk7CisgICAgICAgIGVnbENvbnRleHRBdHRyaWJ1dGVzLmFwcGVu
ZChFR0xfQ09OVEVYVF9NRVRBTF9PV05FUlNISVBfSURFTlRJVFlfQU5HTEUpOworICAgICAgICBl
Z2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQob3duZXJUYXNrSWRUb2tlbik7CisgICAgfQorI2Vu
ZGlmCisKICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX05PTkUpOwogCiAgICAg
bV9jb250ZXh0T2JqID0gRUdMX0NyZWF0ZUNvbnRleHQobV9kaXNwbGF5T2JqLCBtX2NvbmZpZ09i
aiwgRUdMX05PX0NPTlRFWFQsIGVnbENvbnRleHRBdHRyaWJ1dGVzLmRhdGEoKSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446803</attachid>
            <date>2021-12-10 13:33:57 -0800</date>
            <delta_ts>2021-12-10 13:46:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234138-20211210133356.patch</filename>
            <type>text/plain</type>
            <size>4416</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQyZmNlYmExNjJjNmZi
MTVjMjRmYTRkMTI2ODA2MzU3MjlkN2FhZS4uY2M5YmJjOGZhZDhhZmQyNzQ3NGM0NjQwYjE5ZjA3
OTFlZWQ4MTQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEyLTEwICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBd
IENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBpZCB0b2tlbgorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTM4CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgS2ltbW8gS2lubnVuZW4uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAg
IFVzZSBFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50aXR5IHRv
IGNyZWF0ZQorICAgICAgICBhIFdlYkdMIGNvbnRleHQgd2hlbiBHUFVQIGFuZCBXZWJHTCBpbiBH
UFVQIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFw
aGljc0NvbnRleHRHTEFOR0xFLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev
R3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u
dGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUpOgorCiAyMDIxLTEyLTEwICBTYWlk
IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10g
W0ZpbHRlcnNdIEFkZHJlc3MgcmV2aWV3IGNvbW1lbnRzIGFmdGVyIHIyODU1OTcKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBoaWNzQ29udGV4
dEdMQU5HTEUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBo
aWNzQ29udGV4dEdMQU5HTEUuaAppbmRleCA5NzRlYmIzNTFmYzYzZDM4NGZkNGE3Yzk5NzlhZjBk
MjY0NTgzOWMwLi4xMTZhM2Q0OTY1MGIzNDYyMWVhNDg1ZjZlNzA3ZWM4YzM4ZTk2NmVmIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0Nv
bnRleHRHTEFOR0xFLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5n
bGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5oCkBAIC0zNjMsNyArMzYzLDExIEBAIHB1YmxpYzoK
ICNlbmRpZgogCiBwcm90ZWN0ZWQ6CisjaWYgUExBVEZPUk0oQ09DT0EpICYmIEhBVkUoVEFTS19J
REVOVElUWV9UT0tFTikKKyAgICBHcmFwaGljc0NvbnRleHRHTEFOR0xFKEdyYXBoaWNzQ29udGV4
dEdMQXR0cmlidXRlcywgY29uc3QgUHJvY2Vzc0lkZW50aXR5Jik7CisjZWxzZQogICAgIEdyYXBo
aWNzQ29udGV4dEdMQU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzKTsKKyNlbmRpZgog
ICAgIC8vIENhbGxlZCBvbmNlIGJ5IGFsbCB0aGUgcHVibGljIGVudHJ5IHBvaW50cyB0aGF0IGV2
ZW50dWFsbHkgY2FsbCBPcGVuR0wuCiAgICAgLy8gQ2FsbGVkIG9uY2UgYnkgYWxsIHRoZSBwdWJs
aWMgZW50cnkgcG9pbnRzIG9mIEV4dGVuc2lvbnNHTCB0aGF0IGV2ZW50dWFsbHkgY2FsbCBPcGVu
R0wuCiAgICAgYm9vbCBtYWtlQ29udGV4dEN1cnJlbnQoKSBXQVJOX1VOVVNFRF9SRVRVUk47CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGlj
c0NvbnRleHRHTENvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbQppbmRleCA5YWIyZDc0NDEwYTA2YmMwZGU2NDE1
MGU4ZTEyMDNlMDUzYWQ1OTRiLi43Nzk4ZWJlZjFkZGM0N2Q0MGE4YTA3ZjQzNzZhMjI2YTc1Zjdk
YmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9H
cmFwaGljc0NvbnRleHRHTENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdMQ29jb2EubW0KQEAgLTIwMSw4ICsyMDEsMTMg
QEAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dEdMQ29jb2E+IEdyYXBoaWNzQ29udGV4dEdMQ29jb2E6
OmNyZWF0ZShHcmFwaGljc0NvbnRleHRHTEEKICAgICByZXR1cm4gY29udGV4dDsKIH0KIAotR3Jh
cGhpY3NDb250ZXh0R0xDb2NvYTo6R3JhcGhpY3NDb250ZXh0R0xDb2NvYShHcmFwaGljc0NvbnRl
eHRHTEF0dHJpYnV0ZXMmJiBjcmVhdGlvbkF0dHJpYnV0ZXMsIFByb2Nlc3NJZGVudGl0eSYmIHJl
c291cmNlT3duZXIpCi0gICAgOiBHcmFwaGljc0NvbnRleHRHTEFOR0xFKFdURk1vdmUoY3JlYXRp
b25BdHRyaWJ1dGVzKSkKK0dyYXBoaWNzQ29udGV4dEdMQ29jb2E6OkdyYXBoaWNzQ29udGV4dEdM
Q29jb2EoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzICYmY3JlYXRpb25BdHRyaWJ1dGVzLCBQ
cm9jZXNzSWRlbnRpdHkgJiZyZXNvdXJjZU93bmVyKQorICAgIDoKKyNpZiBQTEFURk9STShDT0NP
QSkgJiYgSEFWRShUQVNLX0lERU5USVRZX1RPS0VOKQorICAgIEdyYXBoaWNzQ29udGV4dEdMQU5H
TEUoV1RGTW92ZShjcmVhdGlvbkF0dHJpYnV0ZXMpLCByZXNvdXJjZU93bmVyKQorI2Vsc2UKKyAg
ICBHcmFwaGljc0NvbnRleHRHTEFOR0xFKFdURk1vdmUoY3JlYXRpb25BdHRyaWJ1dGVzKSkKKyNl
bmRpZgogewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CkBAIC0yMzAsNyAr
MjM1LDExIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0R0xDb2NvYTo6bWFya0Rpc3BsYXlCdWZmZXJJ
blVzZSgpCiAKIC8vIEZJWE1FOiBCZWxvdyBpcyBmdW5jdGlvbmFsaXR5IHRoYXQgc2hvdWxkIGJl
IG1vdmVkIHRvIEdyYXBoaWNzQ29udGV4dEdMQ29jb2EgdG8gc2ltcGxpZnkgdGhlIGJhc2UgY2xh
c3MuCiAKKyNpZiBQTEFURk9STShDT0NPQSkgJiYgSEFWRShUQVNLX0lERU5USVRZX1RPS0VOKQor
R3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3NDb250ZXh0R0xBTkdMRShHcmFwaGljc0Nv
bnRleHRHTEF0dHJpYnV0ZXMgYXR0cnMsIGNvbnN0IFByb2Nlc3NJZGVudGl0eSAmcmVzb3VyY2VP
d25lcikKKyNlbHNlCiBHcmFwaGljc0NvbnRleHRHTEFOR0xFOjpHcmFwaGljc0NvbnRleHRHTEFO
R0xFKEdyYXBoaWNzQ29udGV4dEdMQXR0cmlidXRlcyBhdHRycykKKyNlbmRpZgogICAgIDogR3Jh
cGhpY3NDb250ZXh0R0woYXR0cnMpCiB7CiAgICAgbV9pc0ZvcldlYkdMMiA9IGF0dHJzLndlYkdM
VmVyc2lvbiA9PSBHcmFwaGljc0NvbnRleHRHTFdlYkdMVmVyc2lvbjo6V2ViR0wyOwpAQCAtMzIz
LDYgKzMzMiwxNiBAQCBHcmFwaGljc0NvbnRleHRHTEFOR0xFOjpHcmFwaGljc0NvbnRleHRHTEFO
R0xFKEdyYXBoaWNzQ29udGV4dEdMQXR0cmlidXRlcyBhdHRycwogICAgIGVnbENvbnRleHRBdHRy
aWJ1dGVzLmFwcGVuZChFR0xfQ09OVEVYVF9CSU5EX0dFTkVSQVRFU19SRVNPVVJDRV9DSFJPTUlV
TSk7CiAgICAgZWdsQ29udGV4dEF0dHJpYnV0ZXMuYXBwZW5kKEVHTF9GQUxTRSk7CiAKKyNpZiBQ
TEFURk9STShDT0NPQSkgJiYgSEFWRShUQVNLX0lERU5USVRZX1RPS0VOKQorICAgIGF1dG8gZGlz
cGxheUV4dGVuc2lvbnMgPSBFR0xfUXVlcnlTdHJpbmcobV9kaXNwbGF5T2JqLCBFR0xfRVhURU5T
SU9OUyk7CisgICAgYm9vbCBzdXBwb3J0c093bmVyc2hpcElkZW50aXR5ID0gc3Ryc3RyKGRpc3Bs
YXlFeHRlbnNpb25zLCAiRUdMX0FOR0xFX21ldGFsX2NyZWF0ZV9jb250ZXh0X293bmVyc2hpcF9p
ZGVudGl0eSIpOworICAgIC8vIEZJWE1FOiBVc2UgbV9yZXNvdXJjZU93bmVyIG9uY2UgaXQgbW92
ZXMgdG8gR3JhcGhpY3NDb250ZXh0R0xDb2NvYS4KKyAgICBpZiAoYXR0cnMudXNlTWV0YWwgJiYg
cmVzb3VyY2VPd25lciAmJiBzdXBwb3J0c093bmVyc2hpcElkZW50aXR5KSB7CisgICAgICAgIGVn
bENvbnRleHRBdHRyaWJ1dGVzLmFwcGVuZChFR0xfQ09OVEVYVF9NRVRBTF9PV05FUlNISVBfSURF
TlRJVFlfQU5HTEUpOworICAgICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQocmVzb3Vy
Y2VPd25lci50YXNrSWRUb2tlbigpKTsKKyAgICB9CisjZW5kaWYKKwogICAgIGVnbENvbnRleHRB
dHRyaWJ1dGVzLmFwcGVuZChFR0xfTk9ORSk7CiAKICAgICBtX2NvbnRleHRPYmogPSBFR0xfQ3Jl
YXRlQ29udGV4dChtX2Rpc3BsYXlPYmosIG1fY29uZmlnT2JqLCBFR0xfTk9fQ09OVEVYVCwgZWds
Q29udGV4dEF0dHJpYnV0ZXMuZGF0YSgpKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>446804</attachid>
            <date>2021-12-10 13:46:06 -0800</date>
            <delta_ts>2021-12-15 09:29:30 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-234138-20211210134605.patch</filename>
            <type>text/plain</type>
            <size>4264</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQyZmNlYmExNjJjNmZi
MTVjMjRmYTRkMTI2ODA2MzU3MjlkN2FhZS4uY2M5YmJjOGZhZDhhZmQyNzQ3NGM0NjQwYjE5ZjA3
OTFlZWQ4MTQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEyLTEwICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBd
IENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBpZCB0b2tlbgorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTM4CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgS2ltbW8gS2lubnVuZW4uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAg
IFVzZSBFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50aXR5IHRv
IGNyZWF0ZQorICAgICAgICBhIFdlYkdMIGNvbnRleHQgd2hlbiBHUFVQIGFuZCBXZWJHTCBpbiBH
UFVQIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFw
aGljc0NvbnRleHRHTEFOR0xFLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev
R3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u
dGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUpOgorCiAyMDIxLTEyLTEwICBTYWlk
IEFib3UtSGFsbGF3YSAgPHNhaWRAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vzc10g
W0ZpbHRlcnNdIEFkZHJlc3MgcmV2aWV3IGNvbW1lbnRzIGFmdGVyIHIyODU1OTcKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBoaWNzQ29udGV4
dEdMQU5HTEUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBo
aWNzQ29udGV4dEdMQU5HTEUuaAppbmRleCA5NzRlYmIzNTFmYzYzZDM4NGZkNGE3Yzk5NzlhZjBk
MjY0NTgzOWMwLi4xMTZhM2Q0OTY1MGIzNDYyMWVhNDg1ZjZlNzA3ZWM4YzM4ZTk2NmVmIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0Nv
bnRleHRHTEFOR0xFLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYW5n
bGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5oCkBAIC0zNjMsNyArMzYzLDExIEBAIHB1YmxpYzoK
ICNlbmRpZgogCiBwcm90ZWN0ZWQ6CisjaWYgUExBVEZPUk0oQ09DT0EpICYmIEhBVkUoVEFTS19J
REVOVElUWV9UT0tFTikKKyAgICBHcmFwaGljc0NvbnRleHRHTEFOR0xFKEdyYXBoaWNzQ29udGV4
dEdMQXR0cmlidXRlcywgY29uc3QgUHJvY2Vzc0lkZW50aXR5Jik7CisjZWxzZQogICAgIEdyYXBo
aWNzQ29udGV4dEdMQU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzKTsKKyNlbmRpZgog
ICAgIC8vIENhbGxlZCBvbmNlIGJ5IGFsbCB0aGUgcHVibGljIGVudHJ5IHBvaW50cyB0aGF0IGV2
ZW50dWFsbHkgY2FsbCBPcGVuR0wuCiAgICAgLy8gQ2FsbGVkIG9uY2UgYnkgYWxsIHRoZSBwdWJs
aWMgZW50cnkgcG9pbnRzIG9mIEV4dGVuc2lvbnNHTCB0aGF0IGV2ZW50dWFsbHkgY2FsbCBPcGVu
R0wuCiAgICAgYm9vbCBtYWtlQ29udGV4dEN1cnJlbnQoKSBXQVJOX1VOVVNFRF9SRVRVUk47CmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGlj
c0NvbnRleHRHTENvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbQppbmRleCA5YWIyZDc0NDEwYTA2YmMwZGU2NDE1
MGU4ZTEyMDNlMDUzYWQ1OTRiLi5iZDNjOGZkMDJiZTI5MTUwYTFmMmM5YTEyMzVlMzkyZjY2ODFi
MzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9H
cmFwaGljc0NvbnRleHRHTENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdMQ29jb2EubW0KQEAgLTIwMiw3ICsyMDIsMTIg
QEAgUmVmUHRyPEdyYXBoaWNzQ29udGV4dEdMQ29jb2E+IEdyYXBoaWNzQ29udGV4dEdMQ29jb2E6
OmNyZWF0ZShHcmFwaGljc0NvbnRleHRHTEEKIH0KIAogR3JhcGhpY3NDb250ZXh0R0xDb2NvYTo6
R3JhcGhpY3NDb250ZXh0R0xDb2NvYShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMmJiBjcmVh
dGlvbkF0dHJpYnV0ZXMsIFByb2Nlc3NJZGVudGl0eSYmIHJlc291cmNlT3duZXIpCi0gICAgOiBH
cmFwaGljc0NvbnRleHRHTEFOR0xFKFdURk1vdmUoY3JlYXRpb25BdHRyaWJ1dGVzKSkKKyAgICA6
CisjaWYgUExBVEZPUk0oQ09DT0EpICYmIEhBVkUoVEFTS19JREVOVElUWV9UT0tFTikKKyAgICBH
cmFwaGljc0NvbnRleHRHTEFOR0xFKFdURk1vdmUoY3JlYXRpb25BdHRyaWJ1dGVzKSwgcmVzb3Vy
Y2VPd25lcikKKyNlbHNlCisgICAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRShXVEZNb3ZlKGNyZWF0
aW9uQXR0cmlidXRlcykpCisjZW5kaWYKIHsKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAg
cmV0dXJuOwpAQCAtMjMwLDcgKzIzNSwxMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dEdMQ29jb2E6
Om1hcmtEaXNwbGF5QnVmZmVySW5Vc2UoKQogCiAvLyBGSVhNRTogQmVsb3cgaXMgZnVuY3Rpb25h
bGl0eSB0aGF0IHNob3VsZCBiZSBtb3ZlZCB0byBHcmFwaGljc0NvbnRleHRHTENvY29hIHRvIHNp
bXBsaWZ5IHRoZSBiYXNlIGNsYXNzLgogCisjaWYgUExBVEZPUk0oQ09DT0EpICYmIEhBVkUoVEFT
S19JREVOVElUWV9UT0tFTikKK0dyYXBoaWNzQ29udGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4
dEdMQU5HTEUoR3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzIGF0dHJzLCBjb25zdCBQcm9jZXNz
SWRlbnRpdHkmIHJlc291cmNlT3duZXIpCisjZWxzZQogR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6
R3JhcGhpY3NDb250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgYXR0cnMp
CisjZW5kaWYKICAgICA6IEdyYXBoaWNzQ29udGV4dEdMKGF0dHJzKQogewogICAgIG1faXNGb3JX
ZWJHTDIgPSBhdHRycy53ZWJHTFZlcnNpb24gPT0gR3JhcGhpY3NDb250ZXh0R0xXZWJHTFZlcnNp
b246OldlYkdMMjsKQEAgLTMyMyw2ICszMzIsMTYgQEAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6
R3JhcGhpY3NDb250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMgYXR0cnMK
ICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX0NPTlRFWFRfQklORF9HRU5FUkFU
RVNfUkVTT1VSQ0VfQ0hST01JVU0pOwogICAgIGVnbENvbnRleHRBdHRyaWJ1dGVzLmFwcGVuZChF
R0xfRkFMU0UpOwogCisjaWYgUExBVEZPUk0oQ09DT0EpICYmIEhBVkUoVEFTS19JREVOVElUWV9U
T0tFTikKKyAgICBhdXRvIGRpc3BsYXlFeHRlbnNpb25zID0gRUdMX1F1ZXJ5U3RyaW5nKG1fZGlz
cGxheU9iaiwgRUdMX0VYVEVOU0lPTlMpOworICAgIGJvb2wgc3VwcG9ydHNPd25lcnNoaXBJZGVu
dGl0eSA9IHN0cnN0cihkaXNwbGF5RXh0ZW5zaW9ucywgIkVHTF9BTkdMRV9tZXRhbF9jcmVhdGVf
Y29udGV4dF9vd25lcnNoaXBfaWRlbnRpdHkiKTsKKyAgICAvLyBGSVhNRTogVXNlIG1fcmVzb3Vy
Y2VPd25lciBvbmNlIGl0IG1vdmVzIHRvIEdyYXBoaWNzQ29udGV4dEdMQ29jb2EuCisgICAgaWYg
KGF0dHJzLnVzZU1ldGFsICYmIHJlc291cmNlT3duZXIgJiYgc3VwcG9ydHNPd25lcnNoaXBJZGVu
dGl0eSkgeworICAgICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX0NPTlRFWFRf
TUVUQUxfT1dORVJTSElQX0lERU5USVRZX0FOR0xFKTsKKyAgICAgICAgZWdsQ29udGV4dEF0dHJp
YnV0ZXMuYXBwZW5kKHJlc291cmNlT3duZXIudGFza0lkVG9rZW4oKSk7CisgICAgfQorI2VuZGlm
CisKICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX05PTkUpOwogCiAgICAgbV9j
b250ZXh0T2JqID0gRUdMX0NyZWF0ZUNvbnRleHQobV9kaXNwbGF5T2JqLCBtX2NvbmZpZ09iaiwg
RUdMX05PX0NPTlRFWFQsIGVnbENvbnRleHRBdHRyaWJ1dGVzLmRhdGEoKSk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>447243</attachid>
            <date>2021-12-15 09:29:34 -0800</date>
            <delta_ts>2021-12-16 10:16:05 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-234138-20211215092933.patch</filename>
            <type>text/plain</type>
            <size>4355</size>
            <attacher name="John Cunningham">johncunningham</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWUzY2FhZTM0OGIwM2M1
YjgzOTVkYmU2NjNiMTJkMWY5MmFjODk0Zi4uZmZjMjhiNDM2NjlmNzI0NjFkYTJhYzE2NTUxZDFk
MGI5ODI5ZTUwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTEyLTE1ICBKb2hu
IEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVVBd
IENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBpZCB0b2tlbgorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MTM4CisKKyAgICAgICAgUmV2aWV3
ZWQgYnkgS2ltbW8gS2lubnVuZW4uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAg
IFVzZSBFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50aXR5IHRv
IGNyZWF0ZQorICAgICAgICBhIFdlYkdMIGNvbnRleHQgd2hlbiBHUFVQIGFuZCBXZWJHTCBpbiBH
UFVQIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFw
aGljc0NvbnRleHRHTEFOR0xFLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev
R3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29u
dGV4dEdMQ29jb2E6OkdyYXBoaWNzQ29udGV4dEdMQ29jb2EpOgorICAgICAgICAoV2ViQ29yZTo6
R3JhcGhpY3NDb250ZXh0R0xBTkdMRTo6R3JhcGhpY3NDb250ZXh0R0xBTkdMRSk6CisKIDIwMjEt
MTItMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwL3Rl
c3RzL3NlY3VyaXR5L2Jhc2ljLWF1dGgtc3VicmVzb3VyY2UuaHRtbCBhbmQgc29tZSBvdGhlciBo
dHRwIGF1dGggdGVzdHMgYXJlIGZsYWt5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmggYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hbmdsZS9HcmFwaGljc0NvbnRleHRHTEFOR0xFLmgKaW5k
ZXggOWUwY2YwMGRhYTJmNDk0NDdlZWJiM2E4NDQ3OWU0N2E2NDRmZjk5Yi4uZjg5Yjk5ZTEzY2Ix
ZWM0OTFjZjdmMWQxZDBiMGVjOTM2MGE2NGE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvYW5nbGUvR3JhcGhpY3NDb250ZXh0R0xBTkdMRS5oCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2FuZ2xlL0dyYXBoaWNzQ29udGV4dEdMQU5H
TEUuaApAQCAtMzY0LDcgKzM2NCwxMSBAQCBwdWJsaWM6CiAjZW5kaWYKIAogcHJvdGVjdGVkOgor
I2lmIFBMQVRGT1JNKENPQ09BKSAmJiBIQVZFKFRBU0tfSURFTlRJVFlfVE9LRU4pCisgICAgR3Jh
cGhpY3NDb250ZXh0R0xBTkdMRShHcmFwaGljc0NvbnRleHRHTEF0dHJpYnV0ZXMsIGNvbnN0IFBy
b2Nlc3NJZGVudGl0eSYpOworI2Vsc2UKICAgICBHcmFwaGljc0NvbnRleHRHTEFOR0xFKEdyYXBo
aWNzQ29udGV4dEdMQXR0cmlidXRlcyk7CisjZW5kaWYKICAgICAvLyBDYWxsZWQgb25jZSBieSBh
bGwgdGhlIHB1YmxpYyBlbnRyeSBwb2ludHMgdGhhdCBldmVudHVhbGx5IGNhbGwgT3BlbkdMLgog
ICAgIC8vIENhbGxlZCBvbmNlIGJ5IGFsbCB0aGUgcHVibGljIGVudHJ5IHBvaW50cyBvZiBFeHRl
bnNpb25zR0wgdGhhdCBldmVudHVhbGx5IGNhbGwgT3BlbkdMLgogICAgIGJvb2wgbWFrZUNvbnRl
eHRDdXJyZW50KCkgV0FSTl9VTlVTRURfUkVUVVJOOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5tbSBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dEdMQ29j
b2EubW0KaW5kZXggZTI2ODk1NzI2OTQ5ODhmNGUyYjk4Nzk1MjFkOWQyOGQ3NTFlZWVhZi4uMTY0
YWI3ZmJkMTZkZDdjYTA2NjhhNTRiNWY2NGIxN2NmMzIyMTdlZSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0R0xDb2NvYS5t
bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0Nv
bnRleHRHTENvY29hLm1tCkBAIC0yMDIsNyArMjAyLDEyIEBAIFJlZlB0cjxHcmFwaGljc0NvbnRl
eHRHTENvY29hPiBHcmFwaGljc0NvbnRleHRHTENvY29hOjpjcmVhdGUoR3JhcGhpY3NDb250ZXh0
R0xBCiB9CiAKIEdyYXBoaWNzQ29udGV4dEdMQ29jb2E6OkdyYXBoaWNzQ29udGV4dEdMQ29jb2Eo
R3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzJiYgY3JlYXRpb25BdHRyaWJ1dGVzLCBQcm9jZXNz
SWRlbnRpdHkmJiByZXNvdXJjZU93bmVyKQotICAgIDogR3JhcGhpY3NDb250ZXh0R0xBTkdMRShX
VEZNb3ZlKGNyZWF0aW9uQXR0cmlidXRlcykpCisgICAgOgorI2lmIFBMQVRGT1JNKENPQ09BKSAm
JiBIQVZFKFRBU0tfSURFTlRJVFlfVE9LRU4pCisgICAgR3JhcGhpY3NDb250ZXh0R0xBTkdMRShX
VEZNb3ZlKGNyZWF0aW9uQXR0cmlidXRlcyksIHJlc291cmNlT3duZXIpCisjZWxzZQorICAgIEdy
YXBoaWNzQ29udGV4dEdMQU5HTEUoV1RGTW92ZShjcmVhdGlvbkF0dHJpYnV0ZXMpKQorI2VuZGlm
CiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTIzMCw3ICsyMzUs
MTEgQEAgdm9pZCBHcmFwaGljc0NvbnRleHRHTENvY29hOjptYXJrRGlzcGxheUJ1ZmZlckluVXNl
KCkKIAogLy8gRklYTUU6IEJlbG93IGlzIGZ1bmN0aW9uYWxpdHkgdGhhdCBzaG91bGQgYmUgbW92
ZWQgdG8gR3JhcGhpY3NDb250ZXh0R0xDb2NvYSB0byBzaW1wbGlmeSB0aGUgYmFzZSBjbGFzcy4K
IAorI2lmIFBMQVRGT1JNKENPQ09BKSAmJiBIQVZFKFRBU0tfSURFTlRJVFlfVE9LRU4pCitHcmFw
aGljc0NvbnRleHRHTEFOR0xFOjpHcmFwaGljc0NvbnRleHRHTEFOR0xFKEdyYXBoaWNzQ29udGV4
dEdMQXR0cmlidXRlcyBhdHRycywgY29uc3QgUHJvY2Vzc0lkZW50aXR5JiByZXNvdXJjZU93bmVy
KQorI2Vsc2UKIEdyYXBoaWNzQ29udGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUo
R3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzIGF0dHJzKQorI2VuZGlmCiAgICAgOiBHcmFwaGlj
c0NvbnRleHRHTChhdHRycykKIHsKICAgICBtX2lzRm9yV2ViR0wyID0gYXR0cnMud2ViR0xWZXJz
aW9uID09IEdyYXBoaWNzQ29udGV4dEdMV2ViR0xWZXJzaW9uOjpXZWJHTDI7CkBAIC0zMjMsNiAr
MzMyLDE2IEBAIEdyYXBoaWNzQ29udGV4dEdMQU5HTEU6OkdyYXBoaWNzQ29udGV4dEdMQU5HTEUo
R3JhcGhpY3NDb250ZXh0R0xBdHRyaWJ1dGVzIGF0dHJzCiAgICAgZWdsQ29udGV4dEF0dHJpYnV0
ZXMuYXBwZW5kKEVHTF9DT05URVhUX0JJTkRfR0VORVJBVEVTX1JFU09VUkNFX0NIUk9NSVVNKTsK
ICAgICBlZ2xDb250ZXh0QXR0cmlidXRlcy5hcHBlbmQoRUdMX0ZBTFNFKTsKIAorI2lmIFBMQVRG
T1JNKENPQ09BKSAmJiBIQVZFKFRBU0tfSURFTlRJVFlfVE9LRU4pCisgICAgYXV0byBkaXNwbGF5
RXh0ZW5zaW9ucyA9IEVHTF9RdWVyeVN0cmluZyhtX2Rpc3BsYXlPYmosIEVHTF9FWFRFTlNJT05T
KTsKKyAgICBib29sIHN1cHBvcnRzT3duZXJzaGlwSWRlbnRpdHkgPSBzdHJzdHIoZGlzcGxheUV4
dGVuc2lvbnMsICJFR0xfQU5HTEVfbWV0YWxfY3JlYXRlX2NvbnRleHRfb3duZXJzaGlwX2lkZW50
aXR5Iik7CisgICAgLy8gRklYTUU6IFVzZSBtX3Jlc291cmNlT3duZXIgb25jZSBpdCBtb3ZlcyB0
byBHcmFwaGljc0NvbnRleHRHTENvY29hLgorICAgIGlmIChhdHRycy51c2VNZXRhbCAmJiByZXNv
dXJjZU93bmVyICYmIHN1cHBvcnRzT3duZXJzaGlwSWRlbnRpdHkpIHsKKyAgICAgICAgZWdsQ29u
dGV4dEF0dHJpYnV0ZXMuYXBwZW5kKEVHTF9DT05URVhUX01FVEFMX09XTkVSU0hJUF9JREVOVElU
WV9BTkdMRSk7CisgICAgICAgIGVnbENvbnRleHRBdHRyaWJ1dGVzLmFwcGVuZChyZXNvdXJjZU93
bmVyLnRhc2tJZFRva2VuKCkpOworICAgIH0KKyNlbmRpZgorCiAgICAgZWdsQ29udGV4dEF0dHJp
YnV0ZXMuYXBwZW5kKEVHTF9OT05FKTsKIAogICAgIG1fY29udGV4dE9iaiA9IEVHTF9DcmVhdGVD
b250ZXh0KG1fZGlzcGxheU9iaiwgbV9jb25maWdPYmosIEVHTF9OT19DT05URVhULCBlZ2xDb250
ZXh0QXR0cmlidXRlcy5kYXRhKCkpOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>