<?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>227141</bug_id>
          
          <creation_ts>2021-06-17 12:36:51 -0700</creation_ts>
          <short_desc>AppHighlights disappear on page reload</short_desc>
          <delta_ts>2021-06-21 13:44:59 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Megan Gardner">megan_gardner</reporter>
          <assigned_to name="Megan Gardner">megan_gardner</assigned_to>
          <cc>cdumez</cc>
    
    <cc>esprehn+autocc</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>hi</cc>
    
    <cc>kangil.han</cc>
    
    <cc>thorton</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1770771</commentid>
    <comment_count>0</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-06-17 12:36:51 -0700</bug_when>
    <thetext>AppHighlights disappear on page reload</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770772</commentid>
    <comment_count>1</comment_count>
      <attachid>431706</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-06-17 12:43:03 -0700</bug_when>
    <thetext>Created attachment 431706
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770773</commentid>
    <comment_count>2</comment_count>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-06-17 12:43:43 -0700</bug_when>
    <thetext>rdar://78190331</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770774</commentid>
    <comment_count>3</comment_count>
      <attachid>431706</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-06-17 12:46:53 -0700</bug_when>
    <thetext>Comment on attachment 431706
Patch

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

&gt; Source/WebCore/page/ChromeClient.h:246
&gt; +    virtual WebCore::HighlightVisibility appHighlightsVisiblility() const { return WebCore::HighlightVisibility::Hidden; };

We&apos;re in WebCore, why the &quot;WebCore::&quot;s ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770775</commentid>
    <comment_count>4</comment_count>
      <attachid>431706</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-17 12:49:05 -0700</bug_when>
    <thetext>Comment on attachment 431706
Patch

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

&gt; Source/WebKit/WebProcess/WebPage/WebPage.cpp:538
&gt; +#if ENABLE(APP_BOUND_DOMAINS)

I think you meant to use ENABLE(APP_HIGHLIGHTS) here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770776</commentid>
    <comment_count>5</comment_count>
      <attachid>431706</attachid>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-06-17 12:53:12 -0700</bug_when>
    <thetext>Comment on attachment 431706
Patch

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

r=me

&gt; Source/WebCore/page/ChromeClient.h:65
&gt; +#include &quot;HighlightVisibility.h&quot;

Is it really necessary to wrap this in an `#if`?  You could just always include it and remove the forward-declare below.

&gt; Source/WebKit/Shared/WebPageCreationParameters.h:261
&gt; +    WebCore::HighlightVisibility appHighlightsVisible { WebCore::HighlightVisibility::Hidden };

Does this need to be set in the UIProcess (e.g. `WebPageProxy::creationParameters`)?  If not, is it set somewhere else?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770851</commentid>
    <comment_count>6</comment_count>
      <attachid>431706</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2021-06-17 15:30:25 -0700</bug_when>
    <thetext>Comment on attachment 431706
Patch

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

&gt; Source/WebKit/WebProcess/WebPage/WebPage.h:2358
&gt; +    WebCore::HighlightVisibility m_appHighlightsVisible { false };

Nit - this should be initialized to `WebCore::HighlightVisibility::Hidden` instead of `false` too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1770885</commentid>
    <comment_count>7</comment_count>
      <attachid>431739</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-06-17 16:34:58 -0700</bug_when>
    <thetext>Created attachment 431739
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771407</commentid>
    <comment_count>8</comment_count>
      <attachid>431896</attachid>
    <who name="Megan Gardner">megan_gardner</who>
    <bug_when>2021-06-21 12:49:05 -0700</bug_when>
    <thetext>Created attachment 431896
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771411</commentid>
    <comment_count>9</comment_count>
      <attachid>431896</attachid>
    <who name="Devin Rousso">hi</who>
    <bug_when>2021-06-21 12:53:02 -0700</bug_when>
    <thetext>Comment on attachment 431896
Patch for landing

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

&gt; Source/WebKit/Shared/WebPageCreationParameters.h:41
&gt; +#include &lt;WebCore/HighlightVisibility.h&gt;

NIT: I&apos;d also add this include in `WebProcess/WebCoreSupport/WebChromeClient.h` and `Source/WebKit/WebProcess/WebPage/WebPage.h`

&gt; Source/WebKit/WebProcess/WebPage/WebPage.h:2358
&gt; +    WebCore::HighlightVisibility m_appHighlightsVisible { false };

s/`false`/`WebCore::HighlightVisibility::Hidden`</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1771427</commentid>
    <comment_count>10</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-06-21 13:44:57 -0700</bug_when>
    <thetext>Committed r279078 (238997@main): &lt;https://commits.webkit.org/238997@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 431896.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431706</attachid>
            <date>2021-06-17 12:43:03 -0700</date>
            <delta_ts>2021-06-21 12:49:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227141-20210617124302.patch</filename>
            <type>text/plain</type>
            <size>10273</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM3MjYxMmIyNGNiMDEx
