<?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>192970</bug_id>
          
          <creation_ts>2018-12-20 19:14:13 -0800</creation_ts>
          <short_desc>[curl] Move cookiePersistentStorageFile from NetworkProcessCreationParameters to NetworkSessionCreationParameters</short_desc>
          <delta_ts>2019-01-04 11:08:49 -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="Fujii Hironori">fujii</reporter>
          <assigned_to name="Fujii Hironori">fujii</assigned_to>
          <cc>achristensen</cc>
    
    <cc>basuke</cc>
    
    <cc>commit-queue</cc>
    
    <cc>don.olmstead</cc>
    
    <cc>ross.kirsling</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1490258</commentid>
    <comment_count>0</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-12-20 19:14:13 -0800</bug_when>
    <thetext>[curl] Move cookiePersistentStorageFile from NetworkProcessCreationParameters to NetworkSessionCreationParameters

[webkit-dev] Reducing globals
https://lists.webkit.org/pipermail/webkit-dev/2018-December/030267.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1490270</commentid>
    <comment_count>1</comment_count>
      <attachid>357921</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-12-20 20:00:45 -0800</bug_when>
    <thetext>Created attachment 357921
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1490368</commentid>
    <comment_count>2</comment_count>
      <attachid>357921</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2018-12-21 09:44:38 -0800</bug_when>
    <thetext>Comment on attachment 357921
Patch

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

r=me.  Thanks

&gt; Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp:43
&gt; +        NetworkProcess::singleton().supplement&lt;WebCookieManager&gt;()-&gt;setCookiePersistentStorage(parameters.cookiePersistentStorageFile);

This is a great step in the right direction.  Thanks!  The next step would be to stop using the NetworkProcess::singleton() for this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1490388</commentid>
    <comment_count>3</comment_count>
      <attachid>357921</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2018-12-21 10:17:00 -0800</bug_when>
    <thetext>Comment on attachment 357921
Patch

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

&gt;&gt; Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp:43
&gt;&gt; +        NetworkProcess::singleton().supplement&lt;WebCookieManager&gt;()-&gt;setCookiePersistentStorage(parameters.cookiePersistentStorageFile);
&gt; 
&gt; This is a great step in the right direction.  Thanks!  The next step would be to stop using the NetworkProcess::singleton() for this.

Instead, this should probably be a member of the NetworkSessionCurl or even better, the NetworkStorageSession.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1490747</commentid>
    <comment_count>4</comment_count>
      <attachid>357921</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-12-24 19:32:27 -0800</bug_when>
    <thetext>Comment on attachment 357921
Patch

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

Thank you for the review.

&gt;&gt;&gt; Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp:43
&gt;&gt;&gt; +        NetworkProcess::singleton().supplement&lt;WebCookieManager&gt;()-&gt;setCookiePersistentStorage(parameters.cookiePersistentStorageFile);
&gt;&gt; 
&gt;&gt; This is a great step in the right direction.  Thanks!  The next step would be to stop using the NetworkProcess::singleton() for this.
&gt; 
&gt; Instead, this should probably be a member of the NetworkSessionCurl or even better, the NetworkStorageSession.

I get the idea. I will revise this patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1490748</commentid>
    <comment_count>5</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-12-24 19:49:49 -0800</bug_when>
    <thetext>NetworkProcess::setNetworkProxySettings also should be removed?
https://trac.webkit.org/browser/webkit/trunk/Source/WebKit/NetworkProcess/NetworkProcess.h?rev=239474#L297</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1490749</commentid>
    <comment_count>6</comment_count>
      <attachid>358051</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-12-24 19:54:15 -0800</bug_when>
    <thetext>Created attachment 358051
WIP Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1491447</commentid>
    <comment_count>7</comment_count>
      <attachid>358051</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2019-01-03 09:45:49 -0800</bug_when>
    <thetext>Comment on attachment 358051
WIP Patch

Looks good to me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1491750</commentid>
    <comment_count>8</comment_count>
      <attachid>358051</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-01-04 11:07:23 -0800</bug_when>
    <thetext>Comment on attachment 358051
WIP Patch

Clearing flags on attachment: 358051

Committed r239624: &lt;https://trac.webkit.org/changeset/239624&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1491751</commentid>
    <comment_count>9</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-01-04 11:07:25 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1491754</commentid>
    <comment_count>10</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-01-04 11:08:49 -0800</bug_when>
    <thetext>&lt;rdar://problem/47052236&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>357921</attachid>
            <date>2018-12-20 20:00:45 -0800</date>
            <delta_ts>2018-12-24 19:53:40 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-192970-20181221130044.patch</filename>
            <type>text/plain</type>
            <size>7771</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NDk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDVjM2VjMzNmM2Y3NjM1YjMx
