<?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>221123</bug_id>
          
          <creation_ts>2021-01-28 23:56:26 -0800</creation_ts>
          <short_desc>Add plumbing to allow AppHighlights to be restored.</short_desc>
          <delta_ts>2021-01-29 18:41:29 -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>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="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>hi</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1723634</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-01-28 23:56:26 -0800</bug_when>
    <thetext>Add plumbing to allow AppHighlights to be restored.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723635</commentid>
    <comment_count>1</comment_count>
      <attachid>418710</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-01-29 00:00:06 -0800</bug_when>
    <thetext>Created attachment 418710
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723638</commentid>
    <comment_count>2</comment_count>
      <attachid>418710</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-01-29 00:07:37 -0800</bug_when>
    <thetext>Comment on attachment 418710
Patch

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

&gt; Source/WebCore/Modules/highlight/AppHighlightStorage.cpp:255
&gt; +    return;

You can just delete this now

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:366
&gt; +- (void)_restoreAppHighlights:(NSData *)data WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));

I would put a newline between this and the family of methods above.

&gt; Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:547
&gt; +    IPC::SharedBufferDataReference dataReference {data};

Spaces inside the { }

&gt; Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm:550
&gt; +    if (!hasRunningProcess())
&gt; +        return;

Seems like this should come first.

&gt; Source/WebKit/WebProcess/WebPage/WebPage.cpp:7191
&gt; +void WebPage::restoreAppHighlights(const IPC::DataReference&amp; data)

Newline before this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723639</commentid>
    <comment_count>3</comment_count>
      <attachid>418710</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2021-01-29 00:09:28 -0800</bug_when>
    <thetext>Comment on attachment 418710
Patch

I&apos;m not sure all the SharedBuffer machinations are right, it would be good if someone who&apos;d touched it recently could peek (things look slightly different than I remember).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723713</commentid>
    <comment_count>4</comment_count>
      <attachid>418710</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-01-29 08:27:10 -0800</bug_when>
    <thetext>Comment on attachment 418710
Patch

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

LGTM with Tim&apos;s comments.

&gt; Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:2048
&gt; +    _page-&gt;restoreAppHighlights(WTFMove(buffer));

Nit - I would just write this as `_page-&gt;restoreAppHighlights(WebCore::SharedBuffer::create(data));`.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723752</commentid>
    <comment_count>5</comment_count>
      <attachid>418738</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-01-29 09:36:01 -0800</bug_when>
    <thetext>Created attachment 418738
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723980</commentid>
    <comment_count>6</comment_count>
      <attachid>418796</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-01-29 18:03:22 -0800</bug_when>
    <thetext>Created attachment 418796
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723989</commentid>
    <comment_count>7</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-01-29 18:39:29 -0800</bug_when>
    <thetext>Committed r272096: &lt;https://trac.webkit.org/changeset/272096&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 418796.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1723990</commentid>
    <comment_count>8</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-01-29 18:41:29 -0800</bug_when>
    <thetext>&lt;rdar://problem/73781161&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418710</attachid>
            <date>2021-01-29 00:00:06 -0800</date>
            <delta_ts>2021-01-29 18:03:19 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221123-20210129000005.patch</filename>
            <type>text/plain</type>
            <size>9483</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjljNjc2ODA2ZGZkZTc3
