<?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>236620</bug_id>
          
          <creation_ts>2022-02-14 16:42:32 -0800</creation_ts>
          <short_desc>[Cocoa] Update audio session category before setting NowPlaying status</short_desc>
          <delta_ts>2022-02-16 12:23:57 -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>Media</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="Eric Carlson">eric.carlson</reporter>
          <assigned_to name="Eric Carlson">eric.carlson</assigned_to>
          <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jer.noble</cc>
    
    <cc>lmoura</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1841475</commentid>
    <comment_count>0</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-14 16:42:32 -0800</bug_when>
    <thetext>NowPlaying doesn&apos;t update correctly when the audio category changes from Ambient to Playback after becoming active, so always set category first.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841477</commentid>
    <comment_count>1</comment_count>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-14 16:43:20 -0800</bug_when>
    <thetext>rdar://88827167</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841483</commentid>
    <comment_count>2</comment_count>
      <attachid>451960</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-14 16:53:05 -0800</bug_when>
    <thetext>Created attachment 451960
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841488</commentid>
    <comment_count>3</comment_count>
      <attachid>451963</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-14 17:05:01 -0800</bug_when>
    <thetext>Created attachment 451963
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841536</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-14 19:30:32 -0800</bug_when>
    <thetext>Found 2 new test failures: media/picture-in-picture/picture-in-picture-interruption.html, webaudio/audiocontext-state-interrupted.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841740</commentid>
    <comment_count>5</comment_count>
      <attachid>452030</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-15 09:01:00 -0800</bug_when>
    <thetext>Created attachment 452030
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841816</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-15 11:05:56 -0800</bug_when>
    <thetext>Found 1 new test failure: webaudio/audiocontext-state-interrupted.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841846</commentid>
    <comment_count>7</comment_count>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2022-02-15 11:48:49 -0800</bug_when>
    <thetext>This patch seems to have triggered lots of crashes in GTK:

https://ews-build.webkit.org/#/builders/35/builds/9078

Results page: https://ews-build.s3-us-west-2.amazonaws.com/GTK-WK2-Tests-EWS/452030-9078/results.html

Sample trace of the crash:

Thread 1 (Thread 0x7fcc17dc09c0 (LWP 10616)):
#0  g_logv (log_domain=0x7fcc1a72700e &quot;GLib&quot;, log_level=G_LOG_LEVEL_CRITICAL, format=&lt;optimized out&gt;, args=&lt;optimized out&gt;) at ../glib/gmessages.c:1417
#1  0x00007fcc1a6d9073 in g_log (log_domain=log_domain@entry=0x7fcc1a72700e &quot;GLib&quot;, log_level=log_level@entry=G_LOG_LEVEL_CRITICAL, format=format@entry=0x7fcc1a731b70 &quot;%s: assertion &apos;%s&apos; failed&quot;) at ../glib/gmessages.c:1455
#2  0x00007fcc1a6d98ad in g_return_if_fail_warning (log_domain=log_domain@entry=0x7fcc1a72700e &quot;GLib&quot;, pretty_function=pretty_function@entry=0x7fcc1a78c760 &lt;__func__.76&gt; &quot;g_variant_new_variant&quot;, expression=expression@entry=0x7fcc1a78a119 &quot;value != NULL&quot;) at ../glib/gmessages.c:2891
#3  0x00007fcc1a70fcd6 in g_variant_new_variant (value=&lt;optimized out&gt;) at ../glib/gvariant.c:723
#4  g_variant_new_variant (value=&lt;optimized out&gt;) at ../glib/gvariant.c:721
#5  0x00007fcc1a7151dd in g_variant_valist_new (str=0x7fff63d79cf8, app=0x7fff63d79d20) at ../glib/gvariant.c:5225
#6  0x00007fcc1a7157b2 in g_variant_new_va (format_string=&lt;optimized out&gt;, endptr=endptr@entry=0x0, app=app@entry=0x7fff63d79d20) at ../glib/gvariant.c:5401
#7  0x00007fcc1a715d11 in g_variant_builder_add (builder=0x7fff63d79e10, format_string=&lt;optimized out&gt;) at ../glib/gvariant.c:5558
#8  0x00007fcc2355cc26 in WebCore::MediaSessionManagerGLib::sessionStateChanged(WebCore::PlatformMediaSession&amp;) () at /app/webkit/WebKitBuild/Release/lib/libwebkit2gtk-4.1.so.0
#9  0x00007fcc2354f4a8 in WebCore::PlatformMediaSession::setState(WebCore::PlatformMediaSession::State) () at /app/webkit/WebKitBuild/Release/lib/libwebkit2gtk-4.1.so.0
#10 0x00007fcc235512d0 in WebCore::PlatformMediaSession::clientWillBeginPlayback() () at /app/webkit/WebKitBuild/Release/lib/libwebkit2gtk-4.1.so.0
#11 0x00007fcc22f76c6f in WebCore::MediaElementSession::clientWillBeginPlayback() () at /app/webkit/WebKitBuild/Release/lib/libwebkit2gtk-4.1.so.0
#12 0x00007fcc22ed71d0 in WebCore::HTMLMediaElement::playInternal() () at /app/webkit/WebKitBuild/Release/lib/libwebkit2gtk-4.1.so.0
#13 0x00007fcc21c9ab2b in WebCore::jsHTMLMediaElementPrototypeFunction_play(JSC::JSGlobalObject*, JSC::CallFrame*) () at /app/webkit/WebKitBuild/Release/lib/libwebkit2gtk-4.1.so.0
#14 0x00007fcbd6bff1d8 in  ()
#15 0x00007fff63d7a0a0 in  ()
#16 0x00007fcc1cf7c88a in op_call_slow_return_location () at /app/webkit/WebKitBuild/Release/lib/libjavascriptcoregtk-4.1.so.0
#17 0x0000000000000000 in  ()</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841850</commentid>
    <comment_count>8</comment_count>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2022-02-15 11:53:33 -0800</bug_when>
    <thetext>Looks like the fix would be adding the new enum value to the switch in MediaSessionGLib::getPlaybackStatusAsGVariant(...) in Source/WebCore/platform/audio/glib/MediaSessionGlib.cpp</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841867</commentid>
    <comment_count>9</comment_count>
      <attachid>452072</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-15 12:17:44 -0800</bug_when>
    <thetext>Created attachment 452072
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841959</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-15 14:54:31 -0800</bug_when>
    <thetext>Found 1 new test failure: webaudio/audiocontext-state-interrupted.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1841968</commentid>
    <comment_count>11</comment_count>
      <attachid>452072</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-15 15:10:43 -0800</bug_when>
    <thetext>Comment on attachment 452072
Patch for landing

I don&apos;t believe the gtk API test failure is related.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842078</commentid>
    <comment_count>12</comment_count>
      <attachid>452119</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-15 17:53:56 -0800</bug_when>
    <thetext>Created attachment 452119
patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842297</commentid>
    <comment_count>13</comment_count>
      <attachid>452199</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-16 08:20:30 -0800</bug_when>
    <thetext>Created attachment 452199
patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842347</commentid>
    <comment_count>14</comment_count>
      <attachid>452199</attachid>
    <who name="Eric Carlson">eric.carlson</who>
    <bug_when>2022-02-16 09:55:17 -0800</bug_when>
    <thetext>Comment on attachment 452199
patch for landing

The Windows failure is unrelated.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1842448</commentid>
    <comment_count>15</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2022-02-16 12:23:54 -0800</bug_when>
    <thetext>Committed r289942 (247346@main): &lt;https://commits.webkit.org/247346@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 452199.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>451960</attachid>
            <date>2022-02-14 16:53:05 -0800</date>
            <delta_ts>2022-02-14 17:04:59 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-236620-20220214165305.patch</filename>
            <type>text/plain</type>
            <size>8116</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVjZTc5ODQ2MDliYTA0
