<?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>216205</bug_id>
          
          <creation_ts>2020-09-04 17:12:58 -0700</creation_ts>
          <short_desc>Unified build fix for &quot;redefinition of &apos;kCMVideoCodecType_VP9&quot;</short_desc>
          <delta_ts>2020-09-17 02:19:17 -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>
          
          <blocked>202798</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Jer Noble">jer.noble</reporter>
          <assigned_to name="Jer Noble">jer.noble</assigned_to>
          <cc>clord</cc>
    
    <cc>darin</cc>
    
    <cc>eric.carlson</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>peng.liu6</cc>
    
    <cc>philipj</cc>
    
    <cc>sergio</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
    
    <cc>ysuzuki</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1685941</commentid>
    <comment_count>0</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-04 17:12:58 -0700</bug_when>
    <thetext>Unified build fix for &quot;redefinition of &apos;kCMVideoCodecType_VP9&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1685948</commentid>
    <comment_count>1</comment_count>
      <attachid>408049</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-04 17:20:10 -0700</bug_when>
    <thetext>Created attachment 408049
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686002</commentid>
    <comment_count>2</comment_count>
      <attachid>408049</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-09-04 21:30:08 -0700</bug_when>
    <thetext>Comment on attachment 408049
Patch

Build failures so I won’t r+ yet.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686579</commentid>
    <comment_count>3</comment_count>
      <attachid>408233</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-08 09:18:48 -0700</bug_when>
    <thetext>Created attachment 408233
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686582</commentid>
    <comment_count>4</comment_count>
      <attachid>408234</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-08 09:30:47 -0700</bug_when>
    <thetext>Created attachment 408234
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686586</commentid>
    <comment_count>5</comment_count>
      <attachid>408235</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-08 09:40:04 -0700</bug_when>
    <thetext>Created attachment 408235
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686794</commentid>
    <comment_count>6</comment_count>
      <attachid>408282</attachid>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-08 16:18:18 -0700</bug_when>
    <thetext>Created attachment 408282
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686813</commentid>
    <comment_count>7</comment_count>
      <attachid>408282</attachid>
    <who name="Peng Liu">peng.liu6</who>
    <bug_when>2020-09-08 17:03:50 -0700</bug_when>
    <thetext>Comment on attachment 408282
Patch

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

&gt; Source/WebCore/ChangeLog:17
&gt; +        (): Deleted.