NTlmOGNhMzczNzQ4MDk1Y2YzMzFhOTE0OS4uNTZmNTc3ZGNiYTM4MmMzNmU2ZjI5MWIwYjE3NDFh
NTM4MWYwNDExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI4ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHBsdW1i
aW5nIHRvIGFsbG93IEFwcEhpZ2hsaWdodHMgdG8gYmUgcmVzdG9yZWQuCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjExMjMKKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0Fw
cEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwSGlnaGxpZ2h0U3Rv
cmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHMpOgorICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0
L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaDoKKwogMjAyMS0wMS0yOCAgSmVhbi1ZdmVzIEF2ZW5hcmQg
IDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIFsgQmlnIFN1ciBdIG1lZGlhL21lZGlhLXNvdXJj
ZS9tZWRpYS1zb3VyY2Utd2VibS1pbml0LWluc2lkZS1zZWdtZW50Lmh0bWwgaXMgZmFpbGluZwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n
ZUxvZwppbmRleCBjN2Q4MTQxMTdiNDFkYTM0YzdjZTRiNzIyZTEyZjFhODM4OTZiYjE1Li5jYTMy
ZmI2ZTZkYWQ0YmIwMDA1YTFjMzhiYmM3YjYxMTExMWJmZTYzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx
LDIxIEBACisyMDIxLTAxLTI4ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5j
b20+CisKKyAgICAgICAgQWRkIHBsdW1iaW5nIHRvIGFsbG93IEFwcEhpZ2hsaWdodHMgdG8gYmUg
cmVzdG9yZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjExMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp
ZXcgX3Jlc3RvcmVBcHBIaWdobGlnaHRzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j
b2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQYWdl
UHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXN0b3JlQXBw
SGlnaGxpZ2h0cyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAg
ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi
UGFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn
ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn
ZXMuaW46CisKIDIwMjEtMDEtMjggIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxl
LmNvbT4KIAogICAgICAgICBBZGQgcGx1bWJpbmcgdG8gYWxsb3cgQXBwSGlnaGxpZ2h0cyB0byBi
ZSBzdG9yZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9B
cHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0
L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IGI1N2YyNDc2YWQyMmVhMDliMDA4MzMzOGEy
YmQ2MjJiZmQwMDFiYWEuLmY1ODQ5YzBhZjE1YTI4ZDVmYTk2OWE1NzU5ZTVlNjcxNzE5NWZmZDgg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdo
dFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhp
Z2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yMzEsMTQgKzIzMSwxNCBAQCB2b2lkIEFwcEhpZ2hsaWdo
dFN0b3JhZ2U6OnVwZGF0ZUFwcEhpZ2hsaWdodHNTdG9yYWdlKCkKICAgICBtX2RvY3VtZW50LT5w
YWdlKCktPmNocm9tZSgpLnVwZGF0ZUFwcEhpZ2hsaWdodHNTdG9yYWdlKGxpc3REYXRhLnRvU2hh
cmVkQnVmZmVyKCkpOwogfQogCi1WZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBBcHBIaWdo
bGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0cyhSZWY8U2hhcmVkQnVmZmVyPiYmIGJ1
ZmZlcikKK3ZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHMoUmVm
PFNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCiB7CiAgICAgYXV0byBhcHBIaWdobGlnaHRMaXN0RGF0
YSA9IEFwcEhpZ2hsaWdodExpc3REYXRhOjpjcmVhdGUoYnVmZmVyKTsKICAgICBWZWN0b3I8QXBw
SGlnaGxpZ2h0UmFuZ2VEYXRhPiB1bnJlc3RvcmVkUmFuZ2VzOwogICAgIFZlY3RvcjxBcHBIaWdo
bGlnaHRSYW5nZURhdGE+IHJlc3RvcmVkUmFuZ2VzOwogCiAgICAgaWYgKCFtX2RvY3VtZW50KQot
ICAgICAgICByZXR1cm4gdW5yZXN0b3JlZFJhbmdlczsKKyAgICAgICAgcmV0dXJuOwogCiAgICAg
YXV0byBzdHJvbmdEb2N1bWVudCA9IG1fZG9jdW1lbnQuZ2V0KCk7CiAKQEAgLTI1Miw3ICsyNTIs
NyBAQCBWZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBBcHBIaWdobGlnaHRTdG9yYWdlOjpy
ZXN0b3JlQXBwSGlnaGxpZ2h0cyhSZWY8U2hhcgogICAgICAgICByZXN0b3JlZFJhbmdlcy5hcHBl
bmQoYXBwSGlnaGxpZ2h0TGlzdERhdGEpOwogICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGln
aGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFu
Z2UpKTsKICAgICB9Ci0gICAgcmV0dXJuIHVucmVzdG9yZWRSYW5nZXM7CisgICAgcmV0dXJuOwog
fQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0
L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0
L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAppbmRleCBjMTBhMzQyOGMxODJlMDBkYTIyYWM4MTg3MWJm
Mjk5NjdkMGFlYWI5Li44YjYwNzVhZDY0MDI0MjljZWRjNGJlOTI2ZjZjZGEwOWU0NDNiYzk5IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRT
dG9yYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxp
Z2h0U3RvcmFnZS5oCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKICAgICBBcHBIaWdobGlnaHRT
dG9yYWdlKERvY3VtZW50Jik7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZUFwcEhp
Z2hsaWdodHNTdG9yYWdlKCk7Ci0gICAgVmVjdG9yPEFwcEhpZ2hsaWdodFJhbmdlRGF0YT4gcmVz
dG9yZUFwcEhpZ2hsaWdodHMoUmVmPFNoYXJlZEJ1ZmZlcj4mJik7CisgICAgV0VCQ09SRV9FWFBP
UlQgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0cyhSZWY8U2hhcmVkQnVmZmVyPiYmKTsKIAogcHJp
dmF0ZToKICAgICBXZWFrUHRyPERvY3VtZW50PiBtX2RvY3VtZW50OwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggODE2ZWY2NjRmNDhhZmFj
NjU1YzM5ZmQ5MDA1Yzc2NTRhZmQxNTdkMi4uN2VlYjExZTc2NzZiN2M4YmJiYWZjMzM0OTliNjYy
OGIxZTIwNDEwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h
L1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX
ZWJWaWV3Lm1tCkBAIC01Miw2ICs1Miw3IEBACiAjaW1wb3J0ICJSZW1vdGVPYmplY3RSZWdpc3Ry
eU1lc3NhZ2VzLmgiCiAjaW1wb3J0ICJSZXNvdXJjZUxvYWREZWxlZ2F0ZS5oIgogI2ltcG9ydCAi
U2FmZUJyb3dzaW5nV2FybmluZy5oIgorI2ltcG9ydCAiU2hhcmVkQnVmZmVyQ29weS5oIgogI2lt
cG9ydCAiVUlEZWxlZ2F0ZS5oIgogI2ltcG9ydCAiVmlkZW9GdWxsc2NyZWVuTWFuYWdlclByb3h5
LmgiCiAjaW1wb3J0ICJWaWV3R2VzdHVyZUNvbnRyb2xsZXIuaCIKQEAgLTIwNDAsNiArMjA0MSwx
NiBAQCAtICh2b2lkKV9yZXN1bWVBbGxNZWRpYVBsYXliYWNrCiAgICAgW3NlbGYgcmVzdW1lQWxs
TWVkaWFQbGF5YmFjazpuaWxdOwogfQogCistICh2b2lkKV9yZXN0b3JlQXBwSGlnaGxpZ2h0czoo
TlNEYXRhICopZGF0YQoreworI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKKyAgICBSZWY8V2Vi
Q29yZTo6U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0
ZShkYXRhKTsKKyAgICBfcGFnZS0+cmVzdG9yZUFwcEhpZ2hsaWdodHMoV1RGTW92ZShidWZmZXIp
KTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGRhdGEpOworI2VuZGlmCit9CisKIC0gKE5TVVJM
ICopX3VucmVhY2hhYmxlVVJMCiB7CiAgICAgcmV0dXJuIFtOU1VSTCBfd2ViX1VSTFdpdGhXVEZT
dHJpbmc6X3BhZ2UtPnBhZ2VMb2FkU3RhdGUoKS51bnJlYWNoYWJsZVVSTCgpXTsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgg
Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmlu
ZGV4IDc5MTRjY2RkMjU2OTBlNmFlNzRkODA2ODQ0YjVmMDA1ZWUzMmE5ZmUuLjM5NGI4OWEwYmJl
YjdlYzg3ZWVhNDYzMWQ5MTVkMWUzODFjYzE5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaApAQCAtMzYzLDYgKzM2Myw3
IEBAIGZvciB0aGlzIHByb3BlcnR5LgogCiAtICh2b2lkKV9kaWRFbmFibGVCcm93c2VyRXh0ZW5z
aW9uczooTlNEaWN0aW9uYXJ5PE5TU3RyaW5nICosIE5TU3RyaW5nICo+ICopZXh0ZW5zaW9uSURU
b05hbWVNYXAgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19U
QkEpKTsKIC0gKHZvaWQpX2RpZERpc2FibGVCcm93c2VyRXh0ZW5zaW9uczooTlNTZXQ8TlNTdHJp
bmcgKj4gKilleHRlbnNpb25JRHMgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg
aW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpX3Jlc3RvcmVBcHBIaWdobGlnaHRzOihOU0RhdGEg
KilkYXRhIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJB
KSk7CiAKIC8qISBAYWJzdHJhY3QgVGhlIHRoZW1lIGNvbG9yIG9mIHRoZSBhY3RpdmUgcGFnZS4K
ICBAZGlzY3Vzc2lvbiBUaGlzIGlzIHRoZSB2YWx1ZSBvZiB0aGUgbW9zdCByZWNlbnRseSBjcmVh
dGVkIG9yIG1vZGlmaWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv
YS9XZWJQYWdlUHJveHlDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dl
YlBhZ2VQcm94eUNvY29hLm1tCmluZGV4IDUxMzlkOGNmY2EyNDM5Y2Y3ZTVhOGZiY2YwYjA4YmFj
YmM4OWI3NTUuLjczMmQ3OGRkMmIxMmE3OTAzZWQwMzVmZjJlNDg4MzM4YTc2NTI1NTYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1t
CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94eUNvY29hLm1t
CkBAIC0zOCw2ICszOCw3IEBACiAjaW1wb3J0ICJTYWZlQnJvd3NpbmdTUEkuaCIKICNpbXBvcnQg
IlNhZmVCcm93c2luZ1dhcm5pbmcuaCIKICNpbXBvcnQgIlNoYXJlZEJ1ZmZlckNvcHkuaCIKKyNp
bXBvcnQgIlNoYXJlZEJ1ZmZlckRhdGFSZWZlcmVuY2UuaCIKICNpbXBvcnQgIldlYlBhZ2UuaCIK
ICNpbXBvcnQgIldlYlBhZ2VNZXNzYWdlcy5oIgogI2ltcG9ydCAiV2ViUGFzdGVib2FyZFByb3h5
LmgiCkBAIC01NDAsNiArNTQxLDE2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjcmVhdGVBcHBIaWdo
bGlnaHRJblNlbGVjdGVkUmFuZ2UoQ3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQKIAogICAgIHNl
bmQoTWVzc2FnZXM6OldlYlBhZ2U6OkNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShj
cmVhdGVOZXdHcm91cCkpOwogfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6cmVzdG9yZUFwcEhpZ2hs
aWdodHMoUmVmPFNoYXJlZEJ1ZmZlcj4mJiBkYXRhKQoreworICAgIElQQzo6U2hhcmVkQnVmZmVy
RGF0YVJlZmVyZW5jZSBkYXRhUmVmZXJlbmNlIHtkYXRhfTsKKworICAgIGlmICghaGFzUnVubmlu
Z1Byb2Nlc3MoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFn
ZTo6UmVzdG9yZUFwcEhpZ2hsaWdodHMoZGF0YVJlZmVyZW5jZSkpOworfQogI2VuZGlmCiAKIFNh
bmRib3hFeHRlbnNpb246OkhhbmRsZUFycmF5IFdlYlBhZ2VQcm94eTo6Y3JlYXRlTmV0d29ya0V4
dGVuc2lvbnNTYW5kYm94RXh0ZW5zaW9ucyhXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDI0NjQ0NDI3MDQzZDFlNmJhYTdi
YThhNTdkNjg1NjFhNTVmMDQyOTguLjZhOTkxZGMwNWVlNGMzNjJlNzkwNWVhZTc4MzE2YzFiNjQy
NDdkMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o
CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xODI0LDYg
KzE4MjQsNyBAQCBwdWJsaWM6CiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQogICAgIHZvaWQg
Y3JlYXRlQXBwSGlnaGxpZ2h0SW5TZWxlY3RlZFJhbmdlKENyZWF0ZU5ld0dyb3VwRm9ySGlnaGxp
Z2h0KTsKICAgICB2b2lkIHVwZGF0ZUFwcEhpZ2hsaWdodHNTdG9yYWdlKGNvbnN0IElQQzo6U2hh
cmVkQnVmZmVyQ29weSYpOworICAgIHZvaWQgcmVzdG9yZUFwcEhpZ2hsaWdodHMoUmVmPFdlYkNv
cmU6OlNoYXJlZEJ1ZmZlcj4mJiBkYXRhKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKE1FRElBX1NU
UkVBTSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh
Z2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5k
ZXggNTQ5YzIzOWY5ZjZkNGQ5Y2ZhNmY0OGI1OTIwZjgwMjVjZTM1NjcyNy4uM2E5MDAwMzY5OTU3
ZWE4Y2U1NGRkNDVhNGUwYzA3YTAwYWU4ZTg4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTcxODgsNiArNzE4OCwxMiBAQCBib29sIFdlYlBh
Z2U6OmNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShDcmVhdGVOZXdHcm91cEZvckhp
Z2hsaWdodCBjcmVhdAogCiAgICAgcmV0dXJuIHRydWU7CiB9Cit2b2lkIFdlYlBhZ2U6OnJlc3Rv
cmVBcHBIaWdobGlnaHRzKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSkKK3sKKyAgICBh
dXRvIGRvY3VtZW50ID0gbWFrZVJlZlB0cihtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3Vz
ZWRPck1haW5GcmFtZSgpLmRvY3VtZW50KCkpOworCisgICAgZG9jdW1lbnQtPmFwcEhpZ2hsaWdo
dFN0b3JhZ2UoKS5yZXN0b3JlQXBwSGlnaGxpZ2h0cyhTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRh
LmRhdGEoKSwgZGF0YS5zaXplKCkpKTsKK30KICNlbmRpZgogCiAjaWYgIVBMQVRGT1JNKENPQ09B
KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o
IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDA0YWQ3
YmI2ZDI1MjFiMDViY2E5MmYzOWYzOWZmOWIzNzdiMTk5MjAuLjgzMzUxOTQxNmYyNmMzZDFjNDk1
ZDdjZjNiYWE1YTM4ZTA4NTEzOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn
ZS9XZWJQYWdlLmgKQEAgLTEzODAsNiArMTM4MCw3IEBAIHB1YmxpYzoKIAogI2lmIEVOQUJMRShB
UFBfSElHSExJR0hUUykKICAgICBib29sIGNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5n
ZShDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodCk7CisgICAgdm9pZCByZXN0b3JlQXBwSGlnaGxp
Z2h0cyhjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmKTsKICNlbmRpZgogCiAgICAgdm9pZCBkaXNw
YXRjaFdoZWVsRXZlbnRXaXRob3V0U2Nyb2xsaW5nKGNvbnN0IFdlYldoZWVsRXZlbnQmLCBDb21w
bGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDI0ZWExMWYyYTg0ZTAx
MjZiYmY4NzI0YTJhYTYzMzNhNjZjZjY4ZmEuLjJkYTk5Y2QzNzIzOTJlODJjNTMwZDQyYzAxYTEy
ODc3MGZiZDg3MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh
Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtNjE5LDYgKzYxOSw3IEBAIEdlbmVyYXRlU3ludGhl
dGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0Nv
bW1hbmRUeXBlCiAKICNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCiAgICAgQ3JlYXRlQXBwSGln
aGxpZ2h0SW5TZWxlY3RlZFJhbmdlKGVudW06Ym9vbCBXZWJLaXQ6OkNyZWF0ZU5ld0dyb3VwRm9y
SGlnaGxpZ2h0IGNyZWF0ZU5ld0dyb3VwKQorICAgIFJlc3RvcmVBcHBIaWdobGlnaHRzKElQQzo6
U2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZSBkYXRhKQogI2VuZGlmCiAKICAgICBEaXNwYXRjaFdo
ZWVsRXZlbnRXaXRob3V0U2Nyb2xsaW5nKFdlYktpdDo6V2ViV2hlZWxFdmVudCBldmVudCkgLT4g
KGJvb2wgaGFuZGxlZCkgQXN5bmMK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418738</attachid>
            <date>2021-01-29 09:36:01 -0800</date>
            <delta_ts>2021-01-29 18:03:20 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-221123-20210129093601.patch</filename>
            <type>text/plain</type>
            <size>9429</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjljNjc2ODA2ZGZkZTc3