ODU3ODhlNWE0MDlkYTZjOWYwNTE4YTNlZi4uNWZkMTVhYWQ1NjcyMWI2Y2RkYmI5MDNkMTU5YzQ1
ZDdlZTJlNzU4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIyLTAyLTE0ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVXBk
YXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgYmVmb3JlIHNldHRpbmcgTm93UGxheWluZyBzdGF0
dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjYy
MAorICAgICAgICByZGFyOi8vODg4MjcxNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBOb3dQbGF5aW5nIGRvZXNuJ3QgdXBkYXRlIGNvcnJlY3RseSB3
aGVuIHRoZSBhdWRpbyBjYXRlZ29yeSBjaGFuZ2VzIGZyb20gQW1iaWVudAorICAgICAgICB0byBQ
bGF5YmFjayBhZnRlciBiZWNvbWluZyBhY3RpdmUsIHNvIGFsd2F5cyBzZXQgdGhlIGNhdGVnb3J5
IGZpcnN0LgorCisgICAgICAgIFRlc3RlZCBtYW51YWxseS4KKworICAgICAgICAqIHBsYXRmb3Jt
L2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZl
cnRFbnVtZXJhdGlvblRvU3RyaW5nKTogQ29udmVydCBuZXcgc3RhdGUuCisgICAgICAgIChXZWJD
b3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJlZ2luUGxheWJhY2spOiBTZXQg
c3RhdGUgdG8gCisgICAgICAgIGBQcmVwYXJpbmdUb1BsYXlgIGJlZm9yZSBjYWxsaW5nIGBzZXNz
aW9uV2lsbEJlZ2luUGxheWJhY2tgIHNvIGB1cGRhdGVTZXNzaW9uU3RhdGVgCisgICAgICAgIGNh
biB0ZWxsIHRoYXQgcGxheWJhY2sgaXMgYWJvdXQgdG8gYmVnaW4uCisgICAgICAgIChXZWJDb3Jl
OjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6YWN0aXZlQXVkaW9TZXNzaW9uUmVxdWlyZWQgY29uc3Qp
OiBDb25zaWRlciBuZXcKKyAgICAgICAgc2Vzc2lvbiBzdGF0ZS4KKyAgICAgICAgKiBwbGF0Zm9y
bS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oOgorCisgICAgICAgICogcGxhdGZvcm0vYXVk
aW8vUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBs
YXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2Vzc2lvbkNhblByb2R1Y2VBdWRpb0NoYW5nZWQp
OiBEb24ndCBjYWxsCisgICAgICAgIGB1cGRhdGVTZXNzaW9uU3RhdGVgLCBpdCBpcyBjYWxsZWQg
YnkgYG1heWJlQWN0aXZhdGVBdWRpb1Nlc3Npb25gIG5vdy4KKyAgICAgICAgKFdlYkNvcmU6OlBs
YXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6bWF5YmVBY3RpdmF0ZUF1ZGlvU2Vzc2lvbik6IENh
bGwgYHVwZGF0ZVNlc3Npb25TdGF0ZWAKKyAgICAgICAgaWYgdGhlIGF1ZGlvIHNlc3Npb24gYmVj
b21lcyBhY3RpdmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Np
b25NYW5hZ2VyQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNlc3Npb25NYW5hZ2Vy
Q29jb2E6OnVwZGF0ZVNlc3Npb25TdGF0ZSk6IENvbnNpZGVyIGEgc2Vzc2lvbiB0byAKKyAgICAg
ICAgcG90ZW50aWFsbHkgaGF2ZSBhdWRpbyBpZiBpdCBpcyBwcmVwYXJpbmcgdG8gcGxheS4KKwog
MjAyMi0wMi0xNCAgSiBQYXNjb2UgIDxqX3Bhc2NvZUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dl
YkF1dGhuXSBNb2RpZnkgX1dLV2ViQXV0aGVudGljYXRpb25Bc3NlcnRpb25SZXNwb25zZSBhY2Nv
cmRpbmcgdG8gaW50ZXJuYWwgbmVlZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcAppbmRleCAwOTZiNjAxNTc5OWU0NTUy
NTQ3NzlmYWY3ZTYwNWZkZDk5NzJlZThlLi5jNWQ4MWU2ZWIzODI2MWJlMDhmNjFhZDYzMTQ0MTFj
MWI3MjlmNzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0
Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v
UGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCkBAIC00MiwxNSArNDIsMTcgQEAgU3RyaW5nIGNvbnZl
cnRFbnVtZXJhdGlvblRvU3RyaW5nKFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZSBzdGF0ZSkK
ICAgICBzdGF0aWMgY29uc3QgTmV2ZXJEZXN0cm95ZWQ8U3RyaW5nPiB2YWx1ZXNbXSA9IHsKICAg
ICAgICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIklkbGUiKSwKICAgICAgICAgTUFLRV9TVEFU
SUNfU1RSSU5HX0lNUEwoIkF1dG9wbGF5aW5nIiksCisgICAgICAgIE1BS0VfU1RBVElDX1NUUklO
R19JTVBMKCJQcmVwYXJpbmdUb1BsYXkiKSwKICAgICAgICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lN
UEwoIlBsYXlpbmciKSwKICAgICAgICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIlBhdXNlZCIp
LAogICAgICAgICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgiSW50ZXJydXB0ZWQiKSwKICAgICB9
OwogICAgIHN0YXRpY19hc3NlcnQoIXN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNl
c3Npb246OklkbGUpLCAiUGxhdGZvcm1NZWRpYVNlc3Npb246OklkbGUgaXMgbm90IDAgYXMgZXhw
ZWN0ZWQiKTsKICAgICBzdGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1N
ZWRpYVNlc3Npb246OkF1dG9wbGF5aW5nKSA9PSAxLCAiUGxhdGZvcm1NZWRpYVNlc3Npb246OkF1
dG9wbGF5aW5nIGlzIG5vdCAxIGFzIGV4cGVjdGVkIik7Ci0gICAgc3RhdGljX2Fzc2VydChzdGF0
aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQbGF5aW5nKSA9PSAyLCAiUGxh
dGZvcm1NZWRpYVNlc3Npb246OlBsYXlpbmcgaXMgbm90IDIgYXMgZXhwZWN0ZWQiKTsKLSAgICBz
dGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNlc3Npb246OlBh
dXNlZCkgPT0gMywgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQYXVzZWQgaXMgbm90IDMgYXMgZXhw
ZWN0ZWQiKTsKLSAgICBzdGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1N
ZWRpYVNlc3Npb246OkludGVycnVwdGVkKSA9PSA0LCAiUGxhdGZvcm1NZWRpYVNlc3Npb246Oklu
dGVycnVwdGVkIGlzIG5vdCA0IGFzIGV4cGVjdGVkIik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0
aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQcmVwYXJpbmdUb1BsYXkpID09
IDIsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UHJlcGFyaW5nVG9QbGF5IGlzIG5vdCAyIGFzIGV4
cGVjdGVkIik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3Jt
TWVkaWFTZXNzaW9uOjpQbGF5aW5nKSA9PSAzLCAiUGxhdGZvcm1NZWRpYVNlc3Npb246OlBsYXlp
bmcgaXMgbm90IDMgYXMgZXhwZWN0ZWQiKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0
PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNlc3Npb246OlBhdXNlZCkgPT0gNCwgIlBsYXRmb3JtTWVk
aWFTZXNzaW9uOjpQYXVzZWQgaXMgbm90IDQgYXMgZXhwZWN0ZWQiKTsKKyAgICBzdGF0aWNfYXNz
ZXJ0KHN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNlc3Npb246OkludGVycnVwdGVk
KSA9PSA1LCAiUGxhdGZvcm1NZWRpYVNlc3Npb246OkludGVycnVwdGVkIGlzIG5vdCA1IGFzIGV4
cGVjdGVkIik7CiAgICAgQVNTRVJUKHN0YXRpY19jYXN0PHNpemVfdD4oc3RhdGUpIDwgV1RGX0FS
UkFZX0xFTkdUSCh2YWx1ZXMpKTsKICAgICByZXR1cm4gdmFsdWVzW3N0YXRpY19jYXN0PHNpemVf
dD4oc3RhdGUpXTsKIH0KQEAgLTIzNSw3ICsyMzcsMTEgQEAgYm9vbCBQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6Y2xpZW50V2lsbEJlZ2luUGxheWJhY2soKQogCiAgICAgQUxXQVlTX0xPRyhMT0dJREVO
VElGSUVSLCAic3RhdGUgPSAiLCBtX3N0YXRlKTsKIAorICAgIGF1dG8gb2xkU3RhdGUgPSBtX3N0
YXRlOworICAgIHNldFN0YXRlKFByZXBhcmluZ1RvUGxheSk7CisKICAgICBpZiAoIVBsYXRmb3Jt
TWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigpLnNlc3Npb25XaWxsQmVnaW5QbGF5
YmFjaygqdGhpcykpIHsKKyAgICAgICAgbV9zdGF0ZSA9IG9sZFN0YXRlOwogICAgICAgICBpZiAo
c3RhdGUoKSA9PSBJbnRlcnJ1cHRlZCkKICAgICAgICAgICAgIG1fc3RhdGVUb1Jlc3RvcmUgPSBQ
bGF5aW5nOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0zNTIsNyArMzU4LDcgQEAgYm9vbCBQ
bGF0Zm9ybU1lZGlhU2Vzc2lvbjo6YWN0aXZlQXVkaW9TZXNzaW9uUmVxdWlyZWQoKSBjb25zdAog
ewogICAgIGlmIChtZWRpYVR5cGUoKSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBl
OjpOb25lKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKHN0YXRlKCkgIT0gUGxhdGZv
cm1NZWRpYVNlc3Npb246OlN0YXRlOjpQbGF5aW5nKQorICAgIGlmIChzdGF0ZSgpICE9IFBsYXRm
b3JtTWVkaWFTZXNzaW9uOjpTdGF0ZTo6UGxheWluZyAmJiBzdGF0ZSgpICE9IFBsYXRmb3JtTWVk
aWFTZXNzaW9uOjpTdGF0ZTo6UHJlcGFyaW5nVG9QbGF5KQogICAgICAgICByZXR1cm4gZmFsc2U7
CiAgICAgcmV0dXJuIGNhblByb2R1Y2VBdWRpbygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKaW5kZXggMzZmM2I3ZWNk
ZGM0YzJhNjJlYWJlYmMxMjMzMDU5NGVkMDZiZWZjOS4uMjFhYzNmNzBhZmNlZTgzNzBhODA2NTg5
ODU5NDYzYWQwNTk3YmIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk
aW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h
dWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCkBAIC03Nyw2ICs3Nyw3IEBAIHB1YmxpYzoKICAg
ICBlbnVtIFN0YXRlIDogdWludDhfdCB7CiAgICAgICAgIElkbGUsCiAgICAgICAgIEF1dG9wbGF5
aW5nLAorICAgICAgICBQcmVwYXJpbmdUb1BsYXksCiAgICAgICAgIFBsYXlpbmcsCiAgICAgICAg
IFBhdXNlZCwKICAgICAgICAgSW50ZXJydXB0ZWQsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyLmNwcApp
bmRleCAwM2FkNDY2MmYyZWM5YzBlZTE3NTY5ZDI0NGU0NDM3MzdlNjg5N2QzLi4xMDczMTEwNzE2
MDM5NzMzNTA1ZDUxYzVlYjViZGM1MDIxYTU5Zjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5j
cHAKQEAgLTI1NSw2ICsyNTUsNyBAQCBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6
c2Vzc2lvbldpbGxCZWdpblBsYXliYWNrKFBsYXRmb3JtTWVkaWFTZXNzaW9uJgogICAgICAgICAg
ICAgb25lU2Vzc2lvbi5wYXVzZVNlc3Npb24oKTsKICAgICAgICAgfSk7CiAgICAgfQorCiAgICAg
QUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCBzZXNzaW9uLmxvZ0lkZW50aWZpZXIoKSwgIiByZXR1
cm5pbmcgdHJ1ZSIpOwogICAgIHJldHVybiB0cnVlOwogfQpAQCAtNDI5LDcgKzQzMCw2IEBAIHZv
aWQgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXNzaW9uQ2FuUHJvZHVjZUF1ZGlvQ2hh
bmdlZCgpCiB7CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSKTsKICAgICBtYXliZUFjdGl2
YXRlQXVkaW9TZXNzaW9uKCk7Ci0gICAgdXBkYXRlU2Vzc2lvblN0YXRlKCk7CiB9CiAKIHZvaWQg
UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpwcm9jZXNzRGlkUmVjZWl2ZVJlbW90ZUNvbnRy
b2xDb21tYW5kKFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpSZW1vdGVDb250cm9sQ29tbWFuZFR5cGUg
Y29tbWFuZCwgY29uc3QgUGxhdGZvcm1NZWRpYVNlc3Npb246OlJlbW90ZUNvbW1hbmRBcmd1bWVu
dCYgYXJndW1lbnQpCkBAIC02MTUsNiArNjE1LDEwIEBAIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Np
b25NYW5hZ2VyOjptYXliZUFjdGl2YXRlQXVkaW9TZXNzaW9uKCkKIAogICAgIG1fYmVjYW1lQWN0
aXZlID0gQXVkaW9TZXNzaW9uOjpzaGFyZWRTZXNzaW9uKCkudHJ5VG9TZXRBY3RpdmUodHJ1ZSk7
CiAgICAgQUxXQVlTX0xPRyhMT0dJREVOVElGSUVSLCBtX2JlY2FtZUFjdGl2ZSA/ICJzdWNjZXNz
ZnVsbHkgYWN0aXZhdGVkIiA6ICJmYWlsZWQgdG8gYWN0aXZhdGUiLCAiIEF1ZGlvU2Vzc2lvbiIp
OworCisgICAgaWYgKG1fYmVjYW1lQWN0aXZlKQorICAgICAgICB1cGRhdGVTZXNzaW9uU3RhdGUo
KTsKKwogICAgIHJldHVybiBtX2JlY2FtZUFjdGl2ZTsKICNlbHNlCiAgICAgcmV0dXJuIHRydWU7
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNl
c3Npb25NYW5hZ2VyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2Nv
YS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KaW5kZXggODYxNzg3NGY2OTMxNzgwZjZiZWUw
MGFiNmQ1OWZkZTVhZTFhN2JiYy4uZGJlZDYyOTkyMjU5YzdhMDVhYTIyZDAwNWRhMDE3MDJmMGFj
ZDFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVk
aWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1
ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQpAQCAtMTI1LDcgKzEyNSwxMCBA
QCB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRlU2Vzc2lvblN0YXRlKCkKICAg
ICAgICAgfQogCiAgICAgICAgIGlmICghaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSkg
ewotICAgICAgICAgICAgYm9vbCBpc1BvdGVudGlhbGx5QXVkaWJsZSA9IHNlc3Npb24uaXNQbGF5
aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkgfHwgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFT
ZXNzaW9uOjpNZWRpYVR5cGU6OlZpZGVvQXVkaW8gfHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6TWVkaWFUeXBlOjpBdWRpbykgJiYgc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSAmJiBz
ZXNzaW9uLmhhc1BsYXllZFNpbmNlTGFzdEludGVycnVwdGlvbigpKTsKKyAgICAgICAgICAgIGJv
b2wgaXNQb3RlbnRpYWxseUF1ZGlibGUgPSBzZXNzaW9uLmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5
YmFja1RhcmdldCgpCisgICAgICAgICAgICAgICAgfHwgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFT
ZXNzaW9uOjpNZWRpYVR5cGU6OlZpZGVvQXVkaW8gfHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6TWVkaWFUeXBlOjpBdWRpbykKKyAgICAgICAgICAgICAgICAgICAgJiYgc2Vzc2lvbi5j
YW5Qcm9kdWNlQXVkaW8oKQorICAgICAgICAgICAgICAgICAgICAmJiAoc2Vzc2lvbi5oYXNQbGF5
ZWRTaW5jZUxhc3RJbnRlcnJ1cHRpb24oKSB8fCBzZXNzaW9uLnN0YXRlKCkgPT0gUGxhdGZvcm1N
ZWRpYVNlc3Npb246OlN0YXRlOjpQcmVwYXJpbmdUb1BsYXkpKTsKICAgICAgICAgICAgIGlmIChp
c1BvdGVudGlhbGx5QXVkaWJsZSkgewogICAgICAgICAgICAgICAgIGhhc0F1ZGlibGVBdWRpb09y
VmlkZW9NZWRpYVR5cGUgPSB0cnVlOwogICAgICAgICAgICAgICAgIGlzUGxheWluZ0F1ZGlvIHw9
IHNlc3Npb24uaXNQbGF5aW5nKCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>451963</attachid>
            <date>2022-02-14 17:05:01 -0800</date>
            <delta_ts>2022-02-15 09:00:58 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-236620-20220214170501.patch</filename>
            <type>text/plain</type>
            <size>6341</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVjZTc5ODQ2MDliYTA0