NjRlNjJiOGM3ZDk5Mzg4Zjc2ZTFlMTYuLmZhNTY5MDg1YjlmN2ExM2ZlMTNhZmIxNmYyYTNlMWVh
YzhjYWUyNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTgtMTItMjAgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1cmxdIE1vdmUg
Y29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlIGZyb20gTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnMgdG8gTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mjk3MAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY29va2llUGVyc2lzdGVu
dFN0b3JhZ2VGaWxlIGlzIG5vdCB1c2VkIGF0IHRoZSBtb21lbnQuIE5vIHRlc3QgaXMgbmVlZGVk
LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFt
ZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l
dGVyczo6ZW5jb2RlIGNvbnN0KTogUmVtb3ZlZCBjb2RlIGZvciBjb29raWVQZXJzaXN0ZW50U3Rv
cmFnZUZpbGUuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0
ZXJzOjpkZWNvZGUpOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJv
Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz
cy9jdXJsL05ldHdvcmtQcm9jZXNzQ3VybC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQ
cm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyk6IERpdHRvLgorCisgICAg
ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuY3Bw
OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVyczo6cHJp
dmF0ZVNlc3Npb25QYXJhbWV0ZXJzKTogQWRkZWQgY29kZSBmb3IgY29va2llUGVyc2lzdGVudFN0
b3JhZ2VGaWxlLgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1l
dGVyczo6ZW5jb2RlIGNvbnN0KTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNz
aW9uQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3Jr
UHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5oOiBEaXR0by4KKyAgICAg
ICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtTZXNzaW9uQ3VybC5jcHA6CisgICAgICAg
IChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ3VybDo6TmV0d29ya1Nlc3Npb25DdXJsKTogRGl0dG8u
CisKIDIwMTgtMTItMjAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y
Zz4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0
ZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j
ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCmluZGV4IGMzNzVmZjk0MjJmNzdi
MWI5NGM4NGU5Yjk2Mjc4ODYwMzdjZDY0MzAuLjFhZTYwYmM4YjdlZjI2NjE1MTk4MWEwZWMzYTBk
NzkxZDVhZWY5M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0
d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC04Myw4
ICs4Myw2IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZShJ
UEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBpZ25vcmVUTFNFcnJv
cnM7CiAgICAgZW5jb2RlciA8PCBsYW5ndWFnZXM7CiAgICAgZW5jb2RlciA8PCBwcm94eVNldHRp
bmdzOwotI2VsaWYgVVNFKENVUkwpCi0gICAgZW5jb2RlciA8PCBjb29raWVQZXJzaXN0ZW50U3Rv
cmFnZUZpbGU7CiAjZW5kaWYKIAogICAgIGVuY29kZXIgPDwgdXJsU2NoZW1lc1JlZ2lzdGVyZWRB
c1NlY3VyZTsKQEAgLTIwMyw5ICsyMDEsNiBAQCBib29sIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25Q
YXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyLCBOZXR3b3JrUHJvYwogICAg
ICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQucHJveHlT
ZXR0aW5ncykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSNlbGlmIFVTRShDVVJMKQotICAgIGlm
ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZSkpCi0g
ICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShy
ZXN1bHQudXJsU2NoZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZSkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgg
Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh
bWV0ZXJzLmgKaW5kZXggN2Y5YzA1ZjVmNzJmMDI1YTk4ZWUyNjJlMGFhZDk5ZWU2NmE5NmZkZi4u
NWQ3YmUzYmQwODRlMmEzNzEwZDgxY2JkYTE4ZTEwMGFkMDFlMjg3MSAxMDA2NDQKLS0tIGEvU291
cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy
cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVh
dGlvblBhcmFtZXRlcnMuaApAQCAtOTYsOCArOTYsNiBAQCBzdHJ1Y3QgTmV0d29ya1Byb2Nlc3ND
cmVhdGlvblBhcmFtZXRlcnMgewogICAgIGJvb2wgaWdub3JlVExTRXJyb3JzIHsgZmFsc2UgfTsK
ICAgICBWZWN0b3I8U3RyaW5nPiBsYW5ndWFnZXM7CiAgICAgV2ViQ29yZTo6U291cE5ldHdvcmtQ
cm94eVNldHRpbmdzIHByb3h5U2V0dGluZ3M7Ci0jZWxpZiBVU0UoQ1VSTCkKLSAgICBTdHJpbmcg
Y29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlOwogI2VuZGlmCiAKICAgICBWZWN0b3I8U3RyaW5n
PiB1cmxTY2hlbWVzUmVnaXN0ZXJlZEFzU2VjdXJlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9T
b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0
ZXJzLmNwcAppbmRleCAwMzc5NWEyYzg0ZTVlMmEzNjJhYzUxZmExZDU3NGNlZDQwOTJiZjVmLi41
ZDY0NTRjMzc1NDY2ODg5MTJkMzMwMjNmMWZkOWFmYzgyMzY4ZDBlIDEwMDY0NAotLS0gYS9Tb3Vy
Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJz
LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3Jl
YXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtNDUsNyArNDUsNyBAQCBOZXR3b3JrU2Vzc2lvbkNyZWF0
aW9uUGFyYW1ldGVycyBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVyczo6cHJpdmF0ZVNl
c3NpbwogICAgICAgICAsIHsgfSwgeyB9LCB7IH0sIGZhbHNlLCB7IH0sIHsgfSwgeyB9CiAjZW5k
aWYKICNpZiBVU0UoQ1VSTCkKLSAgICAgICAgLCB7IH0KKyAgICAgICAgLCB7IH0sIHsgfQogI2Vu
ZGlmCiAgICAgfTsKIH0KQEAgLTY1LDYgKzY1LDcgQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbkNyZWF0
aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBl
bmNvZGVyIDw8IGh0dHBzUHJveHk7CiAjZW5kaWYKICNpZiBVU0UoQ1VSTCkKKyAgICBlbmNvZGVy
IDw8IGNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZTsKICAgICBlbmNvZGVyIDw8IHByb3h5U2V0
dGluZ3M7CiAjZW5kaWYKIH0KQEAgLTEyMiw2ICsxMjMsMTEgQEAgT3B0aW9uYWw8TmV0d29ya1Nl
c3Npb25DcmVhdGlvblBhcmFtZXRlcnM+IE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJz
OjpkZWMKICNlbmRpZgogICAgIAogI2lmIFVTRShDVVJMKQorICAgIE9wdGlvbmFsPFN0cmluZz4g
Y29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlOworICAgIGRlY29kZXIgPj4gY29va2llUGVyc2lz
dGVudFN0b3JhZ2VGaWxlOworICAgIGlmICghY29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlKQor
ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6Q3Vy
bFByb3h5U2V0dGluZ3M+IHByb3h5U2V0dGluZ3M7CiAgICAgZGVjb2RlciA+PiBwcm94eVNldHRp
bmdzOwogICAgIGlmICghcHJveHlTZXR0aW5ncykKQEAgLTE0Miw2ICsxNDgsNyBAQCBPcHRpb25h
bDxOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycz4gTmV0d29ya1Nlc3Npb25DcmVhdGlv
blBhcmFtZXRlcnM6OmRlYwogICAgICAgICAsIFdURk1vdmUoKmh0dHBzUHJveHkpCiAjZW5kaWYK
ICNpZiBVU0UoQ1VSTCkKKyAgICAgICAgLCBXVEZNb3ZlKCpjb29raWVQZXJzaXN0ZW50U3RvcmFn
ZUZpbGUpCiAgICAgICAgICwgV1RGTW92ZSgqcHJveHlTZXR0aW5ncykKICNlbmRpZgogICAgIH19
OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv
bkNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3
b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5oCmluZGV4IDBkZjIyYmZkMDA4ZWYwZDljNmFh
ZmFjMDY4ZDM0MDE2YWFiNDg3NDQuLjA5YWYzMzMyMzEzY2ViNzE4YjRmZjA0ZDMwMTYzMzE5MTFj
OTQzNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nl
c3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j
ZXNzL05ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTY2LDYgKzY2LDcgQEAg
c3RydWN0IE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzIHsKICAgICBVUkwgaHR0cHNQ
cm94eTsKICNlbmRpZgogI2lmIFVTRShDVVJMKQorICAgIFN0cmluZyBjb29raWVQZXJzaXN0ZW50
U3RvcmFnZUZpbGU7CiAgICAgV2ViQ29yZTo6Q3VybFByb3h5U2V0dGluZ3MgcHJveHlTZXR0aW5n
czsKICNlbmRpZgogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv
Y3VybC9OZXR3b3JrUHJvY2Vzc0N1cmwuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz
cy9jdXJsL05ldHdvcmtQcm9jZXNzQ3VybC5jcHAKaW5kZXggZTdhM2I0N2M5YjE2ZTFkOTAwNGFh
ZDkyMjU1NGNlY2Y5OWY5YTI1NC4uYTA0MmMwZTUzNzUyZWZiMGI3YjQ1MmYxNzVjOTg3ZDYwZDRh
NGIzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdv
cmtQcm9jZXNzQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJs
L05ldHdvcmtQcm9jZXNzQ3VybC5jcHAKQEAgLTI3LDcgKzI3LDYgQEAKICNpbmNsdWRlICJOZXR3
b3JrUHJvY2Vzcy5oIgogCiAjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRl
cnMuaCIKLSNpbmNsdWRlICJXZWJDb29raWVNYW5hZ2VyLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9D
dXJsQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTmV0d29ya1N0b3JhZ2VTZXNzaW9uLmg+
CiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1lbnRlZC5oPgpAQCAtMzYsMTAgKzM1LDggQEAg
dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIE5l
dHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3
b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKK3ZvaWQgTmV0d29ya1By
b2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKGNvbnN0IE5ldHdvcmtQcm9j
ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJikKIHsKLSAgICBpZiAoIXBhcmFtZXRlcnMuY29va2llUGVy
c2lzdGVudFN0b3JhZ2VGaWxlLmlzRW1wdHkoKSkKLSAgICAgICAgc3VwcGxlbWVudDxXZWJDb29r
aWVNYW5hZ2VyPigpLT5zZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tp
ZVBlcnNpc3RlbnRTdG9yYWdlRmlsZSk7CiB9CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmFsbG93
U3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdChjb25zdCBDZXJ0aWZpY2F0ZUluZm8mIGNl
cnRpZmljYXRlSW5mbywgY29uc3QgU3RyaW5nJiBob3N0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtTZXNzaW9uQ3VybC5jcHAgYi9Tb3VyY2Uv
V2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Nlc3Npb25DdXJsLmNwcAppbmRleCBm
YTY4YjZlYjdjYWMxMGM0YTlhOGEyN2NmZTEzZDVkM2ZiOGI2ZGRmLi5mYmMwNzViN2NjMGYxYTE4
ZDZmMTVhYWFjNTg2MGZhNTc2YjYxZjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdv
cmtQcm9jZXNzL2N1cmwvTmV0d29ya1Nlc3Npb25DdXJsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0
L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Nlc3Npb25DdXJsLmNwcApAQCAtMjYsNyArMjYs
OSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIk5ldHdvcmtTZXNzaW9uQ3VybC5o
IgogCisjaW5jbHVkZSAiTmV0d29ya1Byb2Nlc3MuaCIKICNpbmNsdWRlICJOZXR3b3JrU2Vzc2lv
bkNyZWF0aW9uUGFyYW1ldGVycy5oIgorI2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXIuaCIKICNp
bmNsdWRlIDxXZWJDb3JlL0N1cmxDb250ZXh0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3Jr
U3RvcmFnZVNlc3Npb24uaD4KIApAQCAtMzcsNiArMzksOCBAQCBuYW1lc3BhY2UgV2ViS2l0IHsK
IE5ldHdvcmtTZXNzaW9uQ3VybDo6TmV0d29ya1Nlc3Npb25DdXJsKE5ldHdvcmtTZXNzaW9uQ3Jl
YXRpb25QYXJhbWV0ZXJzJiYgcGFyYW1ldGVycykKICAgICA6IE5ldHdvcmtTZXNzaW9uKHBhcmFt
ZXRlcnMuc2Vzc2lvbklEKQogeworICAgIGlmICghcGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50
U3RvcmFnZUZpbGUuaXNFbXB0eSgpKQorICAgICAgICBOZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9u
KCkuc3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyPigpLT5zZXRDb29raWVQZXJzaXN0ZW50U3Rv
cmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZSk7CiAgICAgbmV0d29y
a1N0b3JhZ2VTZXNzaW9uKCkuc2V0UHJveHlTZXR0aW5ncyhXVEZNb3ZlKHBhcmFtZXRlcnMucHJv
eHlTZXR0aW5ncykpOwogfQogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>358051</attachid>
            <date>2018-12-24 19:54:15 -0800</date>
            <delta_ts>2019-01-04 11:07:23 -0800</delta_ts>
            <desc>WIP Patch</desc>
            <filename>bug-192970-20181225125414.patch</filename>
            <type>text/plain</type>
            <size>9671</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5NTNjODkxYjA5NmY0NzU3