Something is missing here?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686858</commentid>
    <comment_count>8</comment_count>
    <who name="Jer Noble">jer.noble</who>
    <bug_when>2020-09-08 18:32:15 -0700</bug_when>
    <thetext>(In reply to Peng Liu from comment #7)
&gt; Comment on attachment 408282 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=408282&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/ChangeLog:17
&gt; &gt; +        (): Deleted.
&gt; 
&gt; Something is missing here?

Seems like a bug in the ChangeLog generation script.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1686864</commentid>
    <comment_count>9</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2020-09-08 18:44:25 -0700</bug_when>
    <thetext>(In reply to Jer Noble from comment #8)
&gt; (In reply to Peng Liu from comment #7)
&gt; &gt; &gt; Source/WebCore/ChangeLog:17
&gt; &gt; &gt; +        (): Deleted.
&gt; &gt; 
&gt; &gt; Something is missing here?
&gt; 
&gt; Seems like a bug in the ChangeLog generation script.

Yes, definitely is. The script has a lot of bugs so I recommend looking over what it generated. It’s there to help you write the change log, not to write it for you.

However, since a lot of people are not writing per-function change log I’m starting to wonder what we should do. Not sure that blob of text is doing a lot of good if the person who wrote the change log isn’t reading it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1687669</commentid>
    <comment_count>10</comment_count>
      <attachid>408282</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2020-09-10 23:58:04 -0700</bug_when>
    <thetext>Comment on attachment 408282
Patch

ENABLE_VP9 is Mac Big Sur only, RTC_ENABLE_VP9 is on in all cases.
Maybe we should rationalise that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1687862</commentid>
    <comment_count>11</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-09-11 17:13:14 -0700</bug_when>
    <thetext>&lt;rdar://problem/68740141&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1689396</commentid>
    <comment_count>12</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-09-17 02:19:16 -0700</bug_when>
    <thetext>Committed r267185: &lt;https://trac.webkit.org/changeset/267185&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 408282.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>408049</attachid>
            <date>2020-09-04 17:20:10 -0700</date>
            <delta_ts>2020-09-08 09:18:45 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216205-20200904172010.patch</filename>
            <type>text/plain</type>
            <size>12243</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhkY2UxNThmMmU5ZmFk
MDQ0M2ViMmM4YjhjNjdmYmQ1NDY3MGI1ZS4uMmM2OWI4M2M3YWRiZjdiZTcwYmNiZWVmZGJjNmI4
OWU3YTI5Y2Q0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA5LTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZpZWQgYnVpbGQgZml4
IGZvciAicmVkZWZpbml0aW9uIG9mICdrQ01WaWRlb0NvZGVjVHlwZV9WUDkiCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYyMDUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBrQ01WaWRlb0NvZGVjVHlwZV9W
UDkgaXMgcHJlc2VudCBpbiB0aGUgbWFjT1MgQmlnIFN1ciBTREssIHNvIHRoZSByZWRlY2xhcmF0
aW9uIGNhbgorICAgICAgICBiZSByZW1vdmVkLiBUbyBwcm90ZWN0IGJ1aWxkcyB1c2luZyBwcmlv
ciBPUyBTREtzLCB3cmFwIHRoZSBlbnRpcmUgVlA5IGltcGxlbWVudGF0aW9uCisgICAgICAgIGlu
IEVOQUJMRShWUDkpIGNoZWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0
aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmg6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1cmF0
aW9uRmFjdG9yeUNvY29hLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29h
Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2Eu
bW06CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
SW50ZXJuYWxzOjpJbnRlcm5hbHMpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpwYXJz
ZVZQQ29kZWNQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0SGFy
ZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Oklu
dGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyk6CisKIDIwMjAtMDkt
MDQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hLEhE
Ul0gSExTIHN0cmVhbXMgd2l0aCBIRFIgdmFyaWFudHMgd2lsbCBub3Qgc2VsZWN0IEhEUi4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggOWQ5NmZhNDY0YjUyMzQ2MjMwN2VmY2NiNjk2OGJmMjFiNjZlNjY1ZC4uMmM1ZDkz
ZTkwY2E2NDE2OWU2YWVmODg5M2IxYTZhMmI2YTc1OTM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAyMC0wOS0wNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg
ICAgICBVbmlmaWVkIGJ1aWxkIGZpeCBmb3IgInJlZGVmaW5pdGlvbiBvZiAna0NNVmlkZW9Db2Rl
Y1R5cGVfVlA5IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgV3JhcCBjYWxscyB0byBXZWJDb3JlIFZQOSBmdW5jdGlvbnMgaW4gRU5BQkxFKFZQOSkgY2hl
Y2tzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
OgorCiAyMDIwLTA4LTI2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJFR1JFU1NJT04ocjI2NDcxMCk6IEluaXRpYWxpemluZyB0aGUgQVZQbGF5ZXIgT2JqLUMg
Y2xhc3MgYXQgcHJvY2VzcyBzdGFydCB1cCBjYXVzZXMgYSByZWdyZXNzaW9uIGluIHBvd2VyLXVz
ZSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5
VXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0aWxp
dGllcy5jcHAKaW5kZXggMTQwODc0MWI4MTMzMTBkMjdmNDYwMDAxOGUzMzFhNTA0YzU0NDBiZC4u
MWUwNWJmYjM2N2Q0Mzg3ODI0MzA1MDQwNTVlZmRjOWUyYmM2Y2QwNCAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9WUDlVdGlsaXRpZXMuY3BwCkBAIC0yNiw2ICsy
Niw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzLmgiCiAK
KyNpZiBFTkFCTEUoVlA5KQorCiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5j
bHVkZSA8d3RmL3RleHQvU3RyaW5nVG9JbnRlZ2VyQ29udmVyc2lvbi5oPgogCkBAIC0yMzIsMyAr
MjM0LDUgQEAgT3B0aW9uYWw8VlBDb2RlY0NvbmZpZ3VyYXRpb25SZWNvcmQ+IHBhcnNlVlBDb2Rl
Y1BhcmFtZXRlcnMoU3RyaW5nVmlldyBjb2RlY1ZpZXcKIH0KIAogfQorCisjZW5kaWYgLy8gRU5B
QkxFKFZQOSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1ZQ
OVV0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0
aWVzLmgKaW5kZXggODg3Njk4MzhkNTA4MTk4MmQyMmEwN2IwNTlkNDBiZDMxNWMyY2JlNi4uMmQ3
NjQ5ZGMwZjYxYTQyNTRhMmM3NDVkYTYyNTk5M2RiMzhmNzNhMCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmgKQEAgLTI1LDYgKzI1LDggQEAK
IAogI3ByYWdtYSBvbmNlCiAKKyNpZiBFTkFCTEUoVlA5KQorCiAjaW5jbHVkZSA8d3RmL3RleHQv
U3RyaW5nVmlldy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC0xMjgs
MyArMTMwLDUgQEAgc3RydWN0IFZQQ29kZWNDb25maWd1cmF0aW9uUmVjb3JkIHsKIFdFQkNPUkVf
RVhQT1JUIE9wdGlvbmFsPFZQQ29kZWNDb25maWd1cmF0aW9uUmVjb3JkPiBwYXJzZVZQQ29kZWNQ
YXJhbWV0ZXJzKFN0cmluZ1ZpZXcgY29kZWNTdHJpbmcpOwogCiB9CisKKyNlbmRpZiAvLyBFTkFC
TEUoVlA5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFjdG9yeUNvY29hLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL01lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rv
cnlDb2NvYS5jcHAKaW5kZXggN2NkZmU4NjQyMzA3NDIyMDk3YzFjNWY5NjkyMDcyMTgyMTA0Njcw
ZS4uOWM1NGIxNzNjMzdkZmM3NDQ2YjY1YjA3Njk5NWY2MDNlNzhlYzFiZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1
cmF0aW9uRmFjdG9yeUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jb2NvYS9NZWRpYUVuZ2luZUNvbmZpZ3VyYXRpb25GYWN0b3J5Q29jb2EuY3BwCkBAIC0z
OCw5ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFJlbW92ZSB0
aGlzIG9uY2Uga0NNVmlkZW9Db2RlY1R5cGVfVlA5IGlzIGFkZGVkIHRvIENNRm9ybWF0RGVzY3Jp
cHRpb24uaAotY29uc3RleHByIENNVmlkZW9Db2RlY1R5cGUga0NNVmlkZW9Db2RlY1R5cGVfVlA5
IHsgJ3ZwMDknIH07Ci0KIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogewogICAgIGlmICh0eXBlLnN0YXJ0c1dpdGgoIm1w
NHYiKSkKQEAgLTQ5LDggKzQ2LDEwIEBAIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29k
ZWNUeXBlRnJvbVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogICAgICAgICByZXR1cm4ga0NNVmlk
ZW9Db2RlY1R5cGVfSDI2NDsKICAgICBpZiAodHlwZS5zdGFydHNXaXRoKCJodmMxIikgfHwgdHlw
ZS5zdGFydHNXaXRoKCJoZXYxIikpCiAgICAgICAgIHJldHVybiBrQ01WaWRlb0NvZGVjVHlwZV9I
RVZDOworI2lmIEVOQUJMRShWUDkpCiAgICAgaWYgKHR5cGUuc3RhcnRzV2l0aCgidnAwOSIpKQog
ICAgICAgICByZXR1cm4ga0NNVmlkZW9Db2RlY1R5cGVfVlA5OworI2VuZGlmCiAgICAgcmV0dXJu
IDA7CiB9CiAKQEAgLTk3LDEyICs5NiwxNCBAQCB2b2lkIGNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EoTWVkaWFEZWNvZGluZ0NvbmZpZ3VyYXRpb24mJiBjbwogICAg
ICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29uZmlndXJhdGlvbil9KTsKICAg
ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisjaWYgRU5BQkxFKFZQOSkKICAg
ICAgICAgfSBlbHNlIGlmICh2aWRlb0NvZGVjVHlwZSA9PSBrQ01WaWRlb0NvZGVjVHlwZV9WUDkp
IHsKICAgICAgICAgICAgIGF1dG8gY29kZWNDb25maWd1cmF0aW9uID0gcGFyc2VWUENvZGVjUGFy
YW1ldGVycyhjb2RlYyk7CiAgICAgICAgICAgICBpZiAoIWNvZGVjQ29uZmlndXJhdGlvbiB8fCAh
dmFsaWRhdGVWUFBhcmFtZXRlcnMoKmNvZGVjQ29uZmlndXJhdGlvbiwgaW5mbywgdmlkZW9Db25m
aWd1cmF0aW9uKSkgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29u
ZmlndXJhdGlvbil9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Cisj
ZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChhbHBoYUNoYW5uZWwgfHwg
aGRyU3VwcG9ydGVkKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soe3sgfSwgV1RGTW92ZShj
b25maWd1cmF0aW9uKX0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAppbmRleCBh
NzE3MzgwNTdkODkzMWUyZjA2ZTg1YTU4MDkyNTkyY2MwYjAxMGQ4Li44ODhjODg2N2ZiMjEyNDA5
OWQ3NDI2NzhhMzY4NjZmMGEyYjE3MDFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJN
LmNwcApAQCAtMjQyLDYgKzI0Miw3IEBAIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZSBT
b3VyY2VCdWZmZXJQYXJzZXJXZWJNOjppc0NvbnRlbnRUeXBlU3VwcG9ydGVkKGNvCiAKICAgICBh
dXRvIHNwbGl0UmVzdWx0cyA9IFN0cmluZ1ZpZXcoY29kZWNzUGFyYW1ldGVyKS5zcGxpdCgnLCcp
OwogICAgIGZvciAoYXV0byBzcGxpdCA6IHNwbGl0UmVzdWx0cykgeworI2lmIEVOQUJMRShWUDkp
CiAgICAgICAgIGlmIChzcGxpdC5zdGFydHNXaXRoKCJ2cDA5IikpIHsKICAgICAgICAgICAgIGF1
dG8gY29kZWNQYXJhbWV0ZXJzID0gcGFyc2VWUENvZGVjUGFyYW1ldGVycyhzcGxpdCk7CiAgICAg
ICAgICAgICBpZiAoIWNvZGVjUGFyYW1ldGVycykKQEAgLTI1Miw2ICsyNTMsNyBAQCBNZWRpYVBs
YXllckVudW1zOjpTdXBwb3J0c1R5cGUgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6aXNDb250ZW50
VHlwZVN1cHBvcnRlZChjbwogCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorI2Vu
ZGlmCiAgICAgICAgIC8vIEZJWE1FOiBBZGQgT3B1cyBTdXBwb3J0CiAgICAgICAgIC8vIEZJWE1F
OiBBZGQgVm9yYmlzIFN1cHBvcnQKICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyRW51bXM6OlN1
cHBvcnRzVHlwZTo6SXNOb3RTdXBwb3J0ZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oIGIvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2EuaAppbmRleCBjOWY5
MzFiODUwMDk1Y2U2NDUwNWQ5OGRmMDJlYmJmY2E0OTA0MzhjLi4xNGM2ZjNhZTk4NDMwYWFlYzJi
OGU4MjJiMWZiNTFiNDc1OGFhOTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29hLmgKQEAgLTI1LDcgKzI1
LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFCTEUo
VlA5KSAmJiBQTEFURk9STShDT0NPQSkKIAogI2luY2x1ZGUgIlZQOVV0aWxpdGllcy5oIgogCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGls
aXRpZXNDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQ
OVV0aWxpdGllc0NvY29hLm1tCmluZGV4IDU4MmQ0YjU1YThkZmQzZDNiYTE1ZmZhZjUwNjE4ZThj
ZjI4YWIxZjQuLmM4MWU5N2FhM2U0NzdkN2M3Yjg5YzE2MTlhOWYzZmYyZjJiZWMwYTEgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGll
c0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQ
OVV0aWxpdGllc0NvY29hLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgi
CiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzQ29jb2EuaCIKIAotI2lmIFBMQVRGT1JNKENPQ09BKQor
I2lmIEVOQUJMRShWUDkpICYmIFBMQVRGT1JNKENPQ09BKQogCiAjaW1wb3J0ICJGb3VyQ0MuaCIK
ICNpbXBvcnQgIkxpYldlYlJUQ1Byb3ZpZGVyLmgiCkBAIC0zNSw2ICszNSw3IEBACiAjaW1wb3J0
ICJTY3JlZW5Qcm9wZXJ0aWVzLmgiCiAjaW1wb3J0ICJTeXN0ZW1CYXR0ZXJ5LmgiCiAjaW1wb3J0
ICJWaWRlb0NvbmZpZ3VyYXRpb24uaCIKKyNpbXBvcnQgPENvcmVNZWRpYS9DTUZvcm1hdERlc2Ny
aXB0aW9uLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdUb0ludGVnZXJDb252ZXJzaW9uLmg+
CiAKICNpbXBvcnQgPHBhbC9jb2NvYS9BVkZvdW5kYXRpb25Tb2Z0TGluay5oPgpAQCAtNDIsOSAr
NDMsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhpcyBv
bmNlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSBpcyBhZGRlZCB0byBDTUZvcm1hdERlc2NyaXB0aW9u
LmgKLWNvbnN0ZXhwciBDTVZpZGVvQ29kZWNUeXBlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSB7ICd2
cDA5JyB9OwotCiBzdGF0aWMgYm9vbCBoYXJkd2FyZVZQOURlY29kZXJEaXNhYmxlZEZvclRlc3Rp
bmcgeyBmYWxzZSB9OwogCiBzdHJ1Y3QgT3ZlcnJpZGVTY3JlZW5EYXRhIHsKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rl
c3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCBjMDUzYTRkZGEyMDA4ZWZkN2E2Njg4ZDM0NDhmZmJm
M2JmY2JlMWY1Li4wMzZjMjRhYzEzMDYyOGQ3MTE2NWIyZjM4OTRlM2EyZjNmOTIzZmJkIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC02MzUsNiArNjM1LDkgQEAgSW50ZXJu
YWxzOjpJbnRlcm5hbHMoRG9jdW1lbnQmIGRvY3VtZW50KQogI2lmIFBMQVRGT1JNKENPQ09BKQog
ICAgIHNldE92ZXJyaWRlU3lzdGVtSGFzQmF0dGVyeUZvclRlc3RpbmcoV1RGOjpudWxsb3B0KTsK
ICAgICBzZXRPdmVycmlkZVN5c3RlbUhhc0FDRm9yVGVzdGluZyhXVEY6Om51bGxvcHQpOworI2Vu
ZGlmCisKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBzZXRPdmVycmlk
ZVZQOUhhcmR3YXJlRGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhmYWxzZSk7CiAgICAgcmVzZXRP
dmVycmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3RpbmcoKTsKICNlbmRpZgpAQCAtNTY2
Myw3ICs1NjY2LDExIEBAIE9wdGlvbmFsPERvVmlQYXJhbWV0ZXJTZXQ+IEludGVybmFsczo6cGFy
c2VEb1ZpQ29kZWNQYXJhbWV0ZXJzKGNvbnN0IFN0cmluZyYgY29kCiAKIE9wdGlvbmFsPFZQQ29k
ZWNDb25maWd1cmF0aW9uUmVjb3JkPiBJbnRlcm5hbHM6OnBhcnNlVlBDb2RlY1BhcmFtZXRlcnMo
Y29uc3QgU3RyaW5nJiBjb2RlY1N0cmluZykKIHsKKyNpZiBFTkFCTEUoVlA5KQogICAgIHJldHVy
biBXZWJDb3JlOjpwYXJzZVZQQ29kZWNQYXJhbWV0ZXJzKGNvZGVjU3RyaW5nKTsKKyNlbHNlCisg
ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyNlbmRpZgogfQogCiBhdXRvIEludGVybmFsczo6Z2V0
Q29va2llcygpIGNvbnN0IC0+IFZlY3RvcjxDb29raWVEYXRhPgpAQCAtNTg5OSw3ICs1OTA2LDcg
QEAgdm9pZCBJbnRlcm5hbHM6OnNldFN5c3RlbUhhc0FDRm9yVGVzdGluZyhib29sIGhhc0FDKQog
CiB2b2lkIEludGVybmFsczo6c2V0SGFyZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5n
KGJvb2wgZGlzYWJsZWQpCiB7Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgRU5BQkxFKFZQOSkg
JiYgUExBVEZPUk0oQ09DT0EpCiAgICAgV2ViQ29yZTo6c2V0T3ZlcnJpZGVWUDlIYXJkd2FyZURl
Y29kZXJEaXNhYmxlZEZvclRlc3RpbmcoZGlzYWJsZWQpOwogI2Vsc2UKICAgICBVTlVTRURfUEFS
QU0oZGlzYWJsZWQpOwpAQCAtNTkwOCw3ICs1OTE1LDcgQEAgdm9pZCBJbnRlcm5hbHM6OnNldEhh
cmR3YXJlVlA5RGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhib29sIGRpc2FibGVkKQogCiB2b2lk
IEludGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyhkb3VibGUgd2lk
dGgsIGRvdWJsZSBoZWlnaHQsIGRvdWJsZSBzY2FsZSkKIHsKLSNpZiBQTEFURk9STShDT0NPQSkK
KyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBXZWJDb3JlOjpzZXRPdmVy
cmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3Rpbmcod2lkdGgsIGhlaWdodCwgc2NhbGUp
OwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0od2lkdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYTEyM2ZiMjg1NTk4MjE1MzMwYjUwOTI5NjVlZDEwYmJh
ZWVjNjliOS4uMjk4MGQ5MDJkYjdjOWI0ODM4MmY2Zjc5M2FmOWY1MWU0ZjljZmNlYSAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03ODcwLDcgKzc4NzAsNyBA
QCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0
ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJvYwogICAgIHBhcmFtZXRlcnMuc2hvdWxkQ2FwdHVyZVZp
ZGVvSW5HUFVQcm9jZXNzID0gcHJlZmVyZW5jZXMoKS5jYXB0dXJlVmlkZW9JbkdQVVByb2Nlc3NF
bmFibGVkKCk7CiAgICAgcGFyYW1ldGVycy5zaG91bGRSZW5kZXJDYW52YXNJbkdQVVByb2Nlc3Mg
PSBwcmVmZXJlbmNlcygpLnJlbmRlckNhbnZhc0luR1BVUHJvY2Vzc0VuYWJsZWQoKTsKICAgICBw
YXJhbWV0ZXJzLnNob3VsZEVuYWJsZVZQOURlY29kZXIgPSBwcmVmZXJlbmNlcygpLnZwOURlY29k
ZXJFbmFibGVkKCk7Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgRU5BQkxFKFZQOSkgJiYgUExB
VEZPUk0oQ09DT0EpCiAgICAgcGFyYW1ldGVycy5zaG91bGRFbmFibGVWUDlTV0RlY29kZXIgPSBw
cmVmZXJlbmNlcygpLnZwOURlY29kZXJFbmFibGVkKCkgJiYgKCFXZWJDb3JlOjpzeXN0ZW1IYXNC
YXR0ZXJ5KCkgfHwgcHJlZmVyZW5jZXMoKS52cDlTV0RlY29kZXJFbmFibGVkT25CYXR0ZXJ5KCkp
OwogI2VuZGlmCiAgICAgcGFyYW1ldGVycy5zaG91bGRDYXB0dXJlRGlzcGxheUluVUlQcm9jZXNz
ID0gbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5zaG91bGRDYXB0dXJl
RGlzcGxheUluVUlQcm9jZXNzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5j
cHAKaW5kZXggYzE2NWVjNDQxMTA0ZGUwYWE2OTViNDA3YzdiYzk5MzZjODlmYWUwYi4uMmM3YzVk
ZmI3ZmM1MTBlYTI1ZTYzNGRmNGM2YjNjZTczMjFjNjRmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMTk1NCw2ICsxOTU0LDcgQEAgdm9pZCBXZWJQcm9jZXNz
OjpzZXRVc2VHUFVQcm9jZXNzRm9yTWVkaWEoYm9vbCB1c2VHUFVQcm9jZXNzRm9yTWVkaWEpCiB9
CiAjZW5kaWYKIAorI2lmIEVOQUJMRShWUDkpCiB2b2lkIFdlYlByb2Nlc3M6OmVuYWJsZVZQOURl
Y29kZXIoKQogewogICAgIGlmIChtX3ZwOURlY29kZXJFbmFibGVkKQpAQCAtMTk3Niw2ICsxOTc3
LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjplbmFibGVWUDlTV0RlY29kZXIoKQogICAgIFdlYkNvcmU6
OnJlZ2lzdGVyV2ViS2l0VlA5RGVjb2RlcigpOwogI2VuZGlmCiB9CisjZW5kaWYKIAogfSAvLyBu
YW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCmluZGV4
IDcwYzA3NWQwZmU1NjY0MjQ0MDBkYjU0ODljODIxY2RiMDY3MDdmZmMuLjUxMGEwMmNmZThmNjI1
ODE0ZjA4NjQwYWY1ZDVhODY3NDY3MTA3NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9XZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy
b2Nlc3MuaApAQCAtMzMyLDggKzMzMiwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRVc2VHUFVQ
cm9jZXNzRm9yTWVkaWEoYm9vbCk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShWUDkpCiAgICAgdm9p
ZCBlbmFibGVWUDlEZWNvZGVyKCk7CiAgICAgdm9pZCBlbmFibGVWUDlTV0RlY29kZXIoKTsKKyNl
bmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdm9pZCB3aWxsV3JpdGVUb1Bhc3RlYm9h
cmRBc3luY2hyb25vdXNseShjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKTsKQEAgLTY2MCw4
ICs2NjIsMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgYm9vbCBtX3VzZUdQVVByb2Nlc3NG
b3JNZWRpYSB7IGZhbHNlIH07CisKKyNpZiBFTkFCTEUoVlA5KQogICAgIGJvb2wgbV92cDlEZWNv
ZGVyRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3ZwOVNXRGVjb2RlckVuYWJsZWQgeyBm
YWxzZSB9OworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>408233</attachid>
            <date>2020-09-08 09:18:48 -0700</date>
            <delta_ts>2020-09-08 09:30:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216205-20200908091847.patch</filename>
            <type>text/plain</type>
            <size>13661</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhkY2UxNThmMmU5ZmFk
MDQ0M2ViMmM4YjhjNjdmYmQ1NDY3MGI1ZS4uMmM2OWI4M2M3YWRiZjdiZTcwYmNiZWVmZGJjNmI4
OWU3YTI5Y2Q0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA5LTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZpZWQgYnVpbGQgZml4
IGZvciAicmVkZWZpbml0aW9uIG9mICdrQ01WaWRlb0NvZGVjVHlwZV9WUDkiCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYyMDUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBrQ01WaWRlb0NvZGVjVHlwZV9W
UDkgaXMgcHJlc2VudCBpbiB0aGUgbWFjT1MgQmlnIFN1ciBTREssIHNvIHRoZSByZWRlY2xhcmF0
aW9uIGNhbgorICAgICAgICBiZSByZW1vdmVkLiBUbyBwcm90ZWN0IGJ1aWxkcyB1c2luZyBwcmlv
ciBPUyBTREtzLCB3cmFwIHRoZSBlbnRpcmUgVlA5IGltcGxlbWVudGF0aW9uCisgICAgICAgIGlu
IEVOQUJMRShWUDkpIGNoZWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0
aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmg6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1cmF0
aW9uRmFjdG9yeUNvY29hLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29h
Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2Eu
bW06CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
SW50ZXJuYWxzOjpJbnRlcm5hbHMpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpwYXJz
ZVZQQ29kZWNQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0SGFy
ZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Oklu
dGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyk6CisKIDIwMjAtMDkt
MDQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hLEhE
Ul0gSExTIHN0cmVhbXMgd2l0aCBIRFIgdmFyaWFudHMgd2lsbCBub3Qgc2VsZWN0IEhEUi4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggOWQ5NmZhNDY0YjUyMzQ2MjMwN2VmY2NiNjk2OGJmMjFiNjZlNjY1ZC4uMmM1ZDkz
ZTkwY2E2NDE2OWU2YWVmODg5M2IxYTZhMmI2YTc1OTM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAyMC0wOS0wNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg
ICAgICBVbmlmaWVkIGJ1aWxkIGZpeCBmb3IgInJlZGVmaW5pdGlvbiBvZiAna0NNVmlkZW9Db2Rl
Y1R5cGVfVlA5IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgV3JhcCBjYWxscyB0byBXZWJDb3JlIFZQOSBmdW5jdGlvbnMgaW4gRU5BQkxFKFZQOSkgY2hl
Y2tzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
OgorCiAyMDIwLTA4LTI2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJFR1JFU1NJT04ocjI2NDcxMCk6IEluaXRpYWxpemluZyB0aGUgQVZQbGF5ZXIgT2JqLUMg
Y2xhc3MgYXQgcHJvY2VzcyBzdGFydCB1cCBjYXVzZXMgYSByZWdyZXNzaW9uIGluIHBvd2VyLXVz
ZSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5
VXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0aWxp
dGllcy5jcHAKaW5kZXggMTQwODc0MWI4MTMzMTBkMjdmNDYwMDAxOGUzMzFhNTA0YzU0NDBiZC4u
MWUwNWJmYjM2N2Q0Mzg3ODI0MzA1MDQwNTVlZmRjOWUyYmM2Y2QwNCAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9WUDlVdGlsaXRpZXMuY3BwCkBAIC0yNiw2ICsy
Niw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzLmgiCiAK
KyNpZiBFTkFCTEUoVlA5KQorCiAjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5j
bHVkZSA8d3RmL3RleHQvU3RyaW5nVG9JbnRlZ2VyQ29udmVyc2lvbi5oPgogCkBAIC0yMzIsMyAr
MjM0LDUgQEAgT3B0aW9uYWw8VlBDb2RlY0NvbmZpZ3VyYXRpb25SZWNvcmQ+IHBhcnNlVlBDb2Rl
Y1BhcmFtZXRlcnMoU3RyaW5nVmlldyBjb2RlY1ZpZXcKIH0KIAogfQorCisjZW5kaWYgLy8gRU5B
QkxFKFZQOSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1ZQ
OVV0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0
aWVzLmgKaW5kZXggODg3Njk4MzhkNTA4MTk4MmQyMmEwN2IwNTlkNDBiZDMxNWMyY2JlNi4uMmQ3
NjQ5ZGMwZjYxYTQyNTRhMmM3NDVkYTYyNTk5M2RiMzhmNzNhMCAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmgKKysrIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmgKQEAgLTI1LDYgKzI1LDggQEAK
IAogI3ByYWdtYSBvbmNlCiAKKyNpZiBFTkFCTEUoVlA5KQorCiAjaW5jbHVkZSA8d3RmL3RleHQv
U3RyaW5nVmlldy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCkBAIC0xMjgs
MyArMTMwLDUgQEAgc3RydWN0IFZQQ29kZWNDb25maWd1cmF0aW9uUmVjb3JkIHsKIFdFQkNPUkVf
RVhQT1JUIE9wdGlvbmFsPFZQQ29kZWNDb25maWd1cmF0aW9uUmVjb3JkPiBwYXJzZVZQQ29kZWNQ
YXJhbWV0ZXJzKFN0cmluZ1ZpZXcgY29kZWNTdHJpbmcpOwogCiB9CisKKyNlbmRpZiAvLyBFTkFC
TEUoVlA5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFjdG9yeUNvY29hLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL01lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rv
cnlDb2NvYS5jcHAKaW5kZXggN2NkZmU4NjQyMzA3NDIyMDk3YzFjNWY5NjkyMDcyMTgyMTA0Njcw
ZS4uOWM1NGIxNzNjMzdkZmM3NDQ2YjY1YjA3Njk5NWY2MDNlNzhlYzFiZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1
cmF0aW9uRmFjdG9yeUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jb2NvYS9NZWRpYUVuZ2luZUNvbmZpZ3VyYXRpb25GYWN0b3J5Q29jb2EuY3BwCkBAIC0z
OCw5ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFJlbW92ZSB0
aGlzIG9uY2Uga0NNVmlkZW9Db2RlY1R5cGVfVlA5IGlzIGFkZGVkIHRvIENNRm9ybWF0RGVzY3Jp
cHRpb24uaAotY29uc3RleHByIENNVmlkZW9Db2RlY1R5cGUga0NNVmlkZW9Db2RlY1R5cGVfVlA5
IHsgJ3ZwMDknIH07Ci0KIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogewogICAgIGlmICh0eXBlLnN0YXJ0c1dpdGgoIm1w
NHYiKSkKQEAgLTQ5LDggKzQ2LDEwIEBAIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29k
ZWNUeXBlRnJvbVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogICAgICAgICByZXR1cm4ga0NNVmlk
ZW9Db2RlY1R5cGVfSDI2NDsKICAgICBpZiAodHlwZS5zdGFydHNXaXRoKCJodmMxIikgfHwgdHlw
ZS5zdGFydHNXaXRoKCJoZXYxIikpCiAgICAgICAgIHJldHVybiBrQ01WaWRlb0NvZGVjVHlwZV9I
RVZDOworI2lmIEVOQUJMRShWUDkpCiAgICAgaWYgKHR5cGUuc3RhcnRzV2l0aCgidnAwOSIpKQog
ICAgICAgICByZXR1cm4ga0NNVmlkZW9Db2RlY1R5cGVfVlA5OworI2VuZGlmCiAgICAgcmV0dXJu
IDA7CiB9CiAKQEAgLTk3LDEyICs5NiwxNCBAQCB2b2lkIGNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EoTWVkaWFEZWNvZGluZ0NvbmZpZ3VyYXRpb24mJiBjbwogICAg
ICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29uZmlndXJhdGlvbil9KTsKICAg
ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisjaWYgRU5BQkxFKFZQOSkKICAg
ICAgICAgfSBlbHNlIGlmICh2aWRlb0NvZGVjVHlwZSA9PSBrQ01WaWRlb0NvZGVjVHlwZV9WUDkp
IHsKICAgICAgICAgICAgIGF1dG8gY29kZWNDb25maWd1cmF0aW9uID0gcGFyc2VWUENvZGVjUGFy
YW1ldGVycyhjb2RlYyk7CiAgICAgICAgICAgICBpZiAoIWNvZGVjQ29uZmlndXJhdGlvbiB8fCAh
dmFsaWRhdGVWUFBhcmFtZXRlcnMoKmNvZGVjQ29uZmlndXJhdGlvbiwgaW5mbywgdmlkZW9Db25m
aWd1cmF0aW9uKSkgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29u
ZmlndXJhdGlvbil9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Cisj
ZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChhbHBoYUNoYW5uZWwgfHwg
aGRyU3VwcG9ydGVkKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soe3sgfSwgV1RGTW92ZShj
b25maWd1cmF0aW9uKX0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAppbmRleCBh
NzE3MzgwNTdkODkzMWUyZjA2ZTg1YTU4MDkyNTkyY2MwYjAxMGQ4Li43NzcyMzhlMTg5ZDcwYjcx
OWNkZmJlOTI1ZTljNDUxNzFhZTNkMzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJN
LmNwcApAQCAtMjQwLDYgKzI0MCw3IEBAIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZSBT
b3VyY2VCdWZmZXJQYXJzZXJXZWJNOjppc0NvbnRlbnRUeXBlU3VwcG9ydGVkKGNvCiAgICAgaWYg
KCFjb2RlY3NQYXJhbWV0ZXIpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBw
b3J0c1R5cGU6Ok1heUJlU3VwcG9ydGVkOwogCisjaWYgRU5BQkxFKFZQOSkKICAgICBhdXRvIHNw
bGl0UmVzdWx0cyA9IFN0cmluZ1ZpZXcoY29kZWNzUGFyYW1ldGVyKS5zcGxpdCgnLCcpOwogICAg
IGZvciAoYXV0byBzcGxpdCA6IHNwbGl0UmVzdWx0cykgewogICAgICAgICBpZiAoc3BsaXQuc3Rh
cnRzV2l0aCgidnAwOSIpKSB7CkBAIC0yNTcsNiArMjU4LDkgQEAgTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQoY28KICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZTo6SXNO
b3RTdXBwb3J0ZWQ7CiAgICAgfQogICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBwb3J0
c1R5cGU6OklzU3VwcG9ydGVkOworI2Vsc2UKKyAgICByZXR1cm4gTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlOjpJc05vdFN1cHBvcnRlZDsKKyNlbmRpZgogfQogCiBTb3VyY2VCdWZmZXJQ
YXJzZXJXZWJNOjpTb3VyY2VCdWZmZXJQYXJzZXJXZWJNKCkKQEAgLTUxMyw2ICs1MTcsOCBAQCB3
ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25CbG9ja0dyb3VwRW5kKGNvbnN0
IHdlYm06OkVsZW1lbnRNZXRhZGF0YQogICAgIHJldHVybiBTdGF0dXMoU3RhdHVzOjprT2tDb21w
bGV0ZWQpOwogfQogCisjaWYgRU5BQkxFKFZQOSkKKwogc3RhdGljIHVpbnQ4X3QgY29udmVydFRv
Q29sb3JQcmltYXJpZXMoY29uc3QgUHJpbWFyaWVzJiBjb2VmZmljaWVudHMpCiB7CiAgICAgc3dp
dGNoIChjb2VmZmljaWVudHMpIHsKQEAgLTc5NCw2ICs4MDAsNyBAQCBzdGF0aWMgUmV0YWluUHRy
PENNRm9ybWF0RGVzY3JpcHRpb25SZWY+IGNyZWF0ZUZvcm1hdERlc2NyaXB0aW9uRnJvbVZQOUhl
YWRlclBhcgogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4gYWRvcHRDRihmb3Jt
YXREZXNjcmlwdGlvbik7CiB9CisjZW5kaWYKIAogd2VibTo6U3RhdHVzIFNvdXJjZUJ1ZmZlclBh
cnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJlYWRlciog
cmVhZGVyLCB1aW50NjRfdCogYnl0ZXNSZW1haW5pbmcpCiB7CkBAIC04MjcsNiArODM0LDcgQEAg
d2VibTo6U3RhdHVzIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVN
ZXRhZGF0YSYgbWV0YWRhdGEsIFJlYWQKICAgICBpZiAodHJhY2suZGVmYXVsdF9kdXJhdGlvbi5p
c19wcmVzZW50KCkpCiAgICAgICAgIGR1cmF0aW9uID0gdHJhY2suZGVmYXVsdF9kdXJhdGlvbi52
YWx1ZSgpICogbV90aW1lc2NhbGUgLyAxMDAwMDAwMDAwOwogCisjaWYgRU5BQkxFKFZQOSkKICAg
ICBpZiAodHJhY2suY29kZWNfaWQuaXNfcHJlc2VudCgpICYmIHRyYWNrLmNvZGVjX2lkLnZhbHVl
KCkgPT0gIlZfVlA5IikgewogICAgICAgICBpZiAoIXRyYWNrRGF0YS0+Y3VycmVudEJsb2NrQnVm
ZmVyKSB7CiAgICAgICAgICAgICBDTUJsb2NrQnVmZmVyUmVmIHJhd0Jsb2NrQnVmZmVyID0gbnVs
bHB0cjsKQEAgLTkwNSw4ICs5MTMsOCBAQCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2Vy
V2ViTTo6T25GcmFtZShjb25zdCBGcmFtZU1ldGFkYXRhJiBtZXRhZGF0YSwgUmVhZAogICAgICAg
ICAgICAgYXV0byBtZWRpYVNhbXBsZSA9IE1lZGlhU2FtcGxlQVZGT2JqQzo6Y3JlYXRlKHNhbXBs
ZUJ1ZmZlci5nZXQoKSwgdHJhY2tJRCk7CiAgICAgICAgICAgICBtX2RpZFByb3ZpZGVNZWRpYURh
dGFDYWxsYmFjayhXVEZNb3ZlKG1lZGlhU2FtcGxlKSwgdHJhY2tJRCwgZW1wdHlTdHJpbmcoKSk7
CiAgICAgICAgIH0pOwotCiAgICAgfQorI2VuZGlmCiAKICAgICByZXR1cm4gU2tpcChyZWFkZXIs
IGJ5dGVzUmVtYWluaW5nKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29hLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oCmluZGV4IGM5ZjkzMWI4NTAw
OTVjZTY0NTA1ZDk4ZGYwMmViYmZjYTQ5MDQzOGMuLjE0YzZmM2FlOTg0MzBhYWVjMmI4ZTgyMmIx
ZmI1MWI0NzU4YWE5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2EuaApAQCAtMjUsNyArMjUsNyBAQAog
CiAjcHJhZ21hIG9uY2UKIAotI2lmIFBMQVRGT1JNKENPQ09BKQorI2lmIEVOQUJMRShWUDkpICYm
IFBMQVRGT1JNKENPQ09BKQogCiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzLmgiCiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0Nv
Y29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0
aWVzQ29jb2EubW0KaW5kZXggNTgyZDRiNTVhOGRmZDNkM2JhMTVmZmFmNTA2MThlOGNmMjhhYjFm
NC4uYzgxZTk3YWEzZTQ3N2Q3YzdiODljMTYxOWE5ZjNmZjJmMmJlYzBhMSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2Eu
bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0
aWVzQ29jb2EubW0KQEAgLTI2LDcgKzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs
dWRlICJWUDlVdGlsaXRpZXNDb2NvYS5oIgogCi0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgRU5B
QkxFKFZQOSkgJiYgUExBVEZPUk0oQ09DT0EpCiAKICNpbXBvcnQgIkZvdXJDQy5oIgogI2ltcG9y
dCAiTGliV2ViUlRDUHJvdmlkZXIuaCIKQEAgLTM1LDYgKzM1LDcgQEAKICNpbXBvcnQgIlNjcmVl
blByb3BlcnRpZXMuaCIKICNpbXBvcnQgIlN5c3RlbUJhdHRlcnkuaCIKICNpbXBvcnQgIlZpZGVv
Q29uZmlndXJhdGlvbi5oIgorI2ltcG9ydCA8Q29yZU1lZGlhL0NNRm9ybWF0RGVzY3JpcHRpb24u
aD4KICNpbXBvcnQgPHd0Zi90ZXh0L1N0cmluZ1RvSW50ZWdlckNvbnZlcnNpb24uaD4KIAogI2lt
cG9ydCA8cGFsL2NvY29hL0FWRm91bmRhdGlvblNvZnRMaW5rLmg+CkBAIC00Miw5ICs0Myw2IEBA
CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFJlbW92ZSB0aGlzIG9uY2Uga0NN
VmlkZW9Db2RlY1R5cGVfVlA5IGlzIGFkZGVkIHRvIENNRm9ybWF0RGVzY3JpcHRpb24uaAotY29u
c3RleHByIENNVmlkZW9Db2RlY1R5cGUga0NNVmlkZW9Db2RlY1R5cGVfVlA5IHsgJ3ZwMDknIH07
Ci0KIHN0YXRpYyBib29sIGhhcmR3YXJlVlA5RGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyB7IGZh
bHNlIH07CiAKIHN0cnVjdCBPdmVycmlkZVNjcmVlbkRhdGEgewpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J
bnRlcm5hbHMuY3BwCmluZGV4IGMwNTNhNGRkYTIwMDhlZmQ3YTY2ODhkMzQ0OGZmYmYzYmZjYmUx
ZjUuLjAzNmMyNGFjMTMwNjI4ZDcxMTY1YjJmMzg5NGUzYTJmM2Y5MjNmYmQgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTYzNSw2ICs2MzUsOSBAQCBJbnRlcm5hbHM6Oklu
dGVybmFscyhEb2N1bWVudCYgZG9jdW1lbnQpCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgc2V0
T3ZlcnJpZGVTeXN0ZW1IYXNCYXR0ZXJ5Rm9yVGVzdGluZyhXVEY6Om51bGxvcHQpOwogICAgIHNl
dE92ZXJyaWRlU3lzdGVtSGFzQUNGb3JUZXN0aW5nKFdURjo6bnVsbG9wdCk7CisjZW5kaWYKKwor
I2lmIEVOQUJMRShWUDkpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIHNldE92ZXJyaWRlVlA5SGFy
ZHdhcmVEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKGZhbHNlKTsKICAgICByZXNldE92ZXJyaWRl
VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZygpOwogI2VuZGlmCkBAIC01NjYzLDcgKzU2
NjYsMTEgQEAgT3B0aW9uYWw8RG9WaVBhcmFtZXRlclNldD4gSW50ZXJuYWxzOjpwYXJzZURvVmlD
b2RlY1BhcmFtZXRlcnMoY29uc3QgU3RyaW5nJiBjb2QKIAogT3B0aW9uYWw8VlBDb2RlY0NvbmZp
Z3VyYXRpb25SZWNvcmQ+IEludGVybmFsczo6cGFyc2VWUENvZGVjUGFyYW1ldGVycyhjb25zdCBT
dHJpbmcmIGNvZGVjU3RyaW5nKQogeworI2lmIEVOQUJMRShWUDkpCiAgICAgcmV0dXJuIFdlYkNv
cmU6OnBhcnNlVlBDb2RlY1BhcmFtZXRlcnMoY29kZWNTdHJpbmcpOworI2Vsc2UKKyAgICByZXR1
cm4gV1RGOjpudWxsb3B0OworI2VuZGlmCiB9CiAKIGF1dG8gSW50ZXJuYWxzOjpnZXRDb29raWVz
KCkgY29uc3QgLT4gVmVjdG9yPENvb2tpZURhdGE+CkBAIC01ODk5LDcgKzU5MDYsNyBAQCB2b2lk
IEludGVybmFsczo6c2V0U3lzdGVtSGFzQUNGb3JUZXN0aW5nKGJvb2wgaGFzQUMpCiAKIHZvaWQg
SW50ZXJuYWxzOjpzZXRIYXJkd2FyZVZQOURlY29kZXJEaXNhYmxlZEZvclRlc3RpbmcoYm9vbCBk
aXNhYmxlZCkKIHsKLSNpZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFU
Rk9STShDT0NPQSkKICAgICBXZWJDb3JlOjpzZXRPdmVycmlkZVZQOUhhcmR3YXJlRGVjb2RlckRp
c2FibGVkRm9yVGVzdGluZyhkaXNhYmxlZCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShkaXNh
YmxlZCk7CkBAIC01OTA4LDcgKzU5MTUsNyBAQCB2b2lkIEludGVybmFsczo6c2V0SGFyZHdhcmVW
UDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKGJvb2wgZGlzYWJsZWQpCiAKIHZvaWQgSW50ZXJu
YWxzOjpzZXRWUDlTY3JlZW5TaXplQW5kU2NhbGVGb3JUZXN0aW5nKGRvdWJsZSB3aWR0aCwgZG91
YmxlIGhlaWdodCwgZG91YmxlIHNjYWxlKQogewotI2lmIFBMQVRGT1JNKENPQ09BKQorI2lmIEVO
QUJMRShWUDkpICYmIFBMQVRGT1JNKENPQ09BKQogICAgIFdlYkNvcmU6OnNldE92ZXJyaWRlVlA5
U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyh3aWR0aCwgaGVpZ2h0LCBzY2FsZSk7CiAjZWxz
ZQogICAgIFVOVVNFRF9QQVJBTSh3aWR0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFn
ZVByb3h5LmNwcAppbmRleCBhMTIzZmIyODU1OTgyMTUzMzBiNTA5Mjk2NWVkMTBiYmFlZWM2OWI5
Li4yOTgwZDkwMmRiN2M5YjQ4MzgyZjZmNzkzYWY5ZjUxZTRmOWNmY2VhIDEwMDY0NAotLS0gYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc4NzAsNyArNzg3MCw3IEBAIFdlYlBh
Z2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoV2Vi
UHJvY2Vzc1Byb3h5JiBwcm9jCiAgICAgcGFyYW1ldGVycy5zaG91bGRDYXB0dXJlVmlkZW9JbkdQ
VVByb2Nlc3MgPSBwcmVmZXJlbmNlcygpLmNhcHR1cmVWaWRlb0luR1BVUHJvY2Vzc0VuYWJsZWQo
KTsKICAgICBwYXJhbWV0ZXJzLnNob3VsZFJlbmRlckNhbnZhc0luR1BVUHJvY2VzcyA9IHByZWZl
cmVuY2VzKCkucmVuZGVyQ2FudmFzSW5HUFVQcm9jZXNzRW5hYmxlZCgpOwogICAgIHBhcmFtZXRl
cnMuc2hvdWxkRW5hYmxlVlA5RGVjb2RlciA9IHByZWZlcmVuY2VzKCkudnA5RGVjb2RlckVuYWJs
ZWQoKTsKLSNpZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShD
T0NPQSkKICAgICBwYXJhbWV0ZXJzLnNob3VsZEVuYWJsZVZQOVNXRGVjb2RlciA9IHByZWZlcmVu
Y2VzKCkudnA5RGVjb2RlckVuYWJsZWQoKSAmJiAoIVdlYkNvcmU6OnN5c3RlbUhhc0JhdHRlcnko
KSB8fCBwcmVmZXJlbmNlcygpLnZwOVNXRGVjb2RlckVuYWJsZWRPbkJhdHRlcnkoKSk7CiAjZW5k
aWYKICAgICBwYXJhbWV0ZXJzLnNob3VsZENhcHR1cmVEaXNwbGF5SW5VSVByb2Nlc3MgPSBtX3By
b2Nlc3MtPnByb2Nlc3NQb29sKCkuY29uZmlndXJhdGlvbigpLnNob3VsZENhcHR1cmVEaXNwbGF5
SW5VSVByb2Nlc3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
cm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRl
eCBjMTY1ZWM0NDExMDRkZTBhYTY5NWI0MDdjN2JjOTkzNmM4OWZhZTBiLi4yYzdjNWRmYjdmYzUx
MGVhMjVlNjM0ZGY0YzZiM2NlNzMyMWM2NGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlByb2Nlc3MuY3BwCkBAIC0xOTU0LDYgKzE5NTQsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldFVz
ZUdQVVByb2Nlc3NGb3JNZWRpYShib29sIHVzZUdQVVByb2Nlc3NGb3JNZWRpYSkKIH0KICNlbmRp
ZgogCisjaWYgRU5BQkxFKFZQOSkKIHZvaWQgV2ViUHJvY2Vzczo6ZW5hYmxlVlA5RGVjb2Rlcigp
CiB7CiAgICAgaWYgKG1fdnA5RGVjb2RlckVuYWJsZWQpCkBAIC0xOTc2LDYgKzE5NzcsNyBAQCB2
b2lkIFdlYlByb2Nlc3M6OmVuYWJsZVZQOVNXRGVjb2RlcigpCiAgICAgV2ViQ29yZTo6cmVnaXN0
ZXJXZWJLaXRWUDlEZWNvZGVyKCk7CiAjZW5kaWYKIH0KKyNlbmRpZgogCiB9IC8vIG5hbWVzcGFj
ZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nl
c3MuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKaW5kZXggNzBjMDc1
ZDBmZTU2NjQyNDQwMGRiNTQ4OWM4MjFjZGIwNjcwN2ZmYy4uNTEwYTAyY2ZlOGY2MjU4MTRmMDg2
NDBhZjVkNWE4Njc0NjcxMDc0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
CkBAIC0zMzIsOCArMzMyLDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFVzZUdQVVByb2Nlc3NG
b3JNZWRpYShib29sKTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFZQOSkKICAgICB2b2lkIGVuYWJs
ZVZQOURlY29kZXIoKTsKICAgICB2b2lkIGVuYWJsZVZQOVNXRGVjb2RlcigpOworI2VuZGlmCiAK
ICNpZiBQTEFURk9STShDT0NPQSkKICAgICB2b2lkIHdpbGxXcml0ZVRvUGFzdGVib2FyZEFzeW5j
aHJvbm91c2x5KGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpOwpAQCAtNjYwLDggKzY2Miwx
MSBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAgICBib29sIG1fdXNlR1BVUHJvY2Vzc0Zvck1lZGlh
IHsgZmFsc2UgfTsKKworI2lmIEVOQUJMRShWUDkpCiAgICAgYm9vbCBtX3ZwOURlY29kZXJFbmFi
bGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1fdnA5U1dEZWNvZGVyRW5hYmxlZCB7IGZhbHNlIH07
CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>408234</attachid>
            <date>2020-09-08 09:30:47 -0700</date>
            <delta_ts>2020-09-08 09:40:03 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216205-20200908093047.patch</filename>
            <type>text/plain</type>
            <size>13101</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhkY2UxNThmMmU5ZmFk
MDQ0M2ViMmM4YjhjNjdmYmQ1NDY3MGI1ZS4uMmM2OWI4M2M3YWRiZjdiZTcwYmNiZWVmZGJjNmI4
OWU3YTI5Y2Q0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA5LTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZpZWQgYnVpbGQgZml4
IGZvciAicmVkZWZpbml0aW9uIG9mICdrQ01WaWRlb0NvZGVjVHlwZV9WUDkiCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYyMDUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBrQ01WaWRlb0NvZGVjVHlwZV9W
UDkgaXMgcHJlc2VudCBpbiB0aGUgbWFjT1MgQmlnIFN1ciBTREssIHNvIHRoZSByZWRlY2xhcmF0
aW9uIGNhbgorICAgICAgICBiZSByZW1vdmVkLiBUbyBwcm90ZWN0IGJ1aWxkcyB1c2luZyBwcmlv
ciBPUyBTREtzLCB3cmFwIHRoZSBlbnRpcmUgVlA5IGltcGxlbWVudGF0aW9uCisgICAgICAgIGlu
IEVOQUJMRShWUDkpIGNoZWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0
aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmg6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1cmF0
aW9uRmFjdG9yeUNvY29hLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29h
Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2Eu
bW06CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
SW50ZXJuYWxzOjpJbnRlcm5hbHMpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpwYXJz
ZVZQQ29kZWNQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0SGFy
ZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Oklu
dGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyk6CisKIDIwMjAtMDkt
MDQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hLEhE
Ul0gSExTIHN0cmVhbXMgd2l0aCBIRFIgdmFyaWFudHMgd2lsbCBub3Qgc2VsZWN0IEhEUi4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggOWQ5NmZhNDY0YjUyMzQ2MjMwN2VmY2NiNjk2OGJmMjFiNjZlNjY1ZC4uMmM1ZDkz
ZTkwY2E2NDE2OWU2YWVmODg5M2IxYTZhMmI2YTc1OTM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAyMC0wOS0wNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg
ICAgICBVbmlmaWVkIGJ1aWxkIGZpeCBmb3IgInJlZGVmaW5pdGlvbiBvZiAna0NNVmlkZW9Db2Rl
Y1R5cGVfVlA5IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgV3JhcCBjYWxscyB0byBXZWJDb3JlIFZQOSBmdW5jdGlvbnMgaW4gRU5BQkxFKFZQOSkgY2hl
Y2tzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
OgorCiAyMDIwLTA4LTI2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJFR1JFU1NJT04ocjI2NDcxMCk6IEluaXRpYWxpemluZyB0aGUgQVZQbGF5ZXIgT2JqLUMg
Y2xhc3MgYXQgcHJvY2VzcyBzdGFydCB1cCBjYXVzZXMgYSByZWdyZXNzaW9uIGluIHBvd2VyLXVz
ZSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFjdG9yeUNvY29hLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL01lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rv
cnlDb2NvYS5jcHAKaW5kZXggN2NkZmU4NjQyMzA3NDIyMDk3YzFjNWY5NjkyMDcyMTgyMTA0Njcw
ZS4uOWM1NGIxNzNjMzdkZmM3NDQ2YjY1YjA3Njk5NWY2MDNlNzhlYzFiZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1
cmF0aW9uRmFjdG9yeUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jb2NvYS9NZWRpYUVuZ2luZUNvbmZpZ3VyYXRpb25GYWN0b3J5Q29jb2EuY3BwCkBAIC0z
OCw5ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFJlbW92ZSB0
aGlzIG9uY2Uga0NNVmlkZW9Db2RlY1R5cGVfVlA5IGlzIGFkZGVkIHRvIENNRm9ybWF0RGVzY3Jp
cHRpb24uaAotY29uc3RleHByIENNVmlkZW9Db2RlY1R5cGUga0NNVmlkZW9Db2RlY1R5cGVfVlA5
IHsgJ3ZwMDknIH07Ci0KIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogewogICAgIGlmICh0eXBlLnN0YXJ0c1dpdGgoIm1w
NHYiKSkKQEAgLTQ5LDggKzQ2LDEwIEBAIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29k
ZWNUeXBlRnJvbVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogICAgICAgICByZXR1cm4ga0NNVmlk
ZW9Db2RlY1R5cGVfSDI2NDsKICAgICBpZiAodHlwZS5zdGFydHNXaXRoKCJodmMxIikgfHwgdHlw
ZS5zdGFydHNXaXRoKCJoZXYxIikpCiAgICAgICAgIHJldHVybiBrQ01WaWRlb0NvZGVjVHlwZV9I
RVZDOworI2lmIEVOQUJMRShWUDkpCiAgICAgaWYgKHR5cGUuc3RhcnRzV2l0aCgidnAwOSIpKQog
ICAgICAgICByZXR1cm4ga0NNVmlkZW9Db2RlY1R5cGVfVlA5OworI2VuZGlmCiAgICAgcmV0dXJu
IDA7CiB9CiAKQEAgLTk3LDEyICs5NiwxNCBAQCB2b2lkIGNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EoTWVkaWFEZWNvZGluZ0NvbmZpZ3VyYXRpb24mJiBjbwogICAg
ICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29uZmlndXJhdGlvbil9KTsKICAg
ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisjaWYgRU5BQkxFKFZQOSkKICAg
ICAgICAgfSBlbHNlIGlmICh2aWRlb0NvZGVjVHlwZSA9PSBrQ01WaWRlb0NvZGVjVHlwZV9WUDkp
IHsKICAgICAgICAgICAgIGF1dG8gY29kZWNDb25maWd1cmF0aW9uID0gcGFyc2VWUENvZGVjUGFy
YW1ldGVycyhjb2RlYyk7CiAgICAgICAgICAgICBpZiAoIWNvZGVjQ29uZmlndXJhdGlvbiB8fCAh
dmFsaWRhdGVWUFBhcmFtZXRlcnMoKmNvZGVjQ29uZmlndXJhdGlvbiwgaW5mbywgdmlkZW9Db25m
aWd1cmF0aW9uKSkgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29u
ZmlndXJhdGlvbil9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Cisj
ZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChhbHBoYUNoYW5uZWwgfHwg
aGRyU3VwcG9ydGVkKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soe3sgfSwgV1RGTW92ZShj
b25maWd1cmF0aW9uKX0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAppbmRleCBh
NzE3MzgwNTdkODkzMWUyZjA2ZTg1YTU4MDkyNTkyY2MwYjAxMGQ4Li45NGFkMmNjZDJlNzc5NTZk
ZDE3YzgyMDk5NTM5YjlmYWI5Zjk0Yjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJN
LmNwcApAQCAtMjQwLDYgKzI0MCw3IEBAIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZSBT
b3VyY2VCdWZmZXJQYXJzZXJXZWJNOjppc0NvbnRlbnRUeXBlU3VwcG9ydGVkKGNvCiAgICAgaWYg
KCFjb2RlY3NQYXJhbWV0ZXIpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBw
b3J0c1R5cGU6Ok1heUJlU3VwcG9ydGVkOwogCisjaWYgRU5BQkxFKFZQOSkKICAgICBhdXRvIHNw
bGl0UmVzdWx0cyA9IFN0cmluZ1ZpZXcoY29kZWNzUGFyYW1ldGVyKS5zcGxpdCgnLCcpOwogICAg
IGZvciAoYXV0byBzcGxpdCA6IHNwbGl0UmVzdWx0cykgewogICAgICAgICBpZiAoc3BsaXQuc3Rh
cnRzV2l0aCgidnAwOSIpKSB7CkBAIC0yNTcsNiArMjU4LDkgQEAgTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQoY28KICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZTo6SXNO
b3RTdXBwb3J0ZWQ7CiAgICAgfQogICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBwb3J0
c1R5cGU6OklzU3VwcG9ydGVkOworI2Vsc2UKKyAgICByZXR1cm4gTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlOjpJc05vdFN1cHBvcnRlZDsKKyNlbmRpZgogfQogCiBTb3VyY2VCdWZmZXJQ
YXJzZXJXZWJNOjpTb3VyY2VCdWZmZXJQYXJzZXJXZWJNKCkKQEAgLTUxMyw2ICs1MTcsOCBAQCB3
ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25CbG9ja0dyb3VwRW5kKGNvbnN0
IHdlYm06OkVsZW1lbnRNZXRhZGF0YQogICAgIHJldHVybiBTdGF0dXMoU3RhdHVzOjprT2tDb21w
bGV0ZWQpOwogfQogCisjaWYgRU5BQkxFKFZQOSkKKwogc3RhdGljIHVpbnQ4X3QgY29udmVydFRv
Q29sb3JQcmltYXJpZXMoY29uc3QgUHJpbWFyaWVzJiBjb2VmZmljaWVudHMpCiB7CiAgICAgc3dp
dGNoIChjb2VmZmljaWVudHMpIHsKQEAgLTc5NCw2ICs4MDAsNyBAQCBzdGF0aWMgUmV0YWluUHRy
PENNRm9ybWF0RGVzY3JpcHRpb25SZWY+IGNyZWF0ZUZvcm1hdERlc2NyaXB0aW9uRnJvbVZQOUhl
YWRlclBhcgogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4gYWRvcHRDRihmb3Jt
YXREZXNjcmlwdGlvbik7CiB9CisjZW5kaWYKIAogd2VibTo6U3RhdHVzIFNvdXJjZUJ1ZmZlclBh
cnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJlYWRlciog
cmVhZGVyLCB1aW50NjRfdCogYnl0ZXNSZW1haW5pbmcpCiB7CkBAIC04MjEsMTIgKzgyOCwxMiBA
QCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25GcmFtZShjb25zdCBGcmFt
ZU1ldGFkYXRhJiBtZXRhZGF0YSwgUmVhZAogICAgIGlmICghdHJhY2tEYXRhKQogICAgICAgICBy
ZXR1cm4gU3RhdHVzKFN0YXR1czo6a0ludmFsaWRFbGVtZW50SWQpOwogICAgIGF1dG8mIHRyYWNr
ID0gdHJhY2tEYXRhLT50cmFjazsKLSAgICBhdXRvJiBoZWFkZXJQYXJzZXIgPSB0cmFja0RhdGEt
PmhlYWRlclBhcnNlcjsKIAogICAgIHVpbnQ2NF90IGR1cmF0aW9uID0gMDsKICAgICBpZiAodHJh
Y2suZGVmYXVsdF9kdXJhdGlvbi5pc19wcmVzZW50KCkpCiAgICAgICAgIGR1cmF0aW9uID0gdHJh
Y2suZGVmYXVsdF9kdXJhdGlvbi52YWx1ZSgpICogbV90aW1lc2NhbGUgLyAxMDAwMDAwMDAwOwog
CisjaWYgRU5BQkxFKFZQOSkKICAgICBpZiAodHJhY2suY29kZWNfaWQuaXNfcHJlc2VudCgpICYm
IHRyYWNrLmNvZGVjX2lkLnZhbHVlKCkgPT0gIlZfVlA5IikgewogICAgICAgICBpZiAoIXRyYWNr
RGF0YS0+Y3VycmVudEJsb2NrQnVmZmVyKSB7CiAgICAgICAgICAgICBDTUJsb2NrQnVmZmVyUmVm
IHJhd0Jsb2NrQnVmZmVyID0gbnVsbHB0cjsKQEAgLTg2Myw2ICs4NzAsNyBAQCB3ZWJtOjpTdGF0
dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25GcmFtZShjb25zdCBGcmFtZU1ldGFkYXRhJiBt
ZXRhZGF0YSwgUmVhZAogICAgICAgICBpZiAobm9FcnIgIT0gQ01CbG9ja0J1ZmZlckdldERhdGFQ
b2ludGVyKHRyYWNrRGF0YS0+Y3VycmVudEJsb2NrQnVmZmVyLmdldCgpLCAwLCAmc2VnbWVudFNp
emVBdFBvc2l0aW9uLCBudWxscHRyLCAoY2hhcioqKSZibG9ja0J1ZmZlckRhdGEpKQogICAgICAg
ICAgICAgcmV0dXJuIFNraXAocmVhZGVyLCBieXRlc1JlbWFpbmluZyk7CiAKKyAgICAgICAgYXV0
byYgaGVhZGVyUGFyc2VyID0gdHJhY2tEYXRhLT5oZWFkZXJQYXJzZXI7CiAgICAgICAgIGlmICgh
aGVhZGVyUGFyc2VyLlBhcnNlVW5jb21wcmVzc2VkSGVhZGVyKGJsb2NrQnVmZmVyRGF0YSwgc2Vn
bWVudFNpemVBdFBvc2l0aW9uKSkKICAgICAgICAgICAgIHJldHVybiBTa2lwKHJlYWRlciwgYnl0
ZXNSZW1haW5pbmcpOwogCkBAIC05MDUsOCArOTEzLDggQEAgd2VibTo6U3RhdHVzIFNvdXJjZUJ1
ZmZlclBhcnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJl
YWQKICAgICAgICAgICAgIGF1dG8gbWVkaWFTYW1wbGUgPSBNZWRpYVNhbXBsZUFWRk9iakM6OmNy
ZWF0ZShzYW1wbGVCdWZmZXIuZ2V0KCksIHRyYWNrSUQpOwogICAgICAgICAgICAgbV9kaWRQcm92
aWRlTWVkaWFEYXRhQ2FsbGJhY2soV1RGTW92ZShtZWRpYVNhbXBsZSksIHRyYWNrSUQsIGVtcHR5
U3RyaW5nKCkpOwogICAgICAgICB9KTsKLQogICAgIH0KKyNlbmRpZgogCiAgICAgcmV0dXJuIFNr
aXAocmVhZGVyLCBieXRlc1JlbWFpbmluZyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2EuaAppbmRleCBj
OWY5MzFiODUwMDk1Y2U2NDUwNWQ5OGRmMDJlYmJmY2E0OTA0MzhjLi4xNGM2ZjNhZTk4NDMwYWFl
YzJiOGU4MjJiMWZiNTFiNDc1OGFhOTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29hLmgKQEAgLTI1LDcg
KzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFC
TEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKIAogI2luY2x1ZGUgIlZQOVV0aWxpdGllcy5oIgog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlV
dGlsaXRpZXNDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h
L1ZQOVV0aWxpdGllc0NvY29hLm1tCmluZGV4IDU4MmQ0YjU1YThkZmQzZDNiYTE1ZmZhZjUwNjE4
ZThjZjI4YWIxZjQuLmM4MWU5N2FhM2U0NzdkN2M3Yjg5YzE2MTlhOWYzZmYyZjJiZWMwYTEgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxp
dGllc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h
L1ZQOVV0aWxpdGllc0NvY29hLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmln
LmgiCiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzQ29jb2EuaCIKIAotI2lmIFBMQVRGT1JNKENPQ09B
KQorI2lmIEVOQUJMRShWUDkpICYmIFBMQVRGT1JNKENPQ09BKQogCiAjaW1wb3J0ICJGb3VyQ0Mu
aCIKICNpbXBvcnQgIkxpYldlYlJUQ1Byb3ZpZGVyLmgiCkBAIC0zNSw2ICszNSw3IEBACiAjaW1w
b3J0ICJTY3JlZW5Qcm9wZXJ0aWVzLmgiCiAjaW1wb3J0ICJTeXN0ZW1CYXR0ZXJ5LmgiCiAjaW1w
b3J0ICJWaWRlb0NvbmZpZ3VyYXRpb24uaCIKKyNpbXBvcnQgPENvcmVNZWRpYS9DTUZvcm1hdERl
c2NyaXB0aW9uLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdUb0ludGVnZXJDb252ZXJzaW9u
Lmg+CiAKICNpbXBvcnQgPHBhbC9jb2NvYS9BVkZvdW5kYXRpb25Tb2Z0TGluay5oPgpAQCAtNDIs
OSArNDMsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhp
cyBvbmNlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSBpcyBhZGRlZCB0byBDTUZvcm1hdERlc2NyaXB0
aW9uLmgKLWNvbnN0ZXhwciBDTVZpZGVvQ29kZWNUeXBlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSB7
ICd2cDA5JyB9OwotCiBzdGF0aWMgYm9vbCBoYXJkd2FyZVZQOURlY29kZXJEaXNhYmxlZEZvclRl
c3RpbmcgeyBmYWxzZSB9OwogCiBzdHJ1Y3QgT3ZlcnJpZGVTY3JlZW5EYXRhIHsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCBjMDUzYTRkZGEyMDA4ZWZkN2E2Njg4ZDM0NDhm
ZmJmM2JmY2JlMWY1Li4wMzZjMjRhYzEzMDYyOGQ3MTE2NWIyZjM4OTRlM2EyZjNmOTIzZmJkIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC02MzUsNiArNjM1LDkgQEAgSW50
ZXJuYWxzOjpJbnRlcm5hbHMoRG9jdW1lbnQmIGRvY3VtZW50KQogI2lmIFBMQVRGT1JNKENPQ09B
KQogICAgIHNldE92ZXJyaWRlU3lzdGVtSGFzQmF0dGVyeUZvclRlc3RpbmcoV1RGOjpudWxsb3B0
KTsKICAgICBzZXRPdmVycmlkZVN5c3RlbUhhc0FDRm9yVGVzdGluZyhXVEY6Om51bGxvcHQpOwor
I2VuZGlmCisKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBzZXRPdmVy
cmlkZVZQOUhhcmR3YXJlRGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhmYWxzZSk7CiAgICAgcmVz
ZXRPdmVycmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3RpbmcoKTsKICNlbmRpZgpAQCAt
NTY2Myw3ICs1NjY2LDExIEBAIE9wdGlvbmFsPERvVmlQYXJhbWV0ZXJTZXQ+IEludGVybmFsczo6
cGFyc2VEb1ZpQ29kZWNQYXJhbWV0ZXJzKGNvbnN0IFN0cmluZyYgY29kCiAKIE9wdGlvbmFsPFZQ
Q29kZWNDb25maWd1cmF0aW9uUmVjb3JkPiBJbnRlcm5hbHM6OnBhcnNlVlBDb2RlY1BhcmFtZXRl
cnMoY29uc3QgU3RyaW5nJiBjb2RlY1N0cmluZykKIHsKKyNpZiBFTkFCTEUoVlA5KQogICAgIHJl
dHVybiBXZWJDb3JlOjpwYXJzZVZQQ29kZWNQYXJhbWV0ZXJzKGNvZGVjU3RyaW5nKTsKKyNlbHNl
CisgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyNlbmRpZgogfQogCiBhdXRvIEludGVybmFsczo6
Z2V0Q29va2llcygpIGNvbnN0IC0+IFZlY3RvcjxDb29raWVEYXRhPgpAQCAtNTg5OSw3ICs1OTA2
LDcgQEAgdm9pZCBJbnRlcm5hbHM6OnNldFN5c3RlbUhhc0FDRm9yVGVzdGluZyhib29sIGhhc0FD
KQogCiB2b2lkIEludGVybmFsczo6c2V0SGFyZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0
aW5nKGJvb2wgZGlzYWJsZWQpCiB7Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgRU5BQkxFKFZQ
OSkgJiYgUExBVEZPUk0oQ09DT0EpCiAgICAgV2ViQ29yZTo6c2V0T3ZlcnJpZGVWUDlIYXJkd2Fy
ZURlY29kZXJEaXNhYmxlZEZvclRlc3RpbmcoZGlzYWJsZWQpOwogI2Vsc2UKICAgICBVTlVTRURf
UEFSQU0oZGlzYWJsZWQpOwpAQCAtNTkwOCw3ICs1OTE1LDcgQEAgdm9pZCBJbnRlcm5hbHM6OnNl
dEhhcmR3YXJlVlA5RGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhib29sIGRpc2FibGVkKQogCiB2
b2lkIEludGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyhkb3VibGUg
d2lkdGgsIGRvdWJsZSBoZWlnaHQsIGRvdWJsZSBzY2FsZSkKIHsKLSNpZiBQTEFURk9STShDT0NP
QSkKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBXZWJDb3JlOjpzZXRP
dmVycmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3Rpbmcod2lkdGgsIGhlaWdodCwgc2Nh
bGUpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0od2lkdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYTEyM2ZiMjg1NTk4MjE1MzMwYjUwOTI5NjVlZDEw
YmJhZWVjNjliOS4uMjk4MGQ5MDJkYjdjOWI0ODM4MmY2Zjc5M2FmOWY1MWU0ZjljZmNlYSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03ODcwLDcgKzc4NzAs
NyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJh
bWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJvYwogICAgIHBhcmFtZXRlcnMuc2hvdWxkQ2FwdHVy
ZVZpZGVvSW5HUFVQcm9jZXNzID0gcHJlZmVyZW5jZXMoKS5jYXB0dXJlVmlkZW9JbkdQVVByb2Nl
c3NFbmFibGVkKCk7CiAgICAgcGFyYW1ldGVycy5zaG91bGRSZW5kZXJDYW52YXNJbkdQVVByb2Nl
c3MgPSBwcmVmZXJlbmNlcygpLnJlbmRlckNhbnZhc0luR1BVUHJvY2Vzc0VuYWJsZWQoKTsKICAg
ICBwYXJhbWV0ZXJzLnNob3VsZEVuYWJsZVZQOURlY29kZXIgPSBwcmVmZXJlbmNlcygpLnZwOURl
Y29kZXJFbmFibGVkKCk7Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgRU5BQkxFKFZQOSkgJiYg
UExBVEZPUk0oQ09DT0EpCiAgICAgcGFyYW1ldGVycy5zaG91bGRFbmFibGVWUDlTV0RlY29kZXIg
PSBwcmVmZXJlbmNlcygpLnZwOURlY29kZXJFbmFibGVkKCkgJiYgKCFXZWJDb3JlOjpzeXN0ZW1I
YXNCYXR0ZXJ5KCkgfHwgcHJlZmVyZW5jZXMoKS52cDlTV0RlY29kZXJFbmFibGVkT25CYXR0ZXJ5
KCkpOwogI2VuZGlmCiAgICAgcGFyYW1ldGVycy5zaG91bGRDYXB0dXJlRGlzcGxheUluVUlQcm9j
ZXNzID0gbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24oKS5zaG91bGRDYXB0
dXJlRGlzcGxheUluVUlQcm9jZXNzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vz
cy5jcHAKaW5kZXggYzE2NWVjNDQxMTA0ZGUwYWE2OTViNDA3YzdiYzk5MzZjODlmYWUwYi4uMmM3
YzVkZmI3ZmM1MTBlYTI1ZTYzNGRmNGM2YjNjZTczMjFjNjRmMSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMTk1NCw2ICsxOTU0LDcgQEAgdm9pZCBXZWJQcm9j
ZXNzOjpzZXRVc2VHUFVQcm9jZXNzRm9yTWVkaWEoYm9vbCB1c2VHUFVQcm9jZXNzRm9yTWVkaWEp
CiB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShWUDkpCiB2b2lkIFdlYlByb2Nlc3M6OmVuYWJsZVZQ
OURlY29kZXIoKQogewogICAgIGlmIChtX3ZwOURlY29kZXJFbmFibGVkKQpAQCAtMTk3Niw2ICsx
OTc3LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjplbmFibGVWUDlTV0RlY29kZXIoKQogICAgIFdlYkNv
cmU6OnJlZ2lzdGVyV2ViS2l0VlA5RGVjb2RlcigpOwogI2VuZGlmCiB9CisjZW5kaWYKIAogfSAv
LyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9XZWJQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCmlu
ZGV4IDcwYzA3NWQwZmU1NjY0MjQ0MDBkYjU0ODljODIxY2RiMDY3MDdmZmMuLjUxMGEwMmNmZThm
NjI1ODE0ZjA4NjQwYWY1ZDVhODY3NDY3MTA3NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlByb2Nlc3MuaApAQCAtMzMyLDggKzMzMiwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRVc2VH
UFVQcm9jZXNzRm9yTWVkaWEoYm9vbCk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShWUDkpCiAgICAg
dm9pZCBlbmFibGVWUDlEZWNvZGVyKCk7CiAgICAgdm9pZCBlbmFibGVWUDlTV0RlY29kZXIoKTsK
KyNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdm9pZCB3aWxsV3JpdGVUb1Bhc3Rl
Ym9hcmRBc3luY2hyb25vdXNseShjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKTsKQEAgLTY2
MCw4ICs2NjIsMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgYm9vbCBtX3VzZUdQVVByb2Nl
c3NGb3JNZWRpYSB7IGZhbHNlIH07CisKKyNpZiBFTkFCTEUoVlA5KQogICAgIGJvb2wgbV92cDlE
ZWNvZGVyRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3ZwOVNXRGVjb2RlckVuYWJsZWQg
eyBmYWxzZSB9OworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>408235</attachid>
            <date>2020-09-08 09:40:04 -0700</date>
            <delta_ts>2020-09-08 16:18:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216205-20200908094003.patch</filename>
            <type>text/plain</type>
            <size>13979</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhkY2UxNThmMmU5ZmFk
MDQ0M2ViMmM4YjhjNjdmYmQ1NDY3MGI1ZS4uMmM2OWI4M2M3YWRiZjdiZTcwYmNiZWVmZGJjNmI4
OWU3YTI5Y2Q0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA5LTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZpZWQgYnVpbGQgZml4
IGZvciAicmVkZWZpbml0aW9uIG9mICdrQ01WaWRlb0NvZGVjVHlwZV9WUDkiCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYyMDUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBrQ01WaWRlb0NvZGVjVHlwZV9W
UDkgaXMgcHJlc2VudCBpbiB0aGUgbWFjT1MgQmlnIFN1ciBTREssIHNvIHRoZSByZWRlY2xhcmF0
aW9uIGNhbgorICAgICAgICBiZSByZW1vdmVkLiBUbyBwcm90ZWN0IGJ1aWxkcyB1c2luZyBwcmlv
ciBPUyBTREtzLCB3cmFwIHRoZSBlbnRpcmUgVlA5IGltcGxlbWVudGF0aW9uCisgICAgICAgIGlu
IEVOQUJMRShWUDkpIGNoZWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0
aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmg6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1cmF0
aW9uRmFjdG9yeUNvY29hLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29h
Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2Eu
bW06CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
SW50ZXJuYWxzOjpJbnRlcm5hbHMpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpwYXJz
ZVZQQ29kZWNQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0SGFy
ZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Oklu
dGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyk6CisKIDIwMjAtMDkt
MDQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hLEhE
Ul0gSExTIHN0cmVhbXMgd2l0aCBIRFIgdmFyaWFudHMgd2lsbCBub3Qgc2VsZWN0IEhEUi4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggOWQ5NmZhNDY0YjUyMzQ2MjMwN2VmY2NiNjk2OGJmMjFiNjZlNjY1ZC4uMmM1ZDkz
ZTkwY2E2NDE2OWU2YWVmODg5M2IxYTZhMmI2YTc1OTM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAyMC0wOS0wNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg
ICAgICBVbmlmaWVkIGJ1aWxkIGZpeCBmb3IgInJlZGVmaW5pdGlvbiBvZiAna0NNVmlkZW9Db2Rl
Y1R5cGVfVlA5IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgV3JhcCBjYWxscyB0byBXZWJDb3JlIFZQOSBmdW5jdGlvbnMgaW4gRU5BQkxFKFZQOSkgY2hl
Y2tzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
OgorCiAyMDIwLTA4LTI2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJFR1JFU1NJT04ocjI2NDcxMCk6IEluaXRpYWxpemluZyB0aGUgQVZQbGF5ZXIgT2JqLUMg
Y2xhc3MgYXQgcHJvY2VzcyBzdGFydCB1cCBjYXVzZXMgYSByZWdyZXNzaW9uIGluIHBvd2VyLXVz
ZSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFjdG9yeUNvY29hLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL01lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rv
cnlDb2NvYS5jcHAKaW5kZXggN2NkZmU4NjQyMzA3NDIyMDk3YzFjNWY5NjkyMDcyMTgyMTA0Njcw
ZS4uOWM1NGIxNzNjMzdkZmM3NDQ2YjY1YjA3Njk5NWY2MDNlNzhlYzFiZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1
cmF0aW9uRmFjdG9yeUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jb2NvYS9NZWRpYUVuZ2luZUNvbmZpZ3VyYXRpb25GYWN0b3J5Q29jb2EuY3BwCkBAIC0z
OCw5ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFJlbW92ZSB0
aGlzIG9uY2Uga0NNVmlkZW9Db2RlY1R5cGVfVlA5IGlzIGFkZGVkIHRvIENNRm9ybWF0RGVzY3Jp
cHRpb24uaAotY29uc3RleHByIENNVmlkZW9Db2RlY1R5cGUga0NNVmlkZW9Db2RlY1R5cGVfVlA5
IHsgJ3ZwMDknIH07Ci0KIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogewogICAgIGlmICh0eXBlLnN0YXJ0c1dpdGgoIm1w
NHYiKSkKQEAgLTQ5LDggKzQ2LDEwIEBAIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29k
ZWNUeXBlRnJvbVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogICAgICAgICByZXR1cm4ga0NNVmlk
ZW9Db2RlY1R5cGVfSDI2NDsKICAgICBpZiAodHlwZS5zdGFydHNXaXRoKCJodmMxIikgfHwgdHlw
ZS5zdGFydHNXaXRoKCJoZXYxIikpCiAgICAgICAgIHJldHVybiBrQ01WaWRlb0NvZGVjVHlwZV9I
RVZDOworI2lmIEVOQUJMRShWUDkpCiAgICAgaWYgKHR5cGUuc3RhcnRzV2l0aCgidnAwOSIpKQog
ICAgICAgICByZXR1cm4ga0NNVmlkZW9Db2RlY1R5cGVfVlA5OworI2VuZGlmCiAgICAgcmV0dXJu
IDA7CiB9CiAKQEAgLTk3LDEyICs5NiwxNCBAQCB2b2lkIGNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EoTWVkaWFEZWNvZGluZ0NvbmZpZ3VyYXRpb24mJiBjbwogICAg
ICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29uZmlndXJhdGlvbil9KTsKICAg
ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisjaWYgRU5BQkxFKFZQOSkKICAg
ICAgICAgfSBlbHNlIGlmICh2aWRlb0NvZGVjVHlwZSA9PSBrQ01WaWRlb0NvZGVjVHlwZV9WUDkp
IHsKICAgICAgICAgICAgIGF1dG8gY29kZWNDb25maWd1cmF0aW9uID0gcGFyc2VWUENvZGVjUGFy
YW1ldGVycyhjb2RlYyk7CiAgICAgICAgICAgICBpZiAoIWNvZGVjQ29uZmlndXJhdGlvbiB8fCAh
dmFsaWRhdGVWUFBhcmFtZXRlcnMoKmNvZGVjQ29uZmlndXJhdGlvbiwgaW5mbywgdmlkZW9Db25m
aWd1cmF0aW9uKSkgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29u
ZmlndXJhdGlvbil9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Cisj
ZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChhbHBoYUNoYW5uZWwgfHwg
aGRyU3VwcG9ydGVkKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soe3sgfSwgV1RGTW92ZShj
b25maWd1cmF0aW9uKX0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAppbmRleCBh
NzE3MzgwNTdkODkzMWUyZjA2ZTg1YTU4MDkyNTkyY2MwYjAxMGQ4Li45NGFkMmNjZDJlNzc5NTZk
ZDE3YzgyMDk5NTM5YjlmYWI5Zjk0Yjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJN
LmNwcApAQCAtMjQwLDYgKzI0MCw3IEBAIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZSBT
b3VyY2VCdWZmZXJQYXJzZXJXZWJNOjppc0NvbnRlbnRUeXBlU3VwcG9ydGVkKGNvCiAgICAgaWYg
KCFjb2RlY3NQYXJhbWV0ZXIpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBw
b3J0c1R5cGU6Ok1heUJlU3VwcG9ydGVkOwogCisjaWYgRU5BQkxFKFZQOSkKICAgICBhdXRvIHNw
bGl0UmVzdWx0cyA9IFN0cmluZ1ZpZXcoY29kZWNzUGFyYW1ldGVyKS5zcGxpdCgnLCcpOwogICAg
IGZvciAoYXV0byBzcGxpdCA6IHNwbGl0UmVzdWx0cykgewogICAgICAgICBpZiAoc3BsaXQuc3Rh
cnRzV2l0aCgidnAwOSIpKSB7CkBAIC0yNTcsNiArMjU4LDkgQEAgTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQoY28KICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZTo6SXNO
b3RTdXBwb3J0ZWQ7CiAgICAgfQogICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBwb3J0
c1R5cGU6OklzU3VwcG9ydGVkOworI2Vsc2UKKyAgICByZXR1cm4gTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlOjpJc05vdFN1cHBvcnRlZDsKKyNlbmRpZgogfQogCiBTb3VyY2VCdWZmZXJQ
YXJzZXJXZWJNOjpTb3VyY2VCdWZmZXJQYXJzZXJXZWJNKCkKQEAgLTUxMyw2ICs1MTcsOCBAQCB3
ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25CbG9ja0dyb3VwRW5kKGNvbnN0
IHdlYm06OkVsZW1lbnRNZXRhZGF0YQogICAgIHJldHVybiBTdGF0dXMoU3RhdHVzOjprT2tDb21w
bGV0ZWQpOwogfQogCisjaWYgRU5BQkxFKFZQOSkKKwogc3RhdGljIHVpbnQ4X3QgY29udmVydFRv
Q29sb3JQcmltYXJpZXMoY29uc3QgUHJpbWFyaWVzJiBjb2VmZmljaWVudHMpCiB7CiAgICAgc3dp
dGNoIChjb2VmZmljaWVudHMpIHsKQEAgLTc5NCw2ICs4MDAsNyBAQCBzdGF0aWMgUmV0YWluUHRy
PENNRm9ybWF0RGVzY3JpcHRpb25SZWY+IGNyZWF0ZUZvcm1hdERlc2NyaXB0aW9uRnJvbVZQOUhl
YWRlclBhcgogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4gYWRvcHRDRihmb3Jt
YXREZXNjcmlwdGlvbik7CiB9CisjZW5kaWYKIAogd2VibTo6U3RhdHVzIFNvdXJjZUJ1ZmZlclBh
cnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJlYWRlciog
cmVhZGVyLCB1aW50NjRfdCogYnl0ZXNSZW1haW5pbmcpCiB7CkBAIC04MjEsMTIgKzgyOCwxMiBA
QCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25GcmFtZShjb25zdCBGcmFt
ZU1ldGFkYXRhJiBtZXRhZGF0YSwgUmVhZAogICAgIGlmICghdHJhY2tEYXRhKQogICAgICAgICBy
ZXR1cm4gU3RhdHVzKFN0YXR1czo6a0ludmFsaWRFbGVtZW50SWQpOwogICAgIGF1dG8mIHRyYWNr
ID0gdHJhY2tEYXRhLT50cmFjazsKLSAgICBhdXRvJiBoZWFkZXJQYXJzZXIgPSB0cmFja0RhdGEt
PmhlYWRlclBhcnNlcjsKIAogICAgIHVpbnQ2NF90IGR1cmF0aW9uID0gMDsKICAgICBpZiAodHJh
Y2suZGVmYXVsdF9kdXJhdGlvbi5pc19wcmVzZW50KCkpCiAgICAgICAgIGR1cmF0aW9uID0gdHJh
Y2suZGVmYXVsdF9kdXJhdGlvbi52YWx1ZSgpICogbV90aW1lc2NhbGUgLyAxMDAwMDAwMDAwOwog
CisjaWYgRU5BQkxFKFZQOSkKICAgICBpZiAodHJhY2suY29kZWNfaWQuaXNfcHJlc2VudCgpICYm
IHRyYWNrLmNvZGVjX2lkLnZhbHVlKCkgPT0gIlZfVlA5IikgewogICAgICAgICBpZiAoIXRyYWNr
RGF0YS0+Y3VycmVudEJsb2NrQnVmZmVyKSB7CiAgICAgICAgICAgICBDTUJsb2NrQnVmZmVyUmVm
IHJhd0Jsb2NrQnVmZmVyID0gbnVsbHB0cjsKQEAgLTg2Myw2ICs4NzAsNyBAQCB3ZWJtOjpTdGF0
dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25GcmFtZShjb25zdCBGcmFtZU1ldGFkYXRhJiBt
ZXRhZGF0YSwgUmVhZAogICAgICAgICBpZiAobm9FcnIgIT0gQ01CbG9ja0J1ZmZlckdldERhdGFQ
b2ludGVyKHRyYWNrRGF0YS0+Y3VycmVudEJsb2NrQnVmZmVyLmdldCgpLCAwLCAmc2VnbWVudFNp
emVBdFBvc2l0aW9uLCBudWxscHRyLCAoY2hhcioqKSZibG9ja0J1ZmZlckRhdGEpKQogICAgICAg
ICAgICAgcmV0dXJuIFNraXAocmVhZGVyLCBieXRlc1JlbWFpbmluZyk7CiAKKyAgICAgICAgYXV0
byYgaGVhZGVyUGFyc2VyID0gdHJhY2tEYXRhLT5oZWFkZXJQYXJzZXI7CiAgICAgICAgIGlmICgh
aGVhZGVyUGFyc2VyLlBhcnNlVW5jb21wcmVzc2VkSGVhZGVyKGJsb2NrQnVmZmVyRGF0YSwgc2Vn
bWVudFNpemVBdFBvc2l0aW9uKSkKICAgICAgICAgICAgIHJldHVybiBTa2lwKHJlYWRlciwgYnl0
ZXNSZW1haW5pbmcpOwogCkBAIC05MDUsOCArOTEzLDggQEAgd2VibTo6U3RhdHVzIFNvdXJjZUJ1
ZmZlclBhcnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJl
YWQKICAgICAgICAgICAgIGF1dG8gbWVkaWFTYW1wbGUgPSBNZWRpYVNhbXBsZUFWRk9iakM6OmNy
ZWF0ZShzYW1wbGVCdWZmZXIuZ2V0KCksIHRyYWNrSUQpOwogICAgICAgICAgICAgbV9kaWRQcm92
aWRlTWVkaWFEYXRhQ2FsbGJhY2soV1RGTW92ZShtZWRpYVNhbXBsZSksIHRyYWNrSUQsIGVtcHR5
U3RyaW5nKCkpOwogICAgICAgICB9KTsKLQogICAgIH0KKyNlbmRpZgogCiAgICAgcmV0dXJuIFNr
aXAocmVhZGVyLCBieXRlc1JlbWFpbmluZyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2EuaAppbmRleCBj
OWY5MzFiODUwMDk1Y2U2NDUwNWQ5OGRmMDJlYmJmY2E0OTA0MzhjLi4xNGM2ZjNhZTk4NDMwYWFl
YzJiOGU4MjJiMWZiNTFiNDc1OGFhOTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29hLmgKQEAgLTI1LDcg
KzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFC
TEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKIAogI2luY2x1ZGUgIlZQOVV0aWxpdGllcy5oIgog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlV
dGlsaXRpZXNDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h
L1ZQOVV0aWxpdGllc0NvY29hLm1tCmluZGV4IDU4MmQ0YjU1YThkZmQzZDNiYTE1ZmZhZjUwNjE4
ZThjZjI4YWIxZjQuLmM4MWU5N2FhM2U0NzdkN2M3Yjg5YzE2MTlhOWYzZmYyZjJiZWMwYTEgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxp
dGllc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h
L1ZQOVV0aWxpdGllc0NvY29hLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmln
LmgiCiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzQ29jb2EuaCIKIAotI2lmIFBMQVRGT1JNKENPQ09B
KQorI2lmIEVOQUJMRShWUDkpICYmIFBMQVRGT1JNKENPQ09BKQogCiAjaW1wb3J0ICJGb3VyQ0Mu
aCIKICNpbXBvcnQgIkxpYldlYlJUQ1Byb3ZpZGVyLmgiCkBAIC0zNSw2ICszNSw3IEBACiAjaW1w
b3J0ICJTY3JlZW5Qcm9wZXJ0aWVzLmgiCiAjaW1wb3J0ICJTeXN0ZW1CYXR0ZXJ5LmgiCiAjaW1w
b3J0ICJWaWRlb0NvbmZpZ3VyYXRpb24uaCIKKyNpbXBvcnQgPENvcmVNZWRpYS9DTUZvcm1hdERl
c2NyaXB0aW9uLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdUb0ludGVnZXJDb252ZXJzaW9u
Lmg+CiAKICNpbXBvcnQgPHBhbC9jb2NvYS9BVkZvdW5kYXRpb25Tb2Z0TGluay5oPgpAQCAtNDIs
OSArNDMsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhp
cyBvbmNlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSBpcyBhZGRlZCB0byBDTUZvcm1hdERlc2NyaXB0
aW9uLmgKLWNvbnN0ZXhwciBDTVZpZGVvQ29kZWNUeXBlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSB7
ICd2cDA5JyB9OwotCiBzdGF0aWMgYm9vbCBoYXJkd2FyZVZQOURlY29kZXJEaXNhYmxlZEZvclRl
c3RpbmcgeyBmYWxzZSB9OwogCiBzdHJ1Y3QgT3ZlcnJpZGVTY3JlZW5EYXRhIHsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCBjMDUzYTRkZGEyMDA4ZWZkN2E2Njg4ZDM0NDhm
ZmJmM2JmY2JlMWY1Li4wN2QxNWY2OTcyY2Y2NmViN2IwZGUyMWI5ZWEwOTRkNzRhZmJlNDM5IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC02MzUsNiArNjM1LDkgQEAgSW50
ZXJuYWxzOjpJbnRlcm5hbHMoRG9jdW1lbnQmIGRvY3VtZW50KQogI2lmIFBMQVRGT1JNKENPQ09B
KQogICAgIHNldE92ZXJyaWRlU3lzdGVtSGFzQmF0dGVyeUZvclRlc3RpbmcoV1RGOjpudWxsb3B0
KTsKICAgICBzZXRPdmVycmlkZVN5c3RlbUhhc0FDRm9yVGVzdGluZyhXVEY6Om51bGxvcHQpOwor
I2VuZGlmCisKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBzZXRPdmVy
cmlkZVZQOUhhcmR3YXJlRGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhmYWxzZSk7CiAgICAgcmVz
ZXRPdmVycmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3RpbmcoKTsKICNlbmRpZgpAQCAt
NTY2Myw3ICs1NjY2LDEyIEBAIE9wdGlvbmFsPERvVmlQYXJhbWV0ZXJTZXQ+IEludGVybmFsczo6
cGFyc2VEb1ZpQ29kZWNQYXJhbWV0ZXJzKGNvbnN0IFN0cmluZyYgY29kCiAKIE9wdGlvbmFsPFZQ
Q29kZWNDb25maWd1cmF0aW9uUmVjb3JkPiBJbnRlcm5hbHM6OnBhcnNlVlBDb2RlY1BhcmFtZXRl
cnMoY29uc3QgU3RyaW5nJiBjb2RlY1N0cmluZykKIHsKKyNpZiBFTkFCTEUoVlA5KQogICAgIHJl
dHVybiBXZWJDb3JlOjpwYXJzZVZQQ29kZWNQYXJhbWV0ZXJzKGNvZGVjU3RyaW5nKTsKKyNlbHNl
CisgICAgVU5VU0VEX1BBUkFNKGNvZGVjU3RyaW5nKTsKKyAgICByZXR1cm4gV1RGOjpudWxsb3B0
OworI2VuZGlmCiB9CiAKIGF1dG8gSW50ZXJuYWxzOjpnZXRDb29raWVzKCkgY29uc3QgLT4gVmVj
dG9yPENvb2tpZURhdGE+CkBAIC01ODk5LDcgKzU5MDcsNyBAQCB2b2lkIEludGVybmFsczo6c2V0
U3lzdGVtSGFzQUNGb3JUZXN0aW5nKGJvb2wgaGFzQUMpCiAKIHZvaWQgSW50ZXJuYWxzOjpzZXRI
YXJkd2FyZVZQOURlY29kZXJEaXNhYmxlZEZvclRlc3RpbmcoYm9vbCBkaXNhYmxlZCkKIHsKLSNp
ZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAg
ICBXZWJDb3JlOjpzZXRPdmVycmlkZVZQOUhhcmR3YXJlRGVjb2RlckRpc2FibGVkRm9yVGVzdGlu
ZyhkaXNhYmxlZCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShkaXNhYmxlZCk7CkBAIC01OTA4
LDcgKzU5MTYsNyBAQCB2b2lkIEludGVybmFsczo6c2V0SGFyZHdhcmVWUDlEZWNvZGVyRGlzYWJs
ZWRGb3JUZXN0aW5nKGJvb2wgZGlzYWJsZWQpCiAKIHZvaWQgSW50ZXJuYWxzOjpzZXRWUDlTY3Jl
ZW5TaXplQW5kU2NhbGVGb3JUZXN0aW5nKGRvdWJsZSB3aWR0aCwgZG91YmxlIGhlaWdodCwgZG91
YmxlIHNjYWxlKQogewotI2lmIFBMQVRGT1JNKENPQ09BKQorI2lmIEVOQUJMRShWUDkpICYmIFBM
QVRGT1JNKENPQ09BKQogICAgIFdlYkNvcmU6OnNldE92ZXJyaWRlVlA5U2NyZWVuU2l6ZUFuZFNj
YWxlRm9yVGVzdGluZyh3aWR0aCwgaGVpZ2h0LCBzY2FsZSk7CiAjZWxzZQogICAgIFVOVVNFRF9Q
QVJBTSh3aWR0aCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl
UHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRl
eCBhMTIzZmIyODU1OTgyMTUzMzBiNTA5Mjk2NWVkMTBiYmFlZWM2OWI5Li4yOTgwZDkwMmRiN2M5
YjQ4MzgyZjZmNzkzYWY5ZjUxZTRmOWNmY2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl
YlBhZ2VQcm94eS5jcHAKQEAgLTc4NzAsNyArNzg3MCw3IEBAIFdlYlBhZ2VDcmVhdGlvblBhcmFt
ZXRlcnMgV2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMoV2ViUHJvY2Vzc1Byb3h5JiBw
cm9jCiAgICAgcGFyYW1ldGVycy5zaG91bGRDYXB0dXJlVmlkZW9JbkdQVVByb2Nlc3MgPSBwcmVm
ZXJlbmNlcygpLmNhcHR1cmVWaWRlb0luR1BVUHJvY2Vzc0VuYWJsZWQoKTsKICAgICBwYXJhbWV0
ZXJzLnNob3VsZFJlbmRlckNhbnZhc0luR1BVUHJvY2VzcyA9IHByZWZlcmVuY2VzKCkucmVuZGVy
Q2FudmFzSW5HUFVQcm9jZXNzRW5hYmxlZCgpOwogICAgIHBhcmFtZXRlcnMuc2hvdWxkRW5hYmxl
VlA5RGVjb2RlciA9IHByZWZlcmVuY2VzKCkudnA5RGVjb2RlckVuYWJsZWQoKTsKLSNpZiBQTEFU
Rk9STShDT0NPQSkKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBwYXJh
bWV0ZXJzLnNob3VsZEVuYWJsZVZQOVNXRGVjb2RlciA9IHByZWZlcmVuY2VzKCkudnA5RGVjb2Rl
ckVuYWJsZWQoKSAmJiAoIVdlYkNvcmU6OnN5c3RlbUhhc0JhdHRlcnkoKSB8fCBwcmVmZXJlbmNl
cygpLnZwOVNXRGVjb2RlckVuYWJsZWRPbkJhdHRlcnkoKSk7CiAjZW5kaWYKICAgICBwYXJhbWV0
ZXJzLnNob3VsZENhcHR1cmVEaXNwbGF5SW5VSVByb2Nlc3MgPSBtX3Byb2Nlc3MtPnByb2Nlc3NQ
b29sKCkuY29uZmlndXJhdGlvbigpLnNob3VsZENhcHR1cmVEaXNwbGF5SW5VSVByb2Nlc3MoKTsK
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw
IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMGRh
MzMyY2FhNzk2Njk1NjBjYjhlZTk5ZTEzNGYyMTc0OWY2NjU2YS4uYzZmNzI5NWIxMTRjNmVkODJm
ZGQ5NmViNzFmN2QyMjZmMDgxYmZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl
YlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTc3NywxMSArNzc3LDEzIEBAIFdlYlBhZ2U6OldlYlBhZ2Uo
UGFnZUlkZW50aWZpZXIgcGFnZUlELCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1l
dGVycykKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZENyZWF0ZUNvbnRleHRG
b3JWaXNpYmlsaXR5UHJvcGFnYXRpb24obV9jb250ZXh0Rm9yVmlzaWJpbGl0eVByb3BhZ2F0aW9u
LT5jb250ZXh0SUQoKSkpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoVlA5KQogICAgIGlmIChwYXJh
bWV0ZXJzLnNob3VsZEVuYWJsZVZQOURlY29kZXIpCiAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmds
ZXRvbigpLmVuYWJsZVZQOURlY29kZXIoKTsKIAogICAgIGlmIChwYXJhbWV0ZXJzLnNob3VsZEVu
YWJsZVZQOVNXRGVjb2RlcikKICAgICAgICAgV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuZW5hYmxl
VlA5U1dEZWNvZGVyKCk7CisjZW5kaWYKIAogICAgIG1fcGFnZS0+c2V0Q2FuVXNlQ3JlZGVudGlh
bFN0b3JhZ2UocGFyYW1ldGVycy5jYW5Vc2VDcmVkZW50aWFsU3RvcmFnZSk7CiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAppbmRleCBjMTY1ZWM0NDExMDRkZTBhYTY5NWI0
MDdjN2JjOTkzNmM4OWZhZTBiLi4yYzdjNWRmYjdmYzUxMGVhMjVlNjM0ZGY0YzZiM2NlNzMyMWM2
NGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAK
KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC0xOTU0LDYg
KzE5NTQsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldFVzZUdQVVByb2Nlc3NGb3JNZWRpYShib29s
IHVzZUdQVVByb2Nlc3NGb3JNZWRpYSkKIH0KICNlbmRpZgogCisjaWYgRU5BQkxFKFZQOSkKIHZv
aWQgV2ViUHJvY2Vzczo6ZW5hYmxlVlA5RGVjb2RlcigpCiB7CiAgICAgaWYgKG1fdnA5RGVjb2Rl
ckVuYWJsZWQpCkBAIC0xOTc2LDYgKzE5NzcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmVuYWJsZVZQ
OVNXRGVjb2RlcigpCiAgICAgV2ViQ29yZTo6cmVnaXN0ZXJXZWJLaXRWUDlEZWNvZGVyKCk7CiAj
ZW5kaWYKIH0KKyNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIApkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9XZWJQcm9jZXNzLmgKaW5kZXggNzBjMDc1ZDBmZTU2NjQyNDQwMGRiNTQ4OWM4MjFj
ZGIwNjcwN2ZmYy4uNTEwYTAyY2ZlOGY2MjU4MTRmMDg2NDBhZjVkNWE4Njc0NjcxMDc0OSAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oCkBAIC0zMzIsOCArMzMyLDEwIEBAIHB1
YmxpYzoKICAgICB2b2lkIHNldFVzZUdQVVByb2Nlc3NGb3JNZWRpYShib29sKTsKICNlbmRpZgog
CisjaWYgRU5BQkxFKFZQOSkKICAgICB2b2lkIGVuYWJsZVZQOURlY29kZXIoKTsKICAgICB2b2lk
IGVuYWJsZVZQOVNXRGVjb2RlcigpOworI2VuZGlmCiAKICNpZiBQTEFURk9STShDT0NPQSkKICAg
ICB2b2lkIHdpbGxXcml0ZVRvUGFzdGVib2FyZEFzeW5jaHJvbm91c2x5KGNvbnN0IFN0cmluZyYg
cGFzdGVib2FyZE5hbWUpOwpAQCAtNjYwLDggKzY2MiwxMSBAQCBwcml2YXRlOgogI2VuZGlmCiAK
ICAgICBib29sIG1fdXNlR1BVUHJvY2Vzc0Zvck1lZGlhIHsgZmFsc2UgfTsKKworI2lmIEVOQUJM
RShWUDkpCiAgICAgYm9vbCBtX3ZwOURlY29kZXJFbmFibGVkIHsgZmFsc2UgfTsKICAgICBib29s
IG1fdnA5U1dEZWNvZGVyRW5hYmxlZCB7IGZhbHNlIH07CisjZW5kaWYKIH07CiAKIH0gLy8gbmFt
ZXNwYWNlIFdlYktpdAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>408282</attachid>
            <date>2020-09-08 16:18:18 -0700</date>
            <delta_ts>2020-09-17 02:19:16 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216205-20200908161817.patch</filename>
            <type>text/plain</type>
            <size>13560</size>
            <attacher name="Jer Noble">jer.noble</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzhkY2UxNThmMmU5ZmFk
MDQ0M2ViMmM4YjhjNjdmYmQ1NDY3MGI1ZS4uMmM2OWI4M2M3YWRiZjdiZTcwYmNiZWVmZGJjNmI4
OWU3YTI5Y2Q0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA5LTA0ICBKZXIg
Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFVuaWZpZWQgYnVpbGQgZml4
IGZvciAicmVkZWZpbml0aW9uIG9mICdrQ01WaWRlb0NvZGVjVHlwZV9WUDkiCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYyMDUKKworICAgICAgICBS
ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBrQ01WaWRlb0NvZGVjVHlwZV9W
UDkgaXMgcHJlc2VudCBpbiB0aGUgbWFjT1MgQmlnIFN1ciBTREssIHNvIHRoZSByZWRlY2xhcmF0
aW9uIGNhbgorICAgICAgICBiZSByZW1vdmVkLiBUbyBwcm90ZWN0IGJ1aWxkcyB1c2luZyBwcmlv
ciBPUyBTREtzLCB3cmFwIHRoZSBlbnRpcmUgVlA5IGltcGxlbWVudGF0aW9uCisgICAgICAgIGlu
IEVOQUJMRShWUDkpIGNoZWNrcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1ZQOVV0
aWxpdGllcy5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvVlA5VXRpbGl0aWVzLmg6
CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1cmF0
aW9uRmFjdG9yeUNvY29hLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBw
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcDoKKyAgICAg
ICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29h
Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2Eu
bW06CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6
SW50ZXJuYWxzOjpJbnRlcm5hbHMpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpwYXJz
ZVZQQ29kZWNQYXJhbWV0ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0SGFy
ZHdhcmVWUDlEZWNvZGVyRGlzYWJsZWRGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYkNvcmU6Oklu
dGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVzdGluZyk6CisKIDIwMjAtMDkt
MDQgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hLEhE
Ul0gSExTIHN0cmVhbXMgd2l0aCBIRFIgdmFyaWFudHMgd2lsbCBub3Qgc2VsZWN0IEhEUi4KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM
b2cKaW5kZXggOWQ5NmZhNDY0YjUyMzQ2MjMwN2VmY2NiNjk2OGJmMjFiNjZlNjY1ZC4uMmM1ZDkz
ZTkwY2E2NDE2OWU2YWVmODg5M2IxYTZhMmI2YTc1OTM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx
NyBAQAorMjAyMC0wOS0wNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KKworICAg
ICAgICBVbmlmaWVkIGJ1aWxkIGZpeCBmb3IgInJlZGVmaW5pdGlvbiBvZiAna0NNVmlkZW9Db2Rl
Y1R5cGVfVlA5IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgV3JhcCBjYWxscyB0byBXZWJDb3JlIFZQOSBmdW5jdGlvbnMgaW4gRU5BQkxFKFZQOSkgY2hl
Y2tzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX
ZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAgICAgKiBXZWJQ
cm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
OgorCiAyMDIwLTA4LTI2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAg
ICAgIFJFR1JFU1NJT04ocjI2NDcxMCk6IEluaXRpYWxpemluZyB0aGUgQVZQbGF5ZXIgT2JqLUMg
Y2xhc3MgYXQgcHJvY2VzcyBzdGFydCB1cCBjYXVzZXMgYSByZWdyZXNzaW9uIGluIHBvd2VyLXVz
ZSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29j
b2EvTWVkaWFFbmdpbmVDb25maWd1cmF0aW9uRmFjdG9yeUNvY29hLmNwcCBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL01lZGlhRW5naW5lQ29uZmlndXJhdGlvbkZhY3Rv
cnlDb2NvYS5jcHAKaW5kZXggN2NkZmU4NjQyMzA3NDIyMDk3YzFjNWY5NjkyMDcyMTgyMTA0Njcw
ZS4uOWM1NGIxNzNjMzdkZmM3NDQ2YjY1YjA3Njk5NWY2MDNlNzhlYzFiZSAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvTWVkaWFFbmdpbmVDb25maWd1
cmF0aW9uRmFjdG9yeUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw
aGljcy9jb2NvYS9NZWRpYUVuZ2luZUNvbmZpZ3VyYXRpb25GYWN0b3J5Q29jb2EuY3BwCkBAIC0z
OCw5ICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotLy8gRklYTUU6IFJlbW92ZSB0
aGlzIG9uY2Uga0NNVmlkZW9Db2RlY1R5cGVfVlA5IGlzIGFkZGVkIHRvIENNRm9ybWF0RGVzY3Jp
cHRpb24uaAotY29uc3RleHByIENNVmlkZW9Db2RlY1R5cGUga0NNVmlkZW9Db2RlY1R5cGVfVlA5
IHsgJ3ZwMDknIH07Ci0KIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29kZWNUeXBlRnJv
bVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogewogICAgIGlmICh0eXBlLnN0YXJ0c1dpdGgoIm1w
NHYiKSkKQEAgLTQ5LDggKzQ2LDEwIEBAIHN0YXRpYyBDTVZpZGVvQ29kZWNUeXBlIHZpZGVvQ29k
ZWNUeXBlRnJvbVJGQzQyODFUeXBlKFN0cmluZyB0eXBlKQogICAgICAgICByZXR1cm4ga0NNVmlk
ZW9Db2RlY1R5cGVfSDI2NDsKICAgICBpZiAodHlwZS5zdGFydHNXaXRoKCJodmMxIikgfHwgdHlw
ZS5zdGFydHNXaXRoKCJoZXYxIikpCiAgICAgICAgIHJldHVybiBrQ01WaWRlb0NvZGVjVHlwZV9I
RVZDOworI2lmIEVOQUJMRShWUDkpCiAgICAgaWYgKHR5cGUuc3RhcnRzV2l0aCgidnAwOSIpKQog
ICAgICAgICByZXR1cm4ga0NNVmlkZW9Db2RlY1R5cGVfVlA5OworI2VuZGlmCiAgICAgcmV0dXJu
IDA7CiB9CiAKQEAgLTk3LDEyICs5NiwxNCBAQCB2b2lkIGNyZWF0ZU1lZGlhUGxheWVyRGVjb2Rp
bmdDb25maWd1cmF0aW9uQ29jb2EoTWVkaWFEZWNvZGluZ0NvbmZpZ3VyYXRpb24mJiBjbwogICAg
ICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29uZmlndXJhdGlvbil9KTsKICAg
ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisjaWYgRU5BQkxFKFZQOSkKICAg
ICAgICAgfSBlbHNlIGlmICh2aWRlb0NvZGVjVHlwZSA9PSBrQ01WaWRlb0NvZGVjVHlwZV9WUDkp
IHsKICAgICAgICAgICAgIGF1dG8gY29kZWNDb25maWd1cmF0aW9uID0gcGFyc2VWUENvZGVjUGFy
YW1ldGVycyhjb2RlYyk7CiAgICAgICAgICAgICBpZiAoIWNvZGVjQ29uZmlndXJhdGlvbiB8fCAh
dmFsaWRhdGVWUFBhcmFtZXRlcnMoKmNvZGVjQ29uZmlndXJhdGlvbiwgaW5mbywgdmlkZW9Db25m
aWd1cmF0aW9uKSkgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKHt7IH0sIFdURk1vdmUoY29u
ZmlndXJhdGlvbil9KTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Cisj
ZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGlmIChhbHBoYUNoYW5uZWwgfHwg
aGRyU3VwcG9ydGVkKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soe3sgfSwgV1RGTW92ZShj
b25maWd1cmF0aW9uKX0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh
cGhpY3MvY29jb2EvU291cmNlQnVmZmVyUGFyc2VyV2ViTS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAppbmRleCBh
NzE3MzgwNTdkODkzMWUyZjA2ZTg1YTU4MDkyNTkyY2MwYjAxMGQ4Li45NGFkMmNjZDJlNzc5NTZk
ZDE3YzgyMDk5NTM5YjlmYWI5Zjk0Yjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJNLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Tb3VyY2VCdWZmZXJQYXJzZXJXZWJN
LmNwcApAQCAtMjQwLDYgKzI0MCw3IEBAIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZSBT
b3VyY2VCdWZmZXJQYXJzZXJXZWJNOjppc0NvbnRlbnRUeXBlU3VwcG9ydGVkKGNvCiAgICAgaWYg
KCFjb2RlY3NQYXJhbWV0ZXIpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBw
b3J0c1R5cGU6Ok1heUJlU3VwcG9ydGVkOwogCisjaWYgRU5BQkxFKFZQOSkKICAgICBhdXRvIHNw
bGl0UmVzdWx0cyA9IFN0cmluZ1ZpZXcoY29kZWNzUGFyYW1ldGVyKS5zcGxpdCgnLCcpOwogICAg
IGZvciAoYXV0byBzcGxpdCA6IHNwbGl0UmVzdWx0cykgewogICAgICAgICBpZiAoc3BsaXQuc3Rh
cnRzV2l0aCgidnAwOSIpKSB7CkBAIC0yNTcsNiArMjU4LDkgQEAgTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlIFNvdXJjZUJ1ZmZlclBhcnNlcldlYk06OmlzQ29udGVudFR5cGVTdXBwb3J0
ZWQoY28KICAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyRW51bXM6OlN1cHBvcnRzVHlwZTo6SXNO
b3RTdXBwb3J0ZWQ7CiAgICAgfQogICAgIHJldHVybiBNZWRpYVBsYXllckVudW1zOjpTdXBwb3J0
c1R5cGU6OklzU3VwcG9ydGVkOworI2Vsc2UKKyAgICByZXR1cm4gTWVkaWFQbGF5ZXJFbnVtczo6
U3VwcG9ydHNUeXBlOjpJc05vdFN1cHBvcnRlZDsKKyNlbmRpZgogfQogCiBTb3VyY2VCdWZmZXJQ
YXJzZXJXZWJNOjpTb3VyY2VCdWZmZXJQYXJzZXJXZWJNKCkKQEAgLTUxMyw2ICs1MTcsOCBAQCB3
ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25CbG9ja0dyb3VwRW5kKGNvbnN0
IHdlYm06OkVsZW1lbnRNZXRhZGF0YQogICAgIHJldHVybiBTdGF0dXMoU3RhdHVzOjprT2tDb21w
bGV0ZWQpOwogfQogCisjaWYgRU5BQkxFKFZQOSkKKwogc3RhdGljIHVpbnQ4X3QgY29udmVydFRv
Q29sb3JQcmltYXJpZXMoY29uc3QgUHJpbWFyaWVzJiBjb2VmZmljaWVudHMpCiB7CiAgICAgc3dp
dGNoIChjb2VmZmljaWVudHMpIHsKQEAgLTc5NCw2ICs4MDAsNyBAQCBzdGF0aWMgUmV0YWluUHRy
PENNRm9ybWF0RGVzY3JpcHRpb25SZWY+IGNyZWF0ZUZvcm1hdERlc2NyaXB0aW9uRnJvbVZQOUhl
YWRlclBhcgogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1cm4gYWRvcHRDRihmb3Jt
YXREZXNjcmlwdGlvbik7CiB9CisjZW5kaWYKIAogd2VibTo6U3RhdHVzIFNvdXJjZUJ1ZmZlclBh
cnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJlYWRlciog
cmVhZGVyLCB1aW50NjRfdCogYnl0ZXNSZW1haW5pbmcpCiB7CkBAIC04MjEsMTIgKzgyOCwxMiBA
QCB3ZWJtOjpTdGF0dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25GcmFtZShjb25zdCBGcmFt
ZU1ldGFkYXRhJiBtZXRhZGF0YSwgUmVhZAogICAgIGlmICghdHJhY2tEYXRhKQogICAgICAgICBy
ZXR1cm4gU3RhdHVzKFN0YXR1czo6a0ludmFsaWRFbGVtZW50SWQpOwogICAgIGF1dG8mIHRyYWNr
ID0gdHJhY2tEYXRhLT50cmFjazsKLSAgICBhdXRvJiBoZWFkZXJQYXJzZXIgPSB0cmFja0RhdGEt
PmhlYWRlclBhcnNlcjsKIAogICAgIHVpbnQ2NF90IGR1cmF0aW9uID0gMDsKICAgICBpZiAodHJh
Y2suZGVmYXVsdF9kdXJhdGlvbi5pc19wcmVzZW50KCkpCiAgICAgICAgIGR1cmF0aW9uID0gdHJh
Y2suZGVmYXVsdF9kdXJhdGlvbi52YWx1ZSgpICogbV90aW1lc2NhbGUgLyAxMDAwMDAwMDAwOwog
CisjaWYgRU5BQkxFKFZQOSkKICAgICBpZiAodHJhY2suY29kZWNfaWQuaXNfcHJlc2VudCgpICYm
IHRyYWNrLmNvZGVjX2lkLnZhbHVlKCkgPT0gIlZfVlA5IikgewogICAgICAgICBpZiAoIXRyYWNr
RGF0YS0+Y3VycmVudEJsb2NrQnVmZmVyKSB7CiAgICAgICAgICAgICBDTUJsb2NrQnVmZmVyUmVm
IHJhd0Jsb2NrQnVmZmVyID0gbnVsbHB0cjsKQEAgLTg2Myw2ICs4NzAsNyBAQCB3ZWJtOjpTdGF0
dXMgU291cmNlQnVmZmVyUGFyc2VyV2ViTTo6T25GcmFtZShjb25zdCBGcmFtZU1ldGFkYXRhJiBt
ZXRhZGF0YSwgUmVhZAogICAgICAgICBpZiAobm9FcnIgIT0gQ01CbG9ja0J1ZmZlckdldERhdGFQ
b2ludGVyKHRyYWNrRGF0YS0+Y3VycmVudEJsb2NrQnVmZmVyLmdldCgpLCAwLCAmc2VnbWVudFNp
emVBdFBvc2l0aW9uLCBudWxscHRyLCAoY2hhcioqKSZibG9ja0J1ZmZlckRhdGEpKQogICAgICAg
ICAgICAgcmV0dXJuIFNraXAocmVhZGVyLCBieXRlc1JlbWFpbmluZyk7CiAKKyAgICAgICAgYXV0
byYgaGVhZGVyUGFyc2VyID0gdHJhY2tEYXRhLT5oZWFkZXJQYXJzZXI7CiAgICAgICAgIGlmICgh
aGVhZGVyUGFyc2VyLlBhcnNlVW5jb21wcmVzc2VkSGVhZGVyKGJsb2NrQnVmZmVyRGF0YSwgc2Vn
bWVudFNpemVBdFBvc2l0aW9uKSkKICAgICAgICAgICAgIHJldHVybiBTa2lwKHJlYWRlciwgYnl0
ZXNSZW1haW5pbmcpOwogCkBAIC05MDUsOCArOTEzLDggQEAgd2VibTo6U3RhdHVzIFNvdXJjZUJ1
ZmZlclBhcnNlcldlYk06Ok9uRnJhbWUoY29uc3QgRnJhbWVNZXRhZGF0YSYgbWV0YWRhdGEsIFJl
YWQKICAgICAgICAgICAgIGF1dG8gbWVkaWFTYW1wbGUgPSBNZWRpYVNhbXBsZUFWRk9iakM6OmNy
ZWF0ZShzYW1wbGVCdWZmZXIuZ2V0KCksIHRyYWNrSUQpOwogICAgICAgICAgICAgbV9kaWRQcm92
aWRlTWVkaWFEYXRhQ2FsbGJhY2soV1RGTW92ZShtZWRpYVNhbXBsZSksIHRyYWNrSUQsIGVtcHR5
U3RyaW5nKCkpOwogICAgICAgICB9KTsKLQogICAgIH0KKyNlbmRpZgogCiAgICAgcmV0dXJuIFNr
aXAocmVhZGVyLCBieXRlc1JlbWFpbmluZyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y
ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oIGIvU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvVlA5VXRpbGl0aWVzQ29jb2EuaAppbmRleCBj
OWY5MzFiODUwMDk1Y2U2NDUwNWQ5OGRmMDJlYmJmY2E0OTA0MzhjLi4xNGM2ZjNhZTk4NDMwYWFl
YzJiOGU4MjJiMWZiNTFiNDc1OGFhOTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlVdGlsaXRpZXNDb2NvYS5oCisrKyBiL1NvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxpdGllc0NvY29hLmgKQEAgLTI1LDcg
KzI1LDcgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpZiBQTEFURk9STShDT0NPQSkKKyNpZiBFTkFC
TEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKIAogI2luY2x1ZGUgIlZQOVV0aWxpdGllcy5oIgog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9WUDlV
dGlsaXRpZXNDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h
L1ZQOVV0aWxpdGllc0NvY29hLm1tCmluZGV4IDU4MmQ0YjU1YThkZmQzZDNiYTE1ZmZhZjUwNjE4
ZThjZjI4YWIxZjQuLmM4MWU5N2FhM2U0NzdkN2M3Yjg5YzE2MTlhOWYzZmYyZjJiZWMwYTEgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1ZQOVV0aWxp
dGllc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h
L1ZQOVV0aWxpdGllc0NvY29hLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmln
LmgiCiAjaW5jbHVkZSAiVlA5VXRpbGl0aWVzQ29jb2EuaCIKIAotI2lmIFBMQVRGT1JNKENPQ09B
KQorI2lmIEVOQUJMRShWUDkpICYmIFBMQVRGT1JNKENPQ09BKQogCiAjaW1wb3J0ICJGb3VyQ0Mu
aCIKICNpbXBvcnQgIkxpYldlYlJUQ1Byb3ZpZGVyLmgiCkBAIC0zNSw2ICszNSw3IEBACiAjaW1w
b3J0ICJTY3JlZW5Qcm9wZXJ0aWVzLmgiCiAjaW1wb3J0ICJTeXN0ZW1CYXR0ZXJ5LmgiCiAjaW1w
b3J0ICJWaWRlb0NvbmZpZ3VyYXRpb24uaCIKKyNpbXBvcnQgPENvcmVNZWRpYS9DTUZvcm1hdERl
c2NyaXB0aW9uLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdUb0ludGVnZXJDb252ZXJzaW9u
Lmg+CiAKICNpbXBvcnQgPHBhbC9jb2NvYS9BVkZvdW5kYXRpb25Tb2Z0TGluay5oPgpAQCAtNDIs
OSArNDMsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhp
cyBvbmNlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSBpcyBhZGRlZCB0byBDTUZvcm1hdERlc2NyaXB0
aW9uLmgKLWNvbnN0ZXhwciBDTVZpZGVvQ29kZWNUeXBlIGtDTVZpZGVvQ29kZWNUeXBlX1ZQOSB7
ICd2cDA5JyB9OwotCiBzdGF0aWMgYm9vbCBoYXJkd2FyZVZQOURlY29kZXJEaXNhYmxlZEZvclRl
c3RpbmcgeyBmYWxzZSB9OwogCiBzdHJ1Y3QgT3ZlcnJpZGVTY3JlZW5EYXRhIHsKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcCBiL1NvdXJjZS9XZWJDb3Jl
L3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAppbmRleCBjMDUzYTRkZGEyMDA4ZWZkN2E2Njg4ZDM0NDhm
ZmJmM2JmY2JlMWY1Li4zMmZiNzA4ODFiNDk4YmMyYzVmMjIxNWVmMTAwOGMxYjZkNDJlM2Q4IDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKKysrIGIvU291
cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCkBAIC02MzUsNiArNjM1LDkgQEAgSW50
ZXJuYWxzOjpJbnRlcm5hbHMoRG9jdW1lbnQmIGRvY3VtZW50KQogI2lmIFBMQVRGT1JNKENPQ09B
KQogICAgIHNldE92ZXJyaWRlU3lzdGVtSGFzQmF0dGVyeUZvclRlc3RpbmcoV1RGOjpudWxsb3B0
KTsKICAgICBzZXRPdmVycmlkZVN5c3RlbUhhc0FDRm9yVGVzdGluZyhXVEY6Om51bGxvcHQpOwor
I2VuZGlmCisKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBzZXRPdmVy
cmlkZVZQOUhhcmR3YXJlRGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhmYWxzZSk7CiAgICAgcmVz
ZXRPdmVycmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3RpbmcoKTsKICNlbmRpZgpAQCAt
NTg5OSw3ICs1OTAyLDcgQEAgdm9pZCBJbnRlcm5hbHM6OnNldFN5c3RlbUhhc0FDRm9yVGVzdGlu
Zyhib29sIGhhc0FDKQogCiB2b2lkIEludGVybmFsczo6c2V0SGFyZHdhcmVWUDlEZWNvZGVyRGlz
YWJsZWRGb3JUZXN0aW5nKGJvb2wgZGlzYWJsZWQpCiB7Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisj
aWYgRU5BQkxFKFZQOSkgJiYgUExBVEZPUk0oQ09DT0EpCiAgICAgV2ViQ29yZTo6c2V0T3ZlcnJp
ZGVWUDlIYXJkd2FyZURlY29kZXJEaXNhYmxlZEZvclRlc3RpbmcoZGlzYWJsZWQpOwogI2Vsc2UK
ICAgICBVTlVTRURfUEFSQU0oZGlzYWJsZWQpOwpAQCAtNTkwOCw3ICs1OTExLDcgQEAgdm9pZCBJ
bnRlcm5hbHM6OnNldEhhcmR3YXJlVlA5RGVjb2RlckRpc2FibGVkRm9yVGVzdGluZyhib29sIGRp
c2FibGVkKQogCiB2b2lkIEludGVybmFsczo6c2V0VlA5U2NyZWVuU2l6ZUFuZFNjYWxlRm9yVGVz
dGluZyhkb3VibGUgd2lkdGgsIGRvdWJsZSBoZWlnaHQsIGRvdWJsZSBzY2FsZSkKIHsKLSNpZiBQ
TEFURk9STShDT0NPQSkKKyNpZiBFTkFCTEUoVlA5KSAmJiBQTEFURk9STShDT0NPQSkKICAgICBX
ZWJDb3JlOjpzZXRPdmVycmlkZVZQOVNjcmVlblNpemVBbmRTY2FsZUZvclRlc3Rpbmcod2lkdGgs
IGhlaWdodCwgc2NhbGUpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0od2lkdGgpOwpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYTEyM2ZiMjg1NTk4MjE1MzMw
YjUwOTI5NjVlZDEwYmJhZWVjNjliOS4uMjk4MGQ5MDJkYjdjOWI0ODM4MmY2Zjc5M2FmOWY1MWU0
ZjljZmNlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5
LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03
ODcwLDcgKzc4NzAsNyBAQCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6
Y3JlYXRpb25QYXJhbWV0ZXJzKFdlYlByb2Nlc3NQcm94eSYgcHJvYwogICAgIHBhcmFtZXRlcnMu
c2hvdWxkQ2FwdHVyZVZpZGVvSW5HUFVQcm9jZXNzID0gcHJlZmVyZW5jZXMoKS5jYXB0dXJlVmlk
ZW9JbkdQVVByb2Nlc3NFbmFibGVkKCk7CiAgICAgcGFyYW1ldGVycy5zaG91bGRSZW5kZXJDYW52
YXNJbkdQVVByb2Nlc3MgPSBwcmVmZXJlbmNlcygpLnJlbmRlckNhbnZhc0luR1BVUHJvY2Vzc0Vu
YWJsZWQoKTsKICAgICBwYXJhbWV0ZXJzLnNob3VsZEVuYWJsZVZQOURlY29kZXIgPSBwcmVmZXJl
bmNlcygpLnZwOURlY29kZXJFbmFibGVkKCk7Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgRU5B
QkxFKFZQOSkgJiYgUExBVEZPUk0oQ09DT0EpCiAgICAgcGFyYW1ldGVycy5zaG91bGRFbmFibGVW
UDlTV0RlY29kZXIgPSBwcmVmZXJlbmNlcygpLnZwOURlY29kZXJFbmFibGVkKCkgJiYgKCFXZWJD
b3JlOjpzeXN0ZW1IYXNCYXR0ZXJ5KCkgfHwgcHJlZmVyZW5jZXMoKS52cDlTV0RlY29kZXJFbmFi
bGVkT25CYXR0ZXJ5KCkpOwogI2VuZGlmCiAgICAgcGFyYW1ldGVycy5zaG91bGRDYXB0dXJlRGlz
cGxheUluVUlQcm9jZXNzID0gbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNvbmZpZ3VyYXRpb24o
KS5zaG91bGRDYXB0dXJlRGlzcGxheUluVUlQcm9jZXNzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDBkYTMzMmNhYTc5NjY5NTYwY2I4ZWU5
OWUxMzRmMjE3NDlmNjY1NmEuLmM2ZjcyOTViMTE0YzZlZDgyZmRkOTZlYjcxZjdkMjI2ZjA4MWJm
YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBA
IC03NzcsMTEgKzc3NywxMyBAQCBXZWJQYWdlOjpXZWJQYWdlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJ
RCwgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYmIHBhcmFtZXRlcnMpCiAgICAgc2VuZChNZXNz
YWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVDb250ZXh0Rm9yVmlzaWJpbGl0eVByb3BhZ2F0
aW9uKG1fY29udGV4dEZvclZpc2liaWxpdHlQcm9wYWdhdGlvbi0+Y29udGV4dElEKCkpKTsKICNl
bmRpZgogCisjaWYgRU5BQkxFKFZQOSkKICAgICBpZiAocGFyYW1ldGVycy5zaG91bGRFbmFibGVW
UDlEZWNvZGVyKQogICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbmFibGVWUDlEZWNv
ZGVyKCk7CiAKICAgICBpZiAocGFyYW1ldGVycy5zaG91bGRFbmFibGVWUDlTV0RlY29kZXIpCiAg
ICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuYWJsZVZQOVNXRGVjb2RlcigpOworI2Vu
ZGlmCiAKICAgICBtX3BhZ2UtPnNldENhblVzZUNyZWRlbnRpYWxTdG9yYWdlKHBhcmFtZXRlcnMu
Y2FuVXNlQ3JlZGVudGlhbFN0b3JhZ2UpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJv
Y2Vzcy5jcHAKaW5kZXggYzE2NWVjNDQxMTA0ZGUwYWE2OTViNDA3YzdiYzk5MzZjODlmYWUwYi4u
MmM3YzVkZmI3ZmM1MTBlYTI1ZTYzNGRmNGM2YjNjZTczMjFjNjRmMSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMTk1NCw2ICsxOTU0LDcgQEAgdm9pZCBXZWJQ
cm9jZXNzOjpzZXRVc2VHUFVQcm9jZXNzRm9yTWVkaWEoYm9vbCB1c2VHUFVQcm9jZXNzRm9yTWVk
aWEpCiB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShWUDkpCiB2b2lkIFdlYlByb2Nlc3M6OmVuYWJs
ZVZQOURlY29kZXIoKQogewogICAgIGlmIChtX3ZwOURlY29kZXJFbmFibGVkKQpAQCAtMTk3Niw2
ICsxOTc3LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjplbmFibGVWUDlTV0RlY29kZXIoKQogICAgIFdl
YkNvcmU6OnJlZ2lzdGVyV2ViS2l0VlA5RGVjb2RlcigpOwogI2VuZGlmCiB9CisjZW5kaWYKIAog
fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9XZWJQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o
CmluZGV4IDcwYzA3NWQwZmU1NjY0MjQ0MDBkYjU0ODljODIxY2RiMDY3MDdmZmMuLjUxMGEwMmNm
ZThmNjI1ODE0ZjA4NjQwYWY1ZDVhODY3NDY3MTA3NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlByb2Nlc3MuaApAQCAtMzMyLDggKzMzMiwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRV
c2VHUFVQcm9jZXNzRm9yTWVkaWEoYm9vbCk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShWUDkpCiAg
ICAgdm9pZCBlbmFibGVWUDlEZWNvZGVyKCk7CiAgICAgdm9pZCBlbmFibGVWUDlTV0RlY29kZXIo
KTsKKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgdm9pZCB3aWxsV3JpdGVUb1Bh
c3RlYm9hcmRBc3luY2hyb25vdXNseShjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKTsKQEAg
LTY2MCw4ICs2NjIsMTEgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgYm9vbCBtX3VzZUdQVVBy
b2Nlc3NGb3JNZWRpYSB7IGZhbHNlIH07CisKKyNpZiBFTkFCTEUoVlA5KQogICAgIGJvb2wgbV92
cDlEZWNvZGVyRW5hYmxlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX3ZwOVNXRGVjb2RlckVuYWJs
ZWQgeyBmYWxzZSB9OworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK
</data>

          </attachment>
      

    </bug>

</bugzilla>