ODU3ODhlNWE0MDlkYTZjOWYwNTE4YTNlZi4uYzJhZWFlMmY0YzFlODI0YzA2MzIxYzRiYzBkNjIx
YWQ4MzFhMGExZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIyLTAyLTE0ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVXBk
YXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgYmVmb3JlIHNldHRpbmcgTm93UGxheWluZyBzdGF0
dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjYy
MAorICAgICAgICByZGFyOi8vODg4MjcxNjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBOb3dQbGF5aW5nIGRvZXNuJ3QgdXBkYXRlIGNvcnJlY3RseSB3
aGVuIHRoZSBhdWRpbyBjYXRlZ29yeSBjaGFuZ2VzIGZyb20gQW1iaWVudAorICAgICAgICB0byBQ
bGF5YmFjayBhZnRlciBiZWNvbWluZyBhY3RpdmUsIHNvIGFsd2F5cyBzZXQgdGhlIGNhdGVnb3J5
IGZpcnN0LgorCisgICAgICAgIFRlc3RlZCBtYW51YWxseS4KKworICAgICAgICAqIHBsYXRmb3Jt
L2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZl
cnRFbnVtZXJhdGlvblRvU3RyaW5nKTogQ29udmVydCBuZXcgc3RhdGUuCisgICAgICAgIChXZWJD
b3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJlZ2luUGxheWJhY2spOiBTZXQg
c3RhdGUgdG8gCisgICAgICAgIGBQcmVwYXJpbmdUb1BsYXlgIGJlZm9yZSBjYWxsaW5nIGBzZXNz
aW9uV2lsbEJlZ2luUGxheWJhY2tgIHNvIGB1cGRhdGVTZXNzaW9uU3RhdGVgCisgICAgICAgIGNh
biB0ZWxsIHRoYXQgcGxheWJhY2sgaXMgYWJvdXQgdG8gYmVnaW4uCisgICAgICAgIChXZWJDb3Jl
OjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6YWN0aXZlQXVkaW9TZXNzaW9uUmVxdWlyZWQgY29uc3Qp
OiBDb25zaWRlciBuZXcKKyAgICAgICAgc2Vzc2lvbiBzdGF0ZS4KKyAgICAgICAgKiBwbGF0Zm9y
bS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oOgorCisgICAgICAgICogcGxhdGZvcm0vYXVk
aW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6
TWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9uU3RhdGUpOiBDb25zaWRlciBh
IHNlc3Npb24gdG8gCisgICAgICAgIHBvdGVudGlhbGx5IGhhdmUgYXVkaW8gaWYgaXQgaXMgcHJl
cGFyaW5nIHRvIHBsYXkuCisKIDIwMjItMDItMTQgIEogUGFzY29lICA8al9wYXNjb2VAYXBwbGUu
Y29tPgogCiAgICAgICAgIFtXZWJBdXRobl0gTW9kaWZ5IF9XS1dlYkF1dGhlbnRpY2F0aW9uQXNz
ZXJ0aW9uUmVzcG9uc2UgYWNjb3JkaW5nIHRvIGludGVybmFsIG5lZWRzCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5k
ZXggMDk2YjYwMTU3OTllNDU1MjU0Nzc5ZmFmN2U2MDVmZGQ5OTcyZWU4ZS4uYzVkODFlNmViMzgy
NjFiZTA4ZjYxYWQ2MzE0NDExYzFiNzI5ZjcxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtNDIsMTUgKzQy
LDE3IEBAIFN0cmluZyBjb252ZXJ0RW51bWVyYXRpb25Ub1N0cmluZyhQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6U3RhdGUgc3RhdGUpCiAgICAgc3RhdGljIGNvbnN0IE5ldmVyRGVzdHJveWVkPFN0cmlu
Zz4gdmFsdWVzW10gPSB7CiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJJZGxlIiks
CiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJBdXRvcGxheWluZyIpLAorICAgICAg
ICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgiUHJlcGFyaW5nVG9QbGF5IiksCiAgICAgICAgIE1B
S0VfU1RBVElDX1NUUklOR19JTVBMKCJQbGF5aW5nIiksCiAgICAgICAgIE1BS0VfU1RBVElDX1NU
UklOR19JTVBMKCJQYXVzZWQiKSwKICAgICAgICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIklu
dGVycnVwdGVkIiksCiAgICAgfTsKICAgICBzdGF0aWNfYXNzZXJ0KCFzdGF0aWNfY2FzdDxzaXpl
X3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJZGxlKSwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJ
ZGxlIGlzIG5vdCAwIGFzIGV4cGVjdGVkIik7CiAgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2Fz
dDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpBdXRvcGxheWluZykgPT0gMSwgIlBsYXRm
b3JtTWVkaWFTZXNzaW9uOjpBdXRvcGxheWluZyBpcyBub3QgMSBhcyBleHBlY3RlZCIpOwotICAg
IHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6
UGxheWluZykgPT0gMiwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQbGF5aW5nIGlzIG5vdCAyIGFz
IGV4cGVjdGVkIik7Ci0gICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRm
b3JtTWVkaWFTZXNzaW9uOjpQYXVzZWQpID09IDMsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGF1
c2VkIGlzIG5vdCAzIGFzIGV4cGVjdGVkIik7Ci0gICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2Fz
dDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1cHRlZCkgPT0gNCwgIlBsYXRm
b3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1cHRlZCBpcyBub3QgNCBhcyBleHBlY3RlZCIpOworICAg
IHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6
UHJlcGFyaW5nVG9QbGF5KSA9PSAyLCAiUGxhdGZvcm1NZWRpYVNlc3Npb246OlByZXBhcmluZ1Rv
UGxheSBpcyBub3QgMiBhcyBleHBlY3RlZCIpOworICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nh
c3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGxheWluZykgPT0gMywgIlBsYXRmb3Jt
TWVkaWFTZXNzaW9uOjpQbGF5aW5nIGlzIG5vdCAzIGFzIGV4cGVjdGVkIik7CisgICAgc3RhdGlj
X2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQYXVzZWQp
ID09IDQsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGF1c2VkIGlzIG5vdCA0IGFzIGV4cGVjdGVk
Iik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFT
ZXNzaW9uOjpJbnRlcnJ1cHRlZCkgPT0gNSwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1
cHRlZCBpcyBub3QgNSBhcyBleHBlY3RlZCIpOwogICAgIEFTU0VSVChzdGF0aWNfY2FzdDxzaXpl
X3Q+KHN0YXRlKSA8IFdURl9BUlJBWV9MRU5HVEgodmFsdWVzKSk7CiAgICAgcmV0dXJuIHZhbHVl
c1tzdGF0aWNfY2FzdDxzaXplX3Q+KHN0YXRlKV07CiB9CkBAIC0yMzUsNyArMjM3LDExIEBAIGJv
b2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OmNsaWVudFdpbGxCZWdpblBsYXliYWNrKCkKIAogICAg
IEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwgInN0YXRlID0gIiwgbV9zdGF0ZSk7CiAKKyAgICBh
dXRvIG9sZFN0YXRlID0gbV9zdGF0ZTsKKyAgICBzZXRTdGF0ZShQcmVwYXJpbmdUb1BsYXkpOwor
CiAgICAgaWYgKCFQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5z
ZXNzaW9uV2lsbEJlZ2luUGxheWJhY2soKnRoaXMpKSB7CisgICAgICAgIG1fc3RhdGUgPSBvbGRT
dGF0ZTsKICAgICAgICAgaWYgKHN0YXRlKCkgPT0gSW50ZXJydXB0ZWQpCiAgICAgICAgICAgICBt
X3N0YXRlVG9SZXN0b3JlID0gUGxheWluZzsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzUy
LDcgKzM1OCw3IEBAIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OmFjdGl2ZUF1ZGlvU2Vzc2lv
blJlcXVpcmVkKCkgY29uc3QKIHsKICAgICBpZiAobWVkaWFUeXBlKCkgPT0gUGxhdGZvcm1NZWRp
YVNlc3Npb246Ok1lZGlhVHlwZTo6Tm9uZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlm
IChzdGF0ZSgpICE9IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZTo6UGxheWluZykKKyAgICBp
ZiAoc3RhdGUoKSAhPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGU6OlBsYXlpbmcgJiYgc3Rh
dGUoKSAhPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGU6OlByZXBhcmluZ1RvUGxheSkKICAg
ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiBjYW5Qcm9kdWNlQXVkaW8oKTsKIH0KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNz
aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lv
bi5oCmluZGV4IDM2ZjNiN2VjZGRjNGMyYTYyZWFiZWJjMTIzMzA1OTRlZDA2YmVmYzkuLjIxYWMz
ZjcwYWZjZWU4MzcwYTgwNjU4OTg1OTQ2M2FkMDU5N2JiMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaApAQCAtNzcsNiAr
NzcsNyBAQCBwdWJsaWM6CiAgICAgZW51bSBTdGF0ZSA6IHVpbnQ4X3QgewogICAgICAgICBJZGxl
LAogICAgICAgICBBdXRvcGxheWluZywKKyAgICAgICAgUHJlcGFyaW5nVG9QbGF5LAogICAgICAg
ICBQbGF5aW5nLAogICAgICAgICBQYXVzZWQsCiAgICAgICAgIEludGVycnVwdGVkLApkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFu
YWdlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFT
ZXNzaW9uTWFuYWdlckNvY29hLm1tCmluZGV4IDg2MTc4NzRmNjkzMTc4MGY2YmVlMDBhYjZkNTlm
ZGU1YWUxYTdiYmMuLmRiZWQ2Mjk5MjI1OWM3YTA1YWEyMmQwMDVkYTAxNzAyZjBhY2QxYzkgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lv
bk1hbmFnZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2Nv
YS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KQEAgLTEyNSw3ICsxMjUsMTAgQEAgdm9pZCBN
ZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAgICAgICAgIH0K
IAogICAgICAgICBpZiAoIWhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUpIHsKLSAgICAg
ICAgICAgIGJvb2wgaXNQb3RlbnRpYWxseUF1ZGlibGUgPSBzZXNzaW9uLmlzUGxheWluZ1RvV2ly
ZWxlc3NQbGF5YmFja1RhcmdldCgpIHx8ICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6
TWVkaWFUeXBlOjpWaWRlb0F1ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1l
ZGlhVHlwZTo6QXVkaW8pICYmIHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5o
YXNQbGF5ZWRTaW5jZUxhc3RJbnRlcnJ1cHRpb24oKSk7CisgICAgICAgICAgICBib29sIGlzUG90
ZW50aWFsbHlBdWRpYmxlID0gc2Vzc2lvbi5pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJn
ZXQoKQorICAgICAgICAgICAgICAgIHx8ICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6
TWVkaWFUeXBlOjpWaWRlb0F1ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1l
ZGlhVHlwZTo6QXVkaW8pCisgICAgICAgICAgICAgICAgICAgICYmIHNlc3Npb24uY2FuUHJvZHVj
ZUF1ZGlvKCkKKyAgICAgICAgICAgICAgICAgICAgJiYgKHNlc3Npb24uaGFzUGxheWVkU2luY2VM
YXN0SW50ZXJydXB0aW9uKCkgfHwgc2Vzc2lvbi5zdGF0ZSgpID09IFBsYXRmb3JtTWVkaWFTZXNz
aW9uOjpTdGF0ZTo6UHJlcGFyaW5nVG9QbGF5KSk7CiAgICAgICAgICAgICBpZiAoaXNQb3RlbnRp
YWxseUF1ZGlibGUpIHsKICAgICAgICAgICAgICAgICBoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVk
aWFUeXBlID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNzaW9u
LmlzUGxheWluZygpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452030</attachid>
            <date>2022-02-15 09:01:00 -0800</date>
            <delta_ts>2022-02-15 12:17:43 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-236620-20220215090059.patch</filename>
            <type>text/plain</type>
            <size>7372</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVjZTc5ODQ2MDliYTA0