ZDIwMWQ3YTU4ZTY3MmNjMDZlMTdkZjBkOS4uMzVlNzlkODk4YTEzNGVhNDNmMmI3ZjdiOGQ2ZDdi
MzAyMTJlMGQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTE3ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwSGlnaGxp
Z2h0cyBkaXNhcHBlYXIgb24gcGFnZSByZWxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzE0MQorICAgICAgICByZGFyOi8vNzgxOTAzMzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmVzZXJ2ZSB0
aGUgc3RhdGUgb2YgaGlnaGxpZ2h0IHZpc2liaWxpdHkgc28gdGhhdCBpcyBjb3JyZWN0IG9uIHBh
Z2UtcmVsb2FkLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv
cmU6OkRvY3VtZW50OjphcHBIaWdobGlnaHRSZWdpc3Rlcik6CisgICAgICAgICogcGFnZS9DaHJv
bWVDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudDo6YXBwSGlnaGxpZ2h0
c1Zpc2libGlsaXR5IGNvbnN0KToKKwogMjAyMS0wNi0xNyAgQWRpdHlhIEtlZXJ0aGkgIDxha2Vl
cnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI3NzA2Nyk6IEluY29ycmVj
dCB0ZXh0IGNvbG9yIGZvciBkZWZhdWx0LWJ1dHRvbiBhcHBlYXJhbmNlCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA0
ZDllNjhiYWI3NjljMjU0NmU3ZjYzMTk5ZGMyZDg3NDBiNmYyNzUuLmRiYTc3MWZiMGU3NDJlOWQ3
YTA2YjkyY2UxZmU2ZGNlNDc2NDIwOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEt
MDYtMTcgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAg
ICBBcHBIaWdobGlnaHRzIGRpc2FwcGVhciBvbiBwYWdlIHJlbG9hZAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTQxCisgICAgICAgIHJkYXI6Ly83
ODE5MDMzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFdoZW4gYSBwYWdlIGlzIHJlbG9hZGVkLCBhIG5ldyBzZXQgb2YgaGlnaGxpZ2h0cyBpcyBsb2Fk
ZWQsIGJ1dCB0aGUgc3RhdGUgb2YgdmlzaWJpbGl0eSBvZgorICAgICAgICB0aGUgaGlnaGxpZ2h0
cyBpcyBub3QgcHJlc2VydmVkLgorICAgICAgICBXZSBuZWVkIHRvIHByZXNlcnZlIHRoZSBzdGF0
ZSBvZiBoaWdobGlnaHRzIHNvIHRoZXkgYXJlIGNvcnJlY3RseSBzaG93biBvbiByZWxvYWQuCisK
KyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAg
IChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAg
ICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBXZWJQcm9j
ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6
OldlYkNocm9tZUNsaWVudDo6YXBwSGlnaGxpZ2h0c1Zpc2libGlsaXR5IGNvbnN0KToKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAg
ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bV9h
cHBIaWdobGlnaHRzVmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldEFwcEhp
Z2hsaWdodHNWaXNpYmlsaXR5KToKKyAgICAgICAgKFdlYktpdDo6bV9sYXN0TmF2aWdhdGlvbldh
c0FwcEJvdW5kKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjphcHBIaWdobGlnaHRzVmlzaWJsaWxpdHkg
Y29uc3QpOgorCiAyMDIxLTA2LTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu
Y29tPgogCiAgICAgICAgIEFkb3B0IFdLSG92ZXJHZXN0dXJlUmVjb2duaXplcgpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E
b2N1bWVudC5jcHAKaW5kZXggY2MyNjE1NDRiOWNjZTBiOGE0ZDFkZTZkYmJjZjY0MDY0YjEzNzAw
Yy4uNTUyNGVlYzU1ODdkMWU5MTcwZWY5ZjE0OTJjYzA3ZGUyNWM4MGVjNyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v
RG9jdW1lbnQuY3BwCkBAIC0yODIyLDggKzI4MjIsMTEgQEAgSGlnaGxpZ2h0UmVnaXN0ZXImIERv
Y3VtZW50OjpoaWdobGlnaHRSZWdpc3RlcigpCiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQog
SGlnaGxpZ2h0UmVnaXN0ZXImIERvY3VtZW50OjphcHBIaWdobGlnaHRSZWdpc3RlcigpCiB7Ci0g
ICAgaWYgKCFtX2FwcEhpZ2hsaWdodFJlZ2lzdGVyKQorICAgIGlmICghbV9hcHBIaWdobGlnaHRS
ZWdpc3RlcikgewogICAgICAgICBtX2FwcEhpZ2hsaWdodFJlZ2lzdGVyID0gSGlnaGxpZ2h0UmVn
aXN0ZXI6OmNyZWF0ZSgpOworICAgICAgICBpZiAoYXV0byogY3VycmVudFBhZ2UgPSBwYWdlKCkp
CisgICAgICAgICAgICBtX2FwcEhpZ2hsaWdodFJlZ2lzdGVyLT5zZXRIaWdobGlnaHRWaXNpYmls
aXR5KGN1cnJlbnRQYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5hcHBIaWdobGlnaHRzVmlzaWJsaWxp
dHkoKSk7CisgICAgfQogICAgIHJldHVybiAqbV9hcHBIaWdobGlnaHRSZWdpc3RlcjsKIH0KIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaCBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKaW5kZXggNmQ4NGY2OTQ0ZGY2MTc3NDA1YzFmYWYz
YmFiZGUxMGQ5YmJmNTk5My4uY2NhMDM4Y2YyNTI1MzI5YzBiMDRjOTk4MTI3NjU3NjNhOTk1ODVi
MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCkBAIC02MSw2ICs2MSwxMCBAQAogI2lu
Y2x1ZGUgIk1lZGlhUGxheWJhY2tUYXJnZXRDb250ZXh0LmgiCiAjZW5kaWYKIAorI2lmIEVOQUJM
RShBUFBfSElHSExJR0hUUykKKyNpbmNsdWRlICJIaWdobGlnaHRWaXNpYmlsaXR5LmgiCisjZW5k
aWYKKwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAjaW5jbHVkZSAiUGxhdGZvcm1MYXllci5o
IgogI2luY2x1ZGUgIldLQ29udGVudE9ic2VydmF0aW9uLmgiCkBAIC0xMzEsNiArMTM1LDcgQEAg
c3RydWN0IFZpZXdwb3J0QXJndW1lbnRzOwogc3RydWN0IFdpbmRvd0ZlYXR1cmVzOwogCiBlbnVt
IGNsYXNzIFJvdXRlU2hhcmluZ1BvbGljeSA6IHVpbnQ4X3Q7CitlbnVtIGNsYXNzIEhpZ2hsaWdo
dFZpc2liaWxpdHkgOiBib29sOwogCiBjbGFzcyBDaHJvbWVDbGllbnQgewogcHVibGljOgpAQCAt
MjM2LDYgKzI0MSwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHRoZW1lQ29sb3JDaGFu
Z2VkKCkgY29uc3QgeyB9CiAgICAgdmlydHVhbCB2b2lkIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRD
b2xvckRpZENoYW5nZSgpIGNvbnN0IHsgfQogICAgIHZpcnR1YWwgdm9pZCBzYW1wbGVkUGFnZVRv
cENvbG9yQ2hhbmdlZCgpIGNvbnN0IHsgfQorICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hU
UykKKyAgICB2aXJ0dWFsIFdlYkNvcmU6OkhpZ2hsaWdodFZpc2liaWxpdHkgYXBwSGlnaGxpZ2h0
c1Zpc2libGlsaXR5KCkgY29uc3QgeyByZXR1cm4gV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0
eTo6SGlkZGVuOyB9OworI2VuZGlmCiAKICAgICB2aXJ0dWFsIHZvaWQgZXhjZWVkZWREYXRhYmFz
ZVF1b3RhKEZyYW1lJiwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIERhdGFiYXNlRGV0YWls
cykgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRp
b25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBh
cmFtZXRlcnMuY3BwCmluZGV4IDllN2I3ZjJmYmRhMTA3ZDFjZDkwMDI0OGE1ZDliNmFjNmJhNzI5
ZDYuLjZhMjUyMzFmNmZjMjU4YzFlMzhhYTA1Y2UxMmFhNDQ0ZmQ3MDk2YzggMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi
L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC0x
ODUsNiArMTg1LDEwIEBAIHZvaWQgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQ
Qzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICNpZiBQTEFURk9STShJT1MpCiAgICAgZW5jb2Rl
ciA8PCBhbGxvd3NEZXByZWNhdGVkU3luY2hyb25vdXNYTUxIdHRwUmVxdWVzdER1cmluZ1VubG9h
ZDsKICNlbmRpZgorCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAgIGVuY29kZXIgPDwg
YXBwSGlnaGxpZ2h0c1Zpc2libGU7CisjZW5kaWYKIH0KIAogc3RkOjpvcHRpb25hbDxXZWJQYWdl
Q3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBD
OjpEZWNvZGVyJiBkZWNvZGVyKQpAQCAtNTk4LDYgKzYwMiwxMSBAQCBzdGQ6Om9wdGlvbmFsPFdl
YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29k
ZShJUEM6OgogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hbGxvd3NEZXByZWNh
dGVkU3luY2hyb25vdXNYTUxIdHRwUmVxdWVzdER1cmluZ1VubG9hZCkpCiAgICAgICAgIHJldHVy
biBzdGQ6Om51bGxvcHQ7CiAjZW5kaWYKKyAgICAKKyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMp
CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0ZXJzLmFwcEhpZ2hsaWdodHNWaXNpYmxl
KSkKKyAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKKyNlbmRpZgogCiAgICAgcmV0dXJuIHBh
cmFtZXRlcnM7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3Jl
YXRpb25QYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q
YXJhbWV0ZXJzLmgKaW5kZXggZDViMTNkMmIwOTE1YjQ4ZWNlOWJmNmRlOTZlODdiYTU5MDk0ZWZl
NS4uYzU4ZTZjMjIwYjFhMDM3NjZhYWU1NDg0NzJmMTZiNzgzZTA0MDJhYyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1Nv
dXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMzgsNiAr
MzgsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ29sb3IuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Rl
c3RpbmF0aW9uQ29sb3JTcGFjZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRTaXplLmg+Cisj
aW5jbHVkZSA8V2ViQ29yZS9IaWdobGlnaHRWaXNpYmlsaXR5Lmg+CiAjaW5jbHVkZSA8V2ViQ29y
ZS9JbnRTaXplLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9MYXlvdXRNaWxlc3RvbmUuaD4KICNpbmNs
dWRlIDxXZWJDb3JlL01lZGlhUHJvZHVjZXIuaD4KQEAgLTI1NSw2ICsyNTYsMTEgQEAgc3RydWN0
IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgewogI2lmIFBMQVRGT1JNKElPUykKICAgICBib29s
IGFsbG93c0RlcHJlY2F0ZWRTeW5jaHJvbm91c1hNTEh0dHBSZXF1ZXN0RHVyaW5nVW5sb2FkIHsg
ZmFsc2UgfTsKICNlbmRpZgorICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKKyAgICBX
ZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5IGFwcEhpZ2hsaWdodHNWaXNpYmxlIHsgV2ViQ29y
ZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eTo6SGlkZGVuIH07CisjZW5kaWYKKyAgICAKIH07CiAKIH0g
Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCA3ZDYyZTVlOWEz
OWQxNWNhYTM3NWExMWM5OTY3NDU2NzY0ZGY4OTk3Li4wNDU1N2E4NWZjODdjNjc0NTFlNzBhZTE3
ZjlmNTBjMGZmZmNjNTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi
Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApAQCAtMTE3Myw2ICsxMTcz
LDEzIEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZCgp
IGNvbnN0CiAgICAgbV9wYWdlLnNhbXBsZWRQYWdlVG9wQ29sb3JDaGFuZ2VkKCk7CiB9CiAKKyNp
ZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCitXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5IFdl
YkNocm9tZUNsaWVudDo6YXBwSGlnaGxpZ2h0c1Zpc2libGlsaXR5KCkgY29uc3QKK3sKKyAgICBy
ZXR1cm4gbV9wYWdlLmFwcEhpZ2hsaWdodHNWaXNpYmxpbGl0eSgpOworfQorI2VuZGlmCisKIHZv
aWQgV2ViQ2hyb21lQ2xpZW50Ojp3aGVlbEV2ZW50SGFuZGxlcnNDaGFuZ2VkKGJvb2wgaGFzSGFu
ZGxlcnMpCiB7CiAgICAgbV9wYWdlLndoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQoaGFzSGFuZGxl
cnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0
L1dlYkNocm9tZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw
b3J0L1dlYkNocm9tZUNsaWVudC5oCmluZGV4IDYyODYyMDI4NDI0ZmJiYmVkMTMyODE2MzU3NGI3
MDVkM2JjMTgzNjYuLjgzNWJmZDBjYzQ4ZTM0M2YxZmIzNDljYzllZTQ0YWZjNGIxOTEyODIgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJv
bWVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv
V2ViQ2hyb21lQ2xpZW50LmgKQEAgLTMzNCw2ICszMzQsMTAgQEAgcHJpdmF0ZToKICAgICB2b2lk
IHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvckRpZENoYW5nZSgpIGNvbnN0IGZpbmFsOwogICAg
IHZvaWQgc2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQoKSBjb25zdCBmaW5hbDsKICAgICAKKyNp
ZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisgICAgV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0
eSBhcHBIaWdobGlnaHRzVmlzaWJsaWxpdHkoKSBjb25zdCBmaW5hbDsKKyNlbmRpZgorICAgIAog
ICAgIHZvaWQgd2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZChib29sKSBmaW5hbDsKIAogICAgIFN0
cmluZyBwbHVnSW5TdGFydExhYmVsVGl0bGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3Qg
ZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ
YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmlu
ZGV4IDJkNGExNDFmZTA1ZTVjMGI5NzMwMmZkMmU1YjJjMTM5OGVmZjY2NjEuLjY2ZWNlNTA2ZjA2
Y2VkNTY0Nzk1YzViMzkxNDUyZjg2MmZiMmQ2ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC01MzUsNiArNTM1LDkgQEAgV2ViUGFnZTo6V2Vi
UGFnZShQYWdlSWRlbnRpZmllciBwYWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmJiBw
YXJhbWV0ZXJzKQogICAgICwgbV9saW1pdHNOYXZpZ2F0aW9uc1RvQXBwQm91bmREb21haW5zKHBh
cmFtZXRlcnMubGltaXRzTmF2aWdhdGlvbnNUb0FwcEJvdW5kRG9tYWlucykKICNlbmRpZgogICAg
ICwgbV9sYXN0TmF2aWdhdGlvbldhc0FwcEJvdW5kKHBhcmFtZXRlcnMubGFzdE5hdmlnYXRpb25X
YXNBcHBCb3VuZCkKKyNpZiBFTkFCTEUoQVBQX0JPVU5EX0RPTUFJTlMpCisgICAgLCBtX2FwcEhp
Z2hsaWdodHNWaXNpYmxlKHBhcmFtZXRlcnMuYXBwSGlnaGxpZ2h0c1Zpc2libGUpCisjZW5kaWYK
IHsKICAgICBBU1NFUlQobV9pZGVudGlmaWVyKTsKIApAQCAtNzYxNyw2ICs3NjIwLDcgQEAgdm9p
ZCBXZWJQYWdlOjpyZXN0b3JlQXBwSGlnaGxpZ2h0c0FuZFNjcm9sbFRvSW5kZXgoY29uc3QgVmVj
dG9yPFNoYXJlZE1lbW9yeTo6SVAKIAogdm9pZCBXZWJQYWdlOjpzZXRBcHBIaWdobGlnaHRzVmlz
aWJpbGl0eShXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5IGFwcEhpZ2hsaWdodFZpc2liaWxp
dHkpCiB7CisgICAgbV9hcHBIaWdobGlnaHRzVmlzaWJsZSA9IGFwcEhpZ2hsaWdodFZpc2liaWxp
dHk7CiAgICAgZm9yIChSZWZQdHI8RnJhbWU+IGZyYW1lID0gbV9tYWluRnJhbWUtPmNvcmVGcmFt
ZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dFJlbmRlcmVkKCkp
IHsKICAgICAgICAgaWYgKGF1dG8gZG9jdW1lbnQgPSBtYWtlUmVmUHRyKGZyYW1lLT5kb2N1bWVu
dCgpKSkKICAgICAgICAgICAgIGRvY3VtZW50LT5hcHBIaWdobGlnaHRSZWdpc3RlcigpLnNldEhp
Z2hsaWdodFZpc2liaWxpdHkoYXBwSGlnaGxpZ2h0VmlzaWJpbGl0eSk7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggZDY3NmU3MDE1NjBmZmUwMzhjMmNh
MzdkNDczMWE0OGEwODYwYjNjNi4uNDRjNmFjMjliNDk3MzgxMzA3NzQ1ZDU5ZGEzYzcxYjk0ODYy
NWFhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAt
MTQzMCw2ICsxNDMwLDcgQEAgcHVibGljOgogI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKICAg
ICBXZWJDb3JlOjpDcmVhdGVOZXdHcm91cEZvckhpZ2hsaWdodCBoaWdobGlnaHRJc05ld0dyb3Vw
KCkgY29uc3QgeyByZXR1cm4gbV9oaWdobGlnaHRJc05ld0dyb3VwOyB9CiAgICAgV2ViQ29yZTo6
SGlnaGxpZ2h0UmVxdWVzdE9yaWdpbmF0ZWRJbkFwcCBoaWdobGlnaHRSZXF1ZXN0T3JpZ2luYXRl
ZEluQXBwKCkgY29uc3QgeyByZXR1cm4gbV9oaWdobGlnaHRSZXF1ZXN0T3JpZ2luYXRlZEluQXBw
OyB9CisgICAgV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eSBhcHBIaWdobGlnaHRzVmlzaWJs
aWxpdHkoKSBjb25zdCB7IHJldHVybiBtX2FwcEhpZ2hsaWdodHNWaXNpYmxlOyB9CiAKICAgICBi
b29sIGNyZWF0ZUFwcEhpZ2hsaWdodEluU2VsZWN0ZWRSYW5nZShXZWJDb3JlOjpDcmVhdGVOZXdH
cm91cEZvckhpZ2hsaWdodCwgV2ViQ29yZTo6SGlnaGxpZ2h0UmVxdWVzdE9yaWdpbmF0ZWRJbkFw
cCk7CiAgICAgdm9pZCByZXN0b3JlQXBwSGlnaGxpZ2h0c0FuZFNjcm9sbFRvSW5kZXgoY29uc3Qg
VmVjdG9yPFNoYXJlZE1lbW9yeTo6SVBDSGFuZGxlPiYmLCBjb25zdCBzdGQ6Om9wdGlvbmFsPHVu
c2lnbmVkPiBpbmRleCk7CkBAIC0yMzUyLDYgKzIzNTMsMTAgQEAgcHJpdmF0ZToKICNpZiBFTkFC
TEUoV0VCWFIpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9y
bVhSU3lzdGVtUHJveHk+IG1feHJTeXN0ZW1Qcm94eTsKICNlbmRpZgorICAgIAorI2lmIEVOQUJM
RShBUFBfSElHSExJR0hUUykKKyAgICBXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5IG1fYXBw
SGlnaGxpZ2h0c1Zpc2libGUgeyBmYWxzZSB9OworI2VuZGlmCiB9OwogCiAjaWYgIVBMQVRGT1JN
KElPU19GQU1JTFkpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431739</attachid>
            <date>2021-06-17 16:34:58 -0700</date>
            <delta_ts>2021-06-21 12:49:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-227141-20210617163457.patch</filename>
            <type>text/plain</type>
            <size>11157</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM3MjYxMmIyNGNiMDEx