NTlmOGNhMzczNzQ4MDk1Y2YzMzFhOTE0OS4uNTZmNTc3ZGNiYTM4MmMzNmU2ZjI5MWIwYjE3NDFh
NTM4MWYwNDExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI4ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHBsdW1i
aW5nIHRvIGFsbG93IEFwcEhpZ2hsaWdodHMgdG8gYmUgcmVzdG9yZWQuCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjExMjMKKworICAgICAgICBSZXZp
ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0L0Fw
cEhpZ2hsaWdodFN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwSGlnaGxpZ2h0U3Rv
cmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHMpOgorICAgICAgICAqIE1vZHVsZXMvaGlnaGxpZ2h0
L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaDoKKwogMjAyMS0wMS0yOCAgSmVhbi1ZdmVzIEF2ZW5hcmQg
IDxqeWFAYXBwbGUuY29tPgogCiAgICAgICAgIFsgQmlnIFN1ciBdIG1lZGlhL21lZGlhLXNvdXJj
ZS9tZWRpYS1zb3VyY2Utd2VibS1pbml0LWluc2lkZS1zZWdtZW50Lmh0bWwgaXMgZmFpbGluZwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n
ZUxvZwppbmRleCBjN2Q4MTQxMTdiNDFkYTM0YzdjZTRiNzIyZTEyZjFhODM4OTZiYjE1Li5jYTMy
ZmI2ZTZkYWQ0YmIwMDA1YTFjMzhiYmM3YjYxMTExMWJmZTYzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx
LDIxIEBACisyMDIxLTAxLTI4ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5j
b20+CisKKyAgICAgICAgQWRkIHBsdW1iaW5nIHRvIGFsbG93IEFwcEhpZ2hsaWdodHMgdG8gYmUg
cmVzdG9yZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0yMjExMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZp
ZXcgX3Jlc3RvcmVBcHBIaWdobGlnaHRzOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j
b2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQYWdl
UHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXN0b3JlQXBw
SGlnaGxpZ2h0cyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAg
ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi
UGFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn
ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn
ZXMuaW46CisKIDIwMjEtMDEtMjggIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxl
LmNvbT4KIAogICAgICAgICBBZGQgcGx1bWJpbmcgdG8gYWxsb3cgQXBwSGlnaGxpZ2h0cyB0byBi
ZSBzdG9yZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9B
cHBIaWdobGlnaHRTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0
L0FwcEhpZ2hsaWdodFN0b3JhZ2UuY3BwCmluZGV4IGI1N2YyNDc2YWQyMmVhMDliMDA4MzMzOGEy
YmQ2MjJiZmQwMDFiYWEuLmMzYjhiYjc3YzBjNGY0ZTVjOTk4NzE3OTIzOTJlM2RkZDhkMTkxODYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdo
dFN0b3JhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhp
Z2hsaWdodFN0b3JhZ2UuY3BwCkBAIC0yMzEsMTQgKzIzMSwxNCBAQCB2b2lkIEFwcEhpZ2hsaWdo
dFN0b3JhZ2U6OnVwZGF0ZUFwcEhpZ2hsaWdodHNTdG9yYWdlKCkKICAgICBtX2RvY3VtZW50LT5w
YWdlKCktPmNocm9tZSgpLnVwZGF0ZUFwcEhpZ2hsaWdodHNTdG9yYWdlKGxpc3REYXRhLnRvU2hh
cmVkQnVmZmVyKCkpOwogfQogCi1WZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBBcHBIaWdo
bGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0cyhSZWY8U2hhcmVkQnVmZmVyPiYmIGJ1
ZmZlcikKK3ZvaWQgQXBwSGlnaGxpZ2h0U3RvcmFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHMoUmVm
PFNoYXJlZEJ1ZmZlcj4mJiBidWZmZXIpCiB7CiAgICAgYXV0byBhcHBIaWdobGlnaHRMaXN0RGF0
YSA9IEFwcEhpZ2hsaWdodExpc3REYXRhOjpjcmVhdGUoYnVmZmVyKTsKICAgICBWZWN0b3I8QXBw
SGlnaGxpZ2h0UmFuZ2VEYXRhPiB1bnJlc3RvcmVkUmFuZ2VzOwogICAgIFZlY3RvcjxBcHBIaWdo
bGlnaHRSYW5nZURhdGE+IHJlc3RvcmVkUmFuZ2VzOwogCiAgICAgaWYgKCFtX2RvY3VtZW50KQot
ICAgICAgICByZXR1cm4gdW5yZXN0b3JlZFJhbmdlczsKKyAgICAgICAgcmV0dXJuOwogCiAgICAg
YXV0byBzdHJvbmdEb2N1bWVudCA9IG1fZG9jdW1lbnQuZ2V0KCk7CiAKQEAgLTI1Miw3ICsyNTIs
NiBAQCBWZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiBBcHBIaWdobGlnaHRTdG9yYWdlOjpy
ZXN0b3JlQXBwSGlnaGxpZ2h0cyhSZWY8U2hhcgogICAgICAgICByZXN0b3JlZFJhbmdlcy5hcHBl
bmQoYXBwSGlnaGxpZ2h0TGlzdERhdGEpOwogICAgICAgICBzdHJvbmdEb2N1bWVudC0+YXBwSGln
aGxpZ2h0UmVnaXN0ZXIoKS5hZGRBcHBIaWdobGlnaHQoU3RhdGljUmFuZ2U6OmNyZWF0ZSgqcmFu
Z2UpKTsKICAgICB9Ci0gICAgcmV0dXJuIHVucmVzdG9yZWRSYW5nZXM7CiB9CiAKICNlbmRpZgpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0
U3RvcmFnZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0
U3RvcmFnZS5oCmluZGV4IGMxMGEzNDI4YzE4MmUwMGRhMjJhYzgxODcxYmYyOTk2N2QwYWVhYjku
LjhiNjA3NWFkNjQwMjQyOWNlZGM0YmU5MjZmNmNkYTA5ZTQ0M2JjOTkgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaAorKysg
Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9yYWdlLmgK
QEAgLTQ3LDcgKzQ3LDcgQEAgcHVibGljOgogICAgIEFwcEhpZ2hsaWdodFN0b3JhZ2UoRG9jdW1l
bnQmKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlQXBwSGlnaGxpZ2h0c1N0b3Jh
Z2UoKTsKLSAgICBWZWN0b3I8QXBwSGlnaGxpZ2h0UmFuZ2VEYXRhPiByZXN0b3JlQXBwSGlnaGxp
Z2h0cyhSZWY8U2hhcmVkQnVmZmVyPiYmKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlc3Rv
cmVBcHBIaWdobGlnaHRzKFJlZjxTaGFyZWRCdWZmZXI+JiYpOwogCiBwcml2YXRlOgogICAgIFdl
YWtQdHI8RG9jdW1lbnQ+IG1fZG9jdW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCA4MTZlZjY2NGY0OGFmYWM2NTVjMzlmZDkwMDVj
NzY1NGFmZDE1N2QyLi5iN2QyNzkyNDdlYjIxMjRjOTY5YmUxNGZjN2NkZTZlM2ZiOGUxOWY2IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t
CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg
LTUyLDYgKzUyLDcgQEAKICNpbXBvcnQgIlJlbW90ZU9iamVjdFJlZ2lzdHJ5TWVzc2FnZXMuaCIK
ICNpbXBvcnQgIlJlc291cmNlTG9hZERlbGVnYXRlLmgiCiAjaW1wb3J0ICJTYWZlQnJvd3NpbmdX
YXJuaW5nLmgiCisjaW1wb3J0ICJTaGFyZWRCdWZmZXJDb3B5LmgiCiAjaW1wb3J0ICJVSURlbGVn
YXRlLmgiCiAjaW1wb3J0ICJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHkuaCIKICNpbXBvcnQg
IlZpZXdHZXN0dXJlQ29udHJvbGxlci5oIgpAQCAtMjA0MCw2ICsyMDQxLDE1IEBAIC0gKHZvaWQp
X3Jlc3VtZUFsbE1lZGlhUGxheWJhY2sKICAgICBbc2VsZiByZXN1bWVBbGxNZWRpYVBsYXliYWNr
Om5pbF07CiB9CiAKKy0gKHZvaWQpX3Jlc3RvcmVBcHBIaWdobGlnaHRzOihOU0RhdGEgKilkYXRh
Cit7CisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAgIF9wYWdlLT5yZXN0b3JlQXBwSGln
aGxpZ2h0cyhXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShkYXRhKSk7CisjZWxzZQorICAg
IFVOVVNFRF9QQVJBTShkYXRhKTsKKyNlbmRpZgorfQorCiAtIChOU1VSTCAqKV91bnJlYWNoYWJs
ZVVSTAogewogICAgIHJldHVybiBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOl9wYWdlLT5w
YWdlTG9hZFN0YXRlKCkudW5yZWFjaGFibGVVUkwoKV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktp
dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAppbmRleCA3OTE0Y2NkZDI1
NjkwZTZhZTc0ZDgwNjg0NGI1ZjAwNWVlMzJhOWZlLi4wM2FiYTQzZTk2MmI3NWZiZDYzZjlmZjhj
M2I2NjU3NjEyMDE2ZjI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv
Q29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ
SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTM2NCw2ICszNjQsOCBAQCBmb3IgdGhpcyBw
cm9wZXJ0eS4KIC0gKHZvaWQpX2RpZEVuYWJsZUJyb3dzZXJFeHRlbnNpb25zOihOU0RpY3Rpb25h
cnk8TlNTdHJpbmcgKiwgTlNTdHJpbmcgKj4gKilleHRlbnNpb25JRFRvTmFtZU1hcCBXS19BUElf
QVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogLSAodm9pZClf
ZGlkRGlzYWJsZUJyb3dzZXJFeHRlbnNpb25zOihOU1NldDxOU1N0cmluZyAqPiAqKWV4dGVuc2lv
bklEcyBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkp
OwogCistICh2b2lkKV9yZXN0b3JlQXBwSGlnaGxpZ2h0czooTlNEYXRhICopZGF0YSBXS19BUElf
QVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOworCiAvKiEgQGFi
c3RyYWN0IFRoZSB0aGVtZSBjb2xvciBvZiB0aGUgYWN0aXZlIHBhZ2UuCiAgQGRpc2N1c3Npb24g
VGhpcyBpcyB0aGUgdmFsdWUgb2YgdGhlIG1vc3QgcmVjZW50bHkgY3JlYXRlZCBvciBtb2RpZmll
ZAogIEB0ZXh0YmxvY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h
L1dlYlBhZ2VQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi
UGFnZVByb3h5Q29jb2EubW0KaW5kZXggNTEzOWQ4Y2ZjYTI0MzljZjdlNWE4ZmJjZjBiMDhiYWNi
Yzg5Yjc1NS4uYjA3MjJhMDMyNzc4OGRhNzg2ZmU3YjBhYjEyMzM1MjE1NzczZmI2YyAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0K
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUGFnZVByb3h5Q29jb2EubW0K
QEAgLTM4LDYgKzM4LDcgQEAKICNpbXBvcnQgIlNhZmVCcm93c2luZ1NQSS5oIgogI2ltcG9ydCAi
U2FmZUJyb3dzaW5nV2FybmluZy5oIgogI2ltcG9ydCAiU2hhcmVkQnVmZmVyQ29weS5oIgorI2lt
cG9ydCAiU2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZS5oIgogI2ltcG9ydCAiV2ViUGFnZS5oIgog
I2ltcG9ydCAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW1wb3J0ICJXZWJQYXN0ZWJvYXJkUHJveHku
aCIKQEAgLTU0MCw2ICs1NDEsMTYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNyZWF0ZUFwcEhpZ2hs
aWdodEluU2VsZWN0ZWRSYW5nZShDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodAogCiAgICAgc2Vu
ZChNZXNzYWdlczo6V2ViUGFnZTo6Q3JlYXRlQXBwSGlnaGxpZ2h0SW5TZWxlY3RlZFJhbmdlKGNy
ZWF0ZU5ld0dyb3VwKSk7CiB9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpyZXN0b3JlQXBwSGlnaGxp
Z2h0cyhSZWY8U2hhcmVkQnVmZmVyPiYmIGRhdGEpCit7CisgICAgaWYgKCFoYXNSdW5uaW5nUHJv
Y2VzcygpKQorICAgICAgICByZXR1cm47CisKKyAgICBJUEM6OlNoYXJlZEJ1ZmZlckRhdGFSZWZl
cmVuY2UgZGF0YVJlZmVyZW5jZSB7IGRhdGEgfTsKKworICAgIHNlbmQoTWVzc2FnZXM6OldlYlBh
Z2U6OlJlc3RvcmVBcHBIaWdobGlnaHRzKGRhdGFSZWZlcmVuY2UpKTsKK30KICNlbmRpZgogCiBT
YW5kYm94RXh0ZW5zaW9uOjpIYW5kbGVBcnJheSBXZWJQYWdlUHJveHk6OmNyZWF0ZU5ldHdvcmtF
eHRlbnNpb25zU2FuZGJveEV4dGVuc2lvbnMoV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzKQpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAyNDY0NDQyNzA0M2QxZTZiYWE3
YmE4YTU3ZDY4NTYxYTU1ZjA0Mjk4Li42YTk5MWRjMDVlZTRjMzYyZTc5MDVlYWU3ODMxNmMxYjY0
MjQ3ZDEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku
aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMTgyNCw2
ICsxODI0LDcgQEAgcHVibGljOgogI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKICAgICB2b2lk
IGNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShDcmVhdGVOZXdHcm91cEZvckhpZ2hs
aWdodCk7CiAgICAgdm9pZCB1cGRhdGVBcHBIaWdobGlnaHRzU3RvcmFnZShjb25zdCBJUEM6OlNo
YXJlZEJ1ZmZlckNvcHkmKTsKKyAgICB2b2lkIHJlc3RvcmVBcHBIaWdobGlnaHRzKFJlZjxXZWJD
b3JlOjpTaGFyZWRCdWZmZXI+JiYgZGF0YSk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShNRURJQV9T
VFJFQU0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ
YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmlu
ZGV4IDU0OWMyMzlmOWY2ZDRkOWNmYTZmNDhiNTkyMGY4MDI1Y2UzNTY3MjcuLmNhZTBhOTcxOGNm
N2ZmOWY0MDIxZjZjY2E5MDRlMjc0YmQxYjMzM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC03MTg4LDYgKzcxODgsMTMgQEAgYm9vbCBXZWJQ
YWdlOjpjcmVhdGVBcHBIaWdobGlnaHRJblNlbGVjdGVkUmFuZ2UoQ3JlYXRlTmV3R3JvdXBGb3JI
aWdobGlnaHQgY3JlYXQKIAogICAgIHJldHVybiB0cnVlOwogfQorCit2b2lkIFdlYlBhZ2U6OnJl
c3RvcmVBcHBIaWdobGlnaHRzKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgZGF0YSkKK3sKKyAg
ICBhdXRvIGRvY3VtZW50ID0gbWFrZVJlZlB0cihtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZv
Y3VzZWRPck1haW5GcmFtZSgpLmRvY3VtZW50KCkpOworCisgICAgZG9jdW1lbnQtPmFwcEhpZ2hs
aWdodFN0b3JhZ2UoKS5yZXN0b3JlQXBwSGlnaGxpZ2h0cyhTaGFyZWRCdWZmZXI6OmNyZWF0ZShk
YXRhLmRhdGEoKSwgZGF0YS5zaXplKCkpKTsKK30KICNlbmRpZgogCiAjaWYgIVBMQVRGT1JNKENP
Q09BKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDA0
YWQ3YmI2ZDI1MjFiMDViY2E5MmYzOWYzOWZmOWIzNzdiMTk5MjAuLjgzMzUxOTQxNmYyNmMzZDFj
NDk1ZDdjZjNiYWE1YTM4ZTA4NTEzOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
UGFnZS9XZWJQYWdlLmgKQEAgLTEzODAsNiArMTM4MCw3IEBAIHB1YmxpYzoKIAogI2lmIEVOQUJM
RShBUFBfSElHSExJR0hUUykKICAgICBib29sIGNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRS
YW5nZShDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodCk7CisgICAgdm9pZCByZXN0b3JlQXBwSGln
aGxpZ2h0cyhjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmKTsKICNlbmRpZgogCiAgICAgdm9pZCBk
aXNwYXRjaFdoZWVsRXZlbnRXaXRob3V0U2Nyb2xsaW5nKGNvbnN0IFdlYldoZWVsRXZlbnQmLCBD
b21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDI0ZWExMWYyYTg0
ZTAxMjZiYmY4NzI0YTJhYTYzMzNhNjZjZjY4ZmEuLjJkYTk5Y2QzNzIzOTJlODJjNTMwZDQyYzAx
YTEyODc3MGZiZDg3MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
YWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtNjE5LDYgKzYxOSw3IEBAIEdlbmVyYXRlU3lu
dGhldGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRpdGlu
Z0NvbW1hbmRUeXBlCiAKICNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCiAgICAgQ3JlYXRlQXBw
SGlnaGxpZ2h0SW5TZWxlY3RlZFJhbmdlKGVudW06Ym9vbCBXZWJLaXQ6OkNyZWF0ZU5ld0dyb3Vw
Rm9ySGlnaGxpZ2h0IGNyZWF0ZU5ld0dyb3VwKQorICAgIFJlc3RvcmVBcHBIaWdobGlnaHRzKElQ
Qzo6U2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5jZSBkYXRhKQogI2VuZGlmCiAKICAgICBEaXNwYXRj
aFdoZWVsRXZlbnRXaXRob3V0U2Nyb2xsaW5nKFdlYktpdDo6V2ViV2hlZWxFdmVudCBldmVudCkg
LT4gKGJvb2wgaGFuZGxlZCkgQXN5bmMK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>418796</attachid>
            <date>2021-01-29 18:03:22 -0800</date>
            <delta_ts>2021-01-29 18:39:29 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-221123-20210129180321.patch</filename>
            <type>text/plain</type>
            <size>9425</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMDQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjljNjc2ODA2ZGZkZTc3