ODU3ODhlNWE0MDlkYTZjOWYwNTE4YTNlZi4uOGUzMDM1M2IxOWFjNjU5NmMwMTVjNjg3NzQ3ZDJl
NTY5Y2JhYTg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIyLTAyLTE1ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVXBk
YXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgYmVmb3JlIHNldHRpbmcgTm93UGxheWluZyBzdGF0
dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjYy
MAorICAgICAgICByZGFyOi8vODg4MjcxNjcKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9i
bGUuCisKKyAgICAgICAgTm93UGxheWluZyBkb2Vzbid0IHVwZGF0ZSBjb3JyZWN0bHkgd2hlbiB0
aGUgYXVkaW8gY2F0ZWdvcnkgY2hhbmdlcyBmcm9tIEFtYmllbnQKKyAgICAgICAgdG8gUGxheWJh
Y2sgYWZ0ZXIgYmVjb21pbmcgYWN0aXZlLCBzbyBhbHdheXMgc2V0IHRoZSBjYXRlZ29yeSBmaXJz
dC4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp
by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RW51
bWVyYXRpb25Ub1N0cmluZyk6IENvbnZlcnQgbmV3IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6
UGxhdGZvcm1NZWRpYVNlc3Npb246OmNsaWVudFdpbGxCZWdpblBsYXliYWNrKTogU2V0IHN0YXRl
IHRvIAorICAgICAgICBgUHJlcGFyaW5nVG9QbGF5YCBiZWZvcmUgY2FsbGluZyBgc2Vzc2lvbldp
bGxCZWdpblBsYXliYWNrYCBzbyBgdXBkYXRlU2Vzc2lvblN0YXRlYAorICAgICAgICBjYW4gdGVs
bCB0aGF0IHBsYXliYWNrIGlzIGFib3V0IHRvIGJlZ2luLgorICAgICAgICAoV2ViQ29yZTo6UGxh
dGZvcm1NZWRpYVNlc3Npb246OmFjdGl2ZUF1ZGlvU2Vzc2lvblJlcXVpcmVkIGNvbnN0KTogQ29u
c2lkZXIgbmV3CisgICAgICAgIHNlc3Npb24gc3RhdGUuCisgICAgICAgICogcGxhdGZvcm0vYXVk
aW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaDoKKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2Nv
Y29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh
U2Vzc2lvbk1hbmFnZXJDb2NvYTo6dXBkYXRlU2Vzc2lvblN0YXRlKTogQ29uc2lkZXIgYSBzZXNz
aW9uIHRvIAorICAgICAgICBwb3RlbnRpYWxseSBoYXZlIGF1ZGlvIGlmIGl0IGlzIHByZXBhcmlu
ZyB0byBwbGF5LgorCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuaDogQWRkIG5ldyBzdGF0
ZSB0byBtYXRjaCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGUKKyAgICAgICAgKiB0ZXN0aW5n
L0ludGVybmFscy5pZGw6IERpdHRvLgorCiAyMDIyLTAyLTE0ICBKIFBhc2NvZSAgPGpfcGFzY29l
QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIE1vZGlmeSBfV0tXZWJBdXRoZW50aWNh
dGlvbkFzc2VydGlvblJlc3BvbnNlIGFjY29yZGluZyB0byBpbnRlcm5hbCBuZWVkcwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u
Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u
Y3BwCmluZGV4IDA5NmI2MDE1Nzk5ZTQ1NTI1NDc3OWZhZjdlNjA1ZmRkOTk3MmVlOGUuLmM1ZDgx
ZTZlYjM4MjYxYmUwOGY2MWFkNjMxNDQxMWMxYjcyOWY3MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKQEAgLTQy
LDE1ICs0MiwxNyBAQCBTdHJpbmcgY29udmVydEVudW1lcmF0aW9uVG9TdHJpbmcoUGxhdGZvcm1N
ZWRpYVNlc3Npb246OlN0YXRlIHN0YXRlKQogICAgIHN0YXRpYyBjb25zdCBOZXZlckRlc3Ryb3ll
ZDxTdHJpbmc+IHZhbHVlc1tdID0gewogICAgICAgICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgi
SWRsZSIpLAogICAgICAgICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgiQXV0b3BsYXlpbmciKSwK
KyAgICAgICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIlByZXBhcmluZ1RvUGxheSIpLAogICAg
ICAgICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgiUGxheWluZyIpLAogICAgICAgICBNQUtFX1NU
QVRJQ19TVFJJTkdfSU1QTCgiUGF1c2VkIiksCiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklOR19J
TVBMKCJJbnRlcnJ1cHRlZCIpLAogICAgIH07CiAgICAgc3RhdGljX2Fzc2VydCghc3RhdGljX2Nh
c3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6SWRsZSksICJQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6SWRsZSBpcyBub3QgMCBhcyBleHBlY3RlZCIpOwogICAgIHN0YXRpY19hc3NlcnQoc3Rh
dGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6QXV0b3BsYXlpbmcpID09IDEs
ICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6QXV0b3BsYXlpbmcgaXMgbm90IDEgYXMgZXhwZWN0ZWQi
KTsKLSAgICBzdGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNl
c3Npb246OlBsYXlpbmcpID09IDIsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGxheWluZyBpcyBu
b3QgMiBhcyBleHBlY3RlZCIpOwotICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90
PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGF1c2VkKSA9PSAzLCAiUGxhdGZvcm1NZWRpYVNlc3Np
b246OlBhdXNlZCBpcyBub3QgMyBhcyBleHBlY3RlZCIpOwotICAgIHN0YXRpY19hc3NlcnQoc3Rh
dGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6SW50ZXJydXB0ZWQpID09IDQs
ICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6SW50ZXJydXB0ZWQgaXMgbm90IDQgYXMgZXhwZWN0ZWQi
KTsKKyAgICBzdGF0aWNfYXNzZXJ0KHN0YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNl
c3Npb246OlByZXBhcmluZ1RvUGxheSkgPT0gMiwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQcmVw
YXJpbmdUb1BsYXkgaXMgbm90IDIgYXMgZXhwZWN0ZWQiKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHN0
YXRpY19jYXN0PHNpemVfdD4oUGxhdGZvcm1NZWRpYVNlc3Npb246OlBsYXlpbmcpID09IDMsICJQ
bGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGxheWluZyBpcyBub3QgMyBhcyBleHBlY3RlZCIpOworICAg
IHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6
UGF1c2VkKSA9PSA0LCAiUGxhdGZvcm1NZWRpYVNlc3Npb246OlBhdXNlZCBpcyBub3QgNCBhcyBl
eHBlY3RlZCIpOworICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9y
bU1lZGlhU2Vzc2lvbjo6SW50ZXJydXB0ZWQpID09IDUsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6
SW50ZXJydXB0ZWQgaXMgbm90IDUgYXMgZXhwZWN0ZWQiKTsKICAgICBBU1NFUlQoc3RhdGljX2Nh
c3Q8c2l6ZV90PihzdGF0ZSkgPCBXVEZfQVJSQVlfTEVOR1RIKHZhbHVlcykpOwogICAgIHJldHVy
biB2YWx1ZXNbc3RhdGljX2Nhc3Q8c2l6ZV90PihzdGF0ZSldOwogfQpAQCAtMjM1LDcgKzIzNywx
MSBAQCBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpjbGllbnRXaWxsQmVnaW5QbGF5YmFjaygp
CiAKICAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIsICJzdGF0ZSA9ICIsIG1fc3RhdGUpOwog
CisgICAgYXV0byBvbGRTdGF0ZSA9IG1fc3RhdGU7CisgICAgc2V0U3RhdGUoUHJlcGFyaW5nVG9Q
bGF5KTsKKwogICAgIGlmICghUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWRNYW5h
Z2VyKCkuc2Vzc2lvbldpbGxCZWdpblBsYXliYWNrKCp0aGlzKSkgeworICAgICAgICBtX3N0YXRl
ID0gb2xkU3RhdGU7CiAgICAgICAgIGlmIChzdGF0ZSgpID09IEludGVycnVwdGVkKQogICAgICAg
ICAgICAgbV9zdGF0ZVRvUmVzdG9yZSA9IFBsYXlpbmc7CiAgICAgICAgIHJldHVybiBmYWxzZTsK
QEAgLTM1Miw3ICszNTgsNyBAQCBib29sIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjphY3RpdmVBdWRp
b1Nlc3Npb25SZXF1aXJlZCgpIGNvbnN0CiB7CiAgICAgaWYgKG1lZGlhVHlwZSgpID09IFBsYXRm
b3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6Ok5vbmUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK
LSAgICBpZiAoc3RhdGUoKSAhPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGU6OlBsYXlpbmcp
CisgICAgaWYgKHN0YXRlKCkgIT0gUGxhdGZvcm1NZWRpYVNlc3Npb246OlN0YXRlOjpQbGF5aW5n
ICYmIHN0YXRlKCkgIT0gUGxhdGZvcm1NZWRpYVNlc3Npb246OlN0YXRlOjpQcmVwYXJpbmdUb1Bs
YXkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICByZXR1cm4gY2FuUHJvZHVjZUF1ZGlvKCk7
CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1l
ZGlhU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRp
YVNlc3Npb24uaAppbmRleCAzNmYzYjdlY2RkYzRjMmE2MmVhYmViYzEyMzMwNTk0ZWQwNmJlZmM5
Li4yMWFjM2Y3MGFmY2VlODM3MGE4MDY1ODk4NTk0NjNhZDA1OTdiYjI2IDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKQEAg
LTc3LDYgKzc3LDcgQEAgcHVibGljOgogICAgIGVudW0gU3RhdGUgOiB1aW50OF90IHsKICAgICAg
ICAgSWRsZSwKICAgICAgICAgQXV0b3BsYXlpbmcsCisgICAgICAgIFByZXBhcmluZ1RvUGxheSwK
ICAgICAgICAgUGxheWluZywKICAgICAgICAgUGF1c2VkLAogICAgICAgICBJbnRlcnJ1cHRlZCwK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vz
c2lvbk1hbmFnZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h
L01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQppbmRleCA4NjE3ODc0ZjY5MzE3ODBmNmJlZTAw
YWI2ZDU5ZmRlNWFlMWE3YmJjLi5kYmVkNjI5OTIyNTljN2EwNWFhMjJkMDA1ZGEwMTcwMmYwYWNk
MWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRp
YVNlc3Npb25NYW5hZ2VyQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk
aW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCkBAIC0xMjUsNyArMTI1LDEwIEBA
IHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9uU3RhdGUoKQogICAg
ICAgICB9CiAKICAgICAgICAgaWYgKCFoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFUeXBlKSB7
Ci0gICAgICAgICAgICBib29sIGlzUG90ZW50aWFsbHlBdWRpYmxlID0gc2Vzc2lvbi5pc1BsYXlp
bmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSB8fCAoKHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNl
c3Npb246Ok1lZGlhVHlwZTo6VmlkZW9BdWRpbyB8fCB0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNz
aW9uOjpNZWRpYVR5cGU6OkF1ZGlvKSAmJiBzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpICYmIHNl
c3Npb24uaGFzUGxheWVkU2luY2VMYXN0SW50ZXJydXB0aW9uKCkpOworICAgICAgICAgICAgYm9v
bCBpc1BvdGVudGlhbGx5QXVkaWJsZSA9IHNlc3Npb24uaXNQbGF5aW5nVG9XaXJlbGVzc1BsYXli
YWNrVGFyZ2V0KCkKKyAgICAgICAgICAgICAgICB8fCAoKHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNl
c3Npb246Ok1lZGlhVHlwZTo6VmlkZW9BdWRpbyB8fCB0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNz
aW9uOjpNZWRpYVR5cGU6OkF1ZGlvKQorICAgICAgICAgICAgICAgICAgICAmJiBzZXNzaW9uLmNh
blByb2R1Y2VBdWRpbygpCisgICAgICAgICAgICAgICAgICAgICYmIChzZXNzaW9uLmhhc1BsYXll
ZFNpbmNlTGFzdEludGVycnVwdGlvbigpIHx8IHNlc3Npb24uc3RhdGUoKSA9PSBQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbjo6U3RhdGU6OlByZXBhcmluZ1RvUGxheSkpOwogICAgICAgICAgICAgaWYgKGlz
UG90ZW50aWFsbHlBdWRpYmxlKSB7CiAgICAgICAgICAgICAgICAgaGFzQXVkaWJsZUF1ZGlvT3JW
aWRlb01lZGlhVHlwZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgaXNQbGF5aW5nQXVkaW8gfD0g
c2Vzc2lvbi5pc1BsYXlpbmcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv
SW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IDc5
ZGMxNjAwNjdiOTBmYWQzNzk1M2YxOWY1OWJhZGJkODNkNzVhYzUuLjM4NTA0MzI0MDgxNDg0ODM0
YjU5MWE1OGJiYTJhZGFmNjZmYTkzYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp
bmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApA
QCAtMTAyNSw2ICsxMDI1LDcgQEAgcHVibGljOgogICAgIGVudW0gTWVkaWFTZXNzaW9uU3RhdGUg
ewogICAgICAgICBJZGxlLAogICAgICAgICBBdXRvcGxheWluZywKKyAgICAgICAgUHJlcGFyaW5n
VG9QbGF5LAogICAgICAgICBQbGF5aW5nLAogICAgICAgICBQYXVzZWQsCiAgICAgICAgIEludGVy
cnVwdGVkLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRs
IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IGJlNzllOTY4Yzk5
N2QxM2QyZWQxZGVkMDJhNDNkYzE2YjRmODg3OTYuLmNlNzRhMGRhOGMyY2Q3ZmNkMWQxZDU3ZTU5
Nzk0NDIzMmY4NWQyYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu
YWxzLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwKQEAgLTgz
LDYgKzgzLDcgQEAgZW51bSBDb21wb3NpdGluZ1BvbGljeSB7CiBbQ29uZGl0aW9uYWw9VklERU9d
IGVudW0gTWVkaWFTZXNzaW9uU3RhdGUgewogICAgICJJZGxlIiwKICAgICAiQXV0b3BsYXlpbmci
LAorICAgICJQcmVwYXJpbmdUb1BsYXkiLAogICAgICJQbGF5aW5nIiwKICAgICAiUGF1c2VkIiwK
ICAgICAiSW50ZXJydXB0ZWQiCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452072</attachid>
            <date>2022-02-15 12:17:44 -0800</date>
            <delta_ts>2022-02-15 17:53:54 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-236620-20220215121744.patch</filename>
            <type>text/plain</type>
            <size>8689</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVjZTc5ODQ2MDliYTA0
