<?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>182751</bug_id>
          
          <creation_ts>2018-02-13 16:22:00 -0800</creation_ts>
          <short_desc>[Curl] Curl Cookie Database File should be configurable using NetworkProcessCreationParameters</short_desc>
          <delta_ts>2018-02-21 16:11:21 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Platform</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Christopher Reid">chris.reid</reporter>
          <assigned_to name="Christopher Reid">chris.reid</assigned_to>
          <cc>achristensen</cc>
    
    <cc>annulen</cc>
    
    <cc>beidson</cc>
    
    <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>chris.reid</cc>
    
    <cc>commit-queue</cc>
    
    <cc>darin</cc>
    
    <cc>don.olmstead</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>galpeter</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>youennf</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1398840</commentid>
    <comment_count>0</comment_count>
    <who name="Christopher Reid">chris.reid</who>
    <bug_when>2018-02-13 16:22:00 -0800</bug_when>
    <thetext>In preparation for WinCairo WebKit2, the curl should follow the other ports and allow the cookie file to be configurable through the network process creation parameters.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398853</commentid>
    <comment_count>1</comment_count>
      <attachid>333746</attachid>
    <who name="Christopher Reid">chris.reid</who>
    <bug_when>2018-02-13 16:49:24 -0800</bug_when>
    <thetext>Created attachment 333746
patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398854</commentid>
    <comment_count>2</comment_count>
    <who name="EWS Watchlist">ews-watchlist</who>
    <bug_when>2018-02-13 16:50:59 -0800</bug_when>
    <thetext>Attachment 333746 did not pass style-queue:


ERROR: Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp:50:  One line control clauses should not use braces.  [whitespace/braces] [4]
Total errors found: 1 in 11 files


If any of these errors are false positives, please file a bug against check-webkit-style.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398857</commentid>
    <comment_count>3</comment_count>
      <attachid>333748</attachid>
    <who name="Christopher Reid">chris.reid</who>
    <bug_when>2018-02-13 16:56:23 -0800</bug_when>
    <thetext>Created attachment 333748
patch

Fixing style issues</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401243</commentid>
    <comment_count>4</comment_count>
      <attachid>333748</attachid>
    <who name="youenn fablet">youennf</who>
    <bug_when>2018-02-21 13:22:32 -0800</bug_when>
    <thetext>Comment on attachment 333748
patch

I do not see anything wrong there related to the &apos;OWNER&apos; side.
I am not very familiar with CURL, it would be good if somebody more familiar could take an additional look.

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

&gt; Source/WebKit/ChangeLog:10
&gt; +        This is parameter is not used yet, it is added to prepare for WinCairo WebKit support.

