<?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>228593</bug_id>
          
          <creation_ts>2021-07-29 10:54:16 -0700</creation_ts>
          <short_desc>[Cocoa|WK1] -[NSAttributeString loadFromHTML...] methods will disable bluetooth route switching</short_desc>
          <delta_ts>2021-07-29 18:51:26 -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="Jer Noble">jer.noble</reporter>
          <assigned_to name="Jer Noble">jer.noble</assigned_to>
          <cc>eric.carlson</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jean-yves.avenard</cc>
    
    <cc>peng.liu6</cc>
    
    <cc>philipj</cc>
    
    <cc>sam</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1780442</commentid>
    <comment_count>0</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 10:54:16 -0700</bug_when>
    <thetext>[Cocoa|WK1] -[NSAttributeString loadFromHTML...] methods will disable bluetooth route switching</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780443</commentid>
    <comment_count>1</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 10:54:33 -0700</bug_when>
    <thetext>&lt;rdar://81160969&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780448</commentid>
    <comment_count>2</comment_count>
      <attachid>434538</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 11:03:06 -0700</bug_when>
    <thetext>Created attachment 434538
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780450</commentid>
    <comment_count>3</comment_count>
      <attachid>434538</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2021-07-29 11:05:26 -0700</bug_when>
    <thetext>Comment on attachment 434538
Patch

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

&gt; Source/WebCore/platform/audio/ios/AudioSessionIOS.mm:31
&gt; +#import &quot;DeprecatedGlobalSettings.h&quot;