ODU3ODhlNWE0MDlkYTZjOWYwNTE4YTNlZi4uNzc2NjVmYTAxMGRkNWRhMDY1MTJmMjJjYTZlYTcz
MmI5OTlmMTMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIyLTAyLTE1ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVXBk
YXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgYmVmb3JlIHNldHRpbmcgTm93UGxheWluZyBzdGF0
dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjYy
MAorICAgICAgICByZGFyOi8vODg4MjcxNjcKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9i
bGUuCisKKyAgICAgICAgTm93UGxheWluZyBkb2Vzbid0IHVwZGF0ZSBjb3JyZWN0bHkgd2hlbiB0
aGUgYXVkaW8gY2F0ZWdvcnkgY2hhbmdlcyBmcm9tIEFtYmllbnQKKyAgICAgICAgdG8gUGxheWJh
Y2sgYWZ0ZXIgYmVjb21pbmcgYWN0aXZlLCBzbyBhbHdheXMgc2V0IHRoZSBjYXRlZ29yeSBmaXJz
dC4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp
by9nbGliL01lZGlhU2Vzc2lvbkdMaWIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNz
aW9uR0xpYjo6Z2V0UGxheWJhY2tTdGF0dXNBc0dWYXJpYW50KTogQWRkIG5ldyBzdGF0ZS4KKwor
ICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OmNvbnZlcnRFbnVtZXJhdGlvblRvU3RyaW5nKTogQ29udmVydCBuZXcgc3Rh
dGUuCisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJl
Z2luUGxheWJhY2spOiBTZXQgc3RhdGUgdG8gCisgICAgICAgIGBQcmVwYXJpbmdUb1BsYXlgIGJl
Zm9yZSBjYWxsaW5nIGBzZXNzaW9uV2lsbEJlZ2luUGxheWJhY2tgIHNvIGB1cGRhdGVTZXNzaW9u
U3RhdGVgCisgICAgICAgIGNhbiB0ZWxsIHRoYXQgcGxheWJhY2sgaXMgYWJvdXQgdG8gYmVnaW4u
CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6YWN0aXZlQXVkaW9TZXNz
aW9uUmVxdWlyZWQgY29uc3QpOiBDb25zaWRlciBuZXcKKyAgICAgICAgc2Vzc2lvbiBzdGF0ZS4K
KyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oOgorCisgICAg
ICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tOgor
ICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlckNvY29hOjp1cGRhdGVTZXNzaW9u
U3RhdGUpOiBDb25zaWRlciBhIHNlc3Npb24gdG8gCisgICAgICAgIHBvdGVudGlhbGx5IGhhdmUg
YXVkaW8gaWYgaXQgaXMgcHJlcGFyaW5nIHRvIHBsYXkuCisKKyAgICAgICAgKiB0ZXN0aW5nL0lu
dGVybmFscy5oOiBBZGQgbmV3IHN0YXRlIHRvIG1hdGNoIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpT
dGF0ZQorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmlkbDogRGl0dG8uCisKIDIwMjItMDIt
MTQgIEogUGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRobl0g
TW9kaWZ5IF9XS1dlYkF1dGhlbnRpY2F0aW9uQXNzZXJ0aW9uUmVzcG9uc2UgYWNjb3JkaW5nIHRv
IGludGVybmFsIG5lZWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp
by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp
by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5kZXggMDk2YjYwMTU3OTllNDU1MjU0Nzc5ZmFm
N2U2MDVmZGQ5OTcyZWU4ZS4uYzVkODFlNmViMzgyNjFiZTA4ZjYxYWQ2MzE0NDExYzFiNzI5Zjcx
NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRp
YVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3Jt
TWVkaWFTZXNzaW9uLmNwcApAQCAtNDIsMTUgKzQyLDE3IEBAIFN0cmluZyBjb252ZXJ0RW51bWVy
YXRpb25Ub1N0cmluZyhQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGUgc3RhdGUpCiAgICAgc3Rh
dGljIGNvbnN0IE5ldmVyRGVzdHJveWVkPFN0cmluZz4gdmFsdWVzW10gPSB7CiAgICAgICAgIE1B
S0VfU1RBVElDX1NUUklOR19JTVBMKCJJZGxlIiksCiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklO
R19JTVBMKCJBdXRvcGxheWluZyIpLAorICAgICAgICBNQUtFX1NUQVRJQ19TVFJJTkdfSU1QTCgi
UHJlcGFyaW5nVG9QbGF5IiksCiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJQbGF5
aW5nIiksCiAgICAgICAgIE1BS0VfU1RBVElDX1NUUklOR19JTVBMKCJQYXVzZWQiKSwKICAgICAg
ICAgTUFLRV9TVEFUSUNfU1RSSU5HX0lNUEwoIkludGVycnVwdGVkIiksCiAgICAgfTsKICAgICBz
dGF0aWNfYXNzZXJ0KCFzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJ
ZGxlKSwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJZGxlIGlzIG5vdCAwIGFzIGV4cGVjdGVkIik7
CiAgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNz
aW9uOjpBdXRvcGxheWluZykgPT0gMSwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpBdXRvcGxheWlu
ZyBpcyBub3QgMSBhcyBleHBlY3RlZCIpOwotICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8
c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGxheWluZykgPT0gMiwgIlBsYXRmb3JtTWVk
aWFTZXNzaW9uOjpQbGF5aW5nIGlzIG5vdCAyIGFzIGV4cGVjdGVkIik7Ci0gICAgc3RhdGljX2Fz
c2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQYXVzZWQpID09
IDMsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UGF1c2VkIGlzIG5vdCAzIGFzIGV4cGVjdGVkIik7
Ci0gICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNz
aW9uOjpJbnRlcnJ1cHRlZCkgPT0gNCwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1cHRl
ZCBpcyBub3QgNCBhcyBleHBlY3RlZCIpOworICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8
c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6UHJlcGFyaW5nVG9QbGF5KSA9PSAyLCAiUGxh
dGZvcm1NZWRpYVNlc3Npb246OlByZXBhcmluZ1RvUGxheSBpcyBub3QgMiBhcyBleHBlY3RlZCIp
OworICAgIHN0YXRpY19hc3NlcnQoc3RhdGljX2Nhc3Q8c2l6ZV90PihQbGF0Zm9ybU1lZGlhU2Vz
c2lvbjo6UGxheWluZykgPT0gMywgIlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQbGF5aW5nIGlzIG5v
dCAzIGFzIGV4cGVjdGVkIik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0aWNfY2FzdDxzaXplX3Q+
KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpQYXVzZWQpID09IDQsICJQbGF0Zm9ybU1lZGlhU2Vzc2lv
bjo6UGF1c2VkIGlzIG5vdCA0IGFzIGV4cGVjdGVkIik7CisgICAgc3RhdGljX2Fzc2VydChzdGF0
aWNfY2FzdDxzaXplX3Q+KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1cHRlZCkgPT0gNSwg
IlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1cHRlZCBpcyBub3QgNSBhcyBleHBlY3RlZCIp
OwogICAgIEFTU0VSVChzdGF0aWNfY2FzdDxzaXplX3Q+KHN0YXRlKSA8IFdURl9BUlJBWV9MRU5H
VEgodmFsdWVzKSk7CiAgICAgcmV0dXJuIHZhbHVlc1tzdGF0aWNfY2FzdDxzaXplX3Q+KHN0YXRl
KV07CiB9CkBAIC0yMzUsNyArMjM3LDExIEBAIGJvb2wgUGxhdGZvcm1NZWRpYVNlc3Npb246OmNs
aWVudFdpbGxCZWdpblBsYXliYWNrKCkKIAogICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUiwg
InN0YXRlID0gIiwgbV9zdGF0ZSk7CiAKKyAgICBhdXRvIG9sZFN0YXRlID0gbV9zdGF0ZTsKKyAg
ICBzZXRTdGF0ZShQcmVwYXJpbmdUb1BsYXkpOworCiAgICAgaWYgKCFQbGF0Zm9ybU1lZGlhU2Vz
c2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5zZXNzaW9uV2lsbEJlZ2luUGxheWJhY2soKnRo
aXMpKSB7CisgICAgICAgIG1fc3RhdGUgPSBvbGRTdGF0ZTsKICAgICAgICAgaWYgKHN0YXRlKCkg
PT0gSW50ZXJydXB0ZWQpCiAgICAgICAgICAgICBtX3N0YXRlVG9SZXN0b3JlID0gUGxheWluZzsK
ICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzUyLDcgKzM1OCw3IEBAIGJvb2wgUGxhdGZvcm1N
ZWRpYVNlc3Npb246OmFjdGl2ZUF1ZGlvU2Vzc2lvblJlcXVpcmVkKCkgY29uc3QKIHsKICAgICBp
ZiAobWVkaWFUeXBlKCkgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6Tm9uZSkK
ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChzdGF0ZSgpICE9IFBsYXRmb3JtTWVkaWFT
ZXNzaW9uOjpTdGF0ZTo6UGxheWluZykKKyAgICBpZiAoc3RhdGUoKSAhPSBQbGF0Zm9ybU1lZGlh
U2Vzc2lvbjo6U3RhdGU6OlBsYXlpbmcgJiYgc3RhdGUoKSAhPSBQbGF0Zm9ybU1lZGlhU2Vzc2lv
bjo6U3RhdGU6OlByZXBhcmluZ1RvUGxheSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJl
dHVybiBjYW5Qcm9kdWNlQXVkaW8oKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCmluZGV4IDM2ZjNiN2VjZGRjNGMyYTYy
ZWFiZWJjMTIzMzA1OTRlZDA2YmVmYzkuLmQ2Njk1MGYxY2M5YTM0MDY4YjhhNGQ3N2NhOWMyOTlm
ZDAwYmFmMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRm
b3JtTWVkaWFTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxh
dGZvcm1NZWRpYVNlc3Npb24uaApAQCAtNzcsNiArNzcsNyBAQCBwdWJsaWM6CiAgICAgZW51bSBT
dGF0ZSA6IHVpbnQ4X3QgewogICAgICAgICBJZGxlLAogICAgICAgICBBdXRvcGxheWluZywKKyAg
ICAgICAgUHJlcGFyaW5nVG9QbGF5LAogICAgICAgICBQbGF5aW5nLAogICAgICAgICBQYXVzZWQs
CiAgICAgICAgIEludGVycnVwdGVkLApAQCAtMzU0LDYgKzM1NSw3IEBAIHRlbXBsYXRlIDw+IHN0
cnVjdCBFbnVtVHJhaXRzPFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZT4gewog
ICAgIFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZSwKICAgICBXZWJDb3JlOjpQ
bGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGU6OklkbGUsCiAgICAgV2ViQ29yZTo6UGxhdGZvcm1N
ZWRpYVNlc3Npb246OlN0YXRlOjpBdXRvcGxheWluZywKKyAgICBXZWJDb3JlOjpQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbjo6U3RhdGU6OlByZXBhcmluZ1RvUGxheSwKICAgICBXZWJDb3JlOjpQbGF0Zm9y
bU1lZGlhU2Vzc2lvbjo6U3RhdGU6OlBsYXlpbmcsCiAgICAgV2ViQ29yZTo6UGxhdGZvcm1NZWRp
YVNlc3Npb246OlN0YXRlOjpQYXVzZWQsCiAgICAgV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Np
b246OlN0YXRlOjpJbnRlcnJ1cHRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCmluZGV4
IDg2MTc4NzRmNjkzMTc4MGY2YmVlMDBhYjZkNTlmZGU1YWUxYTdiYmMuLmRiZWQ2Mjk5MjI1OWM3
YTA1YWEyMmQwMDVkYTAxNzAyZjBhY2QxYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2Eu
bW0KQEAgLTEyNSw3ICsxMjUsMTAgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2E6OnVw
ZGF0ZVNlc3Npb25TdGF0ZSgpCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIWhhc0F1ZGlibGVB
dWRpb09yVmlkZW9NZWRpYVR5cGUpIHsKLSAgICAgICAgICAgIGJvb2wgaXNQb3RlbnRpYWxseUF1
ZGlibGUgPSBzZXNzaW9uLmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpIHx8ICgo
dHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpWaWRlb0F1ZGlvIHx8IHR5
cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6QXVkaW8pICYmIHNlc3Npb24u
Y2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5oYXNQbGF5ZWRTaW5jZUxhc3RJbnRlcnJ1cHRp
b24oKSk7CisgICAgICAgICAgICBib29sIGlzUG90ZW50aWFsbHlBdWRpYmxlID0gc2Vzc2lvbi5p
c1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKQorICAgICAgICAgICAgICAgIHx8ICgo
dHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpWaWRlb0F1ZGlvIHx8IHR5
cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6QXVkaW8pCisgICAgICAgICAg
ICAgICAgICAgICYmIHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkKKyAgICAgICAgICAgICAgICAg
ICAgJiYgKHNlc3Npb24uaGFzUGxheWVkU2luY2VMYXN0SW50ZXJydXB0aW9uKCkgfHwgc2Vzc2lv
bi5zdGF0ZSgpID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZTo6UHJlcGFyaW5nVG9QbGF5
KSk7CiAgICAgICAgICAgICBpZiAoaXNQb3RlbnRpYWxseUF1ZGlibGUpIHsKICAgICAgICAgICAg
ICAgICBoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFUeXBlID0gdHJ1ZTsKICAgICAgICAgICAg
ICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNzaW9uLmlzUGxheWluZygpOwpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ2xpYi9NZWRpYVNlc3Npb25HTGliLmNwcCBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2dsaWIvTWVkaWFTZXNzaW9uR0xpYi5jcHAK
aW5kZXggNGQ2MjEwOTA0NWIyMTJkMTlhZGQwYTlmYjA0NThiMDRjMTJjYzJmMy4uZTk1MmYwNzcx
NTg3YWE1ZDc4OTcyOGQ0MGJmNzQ5NWEzNWNjMDU1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vYXVkaW8vZ2xpYi9NZWRpYVNlc3Npb25HTGliLmNwcAorKysgYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9nbGliL01lZGlhU2Vzc2lvbkdMaWIuY3BwCkBAIC0yOTEs
NiArMjkxLDcgQEAgR1ZhcmlhbnQqIE1lZGlhU2Vzc2lvbkdMaWI6OmdldFBsYXliYWNrU3RhdHVz
QXNHVmFyaWFudChzdGQ6Om9wdGlvbmFsPGNvbnN0IFBsYXQKIAogICAgIHN3aXRjaCAoc3RhdGUp
IHsKICAgICBjYXNlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZTo6QXV0b3BsYXlpbmc6Cisg
ICAgY2FzZSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6U3RhdGU6OlByZXBhcmluZ1RvUGxheToKICAg
ICBjYXNlIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpTdGF0ZTo6UGxheWluZzoKICAgICAgICAgcmV0
dXJuIGdfdmFyaWFudF9uZXdfc3RyaW5nKCJQbGF5aW5nIik7CiAgICAgY2FzZSBQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbjo6U3RhdGU6OlBhdXNlZDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rl
c3RpbmcvSW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmlu
ZGV4IDc5ZGMxNjAwNjdiOTBmYWQzNzk1M2YxOWY1OWJhZGJkODNkNzVhYzUuLjM4NTA0MzI0MDgx
NDg0ODM0YjU5MWE1OGJiYTJhZGFmNjZmYTkzYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L3Rlc3RpbmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h
bHMuaApAQCAtMTAyNSw2ICsxMDI1LDcgQEAgcHVibGljOgogICAgIGVudW0gTWVkaWFTZXNzaW9u
U3RhdGUgewogICAgICAgICBJZGxlLAogICAgICAgICBBdXRvcGxheWluZywKKyAgICAgICAgUHJl
cGFyaW5nVG9QbGF5LAogICAgICAgICBQbGF5aW5nLAogICAgICAgICBQYXVzZWQsCiAgICAgICAg
IEludGVycnVwdGVkLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h
bHMuaWRsIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaWRsCmluZGV4IGJlNzll
OTY4Yzk5N2QxM2QyZWQxZGVkMDJhNDNkYzE2YjRmODg3OTYuLmNlNzRhMGRhOGMyY2Q3ZmNkMWQx
ZDU3ZTU5Nzk0NDIzMmY4NWQyYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv
SW50ZXJuYWxzLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5pZGwK
QEAgLTgzLDYgKzgzLDcgQEAgZW51bSBDb21wb3NpdGluZ1BvbGljeSB7CiBbQ29uZGl0aW9uYWw9
VklERU9dIGVudW0gTWVkaWFTZXNzaW9uU3RhdGUgewogICAgICJJZGxlIiwKICAgICAiQXV0b3Bs
YXlpbmciLAorICAgICJQcmVwYXJpbmdUb1BsYXkiLAogICAgICJQbGF5aW5nIiwKICAgICAiUGF1
c2VkIiwKICAgICAiSW50ZXJydXB0ZWQiCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452119</attachid>
            <date>2022-02-15 17:53:56 -0800</date>
            <delta_ts>2022-02-16 08:20:28 -0800</delta_ts>
            <desc>patch for landing</desc>
            <filename>bug-236620-20220215175355.patch</filename>
            <type>text/plain</type>
            <size>4458</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVjZTc5ODQ2MDliYTA0