s/This is/This/</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401269</commentid>
    <comment_count>5</comment_count>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2018-02-21 14:20:08 -0800</bug_when>
    <thetext>Was there discussion on the mailing list about adding support for Windows to WebKit2?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401271</commentid>
    <comment_count>6</comment_count>
      <attachid>334413</attachid>
    <who name="Christopher Reid">chris.reid</who>
    <bug_when>2018-02-21 14:21:23 -0800</bug_when>
    <thetext>Created attachment 334413
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401289</commentid>
    <comment_count>7</comment_count>
    <who name="Christopher Reid">chris.reid</who>
    <bug_when>2018-02-21 14:43:41 -0800</bug_when>
    <thetext>(In reply to Chris Dumez from comment #5)
&gt; Was there discussion on the mailing list about adding support for Windows to
&gt; WebKit2?

I don&apos;t think there was too much discussion about adding WebKit 2 support for WinCairo on the mailing list yet. Don has mentioned that was something we were working in one of our updates here: https://lists.webkit.org/pipermail/webkit-dev/2017-November/029783.html. We are very much interested in working towards WebKit2 support including getting WebKit2 WinCairo buildbots going. Let us know if you would like to see the discussion opened up on the mailing list some more.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401291</commentid>
    <comment_count>8</comment_count>
    <who name="Don Olmstead">don.olmstead</who>
    <bug_when>2018-02-21 14:49:48 -0800</bug_when>
    <thetext>Its actually been longer than that https://lists.webkit.org/pipermail/webkit-dev/2017-August/029329.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401313</commentid>
    <comment_count>9</comment_count>
      <attachid>334413</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-02-21 16:10:30 -0800</bug_when>
    <thetext>Comment on attachment 334413
Patch for landing

Clearing flags on attachment: 334413

Committed r228905: &lt;https://trac.webkit.org/changeset/228905&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401314</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-02-21 16:10:31 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1401315</commentid>
    <comment_count>11</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2018-02-21 16:11:21 -0800</bug_when>
    <thetext>&lt;rdar://problem/37765140&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333746</attachid>
            <date>2018-02-13 16:49:24 -0800</date>
            <delta_ts>2018-02-13 16:56:23 -0800</delta_ts>
            <desc>patch</desc>
            <filename>182751.diff</filename>
            <type>text/plain</type>
            <size>11442</size>
            <attacher name="Christopher Reid">chris.reid</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCA0OTZlMzk1ZmFhYS4uN2MxNTM2ZTk4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMyBAQAorMjAxOC0wMi0xMyAgQ2hyaXN0b3BoZXIgUmVpZCAgPGNocmlzLnJlaWRAc29u
eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEN1cmwgQ29va2llIERhdGFiYXNlIEZpbGUgc2hvdWxk
IGJlIGNvbmZpZ3VyYWJsZSB1c2luZyBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycwor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNzUxCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdl
IGluIGJlaGF2aW9yLgorCisgICAgICAgIEFkZGluZyBzdXBwb3J0IHRvIHNldCBhIGN1c3RvbSBD
b29raWVKYXIgRGF0YWJhc2UuCisgICAgICAgIFRvb2sgQ29va2llSmFyREI6Om9wZW4oKSBvdXQg
b2YgaXRzIGNvbnN0cnVjdG9yIGJlY2F1c2UgYm90aCB0aGUgTmV0d29yayBhbmQgV2ViIHByb2Nl
c3MKKyAgICAgICAgd2VyZSB0cnlpbmcgdG8gb3BlbiB0aGUgam91cm5hbCBmaWxlcyBidXQgb25l
IHByb2Nlc3Mgd2FzIGZhaWxpbmcgZHVlIHRvIGEgbGFjayBvZiBwZXJtaXNzaW9uLgorICAgICAg
ICBOb3cgdGhlIGRhdGFiYXNlIGZpbGUgaXMgbGF6aWx5IG9wZW5lZCBhbmQgb25seSB0aGUgTmV0
d29yayBwcm9jZXNzIHdpbGwgdHJ5IHRvIG9wZW4gdGhlIGRhdGFiYXNlLgorICAgICAgICBTb21l
IGNsZWFudXAgd2FzIGRvbmUgdG8gQ29va2llSmFyREIgdG9vLgorCisgICAgICAgICogcGxhdGZv
cm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9u
ZXR3b3JrL2N1cmwvQ29va2llSmFyREIuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv
Y3VybC9Db29raWVKYXJEQi5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9OZXR3
b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcDoKKwogMjAxOC0wMi0wOSAgWmFsYW4gQnVqdGFzICA8
emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92ZSBSZW5k
ZXJSdWJ5UnVuOjp0YWtlQ2hpbGQgbXV0YXRpb24gdG8gYSBSZW5kZXJUcmVlQnVpbGRlcgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNl
c3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VT
ZXNzaW9uLmgKaW5kZXggMTAyZTE2MjJlZTAuLjRmYjNlYjJjYTQyIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgK
QEAgLTEyNyw3ICsxMjcsOCBAQCBwdWJsaWM6CiAgICAgfk5ldHdvcmtTdG9yYWdlU2Vzc2lvbigp
OwogCiAgICAgY29uc3QgQ29va2llSmFyQ3VybCYgY29va2llU3RvcmFnZSgpIGNvbnN0IHsgcmV0
dXJuIG1fY29va2llU3RvcmFnZTsgfTsKLSAgICBDb29raWVKYXJEQiYgY29va2llRGF0YWJhc2Uo
KSBjb25zdCB7IHJldHVybiBtX2Nvb2tpZURhdGFiYXNlOyB9OworICAgIENvb2tpZUphckRCJiBj
b29raWVEYXRhYmFzZSgpIGNvbnN0OworICAgIHZvaWQgc2V0Q29va2llRGF0YWJhc2UoVW5pcXVl
UmVmPENvb2tpZUphckRCPiYmKSBjb25zdDsKIAogICAgIE5ldHdvcmtpbmdDb250ZXh0KiBjb250
ZXh0KCkgY29uc3Q7CiAjZWxzZQpAQCAtMTY1LDcgKzE2Niw3IEBAIHByaXZhdGU6CiAgICAgUmVm
UHRyPE5ldHdvcmtpbmdDb250ZXh0PiBtX2NvbnRleHQ7CiAKICAgICBVbmlxdWVSZWY8Q29va2ll
SmFyQ3VybD4gbV9jb29raWVTdG9yYWdlOwotICAgIG11dGFibGUgQ29va2llSmFyREIgbV9jb29r
aWVEYXRhYmFzZTsKKyAgICBtdXRhYmxlIFVuaXF1ZVJlZjxDb29raWVKYXJEQj4gbV9jb29raWVE
YXRhYmFzZTsKICNlbHNlCiAgICAgUmVmUHRyPE5ldHdvcmtpbmdDb250ZXh0PiBtX2NvbnRleHQ7
CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy
bC9Db29raWVKYXJEQi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv
Q29va2llSmFyREIuY3BwCmluZGV4IDk2NTk1ODQzOWU4Li42OWJhYmUyNzY0MSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuY3Bw
CkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiQ29va2llSmFyREIuaCIKIAogI2luY2x1ZGUg
IkNvb2tpZVV0aWwuaCIKKyNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCisjaW5jbHVkZSAiTG9nZ2lu
Zy5oIgogI2luY2x1ZGUgIlNRTGl0ZUZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJVUkwuaCIKIApA
QCAtNjksMTYgKzcxLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBDb29raWVKYXJE
Qjo6c2V0RW5hYmxlZChib29sIGVuYWJsZSkKIHsKLSAgICBDb29raWVKYXJEQjo6bV9jb29raWVF
bmFibGUgPSBlbmFibGU7CisgICAgbV9pc0VuYWJsZWQgPSBlbmFibGU7CiB9CiAKIENvb2tpZUph
ckRCOjpDb29raWVKYXJEQihjb25zdCBTdHJpbmcmIGRhdGFiYXNlUGF0aCkKICAgICA6IG1fZGF0
YWJhc2VQYXRoKGRhdGFiYXNlUGF0aCkKIHsKLSAgICBjaGVja0RhdGFiYXNlQ29ycnVwdGlvbkFu
ZFJlbW92ZUlmTmVlZGVkKCk7Ci0KLSAgICBpZiAoIW9wZW5EYXRhYmFzZSgpKQotICAgICAgICBy
ZXR1cm47CiB9CiAKIENvb2tpZUphckRCOjp+Q29va2llSmFyREIoKQpAQCAtODYsNiArODQsMTQg
QEAgQ29va2llSmFyREI6On5Db29raWVKYXJEQigpCiAgICAgY2xvc2VEYXRhYmFzZSgpOwogfQog
Cit2b2lkIENvb2tpZUphckRCOjpvcGVuKCkKK3sKKyAgICBpZiAoIW1fZGF0YWJhc2UuaXNPcGVu
KCkpIHsKKyAgICAgICAgY2hlY2tEYXRhYmFzZUNvcnJ1cHRpb25BbmRSZW1vdmVJZk5lZWRlZCgp
OworICAgICAgICBvcGVuRGF0YWJhc2UoKTsKKyAgICB9Cit9CisKIGJvb2wgQ29va2llSmFyREI6
Om9wZW5EYXRhYmFzZSgpCiB7CiAgICAgaWYgKG1fZGF0YWJhc2UuaXNPcGVuKCkpCkBAIC0xMTIs
NiArMTE4LDkgQEAgYm9vbCBDb29raWVKYXJEQjo6b3BlbkRhdGFiYXNlKCkKICAgICB9CiAKICAg
ICBpZiAoIWV4aXN0c0RhdGFiYXNlRmlsZSkgeworICAgICAgICBpZiAoIUZpbGVTeXN0ZW06Om1h
a2VBbGxEaXJlY3RvcmllcyhGaWxlU3lzdGVtOjpkaXJlY3RvcnlOYW1lKG1fZGF0YWJhc2VQYXRo
KSkpCisgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBjcmVhdGUgdGhlIENvb2tpZSBE
YXRhYmFzZSBwYXRoICVzIiwgbV9kYXRhYmFzZVBhdGgudXRmOCgpLmRhdGEoKSk7CisKICAgICAg
ICAgaWYgKG1fZGF0YWJhc2Uub3BlbihtX2RhdGFiYXNlUGF0aCwgZmFsc2UpKSB7CiAgICAgICAg
ICAgICBib29sIGRhdGFiYXNlVmFsaWRpdHkgPSB0cnVlOwogICAgICAgICAgICAgZGF0YWJhc2VW
YWxpZGl0eSAmPSAoZXhlY3V0ZVNpbXBsZVNxbChDUkVBVEVfQ09PS0lFX1RBQkxFX1NRTCkgPT0g
U1FMSVRFX0RPTkUpOwpAQCAtMjMwLDcgKzIzOSw3IEBAIGJvb2wgQ29va2llSmFyREI6OmlzRW5h
YmxlZCgpCiAgICAgaWYgKG1fZGF0YWJhc2VQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu
IGZhbHNlOwogCi0gICAgcmV0dXJuIG1fY29va2llRW5hYmxlOworICAgIHJldHVybiBtX2lzRW5h
YmxlZDsKIH0KIAogYm9vbCBDb29raWVKYXJEQjo6c2VhcmNoQ29va2llcyhjb25zdCBTdHJpbmcm
IHJlcXVlc3RVcmwsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIGh0dHBPbmx5LCBjb25zdCBz
dGQ6Om9wdGlvbmFsPGJvb2w+JiBzZWN1cmUsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIHNl
c3Npb24sIFZlY3RvcjxDb29raWU+JiByZXN1bHRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmggYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuaAppbmRleCA1ZWMzMDliZjU2Yy4uNWY5
ODNiMjhhNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy
bC9Db29raWVKYXJEQi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy
bC9Db29raWVKYXJEQi5oCkBAIC00MCw2ICs0MCw3IEBAIGNsYXNzIENvb2tpZUphckRCIHsKICAg
ICBXVEZfTUFLRV9OT05DT1BZQUJMRShDb29raWVKYXJEQik7CiAKIHB1YmxpYzoKKyAgICB2b2lk
IG9wZW4oKTsKICAgICBib29sIGlzRW5hYmxlZCgpOwogICAgIHZvaWQgc2V0RW5hYmxlZChib29s
KTsKIApAQCAtNTYsNyArNTcsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAKLSAgICBib29sIG1f
Y29va2llRW5hYmxlIHt0cnVlfTsKKyAgICBib29sIG1faXNFbmFibGVkIHt0cnVlfTsKICAgICBT
dHJpbmcgbV9kYXRhYmFzZVBhdGg7CiAKICAgICBib29sIG1fZGV0ZWN0ZWREYXRhYmFzZUNvcnJ1
cHRpb24ge2ZhbHNlfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv
cmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL25ldHdvcmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcAppbmRleCA3
YjZmODA3YWI0Ny4uMDYxZGYxOTA1OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ3Vy
bC5jcHAKQEAgLTQ4LDE5ICs0OCwxNCBAQCBzdGF0aWMgU3RyaW5nIGRlZmF1bHRDb29raWVKYXJQ
YXRoKCkKICAgICBpZiAoY29va2llSmFyUGF0aCkKICAgICAgICAgcmV0dXJuIGNvb2tpZUphclBh
dGg7CiAKLSAgICBTdHJpbmcgY29va2llSmFyRGlyZWN0b3J5ID0gRmlsZVN5c3RlbTo6bG9jYWxV
c2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7Ci0KLSAgICBpZiAoIUZpbGVTeXN0ZW06Om1h
a2VBbGxEaXJlY3Rvcmllcyhjb29raWVKYXJEaXJlY3RvcnkpKQotICAgICAgICByZXR1cm4gZGVm
YXVsdEZpbGVOYW1lOwotCi0gICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0Nv
bXBvbmVudChjb29raWVKYXJEaXJlY3RvcnksIGRlZmF1bHRGaWxlTmFtZSk7CisgICAgcmV0dXJu
IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChGaWxlU3lzdGVtOjpsb2NhbFVz
ZXJTcGVjaWZpY1N0b3JhZ2VEaXJlY3RvcnkoKSwgZGVmYXVsdEZpbGVOYW1lKTsKIH0KIAogTmV0
d29ya1N0b3JhZ2VTZXNzaW9uOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24oUEFMOjpTZXNzaW9uSUQg
c2Vzc2lvbklELCBOZXR3b3JraW5nQ29udGV4dCogY29udGV4dCkKICAgICA6IG1fc2Vzc2lvbklE
KHNlc3Npb25JRCkKICAgICAsIG1fY29udGV4dChjb250ZXh0KQogICAgICwgbV9jb29raWVTdG9y
YWdlKG1ha2VVbmlxdWVSZWY8Q29va2llSmFyQ3VybERhdGFiYXNlPigpKQotICAgICwgbV9jb29r
aWVEYXRhYmFzZShkZWZhdWx0Q29va2llSmFyUGF0aCgpKQorICAgICwgbV9jb29raWVEYXRhYmFz
ZShtYWtlVW5pcXVlUmVmPENvb2tpZUphckRCPihkZWZhdWx0Q29va2llSmFyUGF0aCgpKSkKIHsK
IH0KIApAQCAtNzMsNiArNjgsMTcgQEAgTmV0d29ya2luZ0NvbnRleHQqIE5ldHdvcmtTdG9yYWdl
U2Vzc2lvbjo6Y29udGV4dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsKIH0K
IAordm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZURhdGFiYXNlKFVuaXF1ZVJl
ZjxDb29raWVKYXJEQj4mJiBjb29raWVEYXRhYmFzZSkgY29uc3QKK3sKKyAgICBtX2Nvb2tpZURh
dGFiYXNlID0gV1RGTW92ZShjb29raWVEYXRhYmFzZSk7Cit9CisKK0Nvb2tpZUphckRCJiBOZXR3
b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZURhdGFiYXNlKCkgY29uc3QKK3sKKyAgICBtX2Nvb2tp
ZURhdGFiYXNlLT5vcGVuKCk7CisgICAgcmV0dXJuIG1fY29va2llRGF0YWJhc2U7Cit9CisKIHN0
YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya1N0b3JhZ2VTZXNzaW9uPiYgZGVmYXVsdFNlc3Np
b24oKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMyYzE1MzRj
NTA4Li5jZmFjZTUxNDg3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr
IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOC0wMi0xMyAg
Q2hyaXN0b3BoZXIgUmVpZCAgPGNocmlzLnJlaWRAc29ueS5jb20+CisKKyAgICAgICAgW0N1cmxd
IEN1cmwgQ29va2llIERhdGFiYXNlIEZpbGUgc2hvdWxkIGJlIGNvbmZpZ3VyYWJsZSB1c2luZyBO
ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNzUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaW5nIGEgY29va2llUGVyc2lzdGVudFN0b3JhZ2VG
aWxlIHBhcmFtZXRlciB0byBDdXJsJ3MgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu
CisgICAgICAgIFRoaXMgcGFyYW1ldGVyIGlzIGJhc2VkIG9uIFNvdXAncyBjb29raWVQZXJzaXN0
ZW50U3RvcmFnZVBhdGguCisgICAgICAgIFRoaXMgaXMgcGFyYW1ldGVyIGlzIG5vdCB1c2VkIHll
dCwgaXQgaXMgYWRkZWQgdG8gcHJlcGFyZSBmb3IgV2luQ2Fpcm8gV2ViS2l0IHN1cHBvcnQuCisK
KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy
cy5jcHA6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnMuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtQcm9jZXNz
Q3VybC5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIu
aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0Nvb2tpZXMvY3VybC9XZWJDb29raWVNYW5hZ2VyQ3Vy
bC5jcHA6CisKIDIwMTgtMDItMDkgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+
CiAKICAgICAgICAgU2FuZGJveCB2aW9sYXRpbmcgYXR0ZW1wdGluZyB0byByZWFkIGxvZyBmb3Jt
YXR0aW5nIHByZWZlcmVuY2UgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr
UHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2Vi
S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApp
bmRleCAxODNiNTU0ZWQ4OS4uODgwZTEyZmI4MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi
L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFt
ZXRlcnMuY3BwCkBAIC05NCw2ICs5NCw4IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rl
ciA8PCBpZ25vcmVUTFNFcnJvcnM7CiAgICAgZW5jb2RlciA8PCBsYW5ndWFnZXM7CiAgICAgZW5j
b2RlciA8PCBwcm94eVNldHRpbmdzOworI2VsaWYgVVNFKENVUkwpCisgICAgZW5jb2RlciA8PCBj
b29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGU7CiAjZW5kaWYKICNpZiBIQVZFKENGTkVUV09SS19T
VE9SQUdFX1BBUlRJVElPTklORykgJiYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgZW5jb2Rl
ciA8PCBsb2dDb29raWVJbmZvcm1hdGlvbjsKQEAgLTIyOCw2ICsyMzAsOSBAQCBib29sIE5ldHdv
cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVy
LCBOZXR3b3JrUHJvYwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRl
Y29kZShyZXN1bHQucHJveHlTZXR0aW5ncykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbGlm
IFVTRShDVVJMKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNvb2tpZVBlcnNpc3Rl
bnRTdG9yYWdlRmlsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCiAjaWYgSEFW
RShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpICYmICFSRUxFQVNFX0xPR19ESVNBQkxF
RApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz
c0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3
b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IDUxMTAzYzdlNWY3Li44ZmMzZTc2
YThlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTA4LDYgKzEwOCw4IEBA
IHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgYm9vbCBpZ25v
cmVUTFNFcnJvcnMgeyBmYWxzZSB9OwogICAgIFZlY3RvcjxTdHJpbmc+IGxhbmd1YWdlczsKICAg
ICBXZWJDb3JlOjpTb3VwTmV0d29ya1Byb3h5U2V0dGluZ3MgcHJveHlTZXR0aW5nczsKKyNlbGlm
IFVTRShDVVJMKQorICAgIFN0cmluZyBjb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGU7CiAjZW5k
aWYKIAogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKSAmJiAhUkVMRUFT
RV9MT0dfRElTQUJMRUQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
Y3VybC9OZXR3b3JrUHJvY2Vzc0N1cmwuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jdXJsL05ldHdvcmtQcm9jZXNzQ3VybC5jcHAKaW5kZXggYjNmZTZiYWJmZWQuLjMzOGE0ZjI2
MDhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29y
a1Byb2Nlc3NDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwv
TmV0d29ya1Byb2Nlc3NDdXJsLmNwcApAQCAtNDUsNyArNDUsOSBAQCBuYW1lc3BhY2UgV2ViS2l0
IHsKIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nl
c3MoY29uc3QgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7
Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lz
dGVudFN0b3JhZ2VGaWxlLmlzRW1wdHkoKSkgeworICAgICAgICBzdXBwbGVtZW50PFdlYkNvb2tp
ZU1hbmFnZXI+KCktPnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKHBhcmFtZXRlcnMuY29va2ll
UGVyc2lzdGVudFN0b3JhZ2VGaWxlKTsKKyAgICB9CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6
OnBsYXRmb3JtU2V0VVJMQ2FjaGVTaXplKHVuc2lnbmVkLCB1aW50NjRfdCkKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaCBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaAppbmRleCA1
YmU5MjUzNzAzYi4uZjNmM2FkYjQ4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvQ29va2llcy9XZWJDb29raWVNYW5hZ2VyLmgKQEAgLTYwLDYgKzYwLDggQEAgcHVibGlj
OgogCiAjaWYgVVNFKFNPVVApCiAgICAgdm9pZCBzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShj
b25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoLCB1aW50MzJfdCBzdG9yYWdlVHlwZSk7CisjZWxpZiBV
U0UoQ1VSTCkKKyAgICB2b2lkIHNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmlu
ZyYgc3RvcmFnZVBhdGgpOwogI2VuZGlmCiAKICAgICB2b2lkIG5vdGlmeUNvb2tpZXNEaWRDaGFu
Z2UoUEFMOjpTZXNzaW9uSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L0Nvb2tpZXMvY3VybC9XZWJDb29raWVNYW5hZ2VyQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvQ29va2llcy9jdXJsL1dlYkNvb2tpZU1hbmFnZXJDdXJsLmNwcAppbmRleCBjMzA2
NzM1OTg3Ni4uZWQxYjMzM2ZlNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9Db29raWVzL2N1cmwvV2ViQ29va2llTWFuYWdlckN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9Db29raWVzL2N1cmwvV2ViQ29va2llTWFuYWdlckN1cmwuY3BwCkBAIC0y
Nyw2ICsyNyw3IEBACiAjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgogCiAjaW5jbHVkZSAi
Q2hpbGRQcm9jZXNzLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9Db29raWVKYXJEQi5oPgogI2luY2x1
ZGUgPFdlYkNvcmUvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv
Q1N0cmluZy5oPgogCkBAIC00Myw0ICs0NCwxMCBAQCBIVFRQQ29va2llQWNjZXB0UG9saWN5IFdl
YkNvb2tpZU1hbmFnZXI6OnBsYXRmb3JtR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSgpCiAgICAg
cmV0dXJuIEhUVFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbjsK
IH0KIAordm9pZCBXZWJDb29raWVNYW5hZ2VyOjpzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShj
b25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoKQoreworICAgIGF1dG8mIHN0b3JhZ2VTZXNzaW9uID0g
TmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFnZVNlc3Npb24oKTsKKyAgICBzdG9y
YWdlU2Vzc2lvbi5zZXRDb29raWVEYXRhYmFzZShtYWtlVW5pcXVlUmVmPENvb2tpZUphckRCPihz
dG9yYWdlUGF0aCkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333748</attachid>
            <date>2018-02-13 16:56:23 -0800</date>
            <delta_ts>2018-02-21 14:21:19 -0800</delta_ts>
            <desc>patch</desc>
            <filename>182751.diff</filename>
            <type>text/plain</type>
            <size>11433</size>
            <attacher name="Christopher Reid">chris.reid</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No
YW5nZUxvZwppbmRleCA0OTZlMzk1ZmFhYS4uN2MxNTM2ZTk4M2QgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwyMyBAQAorMjAxOC0wMi0xMyAgQ2hyaXN0b3BoZXIgUmVpZCAgPGNocmlzLnJlaWRAc29u
eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEN1cmwgQ29va2llIERhdGFiYXNlIEZpbGUgc2hvdWxk
IGJlIGNvbmZpZ3VyYWJsZSB1c2luZyBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycwor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNzUxCisK
KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdl
IGluIGJlaGF2aW9yLgorCisgICAgICAgIEFkZGluZyBzdXBwb3J0IHRvIHNldCBhIGN1c3RvbSBD
b29raWVKYXIgRGF0YWJhc2UuCisgICAgICAgIFRvb2sgQ29va2llSmFyREI6Om9wZW4oKSBvdXQg
b2YgaXRzIGNvbnN0cnVjdG9yIGJlY2F1c2UgYm90aCB0aGUgTmV0d29yayBhbmQgV2ViIHByb2Nl
c3MKKyAgICAgICAgd2VyZSB0cnlpbmcgdG8gb3BlbiB0aGUgam91cm5hbCBmaWxlcyBidXQgb25l
IHByb2Nlc3Mgd2FzIGZhaWxpbmcgZHVlIHRvIGEgbGFjayBvZiBwZXJtaXNzaW9uLgorICAgICAg
ICBOb3cgdGhlIGRhdGFiYXNlIGZpbGUgaXMgbGF6aWx5IG9wZW5lZCBhbmQgb25seSB0aGUgTmV0
d29yayBwcm9jZXNzIHdpbGwgdHJ5IHRvIG9wZW4gdGhlIGRhdGFiYXNlLgorICAgICAgICBTb21l
IGNsZWFudXAgd2FzIGRvbmUgdG8gQ29va2llSmFyREIgdG9vLgorCisgICAgICAgICogcGxhdGZv
cm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9u
ZXR3b3JrL2N1cmwvQ29va2llSmFyREIuY3BwOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv
Y3VybC9Db29raWVKYXJEQi5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9OZXR3
b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcDoKKwogMjAxOC0wMi0wOSAgWmFsYW4gQnVqdGFzICA8
emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92ZSBSZW5k
ZXJSdWJ5UnVuOjp0YWtlQ2hpbGQgbXV0YXRpb24gdG8gYSBSZW5kZXJUcmVlQnVpbGRlcgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNl
c3Npb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VT
ZXNzaW9uLmgKaW5kZXggMTAyZTE2MjJlZTAuLjRmYjNlYjJjYTQyIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCisrKyBi
L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgK
QEAgLTEyNyw3ICsxMjcsOCBAQCBwdWJsaWM6CiAgICAgfk5ldHdvcmtTdG9yYWdlU2Vzc2lvbigp
OwogCiAgICAgY29uc3QgQ29va2llSmFyQ3VybCYgY29va2llU3RvcmFnZSgpIGNvbnN0IHsgcmV0
dXJuIG1fY29va2llU3RvcmFnZTsgfTsKLSAgICBDb29raWVKYXJEQiYgY29va2llRGF0YWJhc2Uo
KSBjb25zdCB7IHJldHVybiBtX2Nvb2tpZURhdGFiYXNlOyB9OworICAgIENvb2tpZUphckRCJiBj
b29raWVEYXRhYmFzZSgpIGNvbnN0OworICAgIHZvaWQgc2V0Q29va2llRGF0YWJhc2UoVW5pcXVl
UmVmPENvb2tpZUphckRCPiYmKSBjb25zdDsKIAogICAgIE5ldHdvcmtpbmdDb250ZXh0KiBjb250
ZXh0KCkgY29uc3Q7CiAjZWxzZQpAQCAtMTY1LDcgKzE2Niw3IEBAIHByaXZhdGU6CiAgICAgUmVm
UHRyPE5ldHdvcmtpbmdDb250ZXh0PiBtX2NvbnRleHQ7CiAKICAgICBVbmlxdWVSZWY8Q29va2ll
SmFyQ3VybD4gbV9jb29raWVTdG9yYWdlOwotICAgIG11dGFibGUgQ29va2llSmFyREIgbV9jb29r
aWVEYXRhYmFzZTsKKyAgICBtdXRhYmxlIFVuaXF1ZVJlZjxDb29raWVKYXJEQj4gbV9jb29raWVE
YXRhYmFzZTsKICNlbHNlCiAgICAgUmVmUHRyPE5ldHdvcmtpbmdDb250ZXh0PiBtX2NvbnRleHQ7
CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy
bC9Db29raWVKYXJEQi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv
Q29va2llSmFyREIuY3BwCmluZGV4IDk2NTk1ODQzOWU4Li42OWJhYmUyNzY0MSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuY3Bw
CkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiQ29va2llSmFyREIuaCIKIAogI2luY2x1ZGUg
IkNvb2tpZVV0aWwuaCIKKyNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCisjaW5jbHVkZSAiTG9nZ2lu
Zy5oIgogI2luY2x1ZGUgIlNRTGl0ZUZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJVUkwuaCIKIApA
QCAtNjksMTYgKzcxLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBDb29raWVKYXJE
Qjo6c2V0RW5hYmxlZChib29sIGVuYWJsZSkKIHsKLSAgICBDb29raWVKYXJEQjo6bV9jb29raWVF
bmFibGUgPSBlbmFibGU7CisgICAgbV9pc0VuYWJsZWQgPSBlbmFibGU7CiB9CiAKIENvb2tpZUph
ckRCOjpDb29raWVKYXJEQihjb25zdCBTdHJpbmcmIGRhdGFiYXNlUGF0aCkKICAgICA6IG1fZGF0
YWJhc2VQYXRoKGRhdGFiYXNlUGF0aCkKIHsKLSAgICBjaGVja0RhdGFiYXNlQ29ycnVwdGlvbkFu
ZFJlbW92ZUlmTmVlZGVkKCk7Ci0KLSAgICBpZiAoIW9wZW5EYXRhYmFzZSgpKQotICAgICAgICBy
ZXR1cm47CiB9CiAKIENvb2tpZUphckRCOjp+Q29va2llSmFyREIoKQpAQCAtODYsNiArODQsMTQg
QEAgQ29va2llSmFyREI6On5Db29raWVKYXJEQigpCiAgICAgY2xvc2VEYXRhYmFzZSgpOwogfQog
Cit2b2lkIENvb2tpZUphckRCOjpvcGVuKCkKK3sKKyAgICBpZiAoIW1fZGF0YWJhc2UuaXNPcGVu
KCkpIHsKKyAgICAgICAgY2hlY2tEYXRhYmFzZUNvcnJ1cHRpb25BbmRSZW1vdmVJZk5lZWRlZCgp
OworICAgICAgICBvcGVuRGF0YWJhc2UoKTsKKyAgICB9Cit9CisKIGJvb2wgQ29va2llSmFyREI6
Om9wZW5EYXRhYmFzZSgpCiB7CiAgICAgaWYgKG1fZGF0YWJhc2UuaXNPcGVuKCkpCkBAIC0xMTIs
NiArMTE4LDkgQEAgYm9vbCBDb29raWVKYXJEQjo6b3BlbkRhdGFiYXNlKCkKICAgICB9CiAKICAg
ICBpZiAoIWV4aXN0c0RhdGFiYXNlRmlsZSkgeworICAgICAgICBpZiAoIUZpbGVTeXN0ZW06Om1h
a2VBbGxEaXJlY3RvcmllcyhGaWxlU3lzdGVtOjpkaXJlY3RvcnlOYW1lKG1fZGF0YWJhc2VQYXRo
KSkpCisgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBjcmVhdGUgdGhlIENvb2tpZSBE
YXRhYmFzZSBwYXRoICVzIiwgbV9kYXRhYmFzZVBhdGgudXRmOCgpLmRhdGEoKSk7CisKICAgICAg
ICAgaWYgKG1fZGF0YWJhc2Uub3BlbihtX2RhdGFiYXNlUGF0aCwgZmFsc2UpKSB7CiAgICAgICAg
ICAgICBib29sIGRhdGFiYXNlVmFsaWRpdHkgPSB0cnVlOwogICAgICAgICAgICAgZGF0YWJhc2VW
YWxpZGl0eSAmPSAoZXhlY3V0ZVNpbXBsZVNxbChDUkVBVEVfQ09PS0lFX1RBQkxFX1NRTCkgPT0g
U1FMSVRFX0RPTkUpOwpAQCAtMjMwLDcgKzIzOSw3IEBAIGJvb2wgQ29va2llSmFyREI6OmlzRW5h
YmxlZCgpCiAgICAgaWYgKG1fZGF0YWJhc2VQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJu
IGZhbHNlOwogCi0gICAgcmV0dXJuIG1fY29va2llRW5hYmxlOworICAgIHJldHVybiBtX2lzRW5h
YmxlZDsKIH0KIAogYm9vbCBDb29raWVKYXJEQjo6c2VhcmNoQ29va2llcyhjb25zdCBTdHJpbmcm
IHJlcXVlc3RVcmwsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIGh0dHBPbmx5LCBjb25zdCBz
dGQ6Om9wdGlvbmFsPGJvb2w+JiBzZWN1cmUsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIHNl
c3Npb24sIFZlY3RvcjxDb29raWU+JiByZXN1bHRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmggYi9Tb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuaAppbmRleCA1ZWMzMDliZjU2Yy4uNWY5
ODNiMjhhNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy
bC9Db29raWVKYXJEQi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy
bC9Db29raWVKYXJEQi5oCkBAIC00MCw2ICs0MCw3IEBAIGNsYXNzIENvb2tpZUphckRCIHsKICAg
ICBXVEZfTUFLRV9OT05DT1BZQUJMRShDb29raWVKYXJEQik7CiAKIHB1YmxpYzoKKyAgICB2b2lk
IG9wZW4oKTsKICAgICBib29sIGlzRW5hYmxlZCgpOwogICAgIHZvaWQgc2V0RW5hYmxlZChib29s
KTsKIApAQCAtNTYsNyArNTcsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAKLSAgICBib29sIG1f
Y29va2llRW5hYmxlIHt0cnVlfTsKKyAgICBib29sIG1faXNFbmFibGVkIHt0cnVlfTsKICAgICBT
dHJpbmcgbV9kYXRhYmFzZVBhdGg7CiAKICAgICBib29sIG1fZGV0ZWN0ZWREYXRhYmFzZUNvcnJ1
cHRpb24ge2ZhbHNlfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv
cmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL25ldHdvcmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcAppbmRleCA3
YjZmODA3YWI0Ny4uMDYxZGYxOTA1OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ3Vy
bC5jcHAKQEAgLTQ4LDE5ICs0OCwxNCBAQCBzdGF0aWMgU3RyaW5nIGRlZmF1bHRDb29raWVKYXJQ
YXRoKCkKICAgICBpZiAoY29va2llSmFyUGF0aCkKICAgICAgICAgcmV0dXJuIGNvb2tpZUphclBh
dGg7CiAKLSAgICBTdHJpbmcgY29va2llSmFyRGlyZWN0b3J5ID0gRmlsZVN5c3RlbTo6bG9jYWxV
c2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCk7Ci0KLSAgICBpZiAoIUZpbGVTeXN0ZW06Om1h
a2VBbGxEaXJlY3Rvcmllcyhjb29raWVKYXJEaXJlY3RvcnkpKQotICAgICAgICByZXR1cm4gZGVm
YXVsdEZpbGVOYW1lOwotCi0gICAgcmV0dXJuIEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0Nv
bXBvbmVudChjb29raWVKYXJEaXJlY3RvcnksIGRlZmF1bHRGaWxlTmFtZSk7CisgICAgcmV0dXJu
IEZpbGVTeXN0ZW06OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChGaWxlU3lzdGVtOjpsb2NhbFVz
ZXJTcGVjaWZpY1N0b3JhZ2VEaXJlY3RvcnkoKSwgZGVmYXVsdEZpbGVOYW1lKTsKIH0KIAogTmV0
d29ya1N0b3JhZ2VTZXNzaW9uOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24oUEFMOjpTZXNzaW9uSUQg
c2Vzc2lvbklELCBOZXR3b3JraW5nQ29udGV4dCogY29udGV4dCkKICAgICA6IG1fc2Vzc2lvbklE
KHNlc3Npb25JRCkKICAgICAsIG1fY29udGV4dChjb250ZXh0KQogICAgICwgbV9jb29raWVTdG9y
YWdlKG1ha2VVbmlxdWVSZWY8Q29va2llSmFyQ3VybERhdGFiYXNlPigpKQotICAgICwgbV9jb29r
aWVEYXRhYmFzZShkZWZhdWx0Q29va2llSmFyUGF0aCgpKQorICAgICwgbV9jb29raWVEYXRhYmFz
ZShtYWtlVW5pcXVlUmVmPENvb2tpZUphckRCPihkZWZhdWx0Q29va2llSmFyUGF0aCgpKSkKIHsK
IH0KIApAQCAtNzMsNiArNjgsMTcgQEAgTmV0d29ya2luZ0NvbnRleHQqIE5ldHdvcmtTdG9yYWdl
U2Vzc2lvbjo6Y29udGV4dCgpIGNvbnN0CiAgICAgcmV0dXJuIG1fY29udGV4dC5nZXQoKTsKIH0K
IAordm9pZCBOZXR3b3JrU3RvcmFnZVNlc3Npb246OnNldENvb2tpZURhdGFiYXNlKFVuaXF1ZVJl
ZjxDb29raWVKYXJEQj4mJiBjb29raWVEYXRhYmFzZSkgY29uc3QKK3sKKyAgICBtX2Nvb2tpZURh
dGFiYXNlID0gV1RGTW92ZShjb29raWVEYXRhYmFzZSk7Cit9CisKK0Nvb2tpZUphckRCJiBOZXR3
b3JrU3RvcmFnZVNlc3Npb246OmNvb2tpZURhdGFiYXNlKCkgY29uc3QKK3sKKyAgICBtX2Nvb2tp
ZURhdGFiYXNlLT5vcGVuKCk7CisgICAgcmV0dXJuIG1fY29va2llRGF0YWJhc2U7Cit9CisKIHN0
YXRpYyBzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya1N0b3JhZ2VTZXNzaW9uPiYgZGVmYXVsdFNlc3Np
b24oKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMyYzE1MzRj
NTA4Li5jZmFjZTUxNDg3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr
IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOC0wMi0xMyAg
Q2hyaXN0b3BoZXIgUmVpZCAgPGNocmlzLnJlaWRAc29ueS5jb20+CisKKyAgICAgICAgW0N1cmxd
IEN1cmwgQ29va2llIERhdGFiYXNlIEZpbGUgc2hvdWxkIGJlIGNvbmZpZ3VyYWJsZSB1c2luZyBO
ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNzUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C
T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkaW5nIGEgY29va2llUGVyc2lzdGVudFN0b3JhZ2VG
aWxlIHBhcmFtZXRlciB0byBDdXJsJ3MgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu
CisgICAgICAgIFRoaXMgcGFyYW1ldGVyIGlzIGJhc2VkIG9uIFNvdXAncyBjb29raWVQZXJzaXN0
ZW50U3RvcmFnZVBhdGguCisgICAgICAgIFRoaXMgaXMgcGFyYW1ldGVyIGlzIG5vdCB1c2VkIHll
dCwgaXQgaXMgYWRkZWQgdG8gcHJlcGFyZSBmb3IgV2luQ2Fpcm8gV2ViS2l0IHN1cHBvcnQuCisK
KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy
cy5jcHA6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnMuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtQcm9jZXNz
Q3VybC5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIu
aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0Nvb2tpZXMvY3VybC9XZWJDb29raWVNYW5hZ2VyQ3Vy
bC5jcHA6CisKIDIwMTgtMDItMDkgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+
CiAKICAgICAgICAgU2FuZGJveCB2aW9sYXRpbmcgYXR0ZW1wdGluZyB0byByZWFkIGxvZyBmb3Jt
YXR0aW5nIHByZWZlcmVuY2UgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr
UHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2Vi
S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApp
bmRleCAxODNiNTU0ZWQ4OS4uODgwZTEyZmI4MTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
TmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBi
L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFt
ZXRlcnMuY3BwCkBAIC05NCw2ICs5NCw4IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rl
ciA8PCBpZ25vcmVUTFNFcnJvcnM7CiAgICAgZW5jb2RlciA8PCBsYW5ndWFnZXM7CiAgICAgZW5j
b2RlciA8PCBwcm94eVNldHRpbmdzOworI2VsaWYgVVNFKENVUkwpCisgICAgZW5jb2RlciA8PCBj
b29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGU7CiAjZW5kaWYKICNpZiBIQVZFKENGTkVUV09SS19T
VE9SQUdFX1BBUlRJVElPTklORykgJiYgIVJFTEVBU0VfTE9HX0RJU0FCTEVECiAgICAgZW5jb2Rl
ciA8PCBsb2dDb29raWVJbmZvcm1hdGlvbjsKQEAgLTIyOCw2ICsyMzAsOSBAQCBib29sIE5ldHdv
cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVy
LCBOZXR3b3JrUHJvYwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRl
Y29kZShyZXN1bHQucHJveHlTZXR0aW5ncykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbGlm
IFVTRShDVVJMKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNvb2tpZVBlcnNpc3Rl
bnRTdG9yYWdlRmlsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCiAjaWYgSEFW
RShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpICYmICFSRUxFQVNFX0xPR19ESVNBQkxF
RApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz
c0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3
b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IDUxMTAzYzdlNWY3Li44ZmMzZTc2
YThlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl
c3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaApAQCAtMTA4LDYgKzEwOCw4IEBA
IHN0cnVjdCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgYm9vbCBpZ25v
cmVUTFNFcnJvcnMgeyBmYWxzZSB9OwogICAgIFZlY3RvcjxTdHJpbmc+IGxhbmd1YWdlczsKICAg
ICBXZWJDb3JlOjpTb3VwTmV0d29ya1Byb3h5U2V0dGluZ3MgcHJveHlTZXR0aW5nczsKKyNlbGlm
IFVTRShDVVJMKQorICAgIFN0cmluZyBjb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGU7CiAjZW5k
aWYKIAogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JBR0VfUEFSVElUSU9OSU5HKSAmJiAhUkVMRUFT
RV9MT0dfRElTQUJMRUQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
Y3VybC9OZXR3b3JrUHJvY2Vzc0N1cmwuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jdXJsL05ldHdvcmtQcm9jZXNzQ3VybC5jcHAKaW5kZXggYjNmZTZiYWJmZWQuLjgwOTE5ZWZk
YTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29y
a1Byb2Nlc3NDdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwv
TmV0d29ya1Byb2Nlc3NDdXJsLmNwcApAQCAtNDUsNyArNDUsOCBAQCBuYW1lc3BhY2UgV2ViS2l0
IHsKIAogdm9pZCBOZXR3b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nl
c3MoY29uc3QgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7
Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lz
dGVudFN0b3JhZ2VGaWxlLmlzRW1wdHkoKSkKKyAgICAgICAgc3VwcGxlbWVudDxXZWJDb29raWVN
YW5hZ2VyPigpLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBl
cnNpc3RlbnRTdG9yYWdlRmlsZSk7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3Jt
U2V0VVJMQ2FjaGVTaXplKHVuc2lnbmVkLCB1aW50NjRfdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaAppbmRleCA1YmU5MjUzNzAz
Yi4uZjNmM2FkYjQ4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Db29r
aWVzL1dlYkNvb2tpZU1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQ29v
a2llcy9XZWJDb29raWVNYW5hZ2VyLmgKQEAgLTYwLDYgKzYwLDggQEAgcHVibGljOgogCiAjaWYg
VVNFKFNPVVApCiAgICAgdm9pZCBzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBTdHJp
bmcmIHN0b3JhZ2VQYXRoLCB1aW50MzJfdCBzdG9yYWdlVHlwZSk7CisjZWxpZiBVU0UoQ1VSTCkK
KyAgICB2b2lkIHNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgc3RvcmFn
ZVBhdGgpOwogI2VuZGlmCiAKICAgICB2b2lkIG5vdGlmeUNvb2tpZXNEaWRDaGFuZ2UoUEFMOjpT
ZXNzaW9uSUQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Nvb2tpZXMv
Y3VybC9XZWJDb29raWVNYW5hZ2VyQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
Q29va2llcy9jdXJsL1dlYkNvb2tpZU1hbmFnZXJDdXJsLmNwcAppbmRleCBjMzA2NzM1OTg3Ni4u
ZWQxYjMzM2ZlNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Db29raWVz
L2N1cmwvV2ViQ29va2llTWFuYWdlckN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9Db29raWVzL2N1cmwvV2ViQ29va2llTWFuYWdlckN1cmwuY3BwCkBAIC0yNyw2ICsyNyw3
IEBACiAjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgogCiAjaW5jbHVkZSAiQ2hpbGRQcm9j
ZXNzLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9Db29raWVKYXJEQi5oPgogI2luY2x1ZGUgPFdlYkNv
cmUvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5o
PgogCkBAIC00Myw0ICs0NCwxMCBAQCBIVFRQQ29va2llQWNjZXB0UG9saWN5IFdlYkNvb2tpZU1h
bmFnZXI6OnBsYXRmb3JtR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSgpCiAgICAgcmV0dXJuIEhU
VFBDb29raWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbjsKIH0KIAordm9p
ZCBXZWJDb29raWVNYW5hZ2VyOjpzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBTdHJp
bmcmIHN0b3JhZ2VQYXRoKQoreworICAgIGF1dG8mIHN0b3JhZ2VTZXNzaW9uID0gTmV0d29ya1N0
b3JhZ2VTZXNzaW9uOjpkZWZhdWx0U3RvcmFnZVNlc3Npb24oKTsKKyAgICBzdG9yYWdlU2Vzc2lv
bi5zZXRDb29raWVEYXRhYmFzZShtYWtlVW5pcXVlUmVmPENvb2tpZUphckRCPihzdG9yYWdlUGF0
aCkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>334413</attachid>
            <date>2018-02-21 14:21:23 -0800</date>
            <delta_ts>2018-02-21 16:10:30 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-182751-20180221142121.patch</filename>
            <type>text/plain</type>
            <size>12047</size>
            <attacher name="Christopher Reid">chris.reid</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYzOWQ3NmVhMjRmNzgy
OTM3NTM1NGZiMzVkZGQwNDFlY2YwZjQ0ZC4uOTM1YTVmYTM2MjNkYmIxZjI0MGMxNjI3NDMwYWU0
ZmJmZmE1Mzk1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAyLTIxICBDaHJp
c3RvcGhlciBSZWlkICA8Y2hyaXMucmVpZEBzb255LmNvbT4KKworICAgICAgICBbQ3VybF0gQ3Vy
bCBDb29raWUgRGF0YWJhc2UgRmlsZSBzaG91bGQgYmUgY29uZmlndXJhYmxlIHVzaW5nIE5ldHdv
cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu
b3JnL3Nob3dfYnVnLmNnaT9pZD0xODI3NTEKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4g
RmFibGV0LgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICBBZGRp
bmcgc3VwcG9ydCB0byBzZXQgYSBjdXN0b20gQ29va2llSmFyIERhdGFiYXNlLgorICAgICAgICBU
b29rIENvb2tpZUphckRCOjpvcGVuKCkgb3V0IG9mIGl0cyBjb25zdHJ1Y3RvciBiZWNhdXNlIGJv
dGggdGhlIE5ldHdvcmsgYW5kIFdlYiBwcm9jZXNzCisgICAgICAgIHdlcmUgdHJ5aW5nIHRvIG9w
ZW4gdGhlIGpvdXJuYWwgZmlsZXMgYnV0IG9uZSBwcm9jZXNzIHdhcyBmYWlsaW5nIGR1ZSB0byBh
IGxhY2sgb2YgcGVybWlzc2lvbi4KKyAgICAgICAgTm93IHRoZSBkYXRhYmFzZSBmaWxlIGlzIGxh
emlseSBvcGVuZWQgYW5kIG9ubHkgdGhlIE5ldHdvcmsgcHJvY2VzcyB3aWxsIHRyeSB0byBvcGVu
IHRoZSBkYXRhYmFzZS4KKyAgICAgICAgU29tZSBjbGVhbnVwIHdhcyBkb25lIHRvIENvb2tpZUph
ckRCIHRvby4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNz
aW9uLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmNwcDoK
KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuaDoKKyAgICAgICAg
KiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ3VybC5jcHA6CisK
IDIwMTgtMDItMjAgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDog
QU9NOiBEaXNwYXRjaCBhY2Nlc3NpYmxlY2xpY2sgZXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmggYi9Tb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCmluZGV4IDEw
MmUxNjIyZWUwMjI5YTdiNmQ0Mjk2MWYzN2UwNmNlYTMyMTdkMGYuLjRmYjNlYjJjYTQyNGE3ODY2
YjI0NjkzYzJjMTRiZjI3ZDI4OTljZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm
b3JtL25ldHdvcmsvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaApAQCAtMTI3LDcgKzEyNyw4
IEBAIHB1YmxpYzoKICAgICB+TmV0d29ya1N0b3JhZ2VTZXNzaW9uKCk7CiAKICAgICBjb25zdCBD
b29raWVKYXJDdXJsJiBjb29raWVTdG9yYWdlKCkgY29uc3QgeyByZXR1cm4gbV9jb29raWVTdG9y
YWdlOyB9OwotICAgIENvb2tpZUphckRCJiBjb29raWVEYXRhYmFzZSgpIGNvbnN0IHsgcmV0dXJu
IG1fY29va2llRGF0YWJhc2U7IH07CisgICAgQ29va2llSmFyREImIGNvb2tpZURhdGFiYXNlKCkg
Y29uc3Q7CisgICAgdm9pZCBzZXRDb29raWVEYXRhYmFzZShVbmlxdWVSZWY8Q29va2llSmFyREI+
JiYpIGNvbnN0OwogCiAgICAgTmV0d29ya2luZ0NvbnRleHQqIGNvbnRleHQoKSBjb25zdDsKICNl
bHNlCkBAIC0xNjUsNyArMTY2LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8TmV0d29ya2luZ0Nv
bnRleHQ+IG1fY29udGV4dDsKIAogICAgIFVuaXF1ZVJlZjxDb29raWVKYXJDdXJsPiBtX2Nvb2tp
ZVN0b3JhZ2U7Ci0gICAgbXV0YWJsZSBDb29raWVKYXJEQiBtX2Nvb2tpZURhdGFiYXNlOworICAg
IG11dGFibGUgVW5pcXVlUmVmPENvb2tpZUphckRCPiBtX2Nvb2tpZURhdGFiYXNlOwogI2Vsc2UK
ICAgICBSZWZQdHI8TmV0d29ya2luZ0NvbnRleHQ+IG1fY29udGV4dDsKICNlbmRpZgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmNw
cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVKYXJEQi5jcHAK
aW5kZXggOTY1OTU4NDM5ZTgzNjE2MGEwZTM1ZmU3OTkzNzhlMTcwMjY0ZWIxZC4uNjliYWJlMjc2
NDFmNWMyOGM4Zjg3NzEwODRhMDk5NjgyNTM5M2M5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckRCLmNwcAorKysgYi9Tb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIuY3BwCkBAIC0yNiw2ICsyNiw4
IEBACiAjaW5jbHVkZSAiQ29va2llSmFyREIuaCIKIAogI2luY2x1ZGUgIkNvb2tpZVV0aWwuaCIK
KyNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUg
IlNRTGl0ZUZpbGVTeXN0ZW0uaCIKICNpbmNsdWRlICJVUkwuaCIKIApAQCAtNjksMTYgKzcxLDEy
IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBDb29raWVKYXJEQjo6c2V0RW5hYmxlZChi
b29sIGVuYWJsZSkKIHsKLSAgICBDb29raWVKYXJEQjo6bV9jb29raWVFbmFibGUgPSBlbmFibGU7
CisgICAgbV9pc0VuYWJsZWQgPSBlbmFibGU7CiB9CiAKIENvb2tpZUphckRCOjpDb29raWVKYXJE
Qihjb25zdCBTdHJpbmcmIGRhdGFiYXNlUGF0aCkKICAgICA6IG1fZGF0YWJhc2VQYXRoKGRhdGFi
YXNlUGF0aCkKIHsKLSAgICBjaGVja0RhdGFiYXNlQ29ycnVwdGlvbkFuZFJlbW92ZUlmTmVlZGVk
KCk7Ci0KLSAgICBpZiAoIW9wZW5EYXRhYmFzZSgpKQotICAgICAgICByZXR1cm47CiB9CiAKIENv
b2tpZUphckRCOjp+Q29va2llSmFyREIoKQpAQCAtODYsNiArODQsMTQgQEAgQ29va2llSmFyREI6
On5Db29raWVKYXJEQigpCiAgICAgY2xvc2VEYXRhYmFzZSgpOwogfQogCit2b2lkIENvb2tpZUph
ckRCOjpvcGVuKCkKK3sKKyAgICBpZiAoIW1fZGF0YWJhc2UuaXNPcGVuKCkpIHsKKyAgICAgICAg
Y2hlY2tEYXRhYmFzZUNvcnJ1cHRpb25BbmRSZW1vdmVJZk5lZWRlZCgpOworICAgICAgICBvcGVu
RGF0YWJhc2UoKTsKKyAgICB9Cit9CisKIGJvb2wgQ29va2llSmFyREI6Om9wZW5EYXRhYmFzZSgp
CiB7CiAgICAgaWYgKG1fZGF0YWJhc2UuaXNPcGVuKCkpCkBAIC0xMTIsNiArMTE4LDkgQEAgYm9v
bCBDb29raWVKYXJEQjo6b3BlbkRhdGFiYXNlKCkKICAgICB9CiAKICAgICBpZiAoIWV4aXN0c0Rh
dGFiYXNlRmlsZSkgeworICAgICAgICBpZiAoIUZpbGVTeXN0ZW06Om1ha2VBbGxEaXJlY3Rvcmll
cyhGaWxlU3lzdGVtOjpkaXJlY3RvcnlOYW1lKG1fZGF0YWJhc2VQYXRoKSkpCisgICAgICAgICAg
ICBMT0dfRVJST1IoIlVuYWJsZSB0byBjcmVhdGUgdGhlIENvb2tpZSBEYXRhYmFzZSBwYXRoICVz
IiwgbV9kYXRhYmFzZVBhdGgudXRmOCgpLmRhdGEoKSk7CisKICAgICAgICAgaWYgKG1fZGF0YWJh
c2Uub3BlbihtX2RhdGFiYXNlUGF0aCwgZmFsc2UpKSB7CiAgICAgICAgICAgICBib29sIGRhdGFi
YXNlVmFsaWRpdHkgPSB0cnVlOwogICAgICAgICAgICAgZGF0YWJhc2VWYWxpZGl0eSAmPSAoZXhl
Y3V0ZVNpbXBsZVNxbChDUkVBVEVfQ09PS0lFX1RBQkxFX1NRTCkgPT0gU1FMSVRFX0RPTkUpOwpA
QCAtMjMwLDcgKzIzOSw3IEBAIGJvb2wgQ29va2llSmFyREI6OmlzRW5hYmxlZCgpCiAgICAgaWYg
KG1fZGF0YWJhc2VQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg
cmV0dXJuIG1fY29va2llRW5hYmxlOworICAgIHJldHVybiBtX2lzRW5hYmxlZDsKIH0KIAogYm9v
bCBDb29raWVKYXJEQjo6c2VhcmNoQ29va2llcyhjb25zdCBTdHJpbmcmIHJlcXVlc3RVcmwsIGNv
bnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIGh0dHBPbmx5LCBjb25zdCBzdGQ6Om9wdGlvbmFsPGJv
b2w+JiBzZWN1cmUsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8Ym9vbD4mIHNlc3Npb24sIFZlY3RvcjxD
b29raWU+JiByZXN1bHRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0
d29yay9jdXJsL0Nvb2tpZUphckRCLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr
L2N1cmwvQ29va2llSmFyREIuaAppbmRleCA1ZWMzMDliZjU2YzE5ZTczZjlmOWI1NDAwNTZjMzA0
ZDk0ODAyMGYzLi41Zjk4M2IyOGE3MzE5NjVhMTUyMTgzZWNiODZiMGRkOWU1OWE0MWIwIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIu
aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyREIu
aApAQCAtNDAsNiArNDAsNyBAQCBjbGFzcyBDb29raWVKYXJEQiB7CiAgICAgV1RGX01BS0VfTk9O
Q09QWUFCTEUoQ29va2llSmFyREIpOwogCiBwdWJsaWM6CisgICAgdm9pZCBvcGVuKCk7CiAgICAg
Ym9vbCBpc0VuYWJsZWQoKTsKICAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCk7CiAKQEAgLTU2LDcg
KzU3LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogCi0gICAgYm9vbCBtX2Nvb2tpZUVuYWJsZSB7
dHJ1ZX07CisgICAgYm9vbCBtX2lzRW5hYmxlZCB7dHJ1ZX07CiAgICAgU3RyaW5nIG1fZGF0YWJh
c2VQYXRoOwogCiAgICAgYm9vbCBtX2RldGVjdGVkRGF0YWJhc2VDb3JydXB0aW9uIHtmYWxzZX07
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvTmV0d29y
a1N0b3JhZ2VTZXNzaW9uQ3VybC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr
L2N1cmwvTmV0d29ya1N0b3JhZ2VTZXNzaW9uQ3VybC5jcHAKaW5kZXggN2I2ZjgwN2FiNDc5YzAw
OTRlNTI1YzRmZDUwNThmNmFmNGJhMTY0My4uMDYxZGYxOTA1OTZlM2JiOWYxZmY5ZDE2NWI3N2Y3
ZmZhZjNjYzc5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j
dXJsL05ldHdvcmtTdG9yYWdlU2Vzc2lvbkN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL25ldHdvcmsvY3VybC9OZXR3b3JrU3RvcmFnZVNlc3Npb25DdXJsLmNwcApAQCAtNDgs
MTkgKzQ4LDE0IEBAIHN0YXRpYyBTdHJpbmcgZGVmYXVsdENvb2tpZUphclBhdGgoKQogICAgIGlm
IChjb29raWVKYXJQYXRoKQogICAgICAgICByZXR1cm4gY29va2llSmFyUGF0aDsKIAotICAgIFN0
cmluZyBjb29raWVKYXJEaXJlY3RvcnkgPSBGaWxlU3lzdGVtOjpsb2NhbFVzZXJTcGVjaWZpY1N0
b3JhZ2VEaXJlY3RvcnkoKTsKLQotICAgIGlmICghRmlsZVN5c3RlbTo6bWFrZUFsbERpcmVjdG9y
aWVzKGNvb2tpZUphckRpcmVjdG9yeSkpCi0gICAgICAgIHJldHVybiBkZWZhdWx0RmlsZU5hbWU7
Ci0KLSAgICByZXR1cm4gRmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGNvb2tp
ZUphckRpcmVjdG9yeSwgZGVmYXVsdEZpbGVOYW1lKTsKKyAgICByZXR1cm4gRmlsZVN5c3RlbTo6
cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KEZpbGVTeXN0ZW06OmxvY2FsVXNlclNwZWNpZmljU3Rv
cmFnZURpcmVjdG9yeSgpLCBkZWZhdWx0RmlsZU5hbWUpOwogfQogCiBOZXR3b3JrU3RvcmFnZVNl
c3Npb246Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbihQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQsIE5l
dHdvcmtpbmdDb250ZXh0KiBjb250ZXh0KQogICAgIDogbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQog
ICAgICwgbV9jb250ZXh0KGNvbnRleHQpCiAgICAgLCBtX2Nvb2tpZVN0b3JhZ2UobWFrZVVuaXF1
ZVJlZjxDb29raWVKYXJDdXJsRGF0YWJhc2U+KCkpCi0gICAgLCBtX2Nvb2tpZURhdGFiYXNlKGRl
ZmF1bHRDb29raWVKYXJQYXRoKCkpCisgICAgLCBtX2Nvb2tpZURhdGFiYXNlKG1ha2VVbmlxdWVS
ZWY8Q29va2llSmFyREI+KGRlZmF1bHRDb29raWVKYXJQYXRoKCkpKQogewogfQogCkBAIC03Myw2
ICs2OCwxNyBAQCBOZXR3b3JraW5nQ29udGV4dCogTmV0d29ya1N0b3JhZ2VTZXNzaW9uOjpjb250
ZXh0KCkgY29uc3QKICAgICByZXR1cm4gbV9jb250ZXh0LmdldCgpOwogfQogCit2b2lkIE5ldHdv
cmtTdG9yYWdlU2Vzc2lvbjo6c2V0Q29va2llRGF0YWJhc2UoVW5pcXVlUmVmPENvb2tpZUphckRC
PiYmIGNvb2tpZURhdGFiYXNlKSBjb25zdAoreworICAgIG1fY29va2llRGF0YWJhc2UgPSBXVEZN
b3ZlKGNvb2tpZURhdGFiYXNlKTsKK30KKworQ29va2llSmFyREImIE5ldHdvcmtTdG9yYWdlU2Vz
c2lvbjo6Y29va2llRGF0YWJhc2UoKSBjb25zdAoreworICAgIG1fY29va2llRGF0YWJhc2UtPm9w
ZW4oKTsKKyAgICByZXR1cm4gbV9jb29raWVEYXRhYmFzZTsKK30KKwogc3RhdGljIHN0ZDo6dW5p
cXVlX3B0cjxOZXR3b3JrU3RvcmFnZVNlc3Npb24+JiBkZWZhdWx0U2Vzc2lvbigpCiB7CiAgICAg
QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMjk3MWNiNzhkOTE5ZTRhY2ZhNzJi
YzQzZGM2MGJlYjQ0NWI0ZWE1OS4uMThhNjkwOGQzZDU0OWIxNDA2NjM0OGI4OGIyYTRjMmMzMWM0
OGU0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl
YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOC0wMi0yMSAgQ2hyaXN0b3BoZXIg
UmVpZCAgPGNocmlzLnJlaWRAc29ueS5jb20+CisKKyAgICAgICAgW0N1cmxdIEN1cmwgQ29va2ll
IERhdGFiYXNlIEZpbGUgc2hvdWxkIGJlIGNvbmZpZ3VyYWJsZSB1c2luZyBOZXR3b3JrUHJvY2Vz
c0NyZWF0aW9uUGFyYW1ldGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTgyNzUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4K
KworICAgICAgICBBZGRpbmcgYSBjb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGUgcGFyYW1ldGVy
IHRvIEN1cmwncyBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy4KKyAgICAgICAgVGhp
cyBwYXJhbWV0ZXIgaXMgYmFzZWQgb24gU291cCdzIGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0
aC4KKyAgICAgICAgVGhpcyBwYXJhbWV0ZXIgaXMgbm90IHVzZWQgeWV0LCBpdCBpcyBhZGRlZCB0
byBwcmVwYXJlIGZvciBXaW5DYWlybyBXZWJLaXQgc3VwcG9ydC4KKworICAgICAgICAqIE5ldHdv
cmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAg
KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAg
ICAgICAqIE5ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Byb2Nlc3NDdXJsLmNwcDoKKyAgICAg
ICAgKiBXZWJQcm9jZXNzL0Nvb2tpZXMvV2ViQ29va2llTWFuYWdlci5oOgorICAgICAgICAqIFdl
YlByb2Nlc3MvQ29va2llcy9jdXJsL1dlYkNvb2tpZU1hbmFnZXJDdXJsLmNwcDoKKwogMjAxOC0w
Mi0yMCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgogCiAgICAgICAg
IFN3aXRjaCB0byBVSVdLVGV4dEludGVyYWN0aW9uQXNzaXN0YW50IGZvciBub24tZWRpdGFibGUg
dGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCAxODNiNTU0ZWQ4OTg4
NzQ1ZmVlNGI5MzcyMTA0NGQ4NGRhMWNjYmFhLi44ODBlMTJmYjgxNjIyMjUxNzc1OWU2MzhjNDIw
ZmIwOWJlY2YxZGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l
dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05l
dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtOTQs
NiArOTQsOCBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUo
SVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgaWdub3JlVExTRXJy
b3JzOwogICAgIGVuY29kZXIgPDwgbGFuZ3VhZ2VzOwogICAgIGVuY29kZXIgPDwgcHJveHlTZXR0
aW5nczsKKyNlbGlmIFVTRShDVVJMKQorICAgIGVuY29kZXIgPDwgY29va2llUGVyc2lzdGVudFN0
b3JhZ2VGaWxlOwogI2VuZGlmCiAjaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05J
TkcpICYmICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIGVuY29kZXIgPDwgbG9nQ29va2llSW5m
b3JtYXRpb247CkBAIC0yMjgsNiArMjMwLDkgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9u
UGFyYW1ldGVyczo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgTmV0d29ya1Byb2MKICAg
ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnByb3h5
U2V0dGluZ3MpKQogICAgICAgICByZXR1cm4gZmFsc2U7CisjZWxpZiBVU0UoQ1VSTCkKKyAgICBp
ZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5jb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGUpKQor
ICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIAogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JB
R0VfUEFSVElUSU9OSU5HKSAmJiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl
cnMuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlv
blBhcmFtZXRlcnMuaAppbmRleCA1MTEwM2M3ZTVmNzFjMTYwNTJhNWQ3NTAxZDI5NjhiYTVkNzc1
NThhLi44ZmMzZTc2YThlNjhhZmJmNDUyNDE5MDljMDNiZDdlMDI2OGE4YmJkIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh
bWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz
c0NyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC0xMDgsNiArMTA4LDggQEAgc3RydWN0IE5ldHdvcmtQ
cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBib29sIGlnbm9yZVRMU0Vycm9ycyB7IGZh
bHNlIH07CiAgICAgVmVjdG9yPFN0cmluZz4gbGFuZ3VhZ2VzOwogICAgIFdlYkNvcmU6OlNvdXBO
ZXR3b3JrUHJveHlTZXR0aW5ncyBwcm94eVNldHRpbmdzOworI2VsaWYgVVNFKENVUkwpCisgICAg
U3RyaW5nIGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZTsKICNlbmRpZgogCiAjaWYgSEFWRShD
Rk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpICYmICFSRUxFQVNFX0xPR19ESVNBQkxFRApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtQcm9j
ZXNzQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1By
b2Nlc3NDdXJsLmNwcAppbmRleCBiM2ZlNmJhYmZlZDMyYWI2ODY2YjFjOGE3OTExYTczNzA2MWVi
ZmY3Li44MDkxOWVmZGE5MDBhOTRhY2Q3ZjhkYzI3YWQ2MTAzNTIzMWM1ZDRkIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Byb2Nlc3NDdXJsLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Byb2Nlc3ND
dXJsLmNwcApAQCAtNDUsNyArNDUsOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogdm9pZCBOZXR3
b3JrUHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MoY29uc3QgTmV0d29y
a1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7Ci0gICAgbm90SW1wbGVt
ZW50ZWQoKTsKKyAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxl
LmlzRW1wdHkoKSkKKyAgICAgICAgc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpLT5zZXRD
b29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdl
RmlsZSk7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtU2V0VVJMQ2FjaGVTaXpl
KHVuc2lnbmVkLCB1aW50NjRfdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9Db29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9D
b29raWVzL1dlYkNvb2tpZU1hbmFnZXIuaAppbmRleCA1YmU5MjUzNzAzYjg4NWU3MjNhMmM4ODEx
MjM5NjRhMjY0YmJiNTJkLi5mM2YzYWRiNDhkOWRlNmEwODkzZGU4Y2NiY2RiNjM0ZTkyMjNlMWIy
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvQ29va2llcy9XZWJDb29raWVN
YW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Nvb2tpZXMvV2ViQ29va2ll
TWFuYWdlci5oCkBAIC02MCw2ICs2MCw4IEBAIHB1YmxpYzoKIAogI2lmIFVTRShTT1VQKQogICAg
IHZvaWQgc2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgU3RyaW5nJiBzdG9yYWdlUGF0
aCwgdWludDMyX3Qgc3RvcmFnZVR5cGUpOworI2VsaWYgVVNFKENVUkwpCisgICAgdm9pZCBzZXRD
b29raWVQZXJzaXN0ZW50U3RvcmFnZShjb25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRoKTsKICNlbmRp
ZgogCiAgICAgdm9pZCBub3RpZnlDb29raWVzRGlkQ2hhbmdlKFBBTDo6U2Vzc2lvbklEKTsKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Db29raWVzL2N1cmwvV2ViQ29va2ll
TWFuYWdlckN1cmwuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Nvb2tpZXMvY3VybC9X
ZWJDb29raWVNYW5hZ2VyQ3VybC5jcHAKaW5kZXggYzMwNjczNTk4NzZhZTE4MjFhMDhhZGEyYzll
M2YzYjFlNjk4NmZkOS4uZWQxYjMzM2ZlNDQ5MWY5MDllNWQzNDk5MjdhZWIxMTIzYjY5YjE5NSAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Nvb2tpZXMvY3VybC9XZWJDb29r
aWVNYW5hZ2VyQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Nvb2tpZXMv
Y3VybC9XZWJDb29raWVNYW5hZ2VyQ3VybC5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNpbmNsdWRl
ICJXZWJDb29raWVNYW5hZ2VyLmgiCiAKICNpbmNsdWRlICJDaGlsZFByb2Nlc3MuaCIKKyNpbmNs
dWRlIDxXZWJDb3JlL0Nvb2tpZUphckRCLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrU3Rv
cmFnZVNlc3Npb24uaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKQEAgLTQzLDQg
KzQ0LDEwIEBAIEhUVFBDb29raWVBY2NlcHRQb2xpY3kgV2ViQ29va2llTWFuYWdlcjo6cGxhdGZv
cm1HZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KCkKICAgICByZXR1cm4gSFRUUENvb2tpZUFjY2Vw
dFBvbGljeU9ubHlGcm9tTWFpbkRvY3VtZW50RG9tYWluOwogfQogCit2b2lkIFdlYkNvb2tpZU1h
bmFnZXI6OnNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgc3RvcmFnZVBh
dGgpCit7CisgICAgYXV0byYgc3RvcmFnZVNlc3Npb24gPSBOZXR3b3JrU3RvcmFnZVNlc3Npb246
OmRlZmF1bHRTdG9yYWdlU2Vzc2lvbigpOworICAgIHN0b3JhZ2VTZXNzaW9uLnNldENvb2tpZURh
dGFiYXNlKG1ha2VVbmlxdWVSZWY8Q29va2llSmFyREI+KHN0b3JhZ2VQYXRoKSk7Cit9CisKIH0g
Ly8gbmFtZXNwYWNlIFdlYktpdAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>