Using DeprecatedGlobalSettings.h from platform/ is a layering violation (DeprecatedGlobalSettings.h is not part of platform/). The pattern to use here is usually to pass the data down from the WebCore layer or via delegation.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780452</commentid>
    <comment_count>4</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 11:11:37 -0700</bug_when>
    <thetext>(In reply to Sam Weinig from comment #3)
&gt; Comment on attachment 434538 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=434538&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/platform/audio/ios/AudioSessionIOS.mm:31
&gt; &gt; +#import &quot;DeprecatedGlobalSettings.h&quot;
&gt; 
&gt; Using DeprecatedGlobalSettings.h from platform/ is a layering violation
&gt; (DeprecatedGlobalSettings.h is not part of platform/). The pattern to use
&gt; here is usually to pass the data down from the WebCore layer or via
&gt; delegation.

DeprecatedGlobalSettings is used everywhere in platform/. It should probably be moved in there rather than have every use require some kind of delegate push.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780453</commentid>
    <comment_count>5</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 11:13:13 -0700</bug_when>
    <thetext>(In reply to Jer Noble from comment #4)
&gt; (In reply to Sam Weinig from comment #3)
&gt; &gt; Comment on attachment 434538 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=434538&amp;action=review
&gt; &gt; 
&gt; &gt; &gt; Source/WebCore/platform/audio/ios/AudioSessionIOS.mm:31
&gt; &gt; &gt; +#import &quot;DeprecatedGlobalSettings.h&quot;
&gt; &gt; 
&gt; &gt; Using DeprecatedGlobalSettings.h from platform/ is a layering violation
&gt; &gt; (DeprecatedGlobalSettings.h is not part of platform/). The pattern to use
&gt; &gt; here is usually to pass the data down from the WebCore layer or via
&gt; &gt; delegation.
&gt; 
&gt; DeprecatedGlobalSettings is used everywhere in platform/. It should probably
&gt; be moved in there rather than have every use require some kind of delegate
&gt; push.

In fact, there are 4 uses outside of platform/, and 18 inside platform/.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780463</commentid>
    <comment_count>6</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 11:23:01 -0700</bug_when>
    <thetext>Filed bug #228594 to track fixing the layering violation (for this code and all other uses).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780486</commentid>
    <comment_count>7</comment_count>
      <attachid>434550</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 11:51:06 -0700</bug_when>
    <thetext>Created attachment 434550
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780488</commentid>
    <comment_count>8</comment_count>
      <attachid>434550</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2021-07-29 11:57:34 -0700</bug_when>
    <thetext>Comment on attachment 434550
Patch

r=me once the bots are happy</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780489</commentid>
    <comment_count>9</comment_count>
      <attachid>434551</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 11:57:44 -0700</bug_when>
    <thetext>Created attachment 434551
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780503</commentid>
    <comment_count>10</comment_count>
      <attachid>434555</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 12:10:09 -0700</bug_when>
    <thetext>Created attachment 434555
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780514</commentid>
    <comment_count>11</comment_count>
      <attachid>434558</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2021-07-29 12:39:52 -0700</bug_when>
    <thetext>Created attachment 434558
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1780675</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-07-29 18:51:25 -0700</bug_when>
    <thetext>Committed r280462 (240097@main): &lt;https://commits.webkit.org/240097@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 434558.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434538</attachid>
            <date>2021-07-29 11:03:06 -0700</date>
            <delta_ts>2021-07-29 11:51:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228593-20210729110306.patch</filename>
            <type>text/plain</type>
            <size>2155</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJkODQzYjY4YzEyMTEz
ZDk1YzgxZjBmZTc5YTg4YTg5Yzc3NTRmZS4uMTM2OGQxZjAxMjVhNmM3ZDUxNmFhY2JlMWYzMGM2
NTBlZDgxODZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA3LTI5ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxXSzFdIC1bTlNB
dHRyaWJ1dGVTdHJpbmcgbG9hZEZyb21IVE1MLi4uXSBtZXRob2RzIHdpbGwgZGlzYWJsZSBibHVl
dG9vdGggcm91dGUgc3dpdGNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjg1OTMKKyAgICAgICAgPHJkYXI6Ly84MTE2MDk2OT4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOU0F0dHJpYnV0ZWRTdHJp
bmcgd2lsbCB1c2UgV2ViS2l0TGVnYWN5IEFQSXMgdG8gbG9hZCBwcm92aWRlZCBIVE1MOyBpbiBz
byBkb2luZywgYW4gQXVkaW9TZXNzaW9uSU9TCisgICAgICAgIHNpbmdsZXRvbiBvYmplY3QgaXMg
Y3JlYXRlZCwgYW5kIC1bQVZBdWRpb1Nlc3Npb24gc2V0RWxpZ2libGVGb3JCVFNtYXJ0Um91dGlu
Z0NvbnNpZGVyYXRpb246ZXJyb3I6XQorICAgICAgICBpcyBjYWxsZWQgd2l0aCBhIE5PIHBhcmFt
ZXRlciwgZGlzYWJsaW5nIHNtYXJ0IHJvdXRpbmcgZm9yIHRoZSBjYWxsaW5nIHByb2Nlc3MuCisK
KyAgICAgICAgRGlzYWJsZSB0aGlzIGJlaGF2aW9yIGlmIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSByZXR1cm5zIGZhbHNlOworICAg
ICAgICB0aGlzIHNldHRpbmcgaXMgZGlzYWJsZWQgZm9yIGFsbCBXSzEgY2xpZW50cywgYW5kIGVu
YWJsZWQgZm9yIFdLMi4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb1Nlc3Np
b25JT1MubW06CisgICAgICAgIChXZWJDb3JlOjpzZXRFbGlnaWJsZUZvclNtYXJ0Um91dGluZyk6
CisKIDIwMjEtMDctMjggIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAg
ICAgW0NvY29hXSBSZW1vdmUgc3VwcG9ydCBmb3IgQVZBc3NldEltYWdlR2VuZXJhdG9yCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9TZXNzaW9uSU9T
Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5t
bQppbmRleCBhOTMxYjUyMjRmMTZjMjU0MWY3ODU3YTliZDI0NDNiMzQ4ODQ3YzE5Li4yZjgwZTc1
Y2M2M2E3YTUzOTU3NDdkNWYwM2UzMTMxNzA4MDg1YmQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9TZXNzaW9uSU9TLm1tCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb1Nlc3Npb25JT1MubW0KQEAgLTI4LDYgKzI4
LDcgQEAKIAogI2lmIFVTRShBVURJT19TRVNTSU9OKSAmJiBQTEFURk9STShJT1NfRkFNSUxZKQog
CisjaW1wb3J0ICJEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaCIKICNpbXBvcnQgIkxvZ2dpbmcu
aCIKICNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVkF1ZGlvU2Vzc2lvbi5oPgogI2ltcG9ydCA8b2Jq
Yy9ydW50aW1lLmg+CkBAIC05OSw2ICsxMDAsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBzdGF0
aWMgdm9pZCBzZXRFbGlnaWJsZUZvclNtYXJ0Um91dGluZyhib29sIGVsaWdpYmxlKQogewogI2lm
IFBMQVRGT1JNKElPUykKKyAgICBpZiAoIURlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2hvdWxk
TWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0
byAqc2Vzc2lvbiA9IFtQQUw6OmdldEFWQXVkaW9TZXNzaW9uQ2xhc3MoKSBzaGFyZWRJbnN0YW5j
ZV07CiAgICAgaWYgKCFbc2Vzc2lvbiByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldEVs
aWdpYmxlRm9yQlRTbWFydFJvdXRpbmdDb25zaWRlcmF0aW9uOmVycm9yOildCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434550</attachid>
            <date>2021-07-29 11:51:06 -0700</date>
            <delta_ts>2021-07-29 12:07:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228593-20210729115105.patch</filename>
            <type>text/plain</type>
            <size>6058</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJkODQzYjY4YzEyMTEz
ZDk1YzgxZjBmZTc5YTg4YTg5Yzc3NTRmZS4uNTU3NDI3ZjEzZDVmY2NjYmI5ZTEyYjE2NTU4ZDBh
YTE5MDlhOTNkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTI5ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxXSzFdIC1bTlNB
dHRyaWJ1dGVTdHJpbmcgbG9hZEZyb21IVE1MLi4uXSBtZXRob2RzIHdpbGwgZGlzYWJsZSBibHVl
dG9vdGggcm91dGUgc3dpdGNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjg1OTMKKyAgICAgICAgPHJkYXI6Ly84MTE2MDk2OT4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOU0F0dHJpYnV0ZWRTdHJp
bmcgd2lsbCB1c2UgV2ViS2l0TGVnYWN5IEFQSXMgdG8gbG9hZCBwcm92aWRlZCBIVE1MOyBpbiBz
byBkb2luZywgYW4gQXVkaW9TZXNzaW9uSU9TCisgICAgICAgIHNpbmdsZXRvbiBvYmplY3QgaXMg
Y3JlYXRlZCwgYW5kIC1bQVZBdWRpb1Nlc3Npb24gc2V0RWxpZ2libGVGb3JCVFNtYXJ0Um91dGlu
Z0NvbnNpZGVyYXRpb246ZXJyb3I6XQorICAgICAgICBpcyBjYWxsZWQgd2l0aCBhIE5PIHBhcmFt
ZXRlciwgZGlzYWJsaW5nIHNtYXJ0IHJvdXRpbmcgZm9yIHRoZSBjYWxsaW5nIHByb2Nlc3MuCisK
KyAgICAgICAgRGlzYWJsZSB0aGlzIGJlaGF2aW9yIGlmIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSByZXR1cm5zIGZhbHNlOworICAg
ICAgICB0aGlzIHNldHRpbmcgaXMgZGlzYWJsZWQgZm9yIGFsbCBXSzEgY2xpZW50cywgYW5kIGVu
YWJsZWQgZm9yIFdLMi4KKworICAgICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0U2hv
dWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVj
YXRlZEdsb2JhbFNldHRpbmdzOjpzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSk6Cisg
ICAgICAgICogcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNv
cmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9u
Q2F0ZWdvcnkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzOjpzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSk6IERlbGV0ZWQuCisgICAg
ICAgICogcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmg6CisgICAgICAgICogcGxhdGZvcm0v
YXVkaW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNldEVsaWdp
YmxlRm9yU21hcnRSb3V0aW5nKToKKwogMjAyMS0wNy0yOCAgSmVyIE5vYmxlICA8amVyLm5vYmxl
QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFJlbW92ZSBzdXBwb3J0IGZvciBBVkFzc2V0
SW1hZ2VHZW5lcmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRl
ZEdsb2JhbFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzLmNwcAppbmRleCA3ZWYzOWE1MjgwYTJjOGQ1ZThkM2YxNWYzMjVlMjg3MjMyYzY5
MzVkLi4zODQwYWUzMmNjNjk5MTU4ZDgwNWU5ZDFhNGNjM2Y4YzkxYTQyMTcyIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3BwCkBAIC01OCw3
ICs1OCw2IEBAIGJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpnTmV0d29ya0RhdGFVc2Fn
ZVRyYWNraW5nRW5hYmxlZCA9IGZhbHNlOwogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OmdTaG91bGRPcHRPdXRPZk5ldHdvcmtTdGF0ZU9ic2VydmF0aW9uID0gZmFsc2U7CiBib29sIERl
cHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z0Rpc2FibGVTY3JlZW5TaXplT3ZlcnJpZGUgPSBmYWxz
ZTsKICNlbmRpZgotYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdNYW5hZ2VBdWRpb1Nl
c3Npb24gPSBmYWxzZTsKIAogI2lmIFBMQVRGT1JNKFdJTikKIHZvaWQgRGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzOjpzZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyhib29sIHNob3VsZFVz
ZUhpZ2hSZXNvbHV0aW9uVGltZXJzKQpAQCAtMTg0LDYgKzE4MywxNiBAQCBjb25zdCBTdHJpbmcm
IERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6bmV0d29ya0ludGVyZmFjZU5hbWUoKQogfQogI2Vu
ZGlmCiAKK3ZvaWQgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpzZXRTaG91bGRNYW5hZ2VBdWRp
b1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcpCit7CisgICAgQXVkaW9TZXNzaW9uOjpzZXRTaG91
bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShmbGFnKTsKK30KKworYm9vbCBEZXByZWNhdGVk
R2xvYmFsU2V0dGluZ3M6OnNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCkKK3sKKyAg
ICByZXR1cm4gQXVkaW9TZXNzaW9uOjpzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSgp
OworfQorCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0QWxsb3dzQW55U1NMQ2Vy
dGlmaWNhdGUoYm9vbCBhbGxvd0FueVNTTENlcnRpZmljYXRlKQogewogICAgIGdBbGxvd3NBbnlT
U0xDZXJ0aWZpY2F0ZSA9IGFsbG93QW55U1NMQ2VydGlmaWNhdGU7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaAppbmRleCAwODA3MjgwNjE1M2NjYTQ2
NGU5YmRjNjgwOGVjNjljYjVjZTQzNWFlLi5iMGQyZTQ1NGE3ZTNkYjlmOGMyMDFiYzQ0NmZlZWNh
ZDZiZWRkZTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzLmgKQEAgLTg0LDggKzg0LDggQEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBVU0UoQVVE
SU9fU0VTU0lPTikKLSAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25D
YXRlZ29yeShib29sIGZsYWcpIHsgZ01hbmFnZUF1ZGlvU2Vzc2lvbiA9IGZsYWc7IH0KLSAgICBz
dGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSgpIHsgcmV0dXJuIGdN
YW5hZ2VBdWRpb1Nlc3Npb247IH0KKyAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRp
b1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcpOworICAgIHN0YXRpYyBib29sIHNob3VsZE1hbmFn
ZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCk7CiAjZW5kaWYKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0
YXRpYyB2b2lkIHNldEFsbG93c0FueVNTTENlcnRpZmljYXRlKGJvb2wpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5jcHAKaW5kZXggMmZmMmI3MDFiMmYy
NjdmMTRhYTc5MTMyNzgxNTZjM2I5YjIxY2NlNC4uNGU2YzY2YjMwNGQyN2U2OTQyNjUxNjgyYzYz
NjIyNzU5YWMzYmRmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
QXVkaW9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRp
b1Nlc3Npb24uY3BwCkBAIC00MSw2ICs0MSw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAor
QXVkaW9TZXNzaW9uOjpzX3Nob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5IHsgZmFsc2Ug
fTsKKwogc3RhdGljIHN0ZDo6b3B0aW9uYWw8VW5pcXVlUmVmPEF1ZGlvU2Vzc2lvbj4+JiBzaGFy
ZWRBdWRpb1Nlc3Npb24oKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxzdGQ6Om9wdGlv
bmFsPFVuaXF1ZVJlZjxBdWRpb1Nlc3Npb24+Pj4gc2Vzc2lvbjsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmgKaW5kZXggNjgzMTkyMWFkZDJhMGM5ZmE1NmRh
MmI4MzUyY2FhNTQwMzM3YmVkZi4uZWFmNzBlMjA5M2E0NGJjNTFkOTJlMDhlZjQwMDg1OWI4ODll
MTBhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNz
aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmgK
QEAgLTEyNSw2ICsxMjUsOSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Um91dGlu
Z0FyYml0cmF0aW9uQ2xpZW50KFdlYWtQdHI8QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0aW9u
Q2xpZW50PiYmIGNsaWVudCkgeyBtX3JvdXRpbmdBcmJpdHJhdGlvbkNsaWVudCA9IGNsaWVudDsg
fQogCisgICAgc3RhdGljIGJvb2wgc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSB7
IHJldHVybiBzX3Nob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5OyB9CisgICAgc3RhdGlj
IHZvaWQgc2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoYm9vbCBmbGFnKSB7IHNf
c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkgPSBmbGFnOyB9CisKIHByb3RlY3RlZDoK
ICAgICBmcmllbmQgY2xhc3MgTmV2ZXJEZXN0cm95ZWQ8QXVkaW9TZXNzaW9uPjsKICAgICBBdWRp
b1Nlc3Npb24oKTsKQEAgLTEzOCw2ICsxNDEsOCBAQCBwcm90ZWN0ZWQ6CiAKICAgICBXZWFrUHRy
PEF1ZGlvU2Vzc2lvblJvdXRpbmdBcmJpdHJhdGlvbkNsaWVudD4gbV9yb3V0aW5nQXJiaXRyYXRp
b25DbGllbnQ7CiAgICAgYm9vbCBtX2FjdGl2ZSB7IGZhbHNlIH07IC8vIFVzZWQgb25seSBmb3Ig
dGVzdGluZy4KKworICAgIHN0YXRpYyBib29sIHNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0
ZWdvcnk7CiB9OwogCiBjbGFzcyBXRUJDT1JFX0VYUE9SVCBBdWRpb1Nlc3Npb25Sb3V0aW5nQXJi
aXRyYXRpb25DbGllbnQgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk
aW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv
L2lvcy9BdWRpb1Nlc3Npb25JT1MubW0KaW5kZXggYTkzMWI1MjI0ZjE2YzI1NDFmNzg1N2E5YmQy
NDQzYjM0ODg0N2MxOS4uMmEyYjZkZDVmMTE0NGY2Y2NkOWU2ZWQ3Zjk5MTY2ZTVmODcxZjU2ZiAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL0F1ZGlvU2Vzc2lv
bklPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9TZXNz
aW9uSU9TLm1tCkBAIC05OSw2ICs5OSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHN0YXRpYyB2
b2lkIHNldEVsaWdpYmxlRm9yU21hcnRSb3V0aW5nKGJvb2wgZWxpZ2libGUpCiB7CiAjaWYgUExB
VEZPUk0oSU9TKQorICAgIGlmICghc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSkK
KyAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byAqc2Vzc2lvbiA9IFtQQUw6OmdldEFWQXVkaW9T
ZXNzaW9uQ2xhc3MoKSBzaGFyZWRJbnN0YW5jZV07CiAgICAgaWYgKCFbc2Vzc2lvbiByZXNwb25k
c1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldEVsaWdpYmxlRm9yQlRTbWFydFJvdXRpbmdDb25zaWRl
cmF0aW9uOmVycm9yOildCg==
</data>
<flag name="commit-queue"
          id="457087"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434551</attachid>
            <date>2021-07-29 11:57:44 -0700</date>
            <delta_ts>2021-07-29 12:04:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-228593-20210729115743.patch</filename>
            <type>text/plain</type>
            <size>6063</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJkODQzYjY4YzEyMTEz
ZDk1YzgxZjBmZTc5YTg4YTg5Yzc3NTRmZS4uNTU3NDI3ZjEzZDVmY2NjYmI5ZTEyYjE2NTU4ZDBh
YTE5MDlhOTNkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTI5ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxXSzFdIC1bTlNB
dHRyaWJ1dGVTdHJpbmcgbG9hZEZyb21IVE1MLi4uXSBtZXRob2RzIHdpbGwgZGlzYWJsZSBibHVl
dG9vdGggcm91dGUgc3dpdGNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjg1OTMKKyAgICAgICAgPHJkYXI6Ly84MTE2MDk2OT4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOU0F0dHJpYnV0ZWRTdHJp
bmcgd2lsbCB1c2UgV2ViS2l0TGVnYWN5IEFQSXMgdG8gbG9hZCBwcm92aWRlZCBIVE1MOyBpbiBz
byBkb2luZywgYW4gQXVkaW9TZXNzaW9uSU9TCisgICAgICAgIHNpbmdsZXRvbiBvYmplY3QgaXMg
Y3JlYXRlZCwgYW5kIC1bQVZBdWRpb1Nlc3Npb24gc2V0RWxpZ2libGVGb3JCVFNtYXJ0Um91dGlu
Z0NvbnNpZGVyYXRpb246ZXJyb3I6XQorICAgICAgICBpcyBjYWxsZWQgd2l0aCBhIE5PIHBhcmFt
ZXRlciwgZGlzYWJsaW5nIHNtYXJ0IHJvdXRpbmcgZm9yIHRoZSBjYWxsaW5nIHByb2Nlc3MuCisK
KyAgICAgICAgRGlzYWJsZSB0aGlzIGJlaGF2aW9yIGlmIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSByZXR1cm5zIGZhbHNlOworICAg
ICAgICB0aGlzIHNldHRpbmcgaXMgZGlzYWJsZWQgZm9yIGFsbCBXSzEgY2xpZW50cywgYW5kIGVu
YWJsZWQgZm9yIFdLMi4KKworICAgICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdz
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0U2hv
dWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVj
YXRlZEdsb2JhbFNldHRpbmdzOjpzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSk6Cisg
ICAgICAgICogcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaDoKKyAgICAgICAgKFdlYkNv
cmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9u
Q2F0ZWdvcnkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzOjpzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSk6IERlbGV0ZWQuCisgICAg
ICAgICogcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmg6CisgICAgICAgICogcGxhdGZvcm0v
YXVkaW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNldEVsaWdp
YmxlRm9yU21hcnRSb3V0aW5nKToKKwogMjAyMS0wNy0yOCAgSmVyIE5vYmxlICA8amVyLm5vYmxl
QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFJlbW92ZSBzdXBwb3J0IGZvciBBVkFzc2V0
SW1hZ2VHZW5lcmF0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRl
ZEdsb2JhbFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzLmNwcAppbmRleCA3ZWYzOWE1MjgwYTJjOGQ1ZThkM2YxNWYzMjVlMjg3MjMyYzY5
MzVkLi4zODQwYWUzMmNjNjk5MTU4ZDgwNWU5ZDFhNGNjM2Y4YzkxYTQyMTcyIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5jcHAKKysrIGIv
U291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3BwCkBAIC01OCw3
ICs1OCw2IEBAIGJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpnTmV0d29ya0RhdGFVc2Fn
ZVRyYWNraW5nRW5hYmxlZCA9IGZhbHNlOwogYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OmdTaG91bGRPcHRPdXRPZk5ldHdvcmtTdGF0ZU9ic2VydmF0aW9uID0gZmFsc2U7CiBib29sIERl
cHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z0Rpc2FibGVTY3JlZW5TaXplT3ZlcnJpZGUgPSBmYWxz
ZTsKICNlbmRpZgotYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdNYW5hZ2VBdWRpb1Nl
c3Npb24gPSBmYWxzZTsKIAogI2lmIFBMQVRGT1JNKFdJTikKIHZvaWQgRGVwcmVjYXRlZEdsb2Jh
bFNldHRpbmdzOjpzZXRTaG91bGRVc2VIaWdoUmVzb2x1dGlvblRpbWVycyhib29sIHNob3VsZFVz
ZUhpZ2hSZXNvbHV0aW9uVGltZXJzKQpAQCAtMTg0LDYgKzE4MywxNiBAQCBjb25zdCBTdHJpbmcm
IERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6bmV0d29ya0ludGVyZmFjZU5hbWUoKQogfQogI2Vu
ZGlmCiAKK3ZvaWQgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpzZXRTaG91bGRNYW5hZ2VBdWRp
b1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcpCit7CisgICAgQXVkaW9TZXNzaW9uOjpzZXRTaG91
bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShmbGFnKTsKK30KKworYm9vbCBEZXByZWNhdGVk
R2xvYmFsU2V0dGluZ3M6OnNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCkKK3sKKyAg
ICByZXR1cm4gQXVkaW9TZXNzaW9uOjpzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSgp
OworfQorCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2V0QWxsb3dzQW55U1NMQ2Vy
dGlmaWNhdGUoYm9vbCBhbGxvd0FueVNTTENlcnRpZmljYXRlKQogewogICAgIGdBbGxvd3NBbnlT
U0xDZXJ0aWZpY2F0ZSA9IGFsbG93QW55U1NMQ2VydGlmaWNhdGU7CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaAppbmRleCAwODA3MjgwNjE1M2NjYTQ2
NGU5YmRjNjgwOGVjNjljYjVjZTQzNWFlLi5iMGQyZTQ1NGE3ZTNkYjlmOGMyMDFiYzQ0NmZlZWNh
ZDZiZWRkZTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNl
dHRpbmdzLmgKQEAgLTg0LDggKzg0LDggQEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBVU0UoQVVE
SU9fU0VTU0lPTikKLSAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25D
YXRlZ29yeShib29sIGZsYWcpIHsgZ01hbmFnZUF1ZGlvU2Vzc2lvbiA9IGZsYWc7IH0KLSAgICBz
dGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSgpIHsgcmV0dXJuIGdN
YW5hZ2VBdWRpb1Nlc3Npb247IH0KKyAgICBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRp
b1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcpOworICAgIHN0YXRpYyBib29sIHNob3VsZE1hbmFn
ZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCk7CiAjZW5kaWYKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0
YXRpYyB2b2lkIHNldEFsbG93c0FueVNTTENlcnRpZmljYXRlKGJvb2wpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmNwcCBiL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5jcHAKaW5kZXggMmZmMmI3MDFiMmYy
NjdmMTRhYTc5MTMyNzgxNTZjM2I5YjIxY2NlNC4uNjBhMmFlYTM4OTA3OTQzZjJlMWJmM2JlZDll
MmNiNGNlMWNhMzY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
QXVkaW9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRp
b1Nlc3Npb24uY3BwCkBAIC00MSw2ICs0MSw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAor
Ym9vbCBBdWRpb1Nlc3Npb246OnNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkgeyBm
YWxzZSB9OworCiBzdGF0aWMgc3RkOjpvcHRpb25hbDxVbmlxdWVSZWY8QXVkaW9TZXNzaW9uPj4m
IHNoYXJlZEF1ZGlvU2Vzc2lvbigpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPHN0ZDo6
b3B0aW9uYWw8VW5pcXVlUmVmPEF1ZGlvU2Vzc2lvbj4+PiBzZXNzaW9uOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmggYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb1Nlc3Npb24uaAppbmRleCA2ODMxOTIxYWRkMmEwYzlm
YTU2ZGEyYjgzNTJjYWE1NDAzMzdiZWRmLi5lYWY3MGUyMDkzYTQ0YmM1MWQ5MmUwOGVmNDAwODU5
Yjg4OWUxMGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRp
b1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb1Nlc3Np
b24uaApAQCAtMTI1LDYgKzEyNSw5IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRS
b3V0aW5nQXJiaXRyYXRpb25DbGllbnQoV2Vha1B0cjxBdWRpb1Nlc3Npb25Sb3V0aW5nQXJiaXRy
YXRpb25DbGllbnQ+JiYgY2xpZW50KSB7IG1fcm91dGluZ0FyYml0cmF0aW9uQ2xpZW50ID0gY2xp
ZW50OyB9CiAKKyAgICBzdGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29y
eSgpIHsgcmV0dXJuIHNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnk7IH0KKyAgICBz
dGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcp
IHsgc19zaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSA9IGZsYWc7IH0KKwogcHJvdGVj
dGVkOgogICAgIGZyaWVuZCBjbGFzcyBOZXZlckRlc3Ryb3llZDxBdWRpb1Nlc3Npb24+OwogICAg
IEF1ZGlvU2Vzc2lvbigpOwpAQCAtMTM4LDYgKzE0MSw4IEBAIHByb3RlY3RlZDoKIAogICAgIFdl
YWtQdHI8QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0aW9uQ2xpZW50PiBtX3JvdXRpbmdBcmJp
dHJhdGlvbkNsaWVudDsKICAgICBib29sIG1fYWN0aXZlIHsgZmFsc2UgfTsgLy8gVXNlZCBvbmx5
IGZvciB0ZXN0aW5nLgorCisgICAgc3RhdGljIGJvb2wgc19zaG91bGRNYW5hZ2VBdWRpb1Nlc3Np
b25DYXRlZ29yeTsKIH07CiAKIGNsYXNzIFdFQkNPUkVfRVhQT1JUIEF1ZGlvU2Vzc2lvblJvdXRp
bmdBcmJpdHJhdGlvbkNsaWVudCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9hdWRpby9pb3MvQXVkaW9TZXNzaW9uSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
YXVkaW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5tbQppbmRleCBhOTMxYjUyMjRmMTZjMjU0MWY3ODU3
YTliZDI0NDNiMzQ4ODQ3YzE5Li4yYTJiNmRkNWYxMTQ0ZjZjY2Q5ZTZlZDdmOTkxNjZlNWY4NzFm
NTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9T
ZXNzaW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9BdWRp
b1Nlc3Npb25JT1MubW0KQEAgLTk5LDYgKzk5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3Rh
dGljIHZvaWQgc2V0RWxpZ2libGVGb3JTbWFydFJvdXRpbmcoYm9vbCBlbGlnaWJsZSkKIHsKICNp
ZiBQTEFURk9STShJT1MpCisgICAgaWYgKCFzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29y
eSgpKQorICAgICAgICByZXR1cm47CiAKICAgICBhdXRvICpzZXNzaW9uID0gW1BBTDo6Z2V0QVZB
dWRpb1Nlc3Npb25DbGFzcygpIHNoYXJlZEluc3RhbmNlXTsKICAgICBpZiAoIVtzZXNzaW9uIHJl
c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0RWxpZ2libGVGb3JCVFNtYXJ0Um91dGluZ0Nv
bnNpZGVyYXRpb246ZXJyb3I6KV0K
</data>
<flag name="review"
          id="457080"
          type_id="1"
          status="+"
          setter="eric.carlson"
    />
    <flag name="commit-queue"
          id="457084"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434555</attachid>
            <date>2021-07-29 12:10:09 -0700</date>
            <delta_ts>2021-07-29 13:08:31 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-228593-20210729121008.patch</filename>
            <type>text/plain</type>
            <size>6123</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJkODQzYjY4YzEyMTEz
ZDk1YzgxZjBmZTc5YTg4YTg5Yzc3NTRmZS4uYWY0MzcyZDk4NDEwYjVhNGFjMjJlNDc0ZjRkMmVj
YjdkZWJmNTg4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTI5ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxXSzFdIC1bTlNB
dHRyaWJ1dGVTdHJpbmcgbG9hZEZyb21IVE1MLi4uXSBtZXRob2RzIHdpbGwgZGlzYWJsZSBibHVl
dG9vdGggcm91dGUgc3dpdGNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjg1OTMKKyAgICAgICAgPHJkYXI6Ly84MTE2MDk2OT4KKworICAgICAg
ICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgTlNBdHRyaWJ1dGVkU3RyaW5n
IHdpbGwgdXNlIFdlYktpdExlZ2FjeSBBUElzIHRvIGxvYWQgcHJvdmlkZWQgSFRNTDsgaW4gc28g
ZG9pbmcsIGFuIEF1ZGlvU2Vzc2lvbklPUworICAgICAgICBzaW5nbGV0b24gb2JqZWN0IGlzIGNy
ZWF0ZWQsIGFuZCAtW0FWQXVkaW9TZXNzaW9uIHNldEVsaWdpYmxlRm9yQlRTbWFydFJvdXRpbmdD
b25zaWRlcmF0aW9uOmVycm9yOl0KKyAgICAgICAgaXMgY2FsbGVkIHdpdGggYSBOTyBwYXJhbWV0
ZXIsIGRpc2FibGluZyBzbWFydCByb3V0aW5nIGZvciB0aGUgY2FsbGluZyBwcm9jZXNzLgorCisg
ICAgICAgIERpc2FibGUgdGhpcyBiZWhhdmlvciBpZiBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OnNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCkgcmV0dXJucyBmYWxzZTsKKyAgICAg
ICAgdGhpcyBzZXR0aW5nIGlzIGRpc2FibGVkIGZvciBhbGwgV0sxIGNsaWVudHMsIGFuZCBlbmFi
bGVkIGZvciBXSzIuCisKKyAgICAgICAgKiBwYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFNob3Vs
ZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5nczo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOgorICAg
ICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3Jl
OjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNh
dGVnb3J5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0
aW5nczo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOiBEZWxldGVkLgorICAgICAg
ICAqIHBsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1
ZGlvL2lvcy9BdWRpb1Nlc3Npb25JT1MubW06CisgICAgICAgIChXZWJDb3JlOjpzZXRFbGlnaWJs
ZUZvclNtYXJ0Um91dGluZyk6CisKIDIwMjEtMDctMjggIEplciBOb2JsZSAgPGplci5ub2JsZUBh
cHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBSZW1vdmUgc3VwcG9ydCBmb3IgQVZBc3NldElt
YWdlR2VuZXJhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRH
bG9iYWxTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxT
ZXR0aW5ncy5jcHAKaW5kZXggN2VmMzlhNTI4MGEyYzhkNWU4ZDNmMTVmMzI1ZTI4NzIzMmM2OTM1
ZC4uMDFhYjk1YjYyZjFhYTNmYTNhYjMzYmE3YjRmOTA2MmVmZTlkMGFkMiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmNwcApAQCAtNTgsNyAr
NTgsNiBAQCBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z05ldHdvcmtEYXRhVXNhZ2VU
cmFja2luZ0VuYWJsZWQgPSBmYWxzZTsKIGJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpn
U2hvdWxkT3B0T3V0T2ZOZXR3b3JrU3RhdGVPYnNlcnZhdGlvbiA9IGZhbHNlOwogYm9vbCBEZXBy
ZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdEaXNhYmxlU2NyZWVuU2l6ZU92ZXJyaWRlID0gZmFsc2U7
CiAjZW5kaWYKLWJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpnTWFuYWdlQXVkaW9TZXNz
aW9uID0gZmFsc2U7CiAKICNpZiBQTEFURk9STShXSU4pCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxT
ZXR0aW5nczo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMoYm9vbCBzaG91bGRVc2VI
aWdoUmVzb2x1dGlvblRpbWVycykKQEAgLTE4NCw2ICsxODMsMTggQEAgY29uc3QgU3RyaW5nJiBE
ZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6Om5ldHdvcmtJbnRlcmZhY2VOYW1lKCkKIH0KICNlbmRp
ZgogCisjaWYgVVNFKEFVRElPX1NFU1NJT04pCit2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoYm9vbCBmbGFnKQoreworICAg
IEF1ZGlvU2Vzc2lvbjo6c2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoZmxhZyk7
Cit9CisKK2Jvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpzaG91bGRNYW5hZ2VBdWRpb1Nl
c3Npb25DYXRlZ29yeSgpCit7CisgICAgcmV0dXJuIEF1ZGlvU2Vzc2lvbjo6c2hvdWxkTWFuYWdl
QXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKTsKK30KKyNlbmRpZgorCiB2b2lkIERlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5nczo6c2V0QWxsb3dzQW55U1NMQ2VydGlmaWNhdGUoYm9vbCBhbGxvd0FueVNTTENl
cnRpZmljYXRlKQogewogICAgIGdBbGxvd3NBbnlTU0xDZXJ0aWZpY2F0ZSA9IGFsbG93QW55U1NM
Q2VydGlmaWNhdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRH
bG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0
dGluZ3MuaAppbmRleCAwODA3MjgwNjE1M2NjYTQ2NGU5YmRjNjgwOGVjNjljYjVjZTQzNWFlLi5k
MGEzNTJiOTNlZWZiODE1MDNlYTliNTA0YWE3YTFmZGZlMjQ3ZjNmIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgKQEAgLTg0LDggKzg0LDggQEAg
cHVibGljOgogI2VuZGlmCiAKICNpZiBVU0UoQVVESU9fU0VTU0lPTikKLSAgICBzdGF0aWMgdm9p
ZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcpIHsgZ01hbmFn
ZUF1ZGlvU2Vzc2lvbiA9IGZsYWc7IH0KLSAgICBzdGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRp
b1Nlc3Npb25DYXRlZ29yeSgpIHsgcmV0dXJuIGdNYW5hZ2VBdWRpb1Nlc3Npb247IH0KKyAgICBX
RUJDT1JFX0VYUE9SVCBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRl
Z29yeShib29sIGZsYWcpOworICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIHNob3VsZE1h
bmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCk7CiAjZW5kaWYKIAogICAgIFdFQkNPUkVfRVhQT1JU
IHN0YXRpYyB2b2lkIHNldEFsbG93c0FueVNTTENlcnRpZmljYXRlKGJvb2wpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5jcHAKaW5kZXggMmZmMmI3MDFi
MmYyNjdmMTRhYTc5MTMyNzgxNTZjM2I5YjIxY2NlNC4uNjBhMmFlYTM4OTA3OTQzZjJlMWJmM2Jl
ZDllMmNiNGNlMWNhMzY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk
aW8vQXVkaW9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9B
dWRpb1Nlc3Npb24uY3BwCkBAIC00MSw2ICs0MSw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK
IAorYm9vbCBBdWRpb1Nlc3Npb246OnNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkg
eyBmYWxzZSB9OworCiBzdGF0aWMgc3RkOjpvcHRpb25hbDxVbmlxdWVSZWY8QXVkaW9TZXNzaW9u
Pj4mIHNoYXJlZEF1ZGlvU2Vzc2lvbigpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPHN0
ZDo6b3B0aW9uYWw8VW5pcXVlUmVmPEF1ZGlvU2Vzc2lvbj4+PiBzZXNzaW9uOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmggYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb1Nlc3Npb24uaAppbmRleCA2ODMxOTIxYWRkMmEw
YzlmYTU2ZGEyYjgzNTJjYWE1NDAzMzdiZWRmLi5lYWY3MGUyMDkzYTQ0YmM1MWQ5MmUwOGVmNDAw
ODU5Yjg4OWUxMGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9B
dWRpb1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb1Nl
c3Npb24uaApAQCAtMTI1LDYgKzEyNSw5IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBz
ZXRSb3V0aW5nQXJiaXRyYXRpb25DbGllbnQoV2Vha1B0cjxBdWRpb1Nlc3Npb25Sb3V0aW5nQXJi
aXRyYXRpb25DbGllbnQ+JiYgY2xpZW50KSB7IG1fcm91dGluZ0FyYml0cmF0aW9uQ2xpZW50ID0g
Y2xpZW50OyB9CiAKKyAgICBzdGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRl
Z29yeSgpIHsgcmV0dXJuIHNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnk7IH0KKyAg
ICBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShib29sIGZs
YWcpIHsgc19zaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSA9IGZsYWc7IH0KKwogcHJv
dGVjdGVkOgogICAgIGZyaWVuZCBjbGFzcyBOZXZlckRlc3Ryb3llZDxBdWRpb1Nlc3Npb24+Owog
ICAgIEF1ZGlvU2Vzc2lvbigpOwpAQCAtMTM4LDYgKzE0MSw4IEBAIHByb3RlY3RlZDoKIAogICAg
IFdlYWtQdHI8QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0aW9uQ2xpZW50PiBtX3JvdXRpbmdB
cmJpdHJhdGlvbkNsaWVudDsKICAgICBib29sIG1fYWN0aXZlIHsgZmFsc2UgfTsgLy8gVXNlZCBv
bmx5IGZvciB0ZXN0aW5nLgorCisgICAgc3RhdGljIGJvb2wgc19zaG91bGRNYW5hZ2VBdWRpb1Nl
c3Npb25DYXRlZ29yeTsKIH07CiAKIGNsYXNzIFdFQkNPUkVfRVhQT1JUIEF1ZGlvU2Vzc2lvblJv
dXRpbmdBcmJpdHJhdGlvbkNsaWVudCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9hdWRpby9pb3MvQXVkaW9TZXNzaW9uSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vYXVkaW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5tbQppbmRleCBhOTMxYjUyMjRmMTZjMjU0MWY3
ODU3YTliZDI0NDNiMzQ4ODQ3YzE5Li4yYTJiNmRkNWYxMTQ0ZjZjY2Q5ZTZlZDdmOTkxNjZlNWY4
NzFmNTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVk
aW9TZXNzaW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9B
dWRpb1Nlc3Npb25JT1MubW0KQEAgLTk5LDYgKzk5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog
c3RhdGljIHZvaWQgc2V0RWxpZ2libGVGb3JTbWFydFJvdXRpbmcoYm9vbCBlbGlnaWJsZSkKIHsK
ICNpZiBQTEFURk9STShJT1MpCisgICAgaWYgKCFzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRl
Z29yeSgpKQorICAgICAgICByZXR1cm47CiAKICAgICBhdXRvICpzZXNzaW9uID0gW1BBTDo6Z2V0
QVZBdWRpb1Nlc3Npb25DbGFzcygpIHNoYXJlZEluc3RhbmNlXTsKICAgICBpZiAoIVtzZXNzaW9u
IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0RWxpZ2libGVGb3JCVFNtYXJ0Um91dGlu
Z0NvbnNpZGVyYXRpb246ZXJyb3I6KV0K
</data>
<flag name="commit-queue"
          id="457094"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>434558</attachid>
            <date>2021-07-29 12:39:52 -0700</date>
            <delta_ts>2021-07-29 18:51:26 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-228593-20210729123951.patch</filename>
            <type>text/plain</type>
            <size>6137</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTJkODQzYjY4YzEyMTEz
ZDk1YzgxZjBmZTc5YTg4YTg5Yzc3NTRmZS4uYWY0MzcyZDk4NDEwYjVhNGFjMjJlNDc0ZjRkMmVj
YjdkZWJmNTg4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA3LTI5ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYXxXSzFdIC1bTlNB
dHRyaWJ1dGVTdHJpbmcgbG9hZEZyb21IVE1MLi4uXSBtZXRob2RzIHdpbGwgZGlzYWJsZSBibHVl
dG9vdGggcm91dGUgc3dpdGNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No
b3dfYnVnLmNnaT9pZD0yMjg1OTMKKyAgICAgICAgPHJkYXI6Ly84MTE2MDk2OT4KKworICAgICAg
ICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgTlNBdHRyaWJ1dGVkU3RyaW5n
IHdpbGwgdXNlIFdlYktpdExlZ2FjeSBBUElzIHRvIGxvYWQgcHJvdmlkZWQgSFRNTDsgaW4gc28g
ZG9pbmcsIGFuIEF1ZGlvU2Vzc2lvbklPUworICAgICAgICBzaW5nbGV0b24gb2JqZWN0IGlzIGNy
ZWF0ZWQsIGFuZCAtW0FWQXVkaW9TZXNzaW9uIHNldEVsaWdpYmxlRm9yQlRTbWFydFJvdXRpbmdD
b25zaWRlcmF0aW9uOmVycm9yOl0KKyAgICAgICAgaXMgY2FsbGVkIHdpdGggYSBOTyBwYXJhbWV0
ZXIsIGRpc2FibGluZyBzbWFydCByb3V0aW5nIGZvciB0aGUgY2FsbGluZyBwcm9jZXNzLgorCisg
ICAgICAgIERpc2FibGUgdGhpcyBiZWhhdmlvciBpZiBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6
OnNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCkgcmV0dXJucyBmYWxzZTsKKyAgICAg
ICAgdGhpcyBzZXR0aW5nIGlzIGRpc2FibGVkIGZvciBhbGwgV0sxIGNsaWVudHMsIGFuZCBlbmFi
bGVkIGZvciBXSzIuCisKKyAgICAgICAgKiBwYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5j
cHA6CisgICAgICAgIChXZWJDb3JlOjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFNob3Vs
ZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0
ZWRHbG9iYWxTZXR0aW5nczo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOgorICAg
ICAgICAqIHBhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3Jl
OjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldFNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNh
dGVnb3J5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRHbG9iYWxTZXR0
aW5nczo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOiBEZWxldGVkLgorICAgICAg
ICAqIHBsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5oOgorICAgICAgICAqIHBsYXRmb3JtL2F1
ZGlvL2lvcy9BdWRpb1Nlc3Npb25JT1MubW06CisgICAgICAgIChXZWJDb3JlOjpzZXRFbGlnaWJs
ZUZvclNtYXJ0Um91dGluZyk6CisKIDIwMjEtMDctMjggIEplciBOb2JsZSAgPGplci5ub2JsZUBh
cHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBSZW1vdmUgc3VwcG9ydCBmb3IgQVZBc3NldElt
YWdlR2VuZXJhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRH
bG9iYWxTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxT
ZXR0aW5ncy5jcHAKaW5kZXggN2VmMzlhNTI4MGEyYzhkNWU4ZDNmMTVmMzI1ZTI4NzIzMmM2OTM1
ZC4uMDFhYjk1YjYyZjFhYTNmYTNhYjMzYmE3YjRmOTA2MmVmZTlkMGFkMiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmNwcApAQCAtNTgsNyAr
NTgsNiBAQCBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z05ldHdvcmtEYXRhVXNhZ2VU
cmFja2luZ0VuYWJsZWQgPSBmYWxzZTsKIGJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpn
U2hvdWxkT3B0T3V0T2ZOZXR3b3JrU3RhdGVPYnNlcnZhdGlvbiA9IGZhbHNlOwogYm9vbCBEZXBy
ZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdEaXNhYmxlU2NyZWVuU2l6ZU92ZXJyaWRlID0gZmFsc2U7
CiAjZW5kaWYKLWJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpnTWFuYWdlQXVkaW9TZXNz
aW9uID0gZmFsc2U7CiAKICNpZiBQTEFURk9STShXSU4pCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxT
ZXR0aW5nczo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMoYm9vbCBzaG91bGRVc2VI
aWdoUmVzb2x1dGlvblRpbWVycykKQEAgLTE4NCw2ICsxODMsMTggQEAgY29uc3QgU3RyaW5nJiBE
ZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6Om5ldHdvcmtJbnRlcmZhY2VOYW1lKCkKIH0KICNlbmRp
ZgogCisjaWYgVVNFKEFVRElPX1NFU1NJT04pCit2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n
czo6c2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoYm9vbCBmbGFnKQoreworICAg
IEF1ZGlvU2Vzc2lvbjo6c2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoZmxhZyk7
Cit9CisKK2Jvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpzaG91bGRNYW5hZ2VBdWRpb1Nl
c3Npb25DYXRlZ29yeSgpCit7CisgICAgcmV0dXJuIEF1ZGlvU2Vzc2lvbjo6c2hvdWxkTWFuYWdl
QXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKTsKK30KKyNlbmRpZgorCiB2b2lkIERlcHJlY2F0ZWRHbG9i
YWxTZXR0aW5nczo6c2V0QWxsb3dzQW55U1NMQ2VydGlmaWNhdGUoYm9vbCBhbGxvd0FueVNTTENl
cnRpZmljYXRlKQogewogICAgIGdBbGxvd3NBbnlTU0xDZXJ0aWZpY2F0ZSA9IGFsbG93QW55U1NM
Q2VydGlmaWNhdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRH
bG9iYWxTZXR0aW5ncy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVkR2xvYmFsU2V0
dGluZ3MuaAppbmRleCAwODA3MjgwNjE1M2NjYTQ2NGU5YmRjNjgwOGVjNjljYjVjZTQzNWFlLi5k
MGEzNTJiOTNlZWZiODE1MDNlYTliNTA0YWE3YTFmZGZlMjQ3ZjNmIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgKQEAgLTg0LDggKzg0LDggQEAg
cHVibGljOgogI2VuZGlmCiAKICNpZiBVU0UoQVVESU9fU0VTU0lPTikKLSAgICBzdGF0aWMgdm9p
ZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShib29sIGZsYWcpIHsgZ01hbmFn
ZUF1ZGlvU2Vzc2lvbiA9IGZsYWc7IH0KLSAgICBzdGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRp
b1Nlc3Npb25DYXRlZ29yeSgpIHsgcmV0dXJuIGdNYW5hZ2VBdWRpb1Nlc3Npb247IH0KKyAgICBX
RUJDT1JFX0VYUE9SVCBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRl
Z29yeShib29sIGZsYWcpOworICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBib29sIHNob3VsZE1h
bmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KCk7CiAjZW5kaWYKIAogICAgIFdFQkNPUkVfRVhQT1JU
IHN0YXRpYyB2b2lkIHNldEFsbG93c0FueVNTTENlcnRpZmljYXRlKGJvb2wpOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvU2Vzc2lvbi5jcHAKaW5kZXggMmZmMmI3MDFi
MmYyNjdmMTRhYTc5MTMyNzgxNTZjM2I5YjIxY2NlNC4uNjBhMmFlYTM4OTA3OTQzZjJlMWJmM2Jl
ZDllMmNiNGNlMWNhMzY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk
aW8vQXVkaW9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9B
dWRpb1Nlc3Npb24uY3BwCkBAIC00MSw2ICs0MSw4IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK
IAorYm9vbCBBdWRpb1Nlc3Npb246OnNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkg
eyBmYWxzZSB9OworCiBzdGF0aWMgc3RkOjpvcHRpb25hbDxVbmlxdWVSZWY8QXVkaW9TZXNzaW9u
Pj4mIHNoYXJlZEF1ZGlvU2Vzc2lvbigpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPHN0
ZDo6b3B0aW9uYWw8VW5pcXVlUmVmPEF1ZGlvU2Vzc2lvbj4+PiBzZXNzaW9uOwpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9TZXNzaW9uLmggYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb1Nlc3Npb24uaAppbmRleCA2ODMxOTIxYWRkMmEw
YzlmYTU2ZGEyYjgzNTJjYWE1NDAzMzdiZWRmLi5lYWY3MGUyMDkzYTQ0YmM1MWQ5MmUwOGVmNDAw
ODU5Yjg4OWUxMGE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9B
dWRpb1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb1Nl
c3Npb24uaApAQCAtMTI1LDYgKzEyNSw5IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBz
ZXRSb3V0aW5nQXJiaXRyYXRpb25DbGllbnQoV2Vha1B0cjxBdWRpb1Nlc3Npb25Sb3V0aW5nQXJi
aXRyYXRpb25DbGllbnQ+JiYgY2xpZW50KSB7IG1fcm91dGluZ0FyYml0cmF0aW9uQ2xpZW50ID0g
Y2xpZW50OyB9CiAKKyAgICBzdGF0aWMgYm9vbCBzaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRl
Z29yeSgpIHsgcmV0dXJuIHNfc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnk7IH0KKyAg
ICBzdGF0aWMgdm9pZCBzZXRTaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeShib29sIGZs
YWcpIHsgc19zaG91bGRNYW5hZ2VBdWRpb1Nlc3Npb25DYXRlZ29yeSA9IGZsYWc7IH0KKwogcHJv
dGVjdGVkOgogICAgIGZyaWVuZCBjbGFzcyBOZXZlckRlc3Ryb3llZDxBdWRpb1Nlc3Npb24+Owog
ICAgIEF1ZGlvU2Vzc2lvbigpOwpAQCAtMTM4LDYgKzE0MSw4IEBAIHByb3RlY3RlZDoKIAogICAg
IFdlYWtQdHI8QXVkaW9TZXNzaW9uUm91dGluZ0FyYml0cmF0aW9uQ2xpZW50PiBtX3JvdXRpbmdB
cmJpdHJhdGlvbkNsaWVudDsKICAgICBib29sIG1fYWN0aXZlIHsgZmFsc2UgfTsgLy8gVXNlZCBv
bmx5IGZvciB0ZXN0aW5nLgorCisgICAgc3RhdGljIGJvb2wgc19zaG91bGRNYW5hZ2VBdWRpb1Nl
c3Npb25DYXRlZ29yeTsKIH07CiAKIGNsYXNzIFdFQkNPUkVfRVhQT1JUIEF1ZGlvU2Vzc2lvblJv
dXRpbmdBcmJpdHJhdGlvbkNsaWVudCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9hdWRpby9pb3MvQXVkaW9TZXNzaW9uSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vYXVkaW8vaW9zL0F1ZGlvU2Vzc2lvbklPUy5tbQppbmRleCBhOTMxYjUyMjRmMTZjMjU0MWY3
ODU3YTliZDI0NDNiMzQ4ODQ3YzE5Li5mNWM1M2JjYzBjOWIxYTM0MTI5MzJkOWJhMDk3MjI1NGEx
NDc5Y2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVk
aW9TZXNzaW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9B
dWRpb1Nlc3Npb25JT1MubW0KQEAgLTk5LDYgKzk5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog
c3RhdGljIHZvaWQgc2V0RWxpZ2libGVGb3JTbWFydFJvdXRpbmcoYm9vbCBlbGlnaWJsZSkKIHsK
ICNpZiBQTEFURk9STShJT1MpCisgICAgaWYgKCFBdWRpb1Nlc3Npb246OnNob3VsZE1hbmFnZUF1
ZGlvU2Vzc2lvbkNhdGVnb3J5KCkpCisgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8gKnNlc3Np
b24gPSBbUEFMOjpnZXRBVkF1ZGlvU2Vzc2lvbkNsYXNzKCkgc2hhcmVkSW5zdGFuY2VdOwogICAg
IGlmICghW3Nlc3Npb24gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzZXRFbGlnaWJsZUZv
ckJUU21hcnRSb3V0aW5nQ29uc2lkZXJhdGlvbjplcnJvcjopXQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>