YTI4MTQ2N2I3ZTdiMzE1Y2NiYTc3MDcuLjNmZWZlZjA0Y2E5MTYyZDYxMDhiMzJkNWE5OWI0MjYz
MmE3NjQ3MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTgtMTItMjQgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW2N1cmxdIE1vdmUg
Y29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlIGZyb20gTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh
cmFtZXRlcnMgdG8gTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mjk3MAorCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0
d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3
b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KTogUmVtb3ZlZCBjb2Rl
IGZvciBjb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGUuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdv
cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEaXR0by4KKyAgICAgICAgKiBO
ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oOiBEaXR0by4K
KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtQcm9jZXNzQ3VybC5jcHA6Cisg
ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3Jr
UHJvY2Vzcyk6IERpdHRvLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Np
b25DcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lv
bkNyZWF0aW9uUGFyYW1ldGVyczo6cHJpdmF0ZVNlc3Npb25QYXJhbWV0ZXJzKTogQWRkZWQgY29k
ZSBmb3IgY29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlLgorICAgICAgICAoV2ViS2l0OjpOZXR3
b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlIGNvbnN0KTogRGl0dG8uCisgICAg
ICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBE
aXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFy
YW1ldGVycy5oOiBEaXR0by4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtT
ZXNzaW9uQ3VybC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ3VybDo6TmV0
d29ya1Nlc3Npb25DdXJsKTogRGl0dG8uCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9Db29r
aWVzL1dlYkNvb2tpZU1hbmFnZXIuaDogUmVtb3ZlZCBzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFn
ZSBtZXRob2Qgb2YgY3VybCBwb3J0IGV4dGVuc2lvbi4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz
cy9Db29raWVzL2N1cmwvV2ViQ29va2llTWFuYWdlckN1cmwuY3BwOgorICAgICAgICAoV2ViS2l0
OjpXZWJDb29raWVNYW5hZ2VyOjpzZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZSk6IERlbGV0ZWQu
CisKIDIwMTgtMTItMjQgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+
CiAKICAgICAgICAgW1dlYktpdF1bV2luXSBSZW1vdmUgdXNpbmcgbmFtZXNwYWNlIGluIHRoZSBn
bG9iYWwgc2NvcGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ29v
a2llcy9XZWJDb29raWVNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Nv
b2tpZXMvV2ViQ29va2llTWFuYWdlci5oCmluZGV4IDMyMTBlMzI5OWU2ZmNiODMyZmMzOWM4ZWQ2
Y2E4ZTY2NzhiYzZiYzMuLjUyM2ZkYmU4OTNmYjcwMzYwYmZmNGY4MGZmMzM4YmIyYWNhMmI2Y2Eg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ29va2llcy9XZWJDb29r
aWVNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Db29raWVzL1dl
YkNvb2tpZU1hbmFnZXIuaApAQCAtNTksOCArNTksNiBAQCBwdWJsaWM6CiAKICNpZiBVU0UoU09V
UCkKICAgICB2b2lkIHNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgc3Rv
cmFnZVBhdGgsIHVpbnQzMl90IHN0b3JhZ2VUeXBlKTsKLSNlbGlmIFVTRShDVVJMKQotICAgIHZv
aWQgc2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgU3RyaW5nJiBzdG9yYWdlUGF0aCk7
CiAjZW5kaWYKIAogICAgIHZvaWQgbm90aWZ5Q29va2llc0RpZENoYW5nZShQQUw6OlNlc3Npb25J
RCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0Nvb2tpZXMvY3Vy
bC9XZWJDb29raWVNYW5hZ2VyQ3VybC5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz
L0Nvb2tpZXMvY3VybC9XZWJDb29raWVNYW5hZ2VyQ3VybC5jcHAKaW5kZXggZjM3M2UxYTBhOTE2
NGYxM2JkZDhlYjc4OWU4ZGYwZGU2Y2JiZDVjYy4uZWI2YmZmMWZjYWUwMmJjNTBkYTdiZTVhNGJj
MDkxY2Y2N2RjOWIyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9D
b29raWVzL2N1cmwvV2ViQ29va2llTWFuYWdlckN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv
TmV0d29ya1Byb2Nlc3MvQ29va2llcy9jdXJsL1dlYkNvb2tpZU1hbmFnZXJDdXJsLmNwcApAQCAt
MjYsMTEgKzI2LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJDb29raWVN
YW5hZ2VyLmgiCiAKLSNpbmNsdWRlICJDaGlsZFByb2Nlc3MuaCIKLSNpbmNsdWRlIDxXZWJDb3Jl
L0Nvb2tpZUphckRCLmg+Ci0jaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24u
aD4KLSNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+Ci0KIG5hbWVzcGFjZSBXZWJLaXQgewog
CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTQ0LDEwICszOSw0IEBAIEhUVFBDb29raWVB
Y2NlcHRQb2xpY3kgV2ViQ29va2llTWFuYWdlcjo6cGxhdGZvcm1HZXRIVFRQQ29va2llQWNjZXB0
UG9saWN5KCkKICAgICByZXR1cm4gSFRUUENvb2tpZUFjY2VwdFBvbGljeU9ubHlGcm9tTWFpbkRv
Y3VtZW50RG9tYWluOwogfQogCi12b2lkIFdlYkNvb2tpZU1hbmFnZXI6OnNldENvb2tpZVBlcnNp
c3RlbnRTdG9yYWdlKGNvbnN0IFN0cmluZyYgc3RvcmFnZVBhdGgpCi17Ci0gICAgYXV0byYgc3Rv
cmFnZVNlc3Npb24gPSBOZXR3b3JrU3RvcmFnZVNlc3Npb246OmRlZmF1bHRTdG9yYWdlU2Vzc2lv
bigpOwotICAgIHN0b3JhZ2VTZXNzaW9uLnNldENvb2tpZURhdGFiYXNlKG1ha2VVbmlxdWVSZWY8
Q29va2llSmFyREI+KHN0b3JhZ2VQYXRoKSk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0Ny
ZWF0aW9uUGFyYW1ldGVycy5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv
cmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCBjMzc1ZmY5NDIyZjc3YjFiOTRj
ODRlOWI5NjI3ODg2MDM3Y2Q2NDMwLi4xYWU2MGJjOGI3ZWYyNjYxNTE5ODFhMGVjM2EwZDc5MWQ1
YWVmOTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ
cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ
cm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcApAQCAtODMsOCArODMs
NiBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoSVBDOjpF
bmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgaWdub3JlVExTRXJyb3JzOwog
ICAgIGVuY29kZXIgPDwgbGFuZ3VhZ2VzOwogICAgIGVuY29kZXIgPDwgcHJveHlTZXR0aW5nczsK
LSNlbGlmIFVTRShDVVJMKQotICAgIGVuY29kZXIgPDwgY29va2llUGVyc2lzdGVudFN0b3JhZ2VG
aWxlOwogI2VuZGlmCiAKICAgICBlbmNvZGVyIDw8IHVybFNjaGVtZXNSZWdpc3RlcmVkQXNTZWN1
cmU7CkBAIC0yMDMsOSArMjAxLDYgQEAgYm9vbCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l
dGVyczo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgTmV0d29ya1Byb2MKICAgICAgICAg
cmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnByb3h5U2V0dGlu
Z3MpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0jZWxpZiBVU0UoQ1VSTCkKLSAgICBpZiAoIWRl
Y29kZXIuZGVjb2RlKHJlc3VsdC5jb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGUpKQotICAgICAg
ICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIAogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0
LnVybFNjaGVtZXNSZWdpc3RlcmVkQXNTZWN1cmUpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291
cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy
cy5oCmluZGV4IDdmOWMwNWY1ZjcyZjAyNWE5OGVlMjYyZTBhYWQ5OWVlNjZhOTZmZGYuLjVkN2Jl
M2JkMDg0ZTJhMzcxMGQ4MWNiZGExOGUxMDBhZDAxZTI4NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAor
KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25Q
YXJhbWV0ZXJzLmgKQEAgLTk2LDggKzk2LDYgQEAgc3RydWN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRp
b25QYXJhbWV0ZXJzIHsKICAgICBib29sIGlnbm9yZVRMU0Vycm9ycyB7IGZhbHNlIH07CiAgICAg
VmVjdG9yPFN0cmluZz4gbGFuZ3VhZ2VzOwogICAgIFdlYkNvcmU6OlNvdXBOZXR3b3JrUHJveHlT
ZXR0aW5ncyBwcm94eVNldHRpbmdzOwotI2VsaWYgVVNFKENVUkwpCi0gICAgU3RyaW5nIGNvb2tp
ZVBlcnNpc3RlbnRTdG9yYWdlRmlsZTsKICNlbmRpZgogCiAgICAgVmVjdG9yPFN0cmluZz4gdXJs
U2NoZW1lc1JlZ2lzdGVyZWRBc1NlY3VyZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0
d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuY3BwIGIvU291cmNl
L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5j
cHAKaW5kZXggMDM3OTVhMmM4NGU1ZTJhMzYyYWM1MWZhMWQ1NzRjZWQ0MDkyYmY1Zi4uNWQ2NDU0
YzM3NTQ2Njg4OTEyZDMzMDIzZjFmZDlhZmM4MjM2OGQwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl
YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5jcHAK
KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9u
UGFyYW1ldGVycy5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBh
cmFtZXRlcnMgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnM6OnByaXZhdGVTZXNzaW8K
ICAgICAgICAgLCB7IH0sIHsgfSwgeyB9LCBmYWxzZSwgeyB9LCB7IH0sIHsgfQogI2VuZGlmCiAj
aWYgVVNFKENVUkwpCi0gICAgICAgICwgeyB9CisgICAgICAgICwgeyB9LCB7IH0KICNlbmRpZgog
ICAgIH07CiB9CkBAIC02NSw2ICs2NSw3IEBAIHZvaWQgTmV0d29ya1Nlc3Npb25DcmVhdGlvblBh
cmFtZXRlcnM6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiAgICAgZW5jb2Rl
ciA8PCBodHRwc1Byb3h5OwogI2VuZGlmCiAjaWYgVVNFKENVUkwpCisgICAgZW5jb2RlciA8PCBj
b29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGU7CiAgICAgZW5jb2RlciA8PCBwcm94eVNldHRpbmdz
OwogI2VuZGlmCiB9CkBAIC0xMjIsNiArMTIzLDExIEBAIE9wdGlvbmFsPE5ldHdvcmtTZXNzaW9u
Q3JlYXRpb25QYXJhbWV0ZXJzPiBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVyczo6ZGVj
CiAjZW5kaWYKICAgICAKICNpZiBVU0UoQ1VSTCkKKyAgICBPcHRpb25hbDxTdHJpbmc+IGNvb2tp
ZVBlcnNpc3RlbnRTdG9yYWdlRmlsZTsKKyAgICBkZWNvZGVyID4+IGNvb2tpZVBlcnNpc3RlbnRT
dG9yYWdlRmlsZTsKKyAgICBpZiAoIWNvb2tpZVBlcnNpc3RlbnRTdG9yYWdlRmlsZSkKKyAgICAg
ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKwogICAgIE9wdGlvbmFsPFdlYkNvcmU6OkN1cmxQcm94
eVNldHRpbmdzPiBwcm94eVNldHRpbmdzOwogICAgIGRlY29kZXIgPj4gcHJveHlTZXR0aW5nczsK
ICAgICBpZiAoIXByb3h5U2V0dGluZ3MpCkBAIC0xNDIsNiArMTQ4LDcgQEAgT3B0aW9uYWw8TmV0
d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnM+IE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJh
bWV0ZXJzOjpkZWMKICAgICAgICAgLCBXVEZNb3ZlKCpodHRwc1Byb3h5KQogI2VuZGlmCiAjaWYg
VVNFKENVUkwpCisgICAgICAgICwgV1RGTW92ZSgqY29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxl
KQogICAgICAgICAsIFdURk1vdmUoKnByb3h5U2V0dGluZ3MpCiAjZW5kaWYKICAgICB9fTsKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb25DcmVh
dGlvblBhcmFtZXRlcnMuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nl
c3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCAwZGYyMmJmZDAwOGVmMGQ5YzZhYWZhYzA2
OGQzNDAxNmFhYjQ4NzQ0Li4wOWFmMzMzMjMxM2NlYjcxOGI0ZmYwNGQzMDE2MzMxOTExYzk0Mzcw
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9u
Q3JlYXRpb25QYXJhbWV0ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O
ZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5oCkBAIC02Niw2ICs2Niw3IEBAIHN0cnVj
dCBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgVVJMIGh0dHBzUHJveHk7
CiAjZW5kaWYKICNpZiBVU0UoQ1VSTCkKKyAgICBTdHJpbmcgY29va2llUGVyc2lzdGVudFN0b3Jh
Z2VGaWxlOwogICAgIFdlYkNvcmU6OkN1cmxQcm94eVNldHRpbmdzIHByb3h5U2V0dGluZ3M7CiAj
ZW5kaWYKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwv
TmV0d29ya1Byb2Nlc3NDdXJsLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3Vy
bC9OZXR3b3JrUHJvY2Vzc0N1cmwuY3BwCmluZGV4IDI4YWZhOGQ3Y2ZkNWU4ZWFlNzU4YjMwZTI1
ZTYyNWRjNGM3NWUwN2IuLjc5YWUxYjUxNTcyYmJmZTA5N2Q5NDAzMzE0ZjFiNWM2MjFmZjNmM2Ug
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrUHJv
Y2Vzc0N1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3
b3JrUHJvY2Vzc0N1cmwuY3BwCkBAIC0yNyw3ICsyNyw2IEBACiAjaW5jbHVkZSAiTmV0d29ya1By
b2Nlc3MuaCIKIAogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgi
Ci0jaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQ3VybENv
bnRleHQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2lu
Y2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KQEAgLTM2LDEwICszNSw4IEBAIG5hbWVz
cGFjZSBXZWJLaXQgewogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotdm9pZCBOZXR3b3Jr
UHJvY2Vzczo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MoY29uc3QgTmV0d29ya1By
b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCit2b2lkIE5ldHdvcmtQcm9jZXNz
OjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyhjb25zdCBOZXR3b3JrUHJvY2Vzc0Ny
ZWF0aW9uUGFyYW1ldGVycyYpCiB7Ci0gICAgaWYgKCFwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3Rl
bnRTdG9yYWdlRmlsZS5pc0VtcHR5KCkpCi0gICAgICAgIHN1cHBsZW1lbnQ8V2ViQ29va2llTWFu
YWdlcj4oKS0+c2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2UocGFyYW1ldGVycy5jb29raWVQZXJz
aXN0ZW50U3RvcmFnZUZpbGUpOwogfQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzOjphbGxvd1NwZWNp
ZmljSFRUUFNDZXJ0aWZpY2F0ZUZvckhvc3QoY29uc3QgQ2VydGlmaWNhdGVJbmZvJiBjZXJ0aWZp
Y2F0ZUluZm8sIGNvbnN0IFN0cmluZyYgaG9zdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv
TmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrU2Vzc2lvbkN1cmwuY3BwIGIvU291cmNlL1dlYktp
dC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtTZXNzaW9uQ3VybC5jcHAKaW5kZXggNzgxZWI0
MmRiYjUwMzE2N2VkNjU2NWRjMzhmNGVjMDBjYmFiN2ViMC4uZTdkNzdiYzRlMGVkNmIzNWQ0ZDM0
MDUyYmUzYjU0YjczN2FlZDMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv
Y2Vzcy9jdXJsL05ldHdvcmtTZXNzaW9uQ3VybC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3
b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtTZXNzaW9uQ3VybC5jcHAKQEAgLTI2LDcgKzI2LDEwIEBA
CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiTmV0d29ya1Nlc3Npb25DdXJsLmgiCiAK
KyNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzcy5oIgogI2luY2x1ZGUgIk5ldHdvcmtTZXNzaW9uQ3Jl
YXRpb25QYXJhbWV0ZXJzLmgiCisjaW5jbHVkZSAiV2ViQ29va2llTWFuYWdlci5oIgorI2luY2x1
ZGUgPFdlYkNvcmUvQ29va2llSmFyREIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0N1cmxDb250ZXh0
Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4KIApAQCAtMzcs
NiArNDAsOCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIE5ldHdvcmtTZXNzaW9uQ3VybDo6
TmV0d29ya1Nlc3Npb25DdXJsKE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzJiYgcGFy
YW1ldGVycykKICAgICA6IE5ldHdvcmtTZXNzaW9uKHBhcmFtZXRlcnMuc2Vzc2lvbklEKQogewor
ICAgIGlmICghcGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZUZpbGUuaXNFbXB0eSgp
KQorICAgICAgICBuZXR3b3JrU3RvcmFnZVNlc3Npb24oKS5zZXRDb29raWVEYXRhYmFzZShtYWtl
VW5pcXVlUmVmPENvb2tpZUphckRCPihwYXJhbWV0ZXJzLmNvb2tpZVBlcnNpc3RlbnRTdG9yYWdl
RmlsZSkpOwogICAgIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpLnNldFByb3h5U2V0dGluZ3MoV1RG
TW92ZShwYXJhbWV0ZXJzLnByb3h5U2V0dGluZ3MpKTsKIH0KIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>