ZDIwMWQ3YTU4ZTY3MmNjMDZlMTdkZjBkOS4uMzVlNzlkODk4YTEzNGVhNDNmMmI3ZjdiOGQ2ZDdi
MzAyMTJlMGQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTE3ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwSGlnaGxp
Z2h0cyBkaXNhcHBlYXIgb24gcGFnZSByZWxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzE0MQorICAgICAgICByZGFyOi8vNzgxOTAzMzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcmVzZXJ2ZSB0
aGUgc3RhdGUgb2YgaGlnaGxpZ2h0IHZpc2liaWxpdHkgc28gdGhhdCBpcyBjb3JyZWN0IG9uIHBh
Z2UtcmVsb2FkLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv
cmU6OkRvY3VtZW50OjphcHBIaWdobGlnaHRSZWdpc3Rlcik6CisgICAgICAgICogcGFnZS9DaHJv
bWVDbGllbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudDo6YXBwSGlnaGxpZ2h0
c1Zpc2libGlsaXR5IGNvbnN0KToKKwogMjAyMS0wNi0xNyAgQWRpdHlhIEtlZXJ0aGkgIDxha2Vl
cnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI3NzA2Nyk6IEluY29ycmVj
dCB0ZXh0IGNvbG9yIGZvciBkZWZhdWx0LWJ1dHRvbiBhcHBlYXJhbmNlCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA0
ZDllNjhiYWI3NjljMjU0NmU3ZjYzMTk5ZGMyZDg3NDBiNmYyNzUuLmRiYTc3MWZiMGU3NDJlOWQ3
YTA2YjkyY2UxZmU2ZGNlNDc2NDIwOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEt
MDYtMTcgIE1lZ2FuIEdhcmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAg
ICBBcHBIaWdobGlnaHRzIGRpc2FwcGVhciBvbiBwYWdlIHJlbG9hZAorICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3MTQxCisgICAgICAgIHJkYXI6Ly83
ODE5MDMzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg
IFdoZW4gYSBwYWdlIGlzIHJlbG9hZGVkLCBhIG5ldyBzZXQgb2YgaGlnaGxpZ2h0cyBpcyBsb2Fk
ZWQsIGJ1dCB0aGUgc3RhdGUgb2YgdmlzaWJpbGl0eSBvZgorICAgICAgICB0aGUgaGlnaGxpZ2h0
cyBpcyBub3QgcHJlc2VydmVkLgorICAgICAgICBXZSBuZWVkIHRvIHByZXNlcnZlIHRoZSBzdGF0
ZSBvZiBoaWdobGlnaHRzIHNvIHRoZXkgYXJlIGNvcnJlY3RseSBzaG93biBvbiByZWxvYWQuCisK
KyAgICAgICAgKiBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHA6CisgICAgICAg
IChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAg
ICAgIChXZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAg
ICogU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBXZWJQcm9j
ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6
OldlYkNocm9tZUNsaWVudDo6YXBwSGlnaGxpZ2h0c1Zpc2libGlsaXR5IGNvbnN0KToKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oOgorICAgICAg
ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6bV9h
cHBIaWdobGlnaHRzVmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldEFwcEhp
Z2hsaWdodHNWaXNpYmlsaXR5KToKKyAgICAgICAgKFdlYktpdDo6bV9sYXN0TmF2aWdhdGlvbldh
c0FwcEJvdW5kKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjphcHBIaWdobGlnaHRzVmlzaWJsaWxpdHkg
Y29uc3QpOgorCiAyMDIxLTA2LTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUu
Y29tPgogCiAgICAgICAgIEFkb3B0IFdLSG92ZXJHZXN0dXJlUmVjb2duaXplcgpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E
b2N1bWVudC5jcHAKaW5kZXggY2MyNjE1NDRiOWNjZTBiOGE0ZDFkZTZkYmJjZjY0MDY0YjEzNzAw
Yy4uNTUyNGVlYzU1ODdkMWU5MTcwZWY5ZjE0OTJjYzA3ZGUyNWM4MGVjNyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v
RG9jdW1lbnQuY3BwCkBAIC0yODIyLDggKzI4MjIsMTEgQEAgSGlnaGxpZ2h0UmVnaXN0ZXImIERv
Y3VtZW50OjpoaWdobGlnaHRSZWdpc3RlcigpCiAjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQog
SGlnaGxpZ2h0UmVnaXN0ZXImIERvY3VtZW50OjphcHBIaWdobGlnaHRSZWdpc3RlcigpCiB7Ci0g
ICAgaWYgKCFtX2FwcEhpZ2hsaWdodFJlZ2lzdGVyKQorICAgIGlmICghbV9hcHBIaWdobGlnaHRS
ZWdpc3RlcikgewogICAgICAgICBtX2FwcEhpZ2hsaWdodFJlZ2lzdGVyID0gSGlnaGxpZ2h0UmVn
aXN0ZXI6OmNyZWF0ZSgpOworICAgICAgICBpZiAoYXV0byogY3VycmVudFBhZ2UgPSBwYWdlKCkp
CisgICAgICAgICAgICBtX2FwcEhpZ2hsaWdodFJlZ2lzdGVyLT5zZXRIaWdobGlnaHRWaXNpYmls
aXR5KGN1cnJlbnRQYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5hcHBIaWdobGlnaHRzVmlzaWJsaWxp
dHkoKSk7CisgICAgfQogICAgIHJldHVybiAqbV9hcHBIaWdobGlnaHRSZWdpc3RlcjsKIH0KIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaCBiL1NvdXJjZS9X
ZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKaW5kZXggNmQ4NGY2OTQ0ZGY2MTc3NDA1YzFmYWYz
YmFiZGUxMGQ5YmJmNTk5My4uYjU1NzdlZDljYjA4OWE3YjI1YzI4ZmE1Zjk5NGUwYzMzYTcwOTU4
MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9T
b3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCkBAIC0zNSw2ICszNSw3IEBACiAjaW5j
bHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NMYXllci5oIgogI2lu
Y2x1ZGUgIkhUTUxNZWRpYUVsZW1lbnRFbnVtcy5oIgorI2luY2x1ZGUgIkhpZ2hsaWdodFZpc2li
aWxpdHkuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCiAjaW5jbHVkZSAiSWNvbi5oIgogI2lu
Y2x1ZGUgIkltYWdlQnVmZmVyLmgiCkBAIC0yMzYsNiArMjM3LDEwIEBAIHB1YmxpYzoKICAgICB2
aXJ0dWFsIHZvaWQgdGhlbWVDb2xvckNoYW5nZWQoKSBjb25zdCB7IH0KICAgICB2aXJ0dWFsIHZv
aWQgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdlKCkgY29uc3QgeyB9CiAgICAg
dmlydHVhbCB2b2lkIHNhbXBsZWRQYWdlVG9wQ29sb3JDaGFuZ2VkKCkgY29uc3QgeyB9CisgICAg
CisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAgIHZpcnR1YWwgV2ViQ29yZTo6SGlnaGxp
Z2h0VmlzaWJpbGl0eSBhcHBIaWdobGlnaHRzVmlzaWJsaWxpdHkoKSBjb25zdCB7IHJldHVybiBI
aWdobGlnaHRWaXNpYmlsaXR5OjpIaWRkZW47IH07CisjZW5kaWYKIAogICAgIHZpcnR1YWwgdm9p
ZCBleGNlZWRlZERhdGFiYXNlUXVvdGEoRnJhbWUmLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlTmFt
ZSwgRGF0YWJhc2VEZXRhaWxzKSA9IDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hh
cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQv
V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggOWU3YjdmMmZiZGExMDdkMWNkOTAw
MjQ4YTVkOWI2YWM2YmE3MjlkNi4uNmEyNTIzMWY2ZmMyNThjMWUzOGFhMDVjZTEyYWE0NDRmZDcw
OTZjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy
YW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFy
YW1ldGVycy5jcHAKQEAgLTE4NSw2ICsxODUsMTAgQEAgdm9pZCBXZWJQYWdlQ3JlYXRpb25QYXJh
bWV0ZXJzOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogI2lmIFBMQVRGT1JN
KElPUykKICAgICBlbmNvZGVyIDw8IGFsbG93c0RlcHJlY2F0ZWRTeW5jaHJvbm91c1hNTEh0dHBS
ZXF1ZXN0RHVyaW5nVW5sb2FkOwogI2VuZGlmCisKKyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMp
CisgICAgZW5jb2RlciA8PCBhcHBIaWdobGlnaHRzVmlzaWJsZTsKKyNlbmRpZgogfQogCiBzdGQ6
Om9wdGlvbmFsPFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM+IFdlYlBhZ2VDcmVhdGlvblBhcmFt
ZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIpCkBAIC01OTgsNiArNjAyLDExIEBA
IHN0ZDo6b3B0aW9uYWw8V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycz4gV2ViUGFnZUNyZWF0aW9u
UGFyYW1ldGVyczo6ZGVjb2RlKElQQzo6CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJhbWV0
ZXJzLmFsbG93c0RlcHJlY2F0ZWRTeW5jaHJvbm91c1hNTEh0dHBSZXF1ZXN0RHVyaW5nVW5sb2Fk
KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKICNlbmRpZgorICAgIAorI2lmIEVOQUJM
RShBUFBfSElHSExJR0hUUykKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMuYXBw
SGlnaGxpZ2h0c1Zpc2libGUpKQorICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OworI2VuZGlm
CiAKICAgICByZXR1cm4gcGFyYW1ldGVyczsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
U2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVk
L1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCBkNWIxM2QyYjA5MTViNDhlY2U5YmY2
ZGU5NmU4N2JhNTkwOTRlZmU1Li5jNThlNmMyMjBiMWEwMzc2NmFhZTU0ODQ3MmYxNmI3ODNlMDQw
MmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJh
bWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1l
dGVycy5oCkBAIC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9Db2xvci5oPgogI2lu
Y2x1ZGUgPFdlYkNvcmUvRGVzdGluYXRpb25Db2xvclNwYWNlLmg+CiAjaW5jbHVkZSA8V2ViQ29y
ZS9GbG9hdFNpemUuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL0hpZ2hsaWdodFZpc2liaWxpdHkuaD4K
ICNpbmNsdWRlIDxXZWJDb3JlL0ludFNpemUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0xheW91dE1p
bGVzdG9uZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTWVkaWFQcm9kdWNlci5oPgpAQCAtMjU1LDYg
KzI1NiwxMSBAQCBzdHJ1Y3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyB7CiAjaWYgUExBVEZP
Uk0oSU9TKQogICAgIGJvb2wgYWxsb3dzRGVwcmVjYXRlZFN5bmNocm9ub3VzWE1MSHR0cFJlcXVl
c3REdXJpbmdVbmxvYWQgeyBmYWxzZSB9OwogI2VuZGlmCisgICAgCisjaWYgRU5BQkxFKEFQUF9I
SUdITElHSFRTKQorICAgIFdlYkNvcmU6OkhpZ2hsaWdodFZpc2liaWxpdHkgYXBwSGlnaGxpZ2h0
c1Zpc2libGUgeyBXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5OjpIaWRkZW4gfTsKKyNlbmRp
ZgorICAgIAogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA5Yzc1NjZkYmEyMWI5ZGE5YThlZWU0N2VlOWI3NmI4
ZjBmOWYwODZiLi5kMDU1NTRmY2JkNTE2Y2RmMzY3ZjZkN2EzYzRmNTA3MWQzYjc5ZmVlIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTMwMSw2ICszMDEsMTAg
QEAKICNpbmNsdWRlICJNZWRpYVNlc3Npb25Db29yZGluYXRvclByb3h5UHJpdmF0ZS5oIgogI2lu
Y2x1ZGUgIlJlbW90ZU1lZGlhU2Vzc2lvbkNvb3JkaW5hdG9yUHJveHkuaCIKIAorI2lmIEVOQUJM
RShBUFBfSElHSExJR0hUUykKKyNpbmNsdWRlICJIaWdobGlnaHRWaXNpYmlsaXR5LmgiCisjZW5k
aWYKKwogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAjaW1wb3J0IDxXZWJLaXRBZGRpdGlv
bnMvV0tDb29yZGluYXRvckFkZGl0aW9ucy5oPgogI2Vsc2UKQEAgLTgyMTAsNiArODIxNCwxMCBA
QCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0
ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJvYwogICAgIC8vIEZJWE1FOiBUaGlzIGlzIGFsc28gYmVp
bmcgcGFzc2VkIG92ZXIgdGhlIHRvIFdlYlByb2Nlc3MgdmlhIHRoZSBQcmVmZXJlbmNlc1N0b3Jl
LgogICAgIHBhcmFtZXRlcnMuYWxsb3dzRGVwcmVjYXRlZFN5bmNocm9ub3VzWE1MSHR0cFJlcXVl
c3REdXJpbmdVbmxvYWQgPSBhbGxvd3NEZXByZWNhdGVkU3luY2hyb25vdXNYTUxIdHRwUmVxdWVz
dER1cmluZ1VubG9hZCgpOwogI2VuZGlmCisgICAgCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRT
KQorICAgIHBhcmFtZXRlcnMuYXBwSGlnaGxpZ2h0c1Zpc2libGUgPSBhcHBIaWdobGlnaHRzVmlz
aWJpbGl0eSgpID8gSGlnaGxpZ2h0VmlzaWJpbGl0eTo6VmlzaWJsZSA6IEhpZ2hsaWdodFZpc2li
aWxpdHk6OkhpZGRlbjsKKyNlbmRpZgogCiAgICAgcmV0dXJuIHBhcmFtZXRlcnM7CiB9CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21l
Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD
aHJvbWVDbGllbnQuY3BwCmluZGV4IDdkNjJlNWU5YTM5ZDE1Y2FhMzc1YTExYzk5Njc0NTY3NjRk
Zjg5OTcuLjA0NTU3YTg1ZmM4N2M2NzQ1MWU3MGFlMTdmOWY1MGMwZmZmY2M1M2YgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll
bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD
aHJvbWVDbGllbnQuY3BwCkBAIC0xMTczLDYgKzExNzMsMTMgQEAgdm9pZCBXZWJDaHJvbWVDbGll
bnQ6OnNhbXBsZWRQYWdlVG9wQ29sb3JDaGFuZ2VkKCkgY29uc3QKICAgICBtX3BhZ2Uuc2FtcGxl
ZFBhZ2VUb3BDb2xvckNoYW5nZWQoKTsKIH0KIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykK
K1dlYkNvcmU6OkhpZ2hsaWdodFZpc2liaWxpdHkgV2ViQ2hyb21lQ2xpZW50OjphcHBIaWdobGln
aHRzVmlzaWJsaWxpdHkoKSBjb25zdAoreworICAgIHJldHVybiBtX3BhZ2UuYXBwSGlnaGxpZ2h0
c1Zpc2libGlsaXR5KCk7Cit9CisjZW5kaWYKKwogdm9pZCBXZWJDaHJvbWVDbGllbnQ6OndoZWVs
RXZlbnRIYW5kbGVyc0NoYW5nZWQoYm9vbCBoYXNIYW5kbGVycykKIHsKICAgICBtX3BhZ2Uud2hl
ZWxFdmVudEhhbmRsZXJzQ2hhbmdlZChoYXNIYW5kbGVycyk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmggYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgKaW5k
ZXggNjI4NjIwMjg0MjRmYmJiZWQxMzI4MTYzNTc0YjcwNWQzYmMxODM2Ni4uODM1YmZkMGNjNDhl
MzQzZjFmYjM0OWNjOWVlNDRhZmM0YjE5MTI4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCisrKyBiL1NvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaApAQCAtMzM0
LDYgKzMzNCwxMCBAQCBwcml2YXRlOgogICAgIHZvaWQgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENv
bG9yRGlkQ2hhbmdlKCkgY29uc3QgZmluYWw7CiAgICAgdm9pZCBzYW1wbGVkUGFnZVRvcENvbG9y
Q2hhbmdlZCgpIGNvbnN0IGZpbmFsOwogICAgIAorI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykK
KyAgICBXZWJDb3JlOjpIaWdobGlnaHRWaXNpYmlsaXR5IGFwcEhpZ2hsaWdodHNWaXNpYmxpbGl0
eSgpIGNvbnN0IGZpbmFsOworI2VuZGlmCisgICAgCiAgICAgdm9pZCB3aGVlbEV2ZW50SGFuZGxl
cnNDaGFuZ2VkKGJvb2wpIGZpbmFsOwogCiAgICAgU3RyaW5nIHBsdWdJblN0YXJ0TGFiZWxUaXRs
ZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKSBjb25zdCBmaW5hbDsKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMmQ0YTE0MWZlMDVlNWMwYjk3MzAy
ZmQyZTViMmMxMzk4ZWZmNjY2MS4uMzdiNDNlOWM3YzVmMmQ3YzA5N2YzOGQwZmQ2MGY5Y2M4YjRl
NmQxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK
QEAgLTUzNSw2ICs1MzUsOSBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJ
RCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgLCBtX2xpbWl0
c05hdmlnYXRpb25zVG9BcHBCb3VuZERvbWFpbnMocGFyYW1ldGVycy5saW1pdHNOYXZpZ2F0aW9u
c1RvQXBwQm91bmREb21haW5zKQogI2VuZGlmCiAgICAgLCBtX2xhc3ROYXZpZ2F0aW9uV2FzQXBw
Qm91bmQocGFyYW1ldGVycy5sYXN0TmF2aWdhdGlvbldhc0FwcEJvdW5kKQorI2lmIEVOQUJMRShB
UFBfSElHSExJR0hUUykKKyAgICAsIG1fYXBwSGlnaGxpZ2h0c1Zpc2libGUocGFyYW1ldGVycy5h
cHBIaWdobGlnaHRzVmlzaWJsZSkKKyNlbmRpZgogewogICAgIEFTU0VSVChtX2lkZW50aWZpZXIp
OwogCkBAIC03NjE3LDYgKzc2MjAsNyBAQCB2b2lkIFdlYlBhZ2U6OnJlc3RvcmVBcHBIaWdobGln
aHRzQW5kU2Nyb2xsVG9JbmRleChjb25zdCBWZWN0b3I8U2hhcmVkTWVtb3J5OjpJUAogCiB2b2lk
IFdlYlBhZ2U6OnNldEFwcEhpZ2hsaWdodHNWaXNpYmlsaXR5KFdlYkNvcmU6OkhpZ2hsaWdodFZp
c2liaWxpdHkgYXBwSGlnaGxpZ2h0VmlzaWJpbGl0eSkKIHsKKyAgICBtX2FwcEhpZ2hsaWdodHNW
aXNpYmxlID0gYXBwSGlnaGxpZ2h0VmlzaWJpbGl0eTsKICAgICBmb3IgKFJlZlB0cjxGcmFtZT4g
ZnJhbWUgPSBtX21haW5GcmFtZS0+Y29yZUZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50
cmVlKCkudHJhdmVyc2VOZXh0UmVuZGVyZWQoKSkgewogICAgICAgICBpZiAoYXV0byBkb2N1bWVu
dCA9IG1ha2VSZWZQdHIoZnJhbWUtPmRvY3VtZW50KCkpKQogICAgICAgICAgICAgZG9jdW1lbnQt
PmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkuc2V0SGlnaGxpZ2h0VmlzaWJpbGl0eShhcHBIaWdobGln
aHRWaXNpYmlsaXR5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
YWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
aAppbmRleCBkNjc2ZTcwMTU2MGZmZTAzOGMyY2EzN2Q0NzMxYTQ4YTA4NjBiM2M2Li40NGM2YWMy
OWI0OTczODEzMDc3NDVkNTlkYTNjNzFiOTQ4NjI1YWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0xNDMwLDYgKzE0MzAsNyBAQCBwdWJsaWM6CiAj
aWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQogICAgIFdlYkNvcmU6OkNyZWF0ZU5ld0dyb3VwRm9y
SGlnaGxpZ2h0IGhpZ2hsaWdodElzTmV3R3JvdXAoKSBjb25zdCB7IHJldHVybiBtX2hpZ2hsaWdo
dElzTmV3R3JvdXA7IH0KICAgICBXZWJDb3JlOjpIaWdobGlnaHRSZXF1ZXN0T3JpZ2luYXRlZElu
QXBwIGhpZ2hsaWdodFJlcXVlc3RPcmlnaW5hdGVkSW5BcHAoKSBjb25zdCB7IHJldHVybiBtX2hp
Z2hsaWdodFJlcXVlc3RPcmlnaW5hdGVkSW5BcHA7IH0KKyAgICBXZWJDb3JlOjpIaWdobGlnaHRW
aXNpYmlsaXR5IGFwcEhpZ2hsaWdodHNWaXNpYmxpbGl0eSgpIGNvbnN0IHsgcmV0dXJuIG1fYXBw
SGlnaGxpZ2h0c1Zpc2libGU7IH0KIAogICAgIGJvb2wgY3JlYXRlQXBwSGlnaGxpZ2h0SW5TZWxl
Y3RlZFJhbmdlKFdlYkNvcmU6OkNyZWF0ZU5ld0dyb3VwRm9ySGlnaGxpZ2h0LCBXZWJDb3JlOjpI
aWdobGlnaHRSZXF1ZXN0T3JpZ2luYXRlZEluQXBwKTsKICAgICB2b2lkIHJlc3RvcmVBcHBIaWdo
bGlnaHRzQW5kU2Nyb2xsVG9JbmRleChjb25zdCBWZWN0b3I8U2hhcmVkTWVtb3J5OjpJUENIYW5k
bGU+JiYsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQ+IGluZGV4KTsKQEAgLTIzNTIsNiAr
MjM1MywxMCBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShXRUJYUikgJiYgUExBVEZPUk0oQ09DT0Ep
CiAgICAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtWFJTeXN0ZW1Qcm94eT4gbV94clN5c3RlbVBy
b3h5OwogI2VuZGlmCisgICAgCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAgIFdlYkNv
cmU6OkhpZ2hsaWdodFZpc2liaWxpdHkgbV9hcHBIaWdobGlnaHRzVmlzaWJsZSB7IGZhbHNlIH07
CisjZW5kaWYKIH07CiAKICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWSkK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>431896</attachid>
            <date>2021-06-21 12:49:05 -0700</date>
            <delta_ts>2021-06-21 13:44:58 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-227141-20210621124904.patch</filename>
            <type>text/plain</type>
            <size>11153</size>
            <attacher name="Megan Gardner">megan_gardner</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM3MjYxMmIyNGNiMDEx