NTlmOGNhMzczNzQ4MDk1Y2YzMzFhOTE0OS4uNDhlZTBkODUxNDhlMDcwODU1ZDRhODI0MzJhZTFi
MmFhMTI3ZjQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTAxLTI4ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHBsdW1i
aW5nIHRvIGFsbG93IEFwcEhpZ2hsaWdodHMgdG8gYmUgcmVzdG9yZWQuCisgICAgICAgIGh0dHBz
Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjExMjMKKworICAgICAgICBSZXZp
ZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9BcHBI
aWdobGlnaHRTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcEhpZ2hsaWdodFN0b3Jh
Z2U6OnJlc3RvcmVBcHBIaWdobGlnaHRzKToKKyAgICAgICAgKiBNb2R1bGVzL2hpZ2hsaWdodC9B
cHBIaWdobGlnaHRTdG9yYWdlLmg6CisKIDIwMjEtMDEtMjggIEplYW4tWXZlcyBBdmVuYXJkICA8
anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBbIEJpZyBTdXIgXSBtZWRpYS9tZWRpYS1zb3VyY2Uv
bWVkaWEtc291cmNlLXdlYm0taW5pdC1pbnNpZGUtc2VnbWVudC5odG1sIGlzIGZhaWxpbmcKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggYzdkODE0MTE3YjQxZGEzNGM3Y2U0YjcyMmUxMmYxYTgzODk2YmIxNS4uMWNkOTBk
OGQ4YjdjNjgwZTZiMmY3ZGNkZDFhZGM4ZDJiNDJiZTM5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy
MSBAQAorMjAyMS0wMS0yOCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29t
PgorCisgICAgICAgIEFkZCBwbHVtYmluZyB0byBhbGxvdyBBcHBIaWdobGlnaHRzIHRvIGJlIHJl
c3RvcmVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjIxMTIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICog
VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBf
cmVzdG9yZUFwcEhpZ2hsaWdodHM6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlBhZ2VQcm94
eUNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc3RvcmVBcHBIaWdo
bGlnaHRzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICog
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl
OjpyZXN0b3JlQXBwSGlnaGxpZ2h0cyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl
YlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5p
bjoKKwogMjAyMS0wMS0yOCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29t
PgogCiAgICAgICAgIEFkZCBwbHVtYmluZyB0byBhbGxvdyBBcHBIaWdobGlnaHRzIHRvIGJlIHN0
b3JlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhp
Z2hsaWdodFN0b3JhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBw
SGlnaGxpZ2h0U3RvcmFnZS5jcHAKaW5kZXggYjU3ZjI0NzZhZDIyZWEwOWIwMDgzMzM4YTJiZDYy
MmJmZDAwMWJhYS4uYzNiOGJiNzdjMGM0ZjRlNWM5OTg3MTc5MjM5MmUzZGRkOGQxOTE4NiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3Rv
cmFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxp
Z2h0U3RvcmFnZS5jcHAKQEAgLTIzMSwxNCArMjMxLDE0IEBAIHZvaWQgQXBwSGlnaGxpZ2h0U3Rv
cmFnZTo6dXBkYXRlQXBwSGlnaGxpZ2h0c1N0b3JhZ2UoKQogICAgIG1fZG9jdW1lbnQtPnBhZ2Uo
KS0+Y2hyb21lKCkudXBkYXRlQXBwSGlnaGxpZ2h0c1N0b3JhZ2UobGlzdERhdGEudG9TaGFyZWRC
dWZmZXIoKSk7CiB9CiAKLVZlY3RvcjxBcHBIaWdobGlnaHRSYW5nZURhdGE+IEFwcEhpZ2hsaWdo
dFN0b3JhZ2U6OnJlc3RvcmVBcHBIaWdobGlnaHRzKFJlZjxTaGFyZWRCdWZmZXI+JiYgYnVmZmVy
KQordm9pZCBBcHBIaWdobGlnaHRTdG9yYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0cyhSZWY8U2hh
cmVkQnVmZmVyPiYmIGJ1ZmZlcikKIHsKICAgICBhdXRvIGFwcEhpZ2hsaWdodExpc3REYXRhID0g
QXBwSGlnaGxpZ2h0TGlzdERhdGE6OmNyZWF0ZShidWZmZXIpOwogICAgIFZlY3RvcjxBcHBIaWdo
bGlnaHRSYW5nZURhdGE+IHVucmVzdG9yZWRSYW5nZXM7CiAgICAgVmVjdG9yPEFwcEhpZ2hsaWdo
dFJhbmdlRGF0YT4gcmVzdG9yZWRSYW5nZXM7CiAKICAgICBpZiAoIW1fZG9jdW1lbnQpCi0gICAg
ICAgIHJldHVybiB1bnJlc3RvcmVkUmFuZ2VzOworICAgICAgICByZXR1cm47CiAKICAgICBhdXRv
IHN0cm9uZ0RvY3VtZW50ID0gbV9kb2N1bWVudC5nZXQoKTsKIApAQCAtMjUyLDcgKzI1Miw2IEBA
IFZlY3RvcjxBcHBIaWdobGlnaHRSYW5nZURhdGE+IEFwcEhpZ2hsaWdodFN0b3JhZ2U6OnJlc3Rv
cmVBcHBIaWdobGlnaHRzKFJlZjxTaGFyCiAgICAgICAgIHJlc3RvcmVkUmFuZ2VzLmFwcGVuZChh
cHBIaWdobGlnaHRMaXN0RGF0YSk7CiAgICAgICAgIHN0cm9uZ0RvY3VtZW50LT5hcHBIaWdobGln
aHRSZWdpc3RlcigpLmFkZEFwcEhpZ2hsaWdodChTdGF0aWNSYW5nZTo6Y3JlYXRlKCpyYW5nZSkp
OwogICAgIH0KLSAgICByZXR1cm4gdW5yZXN0b3JlZFJhbmdlczsKIH0KIAogI2VuZGlmCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2hpZ2hsaWdodC9BcHBIaWdobGlnaHRTdG9y
YWdlLmgKaW5kZXggYzEwYTM0MjhjMTgyZTAwZGEyMmFjODE4NzFiZjI5OTY3ZDBhZWFiOS4uOGI2
MDc1YWQ2NDAyNDI5Y2VkYzRiZTkyNmY2Y2RhMDllNDQzYmM5OSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvTW9kdWxlcy9oaWdobGlnaHQvQXBwSGlnaGxpZ2h0U3RvcmFnZS5oCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL01vZHVsZXMvaGlnaGxpZ2h0L0FwcEhpZ2hsaWdodFN0b3JhZ2UuaApAQCAt
NDcsNyArNDcsNyBAQCBwdWJsaWM6CiAgICAgQXBwSGlnaGxpZ2h0U3RvcmFnZShEb2N1bWVudCYp
OwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVBcHBIaWdobGlnaHRzU3RvcmFnZSgp
OwotICAgIFZlY3RvcjxBcHBIaWdobGlnaHRSYW5nZURhdGE+IHJlc3RvcmVBcHBIaWdobGlnaHRz
KFJlZjxTaGFyZWRCdWZmZXI+JiYpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVzdG9yZUFw
cEhpZ2hsaWdodHMoUmVmPFNoYXJlZEJ1ZmZlcj4mJik7CiAKIHByaXZhdGU6CiAgICAgV2Vha1B0
cjxEb2N1bWVudD4gbV9kb2N1bWVudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv
Q29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDgxNmVmNjY0ZjQ4YWZhYzY1NWMzOWZkOTAwNWM3NjU0
YWZkMTU3ZDIuLmI3ZDI3OTI0N2ViMjEyNGM5NjliZTE0ZmM3Y2RlNmUzZmI4ZTE5ZjYgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysr
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNTIs
NiArNTIsNyBAQAogI2ltcG9ydCAiUmVtb3RlT2JqZWN0UmVnaXN0cnlNZXNzYWdlcy5oIgogI2lt
cG9ydCAiUmVzb3VyY2VMb2FkRGVsZWdhdGUuaCIKICNpbXBvcnQgIlNhZmVCcm93c2luZ1dhcm5p
bmcuaCIKKyNpbXBvcnQgIlNoYXJlZEJ1ZmZlckNvcHkuaCIKICNpbXBvcnQgIlVJRGVsZWdhdGUu
aCIKICNpbXBvcnQgIlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eS5oIgogI2ltcG9ydCAiVmll
d0dlc3R1cmVDb250cm9sbGVyLmgiCkBAIC0yMDQwLDYgKzIwNDEsMTUgQEAgLSAodm9pZClfcmVz
dW1lQWxsTWVkaWFQbGF5YmFjawogICAgIFtzZWxmIHJlc3VtZUFsbE1lZGlhUGxheWJhY2s6bmls
XTsKIH0KIAorLSAodm9pZClfcmVzdG9yZUFwcEhpZ2hsaWdodHM6KE5TRGF0YSAqKWRhdGEKK3sK
KyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisgICAgX3BhZ2UtPnJlc3RvcmVBcHBIaWdobGln
aHRzKFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGRhdGEpKTsKKyNlbHNlCisgICAgVU5V
U0VEX1BBUkFNKGRhdGEpOworI2VuZGlmCit9CisKIC0gKE5TVVJMICopX3VucmVhY2hhYmxlVVJM
CiB7CiAgICAgcmV0dXJuIFtOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6X3BhZ2UtPnBhZ2VM
b2FkU3RhdGUoKS51bnJlYWNoYWJsZVVSTCgpXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IDc5MTRjY2RkMjU2OTBl
NmFlNzRkODA2ODQ0YjVmMDA1ZWUzMmE5ZmUuLjAzYWJhNDNlOTYyYjc1ZmJkNjNmOWZmOGMzYjY2
NTc2MTIwMTZmMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv
YS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2ViVmlld1ByaXZhdGUuaApAQCAtMzY0LDYgKzM2NCw4IEBAIGZvciB0aGlzIHByb3Bl
cnR5LgogLSAodm9pZClfZGlkRW5hYmxlQnJvd3NlckV4dGVuc2lvbnM6KE5TRGljdGlvbmFyeTxO
U1N0cmluZyAqLCBOU1N0cmluZyAqPiAqKWV4dGVuc2lvbklEVG9OYW1lTWFwIFdLX0FQSV9BVkFJ
TEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9kaWRE
aXNhYmxlQnJvd3NlckV4dGVuc2lvbnM6KE5TU2V0PE5TU3RyaW5nICo+ICopZXh0ZW5zaW9uSURz
IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAK
Ky0gKHZvaWQpX3Jlc3RvcmVBcHBIaWdobGlnaHRzOihOU0RhdGEgKilkYXRhIFdLX0FQSV9BVkFJ
TEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CisKIC8qISBAYWJzdHJh
Y3QgVGhlIHRoZW1lIGNvbG9yIG9mIHRoZSBhY3RpdmUgcGFnZS4KICBAZGlzY3Vzc2lvbiBUaGlz
IGlzIHRoZSB2YWx1ZSBvZiB0aGUgbW9zdCByZWNlbnRseSBjcmVhdGVkIG9yIG1vZGlmaWVkCiAg
QHRleHRibG9jawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi
UGFnZVByb3h5Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdl
UHJveHlDb2NvYS5tbQppbmRleCA1MTM5ZDhjZmNhMjQzOWNmN2U1YThmYmNmMGIwOGJhY2JjODli
NzU1Li5iMDcyMmEwMzI3Nzg4ZGE3ODZmZTdiMGFiMTIzMzUyMTU3NzNmYjZjIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQorKysg
Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJQYWdlUHJveHlDb2NvYS5tbQpAQCAt
MzgsNiArMzgsNyBAQAogI2ltcG9ydCAiU2FmZUJyb3dzaW5nU1BJLmgiCiAjaW1wb3J0ICJTYWZl
QnJvd3NpbmdXYXJuaW5nLmgiCiAjaW1wb3J0ICJTaGFyZWRCdWZmZXJDb3B5LmgiCisjaW1wb3J0
ICJTaGFyZWRCdWZmZXJEYXRhUmVmZXJlbmNlLmgiCiAjaW1wb3J0ICJXZWJQYWdlLmgiCiAjaW1w
b3J0ICJXZWJQYWdlTWVzc2FnZXMuaCIKICNpbXBvcnQgIldlYlBhc3RlYm9hcmRQcm94eS5oIgpA
QCAtNTQwLDYgKzU0MSwxNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Y3JlYXRlQXBwSGlnaGxpZ2h0
SW5TZWxlY3RlZFJhbmdlKENyZWF0ZU5ld0dyb3VwRm9ySGlnaGxpZ2h0CiAKICAgICBzZW5kKE1l
c3NhZ2VzOjpXZWJQYWdlOjpDcmVhdGVBcHBIaWdobGlnaHRJblNlbGVjdGVkUmFuZ2UoY3JlYXRl
TmV3R3JvdXApKTsKIH0KKwordm9pZCBXZWJQYWdlUHJveHk6OnJlc3RvcmVBcHBIaWdobGlnaHRz
KFJlZjxTaGFyZWRCdWZmZXI+JiYgZGF0YSkKK3sKKyAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNz
KCkpCisgICAgICAgIHJldHVybjsKKworICAgIElQQzo6U2hhcmVkQnVmZmVyRGF0YVJlZmVyZW5j
ZSBkYXRhUmVmZXJlbmNlIHsgZGF0YSB9OworCisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6
UmVzdG9yZUFwcEhpZ2hsaWdodHMoZGF0YVJlZmVyZW5jZSkpOworfQogI2VuZGlmCiAKIFNhbmRi
b3hFeHRlbnNpb246OkhhbmRsZUFycmF5IFdlYlBhZ2VQcm94eTo6Y3JlYXRlTmV0d29ya0V4dGVu
c2lvbnNTYW5kYm94RXh0ZW5zaW9ucyhXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MpCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDI0NjQ0NDI3MDQzZDFlNmJhYTdiYThh
NTdkNjg1NjFhNTVmMDQyOTguLjZhOTkxZGMwNWVlNGMzNjJlNzkwNWVhZTc4MzE2YzFiNjQyNDdk
MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisr
KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xODI0LDYgKzE4
MjQsNyBAQCBwdWJsaWM6CiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQogICAgIHZvaWQgY3Jl
YXRlQXBwSGlnaGxpZ2h0SW5TZWxlY3RlZFJhbmdlKENyZWF0ZU5ld0dyb3VwRm9ySGlnaGxpZ2h0
KTsKICAgICB2b2lkIHVwZGF0ZUFwcEhpZ2hsaWdodHNTdG9yYWdlKGNvbnN0IElQQzo6U2hhcmVk
QnVmZmVyQ29weSYpOworICAgIHZvaWQgcmVzdG9yZUFwcEhpZ2hsaWdodHMoUmVmPFdlYkNvcmU6
OlNoYXJlZEJ1ZmZlcj4mJiBkYXRhKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVB
TSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXgg
NTQ5YzIzOWY5ZjZkNGQ5Y2ZhNmY0OGI1OTIwZjgwMjVjZTM1NjcyNy4uY2FlMGE5NzE4Y2Y3ZmY5
ZjQwMjFmNmNjYTkwNGUyNzRiZDFiMzMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTcxODgsNiArNzE4OCwxMyBAQCBib29sIFdlYlBhZ2U6
OmNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShDcmVhdGVOZXdHcm91cEZvckhpZ2hs
aWdodCBjcmVhdAogCiAgICAgcmV0dXJuIHRydWU7CiB9CisKK3ZvaWQgV2ViUGFnZTo6cmVzdG9y
ZUFwcEhpZ2hsaWdodHMoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhKQoreworICAgIGF1
dG8gZG9jdW1lbnQgPSBtYWtlUmVmUHRyKG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNl
ZE9yTWFpbkZyYW1lKCkuZG9jdW1lbnQoKSk7CisKKyAgICBkb2N1bWVudC0+YXBwSGlnaGxpZ2h0
U3RvcmFnZSgpLnJlc3RvcmVBcHBIaWdobGlnaHRzKFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGRhdGEu
ZGF0YSgpLCBkYXRhLnNpemUoKSkpOworfQogI2VuZGlmCiAKICNpZiAhUExBVEZPUk0oQ09DT0Ep
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgg
Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMDRhZDdi
YjZkMjUyMWIwNWJjYTkyZjM5ZjM5ZmY5YjM3N2IxOTkyMC4uODMzNTE5NDE2ZjI2YzNkMWM0OTVk
N2NmM2JhYTVhMzhlMDg1MTM5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L1dlYlBhZ2UuaApAQCAtMTM4MCw2ICsxMzgwLDcgQEAgcHVibGljOgogCiAjaWYgRU5BQkxFKEFQ
UF9ISUdITElHSFRTKQogICAgIGJvb2wgY3JlYXRlQXBwSGlnaGxpZ2h0SW5TZWxlY3RlZFJhbmdl
KENyZWF0ZU5ld0dyb3VwRm9ySGlnaGxpZ2h0KTsKKyAgICB2b2lkIHJlc3RvcmVBcHBIaWdobGln
aHRzKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYpOwogI2VuZGlmCiAKICAgICB2b2lkIGRpc3Bh
dGNoV2hlZWxFdmVudFdpdGhvdXRTY3JvbGxpbmcoY29uc3QgV2ViV2hlZWxFdmVudCYsIENvbXBs
ZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMjRlYTExZjJhODRlMDEy
NmJiZjg3MjRhMmFhNjMzM2E2NmNmNjhmYS4uMmRhOTljZDM3MjM5MmU4MmM1MzBkNDJjMDFhMTI4
NzcwZmJkODcxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv
V2ViUGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn
ZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC02MTksNiArNjE5LDcgQEAgR2VuZXJhdGVTeW50aGV0
aWNFZGl0aW5nQ29tbWFuZChlbnVtOnVpbnQ4X3QgV2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29t
bWFuZFR5cGUKIAogI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKICAgICBDcmVhdGVBcHBIaWdo
bGlnaHRJblNlbGVjdGVkUmFuZ2UoZW51bTpib29sIFdlYktpdDo6Q3JlYXRlTmV3R3JvdXBGb3JI
aWdobGlnaHQgY3JlYXRlTmV3R3JvdXApCisgICAgUmVzdG9yZUFwcEhpZ2hsaWdodHMoSVBDOjpT
aGFyZWRCdWZmZXJEYXRhUmVmZXJlbmNlIGRhdGEpCiAjZW5kaWYKIAogICAgIERpc3BhdGNoV2hl
ZWxFdmVudFdpdGhvdXRTY3JvbGxpbmcoV2ViS2l0OjpXZWJXaGVlbEV2ZW50IGV2ZW50KSAtPiAo
Ym9vbCBoYW5kbGVkKSBBc3luYwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>