ODU3ODhlNWE0MDlkYTZjOWYwNTE4YTNlZi4uOTJkMzg2NjNkYTc5NDYzZjg2NTRiNGZiZDVjOWVh
MDcwOGI4MzkxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTE1ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVXBk
YXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgYmVmb3JlIHNldHRpbmcgTm93UGxheWluZyBzdGF0
dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjYy
MAorICAgICAgICByZGFyOi8vODg4MjcxNjcKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9i
bGUuCisKKyAgICAgICAgTm93UGxheWluZyBkb2Vzbid0IHVwZGF0ZSBjb3JyZWN0bHkgd2hlbiB0
aGUgYXVkaW8gY2F0ZWdvcnkgY2hhbmdlcyBmcm9tIEFtYmllbnQKKyAgICAgICAgdG8gUGxheWJh
Y2sgYWZ0ZXIgYmVjb21pbmcgYWN0aXZlLCBzbyBhbHdheXMgc2V0IHRoZSBjYXRlZ29yeSBmaXJz
dC4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp
by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJlZ2luUGxheWJhY2spOiBTZXQgInByZXBhcmluZ1RvUGxh
eSIKKyAgICAgICAgYmVmb3JlIGNhbGxpbmcgYHNlc3Npb25XaWxsQmVnaW5QbGF5YmFja2Agc28g
YHVwZGF0ZVNlc3Npb25TdGF0ZWAgY2FuIHRlbGwgdGhhdAorICAgICAgICBwbGF5YmFjayBpcyBh
Ym91dCB0byBiZWdpbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vz
c2lvbi5oOgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFu
YWdlckNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlckNvY29h
Ojp1cGRhdGVTZXNzaW9uU3RhdGUpOiBDb25zaWRlciBhIHNlc3Npb24gdG8gCisgICAgICAgIHBv
dGVudGlhbGx5IGhhdmUgYXVkaW8gaWYgaXQgaXMgcHJlcGFyaW5nIHRvIHBsYXkuCisKIDIwMjIt
MDItMTQgIEogUGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRo
bl0gTW9kaWZ5IF9XS1dlYkF1dGhlbnRpY2F0aW9uQXNzZXJ0aW9uUmVzcG9uc2UgYWNjb3JkaW5n
IHRvIGludGVybmFsIG5lZWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h
dWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h
dWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5kZXggMDk2YjYwMTU3OTllNDU1MjU0Nzc5
ZmFmN2U2MDVmZGQ5OTcyZWU4ZS4uY2QyOWZhMzI4YzI3NmUxZGE0YTc0MmFjYmIyYTQxYjE4ZDkx
YzRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1N
ZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRm
b3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMjM1LDYgKzIzNSw4IEBAIGJvb2wgUGxhdGZvcm1NZWRp
YVNlc3Npb246OmNsaWVudFdpbGxCZWdpblBsYXliYWNrKCkKIAogICAgIEFMV0FZU19MT0coTE9H
SURFTlRJRklFUiwgInN0YXRlID0gIiwgbV9zdGF0ZSk7CiAKKyAgICBTZXRGb3JTY29wZTxib29s
PiBwcmVwYXJpbmdUb1BsYXkobV9wcmVwYXJpbmdUb1BsYXksIHRydWUpOworCiAgICAgaWYgKCFQ
bGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIoKS5zZXNzaW9uV2lsbEJl
Z2luUGxheWJhY2soKnRoaXMpKSB7CiAgICAgICAgIGlmIChzdGF0ZSgpID09IEludGVycnVwdGVk
KQogICAgICAgICAgICAgbV9zdGF0ZVRvUmVzdG9yZSA9IFBsYXlpbmc7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oIGIvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaAppbmRleCAz
NmYzYjdlY2RkYzRjMmE2MmVhYmViYzEyMzMwNTk0ZWQwNmJlZmM5Li45ZWE2NzQ1MzJkMDBkNjY2
OThmZjdhMWY3N2I0ODcwZDVkNmMwZjQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKQEAgLTE4Nyw2ICsxODcsOCBAQCBw
dWJsaWM6CiAgICAgYm9vbCBoYXNQbGF5ZWRTaW5jZUxhc3RJbnRlcnJ1cHRpb24oKSBjb25zdCB7
IHJldHVybiBtX2hhc1BsYXllZFNpbmNlTGFzdEludGVycnVwdGlvbjsgfQogICAgIHZvaWQgY2xl
YXJIYXNQbGF5ZWRTaW5jZUxhc3RJbnRlcnJ1cHRpb24oKSB7IG1faGFzUGxheWVkU2luY2VMYXN0
SW50ZXJydXB0aW9uID0gZmFsc2U7IH0KIAorICAgIGJvb2wgcHJlcGFyaW5nVG9QbGF5KCkgY29u
c3QgeyByZXR1cm4gbV9wcmVwYXJpbmdUb1BsYXk7IH0KKwogI2lmICFSRUxFQVNFX0xPR19ESVNB
QkxFRAogICAgIGNvbnN0IExvZ2dlciYgbG9nZ2VyKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9s
b2dnZXIuZ2V0KCk7IH0KICAgICBjb25zdCB2b2lkKiBsb2dJZGVudGlmaWVyKCkgY29uc3Qgb3Zl
cnJpZGUgeyByZXR1cm4gbV9sb2dJZGVudGlmaWVyOyB9CkBAIC0yMjUsNiArMjI3LDcgQEAgcHJp
dmF0ZToKICAgICBib29sIG1fbm90aWZ5aW5nQ2xpZW50IHsgZmFsc2UgfTsKICAgICBib29sIG1f
aXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0IHsgZmFsc2UgfTsKICAgICBib29sIG1f
aGFzUGxheWVkU2luY2VMYXN0SW50ZXJydXB0aW9uIHsgZmFsc2UgfTsKKyAgICBib29sIG1fcHJl
cGFyaW5nVG9QbGF5IHsgZmFsc2UgfTsKIAogI2lmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAg
IFJlZjxjb25zdCBMb2dnZXI+IG1fbG9nZ2VyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tIGIvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1t
CmluZGV4IDg2MTc4NzRmNjkzMTc4MGY2YmVlMDBhYjZkNTlmZGU1YWUxYTdiYmMuLmZmZTY1NWYz
NWY2MzU4NDA2OTAwZjQyNzkyNDE0ODQ3MWUyZTAzMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5tbQorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2Vy
Q29jb2EubW0KQEAgLTEyNSw3ICsxMjUsMTAgQEAgdm9pZCBNZWRpYVNlc3Npb25NYW5hZ2VyQ29j
b2E6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIWhhc0F1
ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUpIHsKLSAgICAgICAgICAgIGJvb2wgaXNQb3RlbnRp
YWxseUF1ZGlibGUgPSBzZXNzaW9uLmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgp
IHx8ICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpWaWRlb0F1ZGlv
IHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6QXVkaW8pICYmIHNl
c3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkgJiYgc2Vzc2lvbi5oYXNQbGF5ZWRTaW5jZUxhc3RJbnRl
cnJ1cHRpb24oKSk7CisgICAgICAgICAgICBib29sIGlzUG90ZW50aWFsbHlBdWRpYmxlID0gc2Vz
c2lvbi5pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKQorICAgICAgICAgICAgICAg
IHx8ICgodHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpWaWRlb0F1ZGlv
IHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZTo6QXVkaW8pCisgICAg
ICAgICAgICAgICAgICAgICYmIHNlc3Npb24uY2FuUHJvZHVjZUF1ZGlvKCkKKyAgICAgICAgICAg
ICAgICAgICAgJiYgKHNlc3Npb24uaGFzUGxheWVkU2luY2VMYXN0SW50ZXJydXB0aW9uKCkgfHwg
c2Vzc2lvbi5wcmVwYXJpbmdUb1BsYXkoKSkpOwogICAgICAgICAgICAgaWYgKGlzUG90ZW50aWFs
bHlBdWRpYmxlKSB7CiAgICAgICAgICAgICAgICAgaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlh
VHlwZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgaXNQbGF5aW5nQXVkaW8gfD0gc2Vzc2lvbi5p
c1BsYXlpbmcoKTsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>452199</attachid>
            <date>2022-02-16 08:20:30 -0800</date>
            <delta_ts>2022-02-16 12:23:56 -0800</delta_ts>
            <desc>patch for landing</desc>
            <filename>bug-236620-20220216082029.patch</filename>
            <type>text/plain</type>
            <size>4628</size>
            <attacher name="Eric Carlson">eric.carlson</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODVjZTc5ODQ2MDliYTA0