ZDIwMWQ3YTU4ZTY3MmNjMDZlMTdkZjBkOS4uNzZmOTIyMDcyOWM4ZGMyNGE2MGY4YzY4ZmY5MzZl
ZWY2MTVjOGIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA2LTE3ICBNZWdh
biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwSGlnaGxp
Z2h0cyBkaXNhcHBlYXIgb24gcGFnZSByZWxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzE0MQorICAgICAgICByZGFyOi8vNzgxOTAzMzEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgUHJlc2VydmUgdGhl
IHN0YXRlIG9mIGhpZ2hsaWdodCB2aXNpYmlsaXR5IHNvIHRoYXQgaXMgY29ycmVjdCBvbiBwYWdl
LXJlbG9hZC4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl
OjpEb2N1bWVudDo6YXBwSGlnaGxpZ2h0UmVnaXN0ZXIpOgorICAgICAgICAqIHBhZ2UvQ2hyb21l
Q2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnQ6OmFwcEhpZ2hsaWdodHNW
aXNpYmxpbGl0eSBjb25zdCk6CisKIDIwMjEtMDYtMTcgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0
aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNzcwNjcpOiBJbmNvcnJlY3Qg
dGV4dCBjb2xvciBmb3IgZGVmYXVsdC1idXR0b24gYXBwZWFyYW5jZQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAwNGQ5
ZTY4YmFiNzY5YzI1NDZlN2Y2MzE5OWRjMmQ4NzQwYjZmMjc1Li5iYWJkNzU4YTY4OTNhYTc4NmIz
YTQ0YjFiZDkzYWRlMDFjNDE0MjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv
ZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTA2
LTE3ICBNZWdhbiBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAg
QXBwSGlnaGxpZ2h0cyBkaXNhcHBlYXIgb24gcGFnZSByZWxvYWQKKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzE0MQorICAgICAgICByZGFyOi8vNzgx
OTAzMzEKKworICAgICAgICBSZXZpZXdlZCBieSBEZXZpbiBSb3Vzc28uCisKKyAgICAgICAgV2hl
biBhIHBhZ2UgaXMgcmVsb2FkZWQsIGEgbmV3IHNldCBvZiBoaWdobGlnaHRzIGlzIGxvYWRlZCwg
YnV0IHRoZSBzdGF0ZSBvZiB2aXNpYmlsaXR5IG9mCisgICAgICAgIHRoZSBoaWdobGlnaHRzIGlz
IG5vdCBwcmVzZXJ2ZWQuCisgICAgICAgIFdlIG5lZWQgdG8gcHJlc2VydmUgdGhlIHN0YXRlIG9m
IGhpZ2hsaWdodHMgc28gdGhleSBhcmUgY29ycmVjdGx5IHNob3duIG9uIHJlbG9hZC4KKworICAg
ICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdl
YktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAg
KFdlYktpdDo6V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBT
aGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi
Q2hyb21lQ2xpZW50OjphcHBIaWdobGlnaHRzVmlzaWJsaWxpdHkgY29uc3QpOgorICAgICAgICAq
IFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50Lmg6CisgICAgICAgICog
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjptX2FwcEhp
Z2hsaWdodHNWaXNpYmxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2V0QXBwSGlnaGxp
Z2h0c1Zpc2liaWxpdHkpOgorICAgICAgICAoV2ViS2l0OjptX2xhc3ROYXZpZ2F0aW9uV2FzQXBw
Qm91bmQpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6
CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmFwcEhpZ2hsaWdodHNWaXNpYmxpbGl0eSBjb25z
dCk6CisKIDIwMjEtMDYtMTcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+
CiAKICAgICAgICAgQWRvcHQgV0tIb3Zlckdlc3R1cmVSZWNvZ25pemVyCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt
ZW50LmNwcAppbmRleCBjYzI2MTU0NGI5Y2NlMGI4YTRkMWRlNmRiYmNmNjQwNjRiMTM3MDBjLi41
NTI0ZWVjNTU4N2QxZTkxNzBlZjlmMTQ5MmNjMDdkZTI1YzgwZWM3IDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1
bWVudC5jcHAKQEAgLTI4MjIsOCArMjgyMiwxMSBAQCBIaWdobGlnaHRSZWdpc3RlciYgRG9jdW1l
bnQ6OmhpZ2hsaWdodFJlZ2lzdGVyKCkKICNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCiBIaWdo
bGlnaHRSZWdpc3RlciYgRG9jdW1lbnQ6OmFwcEhpZ2hsaWdodFJlZ2lzdGVyKCkKIHsKLSAgICBp
ZiAoIW1fYXBwSGlnaGxpZ2h0UmVnaXN0ZXIpCisgICAgaWYgKCFtX2FwcEhpZ2hsaWdodFJlZ2lz
dGVyKSB7CiAgICAgICAgIG1fYXBwSGlnaGxpZ2h0UmVnaXN0ZXIgPSBIaWdobGlnaHRSZWdpc3Rl
cjo6Y3JlYXRlKCk7CisgICAgICAgIGlmIChhdXRvKiBjdXJyZW50UGFnZSA9IHBhZ2UoKSkKKyAg
ICAgICAgICAgIG1fYXBwSGlnaGxpZ2h0UmVnaXN0ZXItPnNldEhpZ2hsaWdodFZpc2liaWxpdHko
Y3VycmVudFBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLmFwcEhpZ2hsaWdodHNWaXNpYmxpbGl0eSgp
KTsKKyAgICB9CiAgICAgcmV0dXJuICptX2FwcEhpZ2hsaWdodFJlZ2lzdGVyOwogfQogCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oIGIvU291cmNlL1dlYkNv
cmUvcGFnZS9DaHJvbWVDbGllbnQuaAppbmRleCA2ZDg0ZjY5NDRkZjYxNzc0MDVjMWZhZjNiYWJk
ZTEwZDliYmY1OTkzLi5iNTU3N2VkOWNiMDg5YTdiMjVjMjhmYTVmOTk0ZTBjMzNhNzA5NTgzIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCisrKyBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRl
ICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJHcmFwaGljc0xheWVyLmgiCiAjaW5jbHVk
ZSAiSFRNTE1lZGlhRWxlbWVudEVudW1zLmgiCisjaW5jbHVkZSAiSGlnaGxpZ2h0VmlzaWJpbGl0
eS5oIgogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJJY29uLmgiCiAjaW5jbHVk
ZSAiSW1hZ2VCdWZmZXIuaCIKQEAgLTIzNiw2ICsyMzcsMTAgQEAgcHVibGljOgogICAgIHZpcnR1
YWwgdm9pZCB0aGVtZUNvbG9yQ2hhbmdlZCgpIGNvbnN0IHsgfQogICAgIHZpcnR1YWwgdm9pZCBw
YWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UoKSBjb25zdCB7IH0KICAgICB2aXJ0
dWFsIHZvaWQgc2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQoKSBjb25zdCB7IH0KKyAgICAKKyNp
ZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisgICAgdmlydHVhbCBXZWJDb3JlOjpIaWdobGlnaHRW
aXNpYmlsaXR5IGFwcEhpZ2hsaWdodHNWaXNpYmxpbGl0eSgpIGNvbnN0IHsgcmV0dXJuIEhpZ2hs
aWdodFZpc2liaWxpdHk6OkhpZGRlbjsgfTsKKyNlbmRpZgogCiAgICAgdmlydHVhbCB2b2lkIGV4
Y2VlZGVkRGF0YWJhc2VRdW90YShGcmFtZSYsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBE
YXRhYmFzZURldGFpbHMpID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQv
V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQ
YWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCA5ZTdiN2YyZmJkYTEwN2QxY2Q5MDAyNDhh
NWQ5YjZhYzZiYTcyOWQ2Li42YTI1MjMxZjZmYzI1OGMxZTM4YWEwNWNlMTJhYTQ0NGZkNzA5NmM4
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0
ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0
ZXJzLmNwcApAQCAtMTg1LDYgKzE4NSwxMCBAQCB2b2lkIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRl
cnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAjaWYgUExBVEZPUk0oSU9T
KQogICAgIGVuY29kZXIgPDwgYWxsb3dzRGVwcmVjYXRlZFN5bmNocm9ub3VzWE1MSHR0cFJlcXVl
c3REdXJpbmdVbmxvYWQ7CiAjZW5kaWYKKworI2lmIEVOQUJMRShBUFBfSElHSExJR0hUUykKKyAg
ICBlbmNvZGVyIDw8IGFwcEhpZ2hsaWdodHNWaXNpYmxlOworI2VuZGlmCiB9CiAKIHN0ZDo6b3B0
aW9uYWw8V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycz4gV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy
czo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlcikKQEAgLTU5OCw2ICs2MDIsMTEgQEAgc3Rk
OjpvcHRpb25hbDxXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzPiBXZWJQYWdlQ3JlYXRpb25QYXJh
bWV0ZXJzOjpkZWNvZGUoSVBDOjoKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhcmFtZXRlcnMu
YWxsb3dzRGVwcmVjYXRlZFN5bmNocm9ub3VzWE1MSHR0cFJlcXVlc3REdXJpbmdVbmxvYWQpKQog
ICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogI2VuZGlmCisgICAgCisjaWYgRU5BQkxFKEFQ
UF9ISUdITElHSFRTKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hcHBIaWdo
bGlnaHRzVmlzaWJsZSkpCisgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisjZW5kaWYKIAog
ICAgIHJldHVybiBwYXJhbWV0ZXJzOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFy
ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2Vi
UGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IGQ1YjEzZDJiMDkxNWI0OGVjZTliZjZkZTk2
ZTg3YmE1OTA5NGVmZTUuLmM1OGU2YzIyMGIxYTAzNzY2YWFlNTQ4NDcyZjE2Yjc4M2UwNDAyYWMg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRl
cnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz
LmgKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0NvbG9yLmg+CiAjaW5jbHVk
ZSA8V2ViQ29yZS9EZXN0aW5hdGlvbkNvbG9yU3BhY2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Zs
b2F0U2l6ZS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvSGlnaGxpZ2h0VmlzaWJpbGl0eS5oPgogI2lu
Y2x1ZGUgPFdlYkNvcmUvSW50U2l6ZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTGF5b3V0TWlsZXN0
b25lLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9NZWRpYVByb2R1Y2VyLmg+CkBAIC0yNTUsNiArMjU2
LDExIEBAIHN0cnVjdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICNpZiBQTEFURk9STShJ
T1MpCiAgICAgYm9vbCBhbGxvd3NEZXByZWNhdGVkU3luY2hyb25vdXNYTUxIdHRwUmVxdWVzdER1
cmluZ1VubG9hZCB7IGZhbHNlIH07CiAjZW5kaWYKKyAgICAKKyNpZiBFTkFCTEUoQVBQX0hJR0hM
SUdIVFMpCisgICAgV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eSBhcHBIaWdobGlnaHRzVmlz
aWJsZSB7IFdlYkNvcmU6OkhpZ2hsaWdodFZpc2liaWxpdHk6OkhpZGRlbiB9OworI2VuZGlmCisg
ICAgCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X
ZWJQYWdlUHJveHkuY3BwCmluZGV4IDljNzU2NmRiYTIxYjlkYTlhOGVlZTQ3ZWU5Yjc2YjhmMGY5
ZjA4NmIuLmQwNTU1NGZjYmQ1MTZjZGYzNjdmNmQ3YTNjNGY1MDcxZDNiNzlmZWUgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzAxLDYgKzMwMSwxMCBAQAog
I2luY2x1ZGUgIk1lZGlhU2Vzc2lvbkNvb3JkaW5hdG9yUHJveHlQcml2YXRlLmgiCiAjaW5jbHVk
ZSAiUmVtb3RlTWVkaWFTZXNzaW9uQ29vcmRpbmF0b3JQcm94eS5oIgogCisjaWYgRU5BQkxFKEFQ
UF9ISUdITElHSFRTKQorI2luY2x1ZGUgIkhpZ2hsaWdodFZpc2liaWxpdHkuaCIKKyNlbmRpZgor
CiAjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9X
S0Nvb3JkaW5hdG9yQWRkaXRpb25zLmg+CiAjZWxzZQpAQCAtODIxMCw2ICs4MjE0LDEwIEBAIFdl
YlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMo
V2ViUHJvY2Vzc1Byb3h5JiBwcm9jCiAgICAgLy8gRklYTUU6IFRoaXMgaXMgYWxzbyBiZWluZyBw
YXNzZWQgb3ZlciB0aGUgdG8gV2ViUHJvY2VzcyB2aWEgdGhlIFByZWZlcmVuY2VzU3RvcmUuCiAg
ICAgcGFyYW1ldGVycy5hbGxvd3NEZXByZWNhdGVkU3luY2hyb25vdXNYTUxIdHRwUmVxdWVzdER1
cmluZ1VubG9hZCA9IGFsbG93c0RlcHJlY2F0ZWRTeW5jaHJvbm91c1hNTEh0dHBSZXF1ZXN0RHVy
aW5nVW5sb2FkKCk7CiAjZW5kaWYKKyAgICAKKyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisg
ICAgcGFyYW1ldGVycy5hcHBIaWdobGlnaHRzVmlzaWJsZSA9IGFwcEhpZ2hsaWdodHNWaXNpYmls
aXR5KCkgPyBIaWdobGlnaHRWaXNpYmlsaXR5OjpWaXNpYmxlIDogSGlnaGxpZ2h0VmlzaWJpbGl0
eTo6SGlkZGVuOworI2VuZGlmCiAKICAgICByZXR1cm4gcGFyYW1ldGVyczsKIH0KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGll
bnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t
ZUNsaWVudC5jcHAKaW5kZXggN2Q2MmU1ZTlhMzlkMTVjYWEzNzVhMTFjOTk2NzQ1Njc2NGRmODk5
Ny4uMDQ1NTdhODVmYzg3YzY3NDUxZTcwYWUxN2Y5ZjUwYzBmZmZjYzUzZiAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5j
cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t
ZUNsaWVudC5jcHAKQEAgLTExNzMsNiArMTE3MywxMyBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6
c2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQoKSBjb25zdAogICAgIG1fcGFnZS5zYW1wbGVkUGFn
ZVRvcENvbG9yQ2hhbmdlZCgpOwogfQogCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorV2Vi
Q29yZTo6SGlnaGxpZ2h0VmlzaWJpbGl0eSBXZWJDaHJvbWVDbGllbnQ6OmFwcEhpZ2hsaWdodHNW
aXNpYmxpbGl0eSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fcGFnZS5hcHBIaWdobGlnaHRzVmlz
aWJsaWxpdHkoKTsKK30KKyNlbmRpZgorCiB2b2lkIFdlYkNocm9tZUNsaWVudDo6d2hlZWxFdmVu
dEhhbmRsZXJzQ2hhbmdlZChib29sIGhhc0hhbmRsZXJzKQogewogICAgIG1fcGFnZS53aGVlbEV2
ZW50SGFuZGxlcnNDaGFuZ2VkKGhhc0hhbmRsZXJzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaCBiL1NvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuaAppbmRleCA2
Mjg2MjAyODQyNGZiYmJlZDEzMjgxNjM1NzRiNzA1ZDNiYzE4MzY2Li44MzViZmQwY2M0OGUzNDNm
MWZiMzQ5Y2M5ZWU0NGFmYzRiMTkxMjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5oCkBAIC0zMzQsNiAr
MzM0LDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JE
aWRDaGFuZ2UoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIHNhbXBsZWRQYWdlVG9wQ29sb3JDaGFu
Z2VkKCkgY29uc3QgZmluYWw7CiAgICAgCisjaWYgRU5BQkxFKEFQUF9ISUdITElHSFRTKQorICAg
IFdlYkNvcmU6OkhpZ2hsaWdodFZpc2liaWxpdHkgYXBwSGlnaGxpZ2h0c1Zpc2libGlsaXR5KCkg
Y29uc3QgZmluYWw7CisjZW5kaWYKKyAgICAKICAgICB2b2lkIHdoZWVsRXZlbnRIYW5kbGVyc0No
YW5nZWQoYm9vbCkgZmluYWw7CiAKICAgICBTdHJpbmcgcGx1Z0luU3RhcnRMYWJlbFRpdGxlKGNv
bnN0IFN0cmluZyYgbWltZVR5cGUpIGNvbnN0IGZpbmFsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAyZDRhMTQxZmUwNWU1YzBiOTczMDJmZDJl
NWIyYzEzOThlZmY2NjYxLi4zN2I0M2U5YzdjNWYyZDdjMDk3ZjM4ZDBmZDYwZjljYzhiNGU2ZDE4
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAt
NTM1LDYgKzUzNSw5IEBAIFdlYlBhZ2U6OldlYlBhZ2UoUGFnZUlkZW50aWZpZXIgcGFnZUlELCBX
ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICAsIG1fbGltaXRzTmF2
aWdhdGlvbnNUb0FwcEJvdW5kRG9tYWlucyhwYXJhbWV0ZXJzLmxpbWl0c05hdmlnYXRpb25zVG9B
cHBCb3VuZERvbWFpbnMpCiAjZW5kaWYKICAgICAsIG1fbGFzdE5hdmlnYXRpb25XYXNBcHBCb3Vu
ZChwYXJhbWV0ZXJzLmxhc3ROYXZpZ2F0aW9uV2FzQXBwQm91bmQpCisjaWYgRU5BQkxFKEFQUF9I
SUdITElHSFRTKQorICAgICwgbV9hcHBIaWdobGlnaHRzVmlzaWJsZShwYXJhbWV0ZXJzLmFwcEhp
Z2hsaWdodHNWaXNpYmxlKQorI2VuZGlmCiB7CiAgICAgQVNTRVJUKG1faWRlbnRpZmllcik7CiAK
QEAgLTc2MTcsNiArNzYyMCw3IEBAIHZvaWQgV2ViUGFnZTo6cmVzdG9yZUFwcEhpZ2hsaWdodHNB
bmRTY3JvbGxUb0luZGV4KGNvbnN0IFZlY3RvcjxTaGFyZWRNZW1vcnk6OklQCiAKIHZvaWQgV2Vi
UGFnZTo6c2V0QXBwSGlnaGxpZ2h0c1Zpc2liaWxpdHkoV2ViQ29yZTo6SGlnaGxpZ2h0VmlzaWJp
bGl0eSBhcHBIaWdobGlnaHRWaXNpYmlsaXR5KQogeworICAgIG1fYXBwSGlnaGxpZ2h0c1Zpc2li
bGUgPSBhcHBIaWdobGlnaHRWaXNpYmlsaXR5OwogICAgIGZvciAoUmVmUHRyPEZyYW1lPiBmcmFt
ZSA9IG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUo
KS50cmF2ZXJzZU5leHRSZW5kZXJlZCgpKSB7CiAgICAgICAgIGlmIChhdXRvIGRvY3VtZW50ID0g
bWFrZVJlZlB0cihmcmFtZS0+ZG9jdW1lbnQoKSkpCiAgICAgICAgICAgICBkb2N1bWVudC0+YXBw
SGlnaGxpZ2h0UmVnaXN0ZXIoKS5zZXRIaWdobGlnaHRWaXNpYmlsaXR5KGFwcEhpZ2hsaWdodFZp
c2liaWxpdHkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv
V2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu
ZGV4IGQ2NzZlNzAxNTYwZmZlMDM4YzJjYTM3ZDQ3MzFhNDhhMDg2MGIzYzYuLjQ0YzZhYzI5YjQ5
NzM4MTMwNzc0NWQ1OWRhM2M3MWI5NDg2MjVhYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTE0MzAsNiArMTQzMCw3IEBAIHB1YmxpYzoKICNpZiBF
TkFCTEUoQVBQX0hJR0hMSUdIVFMpCiAgICAgV2ViQ29yZTo6Q3JlYXRlTmV3R3JvdXBGb3JIaWdo
bGlnaHQgaGlnaGxpZ2h0SXNOZXdHcm91cCgpIGNvbnN0IHsgcmV0dXJuIG1faGlnaGxpZ2h0SXNO
ZXdHcm91cDsgfQogICAgIFdlYkNvcmU6OkhpZ2hsaWdodFJlcXVlc3RPcmlnaW5hdGVkSW5BcHAg
aGlnaGxpZ2h0UmVxdWVzdE9yaWdpbmF0ZWRJbkFwcCgpIGNvbnN0IHsgcmV0dXJuIG1faGlnaGxp
Z2h0UmVxdWVzdE9yaWdpbmF0ZWRJbkFwcDsgfQorICAgIFdlYkNvcmU6OkhpZ2hsaWdodFZpc2li
aWxpdHkgYXBwSGlnaGxpZ2h0c1Zpc2libGlsaXR5KCkgY29uc3QgeyByZXR1cm4gbV9hcHBIaWdo
bGlnaHRzVmlzaWJsZTsgfQogCiAgICAgYm9vbCBjcmVhdGVBcHBIaWdobGlnaHRJblNlbGVjdGVk
UmFuZ2UoV2ViQ29yZTo6Q3JlYXRlTmV3R3JvdXBGb3JIaWdobGlnaHQsIFdlYkNvcmU6OkhpZ2hs
aWdodFJlcXVlc3RPcmlnaW5hdGVkSW5BcHApOwogICAgIHZvaWQgcmVzdG9yZUFwcEhpZ2hsaWdo
dHNBbmRTY3JvbGxUb0luZGV4KGNvbnN0IFZlY3RvcjxTaGFyZWRNZW1vcnk6OklQQ0hhbmRsZT4m
JiwgY29uc3Qgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gaW5kZXgpOwpAQCAtMjM1Miw2ICsyMzUz
LDEwIEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKFdFQlhSKSAmJiBQTEFURk9STShDT0NPQSkKICAg
ICBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1YUlN5c3RlbVByb3h5PiBtX3hyU3lzdGVtUHJveHk7
CiAjZW5kaWYKKyAgICAKKyNpZiBFTkFCTEUoQVBQX0hJR0hMSUdIVFMpCisgICAgV2ViQ29yZTo6
SGlnaGxpZ2h0VmlzaWJpbGl0eSBtX2FwcEhpZ2hsaWdodHNWaXNpYmxlIHsgZmFsc2UgfTsKKyNl
bmRpZgogfTsKIAogI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>