ODU3ODhlNWE0MDlkYTZjOWYwNTE4YTNlZi4uOTJkMzg2NjNkYTc5NDYzZjg2NTRiNGZiZDVjOWVh
MDcwOGI4MzkxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAyLTE1ICBFcmlj
IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gVXBk
YXRlIGF1ZGlvIHNlc3Npb24gY2F0ZWdvcnkgYmVmb3JlIHNldHRpbmcgTm93UGxheWluZyBzdGF0
dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjYy
MAorICAgICAgICByZGFyOi8vODg4MjcxNjcKKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9i
bGUuCisKKyAgICAgICAgTm93UGxheWluZyBkb2Vzbid0IHVwZGF0ZSBjb3JyZWN0bHkgd2hlbiB0
aGUgYXVkaW8gY2F0ZWdvcnkgY2hhbmdlcyBmcm9tIEFtYmllbnQKKyAgICAgICAgdG8gUGxheWJh
Y2sgYWZ0ZXIgYmVjb21pbmcgYWN0aXZlLCBzbyBhbHdheXMgc2V0IHRoZSBjYXRlZ29yeSBmaXJz
dC4KKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRp
by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbjo6Y2xpZW50V2lsbEJlZ2luUGxheWJhY2spOiBTZXQgInByZXBhcmluZ1RvUGxh
eSIKKyAgICAgICAgYmVmb3JlIGNhbGxpbmcgYHNlc3Npb25XaWxsQmVnaW5QbGF5YmFja2Agc28g
YHVwZGF0ZVNlc3Npb25TdGF0ZWAgY2FuIHRlbGwgdGhhdAorICAgICAgICBwbGF5YmFjayBpcyBh
Ym91dCB0byBiZWdpbi4KKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vz
c2lvbi5oOgorCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFu
YWdlckNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlckNvY29h
Ojp1cGRhdGVTZXNzaW9uU3RhdGUpOiBDb25zaWRlciBhIHNlc3Npb24gdG8gCisgICAgICAgIHBv
dGVudGlhbGx5IGhhdmUgYXVkaW8gaWYgaXQgaXMgcHJlcGFyaW5nIHRvIHBsYXkuCisKIDIwMjIt
MDItMTQgIEogUGFzY29lICA8al9wYXNjb2VAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBdXRo
bl0gTW9kaWZ5IF9XS1dlYkF1dGhlbnRpY2F0aW9uQXNzZXJ0aW9uUmVzcG9uc2UgYWNjb3JkaW5n
IHRvIGludGVybmFsIG5lZWRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h
dWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h
dWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5kZXggMDk2YjYwMTU3OTllNDU1MjU0Nzc5
ZmFmN2U2MDVmZGQ5OTcyZWU4ZS4uOTgzNzJkNjA2MmQzNDc3ODFlZTY1MjQ0NDBmY2QyMDAyMzIw
YTRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1N
ZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRm
b3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIk1lZGlhUGxh
eWVyLmgiCiAjaW5jbHVkZSAiTm93UGxheWluZ0luZm8uaCIKICNpbmNsdWRlICJQbGF0Zm9ybU1l
ZGlhU2Vzc2lvbk1hbmFnZXIuaCIKKyNpbmNsdWRlIDx3dGYvU2V0Rm9yU2NvcGUuaD4KIAogbmFt
ZXNwYWNlIFdlYkNvcmUgewogCkBAIC0yMzUsNiArMjM2LDggQEAgYm9vbCBQbGF0Zm9ybU1lZGlh
U2Vzc2lvbjo6Y2xpZW50V2lsbEJlZ2luUGxheWJhY2soKQogCiAgICAgQUxXQVlTX0xPRyhMT0dJ
REVOVElGSUVSLCAic3RhdGUgPSAiLCBtX3N0YXRlKTsKIAorICAgIFNldEZvclNjb3BlPGJvb2w+
IHByZXBhcmluZ1RvUGxheShtX3ByZXBhcmluZ1RvUGxheSwgdHJ1ZSk7CisKICAgICBpZiAoIVBs
YXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigpLnNlc3Npb25XaWxsQmVn
aW5QbGF5YmFjaygqdGhpcykpIHsKICAgICAgICAgaWYgKHN0YXRlKCkgPT0gSW50ZXJydXB0ZWQp
CiAgICAgICAgICAgICBtX3N0YXRlVG9SZXN0b3JlID0gUGxheWluZzsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCmluZGV4IDM2
ZjNiN2VjZGRjNGMyYTYyZWFiZWJjMTIzMzA1OTRlZDA2YmVmYzkuLjllYTY3NDUzMmQwMGQ2NjY5
OGZmN2ExZjc3YjQ4NzBkNWQ2YzBmNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaApAQCAtMTg3LDYgKzE4Nyw4IEBAIHB1
YmxpYzoKICAgICBib29sIGhhc1BsYXllZFNpbmNlTGFzdEludGVycnVwdGlvbigpIGNvbnN0IHsg
cmV0dXJuIG1faGFzUGxheWVkU2luY2VMYXN0SW50ZXJydXB0aW9uOyB9CiAgICAgdm9pZCBjbGVh
ckhhc1BsYXllZFNpbmNlTGFzdEludGVycnVwdGlvbigpIHsgbV9oYXNQbGF5ZWRTaW5jZUxhc3RJ
bnRlcnJ1cHRpb24gPSBmYWxzZTsgfQogCisgICAgYm9vbCBwcmVwYXJpbmdUb1BsYXkoKSBjb25z
dCB7IHJldHVybiBtX3ByZXBhcmluZ1RvUGxheTsgfQorCiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FC
TEVECiAgICAgY29uc3QgTG9nZ2VyJiBsb2dnZXIoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2xv
Z2dlci5nZXQoKTsgfQogICAgIGNvbnN0IHZvaWQqIGxvZ0lkZW50aWZpZXIoKSBjb25zdCBvdmVy
cmlkZSB7IHJldHVybiBtX2xvZ0lkZW50aWZpZXI7IH0KQEAgLTIyNSw2ICsyMjcsNyBAQCBwcml2
YXRlOgogICAgIGJvb2wgbV9ub3RpZnlpbmdDbGllbnQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9p
c1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9o
YXNQbGF5ZWRTaW5jZUxhc3RJbnRlcnJ1cHRpb24geyBmYWxzZSB9OworICAgIGJvb2wgbV9wcmVw
YXJpbmdUb1BsYXkgeyBmYWxzZSB9OwogCiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAg
UmVmPGNvbnN0IExvZ2dlcj4gbV9sb2dnZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0gYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25NYW5hZ2VyQ29jb2EubW0K
aW5kZXggODYxNzg3NGY2OTMxNzgwZjZiZWUwMGFiNmQ1OWZkZTVhZTFhN2JiYy4uZmZlNjU1ZjM1
ZjYzNTg0MDY5MDBmNDI3OTI0MTQ4NDcxZTJlMDMzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vYXVkaW8vY29jb2EvTWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLm1tCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJD
b2NvYS5tbQpAQCAtMTI1LDcgKzEyNSwxMCBAQCB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJDb2Nv
YTo6dXBkYXRlU2Vzc2lvblN0YXRlKCkKICAgICAgICAgfQogCiAgICAgICAgIGlmICghaGFzQXVk
aWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSkgewotICAgICAgICAgICAgYm9vbCBpc1BvdGVudGlh
bGx5QXVkaWJsZSA9IHNlc3Npb24uaXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCkg
fHwgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6OlZpZGVvQXVkaW8g
fHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpBdWRpbykgJiYgc2Vz
c2lvbi5jYW5Qcm9kdWNlQXVkaW8oKSAmJiBzZXNzaW9uLmhhc1BsYXllZFNpbmNlTGFzdEludGVy
cnVwdGlvbigpKTsKKyAgICAgICAgICAgIGJvb2wgaXNQb3RlbnRpYWxseUF1ZGlibGUgPSBzZXNz
aW9uLmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCgpCisgICAgICAgICAgICAgICAg
fHwgKCh0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGU6OlZpZGVvQXVkaW8g
fHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlOjpBdWRpbykKKyAgICAg
ICAgICAgICAgICAgICAgJiYgc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKQorICAgICAgICAgICAg
ICAgICAgICAmJiAoc2Vzc2lvbi5oYXNQbGF5ZWRTaW5jZUxhc3RJbnRlcnJ1cHRpb24oKSB8fCBz
ZXNzaW9uLnByZXBhcmluZ1RvUGxheSgpKSk7CiAgICAgICAgICAgICBpZiAoaXNQb3RlbnRpYWxs
eUF1ZGlibGUpIHsKICAgICAgICAgICAgICAgICBoYXNBdWRpYmxlQXVkaW9PclZpZGVvTWVkaWFU
eXBlID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpc1BsYXlpbmdBdWRpbyB8PSBzZXNzaW9uLmlz
UGxheWluZygpOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>