<?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>191995</bug_id>
          
          <creation_ts>2018-11-26 20:20:08 -0800</creation_ts>
          <short_desc>Remove &quot;using namespace WebCore&quot; under Source/WebKit/WebProcess/InjectedBundle/API</short_desc>
          <delta_ts>2018-12-05 20:09:40 -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>WebKit2</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>191853</blocked>
    
    <blocked>192449</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Fujii Hironori">fujii</reporter>
          <assigned_to name="Fujii Hironori">fujii</assigned_to>
          <cc>achristensen</cc>
    
    <cc>commit-queue</cc>
    
    <cc>darin</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1481820</commentid>
    <comment_count>0</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-11-26 20:20:08 -0800</bug_when>
    <thetext>Remove &quot;using namespace WebCore&quot; under Source/WebKit/WebProcess/InjectedBundle/API

Not break Apple internal build system due to unified source builds such like Bug 191853 Comment 9.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481822</commentid>
    <comment_count>1</comment_count>
      <attachid>355707</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-11-26 20:52:09 -0800</bug_when>
    <thetext>Created attachment 355707
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481823</commentid>
    <comment_count>2</comment_count>
      <attachid>355708</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-11-26 20:57:22 -0800</bug_when>
    <thetext>Created attachment 355708
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481824</commentid>
    <comment_count>3</comment_count>
      <attachid>355709</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-11-26 21:01:51 -0800</bug_when>
    <thetext>Created attachment 355709
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481835</commentid>
    <comment_count>4</comment_count>
      <attachid>355714</attachid>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-11-26 22:00:13 -0800</bug_when>
    <thetext>Created attachment 355714
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481838</commentid>
    <comment_count>5</comment_count>
      <attachid>355714</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-11-26 23:50:50 -0800</bug_when>
    <thetext>Comment on attachment 355714
Patch

Rejecting attachment 355714 from commit-queue.

Failed to run &quot;[&apos;/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch&apos;, &apos;--status-host=webkit-queues.webkit.org&apos;, &apos;--bot-id=webkit-cq-02&apos;, &apos;land-attachment&apos;, &apos;--force-clean&apos;, &apos;--non-interactive&apos;, &apos;--parent-command=commit-queue&apos;, 355714, &apos;--port=mac&apos;]&quot; exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Logging in as commit-queue@webkit.org...
Fetching: https://bugs.webkit.org/attachment.cgi?id=355714&amp;action=edit
Fetching: https://bugs.webkit.org/show_bug.cgi?id=191995&amp;ctype=xml&amp;excludefield=attachmentdata
Processing 1 patch from 1 bug.
Updating working directory
Processing patch 355714 from bug 191995.
Fetching: https://bugs.webkit.org/attachment.cgi?id=355714
Failed to run &quot;[&apos;git&apos;, &apos;svn&apos;, &apos;dcommit&apos;, &apos;--rmdir&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	Source/WebKit/ChangeLog

ERROR from SVN:
Item is out of date: File &apos;/trunk/Source/WebKit/ChangeLog&apos; is out of date
W: 2573f9f9b69f1f64366c347abef13db6b08cb902 and refs/remotes/origin/master differ, using rebase:
:040000 040000 a9d1047455c5ce773b9735903ad79a565409fb62 bfc2fa26c7b37ea3520ffa0f235d1a7be3453b52 M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run &quot;[&apos;git&apos;, &apos;svn&apos;, &apos;dcommit&apos;, &apos;--rmdir&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	Source/WebKit/ChangeLog

ERROR from SVN:
Item is out of date: File &apos;/trunk/Source/WebKit/ChangeLog&apos; is out of date
W: 2573f9f9b69f1f64366c347abef13db6b08cb902 and refs/remotes/origin/master differ, using rebase:
:040000 040000 a9d1047455c5ce773b9735903ad79a565409fb62 bfc2fa26c7b37ea3520ffa0f235d1a7be3453b52 M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run &quot;[&apos;git&apos;, &apos;svn&apos;, &apos;dcommit&apos;, &apos;--rmdir&apos;]&quot; exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.

Full output: https://webkit-queues.webkit.org/results/10163595</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481845</commentid>
    <comment_count>6</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-11-27 00:59:02 -0800</bug_when>
    <thetext>Committed r238546: &lt;https://trac.webkit.org/changeset/238546&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1481846</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2018-11-27 01:00:50 -0800</bug_when>
    <thetext>&lt;rdar://problem/46270039&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1484259</commentid>
    <comment_count>8</comment_count>
    <who name="Darin Adler">darin</who>
    <bug_when>2018-12-02 21:54:23 -0800</bug_when>
    <thetext>Same applies to &quot;using namespace WebKit&quot; and those should be removed for the same reason.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1484278</commentid>
    <comment_count>9</comment_count>
    <who name="Fujii Hironori">fujii</who>
    <bug_when>2018-12-03 00:17:46 -0800</bug_when>
    <thetext>Thank you for the feedback. Let&apos;s do that in Bug 192301.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>355707</attachid>
            <date>2018-11-26 20:52:09 -0800</date>
            <delta_ts>2018-11-26 20:53:19 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191995-20181127135208.patch</filename>
            <type>text/plain</type>
            <size>11441</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc3YmNhZDgyOTg5ZDRmZDlj
OTU2NjA5ZjU5NWVkYjJhMDY2MWMxYzUuLjFkNDhmOWVjYzg4MmM1NjMzY2RkOTNlY2YwN2Q0N2M4
MTYyY2Y5YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTgtMTEtMjYgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgUmVtb3ZlICJ1c2lu
ZyBuYW1lc3BhY2UgV2ViQ29yZSIgdW5kZXIgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVj
dGVkQnVuZGxlL0FQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTkxOTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVGhlIHN0YXRlbWVudCAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIHNob3VsZCBiZSBw
bGFjZWQgaW5zaWRlCisgICAgICAgIG5hbWVzcGFjZSBXZWJLaXQgZm9yIHVuaWZpZWQgc291cmNl
IGJ1aWxkcy4gQnV0LCBzb3VyY2UgZmlsZXMKKyAgICAgICAgZGVmaW5pbmcgV2ViS2l0IEFQSSBj
YW4ndCBiZSBlbmNsb3NlZCBieSBuYW1lc3BhY2UgV2ViS2l0IHsgfQorICAgICAgICBiZWN1YXNl
IHRoZXkgYXJlIGRlZmluZWQgaW4gdGhlIGdsb2JhbCBzY29wZS4KKworICAgICAgICAidXNpbmcg
bmFtZXNwYWNlIFdlYkNvcmUiIGluIGdsb2JhbCBzY29wZSBhbmQgdW5pZmllZCBzb3VyY2UKKyAg
ICAgICAgYnVpbGRzIG1heSBjYXVzZSBidWlsZCBicmVha3MgKEJ1ZyAxOTE4NTMpLgorCisgICAg
ICAgIFJlbW92ZSAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIGluIHRoZSBnbG9iYWwgc2NvcGUu
IFVzZQorICAgICAgICAiV2ViQ29yZTo6IiBwcmVmaXggaW5zdGVhZC4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwOgorICAgICAgICAoV0tC
dW5kbGVDbGVhckFsbERhdGFiYXNlcyk6CisgICAgICAgIChXS0J1bmRsZVNldERhdGFiYXNlUXVv
dGEpOgorICAgICAgICAoV0tCdW5kbGVDbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MpOgorICAg
ICAgICAoV0tCdW5kbGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTm90aWZ5T2JzZXJ2ZXIpOgorICAg
ICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVGcmFtZS5jcHA6
CisgICAgICAgIChXS0J1bmRsZUZyYW1lR2V0RnJhbWVMb2FkU3RhdGUpOgorICAgICAgICAoV0tC
dW5kbGVGcmFtZUNsZWFyT3BlbmVyKToKKyAgICAgICAgKFdLQnVuZGxlRnJhbWVDYWxsU2hvdWxk
Q2xvc2VPbldlYlZpZXcpOgorICAgICAgICAoV0tCdW5kbGVGcmFtZUNvcHlTZWN1cml0eU9yaWdp
bik6CisgICAgICAgIChXS0J1bmRsZUZyYW1lRm9jdXMpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwOgorICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHA6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9tYWMvV0tCdW5kbGVQYWdl
QmFubmVyTWFjLm1tOgorCiAyMDE4LTExLTI2ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A
YXBwbGUuY29tPgogCiAgICAgICAgIEluc2VydCA8YXR0YWNobWVudD4gZWxlbWVudHMgdW5kZXIg
ZWRpdGFibGUgaW1hZ2VzIHRvIG1ha2UgdGhlaXIgYmFja2luZyBkYXRhIGFjY2Vzc2libGUKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL
aXRMZWdhY3kvd2luL0NoYW5nZUxvZwppbmRleCBmZTUzNjdkZGJlNDM5MzNlOWE2NmI0MmU3Y2Nk
ZDM0ZjVhOTIxOTFkLi4wYmUzYjE1N2ZjYmIwZDI3YmUwNjkwNDU0ZGY4MzQxOGY2OGU4OWQzIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKKysrIGIvU291cmNl
L1dlYktpdExlZ2FjeS93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTgtMTEtMjYg
IEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW0Ns
YW5nXVtXZWJLaXRMZWdhY3ldW1dpbl0gTWFyc2hhbGxpbmdIZWxwZXJzLmgoNjUsNDcpOiB3YXJu
aW5nOiBleHRyYSBxdWFsaWZpY2F0aW9uIG9uIG1lbWJlciAnd2luZG93c0Vwb2NoQWJzb2x1dGVU
aW1lJyBbLVdtaWNyb3NvZnQtZXh0cmEtcXVhbGlmaWNhdGlvbl0KKyAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTk1OQorCisgICAgICAgIFJldmlld2Vk
IGJ5IEFsZXggQ2hyaXN0ZW5zZW4uCisKKyAgICAgICAgKiBNYXJzaGFsbGluZ0hlbHBlcnMuaDog
UmVtb3ZlZCBleHRyYSAiTWFyc2hhbGxpbmdIZWxwZXJzOjoiIG9mIHdpbmRvd3NFcG9jaEFic29s
dXRlVGltZSBkZWNsYXJhdGlvbi4KKwogMjAxOC0xMS0yNiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxn
aGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBSZWR1Y2UgdGhlIHVzZSBvZiBXS1NJIGxp
YnJhcnkgY2FsbHM6IENvcmVBbmltYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHAgYi9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCmluZGV4IDdmNzRm
N2UwNzZhZDI5M2RlZWIyM2QzMDVmMzFmYTk4MjQ3ODlmMmEuLjFjZTI1MjRlZGJhZjJmYmYxYWE1
YjhkOTdlYzhhNWUzMGI4NzU3NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9X
ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcApAQCAtNDgsNyArNDgs
NiBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuaD4KICNpbmNsdWRl
IDxXZWJDb3JlL1NlcnZpY2VXb3JrZXJUaHJlYWRQcm94eS5oPgogCi11c2luZyBuYW1lc3BhY2Ug
V2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdLQnVuZGxlR2V0
VHlwZUlEKCkKQEAgLTI1MCwxMyArMjQ5LDEzIEBAIHZvaWQgV0tCdW5kbGVSZXBvcnRFeGNlcHRp
b24oSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTVmFsdWVSZWYgZXhjZXB0aW9uKQogCiB2b2lkIFdL
QnVuZGxlQ2xlYXJBbGxEYXRhYmFzZXMoV0tCdW5kbGVSZWYpCiB7Ci0gICAgRGF0YWJhc2VUcmFj
a2VyOjpzaW5nbGV0b24oKS5kZWxldGVBbGxEYXRhYmFzZXNJbW1lZGlhdGVseSgpOworICAgIFdl
YkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6c2luZ2xldG9uKCkuZGVsZXRlQWxsRGF0YWJhc2VzSW1t
ZWRpYXRlbHkoKTsKIH0KIAogdm9pZCBXS0J1bmRsZVNldERhdGFiYXNlUXVvdGEoV0tCdW5kbGVS
ZWYgYnVuZGxlUmVmLCB1aW50NjRfdCBxdW90YSkKIHsKICAgICAvLyBIaXN0b3JpY2FsbHksIHdl
J3ZlIHVzZWQgdGhlIGZvbGxvd2luZyAoc29tZXdoYXQgbm9uc2Vuc2ljYWwpIHN0cmluZyBmb3Ig
dGhlIGRhdGFiYXNlSWRlbnRpZmllciBvZiBsb2NhbCBmaWxlcy4KLSAgICBEYXRhYmFzZVRyYWNr
ZXI6OnNpbmdsZXRvbigpLnNldFF1b3RhKCpTZWN1cml0eU9yaWdpbkRhdGE6OmZyb21EYXRhYmFz
ZUlkZW50aWZpZXIoImZpbGVfXzAiKSwgcXVvdGEpOworICAgIFdlYkNvcmU6OkRhdGFiYXNlVHJh
Y2tlcjo6c2luZ2xldG9uKCkuc2V0UXVvdGEoKlNlY3VyaXR5T3JpZ2luRGF0YTo6ZnJvbURhdGFi
YXNlSWRlbnRpZmllcigiZmlsZV9fMCIpLCBxdW90YSk7CiB9CiAKIHZvaWQgV0tCdW5kbGVSZWxl
YXNlTWVtb3J5KFdLQnVuZGxlUmVmKQpAQCAtMzIxLDEyICszMjAsMTIgQEAgdm9pZCBXS0J1bmRs
ZVNldFRhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50cyhXS0J1bmRsZVJlZiBidW5kbGVSZWYsIFdL
QnVuZGxlUGFnZVIKIAogdm9pZCBXS0J1bmRsZUNsZWFyUmVzb3VyY2VMb2FkU3RhdGlzdGljcyhX
S0J1bmRsZVJlZikKIHsKLSAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkKCkuY2xlYXJT
dGF0ZSgpOworICAgIFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWQoKS5jbGVh
clN0YXRlKCk7CiB9CiAKIHZvaWQgV0tCdW5kbGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTm90aWZ5
T2JzZXJ2ZXIoV0tCdW5kbGVSZWYpCiB7Ci0gICAgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJl
ZCgpLm5vdGlmeU9ic2VydmVyKCk7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6
OnNoYXJlZCgpLm5vdGlmeU9ic2VydmVyKCk7CiB9CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlRnJhbWUuY3BwIGIv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlRnJh
bWUuY3BwCmluZGV4IDI2NThmZTAzMzI0ZGE5ODVmMjQyNWJjMTVkNGZkY2M1ZWVlNDFkMDIuLjRi
Njk5ZTZjMDQ5NDE2NGM2OGQ0ZTIzZDVjNjJkYTEzYTg4MGQxMmUgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUZyYW1lLmNw
cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tC
dW5kbGVGcmFtZS5jcHAKQEAgLTQ1LDcgKzQ1LDYgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1l
Vmlldy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgogCi11c2luZyBuYW1lc3BhY2UgV2Vi
Q29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdLQnVuZGxlRnJhbWVH
ZXRUeXBlSUQoKQpAQCAtNzUsNyArNzQsNyBAQCBXS1VSTFJlZiBXS0J1bmRsZUZyYW1lQ29weVBy
b3Zpc2lvbmFsVVJMKFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYpCiAKIFdLRnJhbWVMb2FkU3Rh
dGUgV0tCdW5kbGVGcmFtZUdldEZyYW1lTG9hZFN0YXRlKFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVS
ZWYpCiB7Ci0gICAgRnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFt
ZSgpOworICAgIFdlYkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5j
b3JlRnJhbWUoKTsKICAgICBpZiAoIWNvcmVGcmFtZSkKICAgICAgICAgcmV0dXJuIGtXS0ZyYW1l
TG9hZFN0YXRlRmluaXNoZWQ7CiAKQEAgLTE0OSw3ICsxNDgsNyBAQCBXS0J1bmRsZVBhZ2VSZWYg
V0tCdW5kbGVGcmFtZUdldFBhZ2UoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIAogdm9pZCBX
S0J1bmRsZUZyYW1lQ2xlYXJPcGVuZXIoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIHsKLSAg
ICBGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CisgICAg
V2ViQ29yZTo6RnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgp
OwogICAgIGlmIChjb3JlRnJhbWUpCiAgICAgICAgIGNvcmVGcmFtZS0+bG9hZGVyKCkuc2V0T3Bl
bmVyKDApOwogfQpAQCAtMjYxLDcgKzI2MCw3IEBAIFdLRGF0YVJlZiBXS0J1bmRsZUZyYW1lQ29w
eVdlYkFyY2hpdmVGaWx0ZXJpbmdTdWJmcmFtZXMoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlCiAK
IGJvb2wgV0tCdW5kbGVGcmFtZUNhbGxTaG91bGRDbG9zZU9uV2ViVmlldyhXS0J1bmRsZUZyYW1l
UmVmIGZyYW1lUmVmKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYp
LT5jb3JlRnJhbWUoKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZy
YW1lUmVmKS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAgIHJldHVy
biB0cnVlOwogCkBAIC0yNzUsNyArMjc0LDcgQEAgV0tCdW5kbGVIaXRUZXN0UmVzdWx0UmVmIFdL
QnVuZGxlRnJhbWVDcmVhdGVIaXRUZXN0UmVzdWx0KFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUKIAog
V0tTZWN1cml0eU9yaWdpblJlZiBXS0J1bmRsZUZyYW1lQ29weVNlY3VyaXR5T3JpZ2luKFdLQnVu
ZGxlRnJhbWVSZWYgZnJhbWVSZWYpCiB7Ci0gICAgRnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChm
cmFtZVJlZiktPmNvcmVGcmFtZSgpOworICAgIFdlYkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUgPSB0
b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJhbWUoKTsKICAgICBpZiAoIWNvcmVGcmFtZSkKICAgICAg
ICAgcmV0dXJuIDA7CiAKQEAgLTI4NCw3ICsyODMsNyBAQCBXS1NlY3VyaXR5T3JpZ2luUmVmIFdL
QnVuZGxlRnJhbWVDb3B5U2VjdXJpdHlPcmlnaW4oV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikK
IAogdm9pZCBXS0J1bmRsZUZyYW1lRm9jdXMoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIHsK
LSAgICBGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7Cisg
ICAgV2ViQ29yZTo6RnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFt
ZSgpOwogICAgIGlmICghY29yZUZyYW1lKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUlu
c3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ
L2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwCmluZGV4IDdjOTMyNGZkNzU0Yzc2ZmU0ZjQzZGZmMmUw
ZDI1YjVmMTk5NzBlM2YuLjU1ZWIzZGJjMDg3NzcxZGJjYWQ4YjQyZjIyYWU5MzYxZmE4MjY4MDYg
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv
Yy9XS0J1bmRsZUluc3BlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0lu
amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlSW5zcGVjdG9yLmNwcApAQCAtMzAsNyArMzAsNiBA
QAogI2luY2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5oIgogI2luY2x1ZGUgIldlYkluc3BlY3Rvci5o
IgogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAK
IFdLVHlwZUlEIFdLQnVuZGxlSW5zcGVjdG9yR2V0VHlwZUlEKCkKZGlmZiAtLWdpdCBhL1NvdXJj
ZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVy
bGF5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X
S0J1bmRsZVBhZ2VPdmVybGF5LmNwcAppbmRleCBkZjkyODZmNDFjOGJkODM3MDJhZTNlYjE4NDdi
NzhmMWZlMjMwNjEyLi5iNzA4MWQ0MjQ0Yjg3ZDg3Zjc4ODU1ZmRhYjQ2OWJkMzYyOWQwMjAyIDEw
MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv
V0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0lu
amVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwCkBAIC01Myw3ICs1Myw2
IEBAIHRlbXBsYXRlPD4gc3RydWN0IENsaWVudFRyYWl0czxXS0J1bmRsZVBhZ2VPdmVybGF5QWNj
ZXNzaWJpbGl0eUNsaWVudEJhc2U+IHsKIAogfQogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK
IHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIGNsYXNzIFBhZ2VPdmVybGF5Q2xpZW50SW1wbCA6
IEFQSTo6Q2xpZW50PFdLQnVuZGxlUGFnZU92ZXJsYXlDbGllbnRCYXNlPiwgcHVibGljIFdlYlBh
Z2VPdmVybGF5OjpDbGllbnQgewpAQCAtODYsNyArODUsNyBAQCBwcml2YXRlOgogICAgICAgICBt
X2NsaWVudC5kaWRNb3ZlVG9QYWdlKHRvQVBJKCZwYWdlT3ZlcmxheSksIHRvQVBJKHBhZ2UpLCBt
X2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogICAgIH0KIAotICAgIHZvaWQgZHJhd1JlY3QoV2Vi
UGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5LCBHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4
dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KSBvdmVycmlkZQorICAgIHZvaWQgZHJhd1JlY3Qo
V2ViUGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5LCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGdy
YXBoaWNzQ29udGV4dCwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZGlydHlSZWN0KSBvdmVycmlk
ZQogICAgIHsKICAgICAgICAgaWYgKCFtX2NsaWVudC5kcmF3UmVjdCkKICAgICAgICAgICAgIHJl
dHVybjsKQEAgLTk0LDIzICs5MywyMyBAQCBwcml2YXRlOgogICAgICAgICBtX2NsaWVudC5kcmF3
UmVjdCh0b0FQSSgmcGFnZU92ZXJsYXkpLCBncmFwaGljc0NvbnRleHQucGxhdGZvcm1Db250ZXh0
KCksIHRvQVBJKGRpcnR5UmVjdCksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgfQog
ICAgIAotICAgIGJvb2wgbW91c2VFdmVudChXZWJQYWdlT3ZlcmxheSYgcGFnZU92ZXJsYXksIGNv
bnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQpIG92ZXJyaWRlCisgICAgYm9vbCBtb3VzZUV2
ZW50KFdlYlBhZ2VPdmVybGF5JiBwYWdlT3ZlcmxheSwgY29uc3QgV2ViQ29yZTo6UGxhdGZvcm1N
b3VzZUV2ZW50JiBldmVudCkgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIHN3aXRjaCAoZXZlbnQu
dHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgUGxhdGZvcm1Nb3VzZUV2ZW50OjpUeXBlOjpNb3VzZVBy
ZXNzZWQ6IHsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6
Ok1vdXNlUHJlc3NlZDogewogICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5tb3VzZURvd24pCiAg
ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgICAgICByZXR1cm4gbV9jbGll
bnQubW91c2VEb3duKHRvQVBJKCZwYWdlT3ZlcmxheSksIHRvQVBJKGV2ZW50LnBvc2l0aW9uKCkp
LCB0b0FQSShldmVudC5idXR0b24oKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAg
ICAgIH0KLSAgICAgICAgY2FzZSBQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUmVsZWFz
ZWQ6IHsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1v
dXNlUmVsZWFzZWQ6IHsKICAgICAgICAgICAgIGlmICghbV9jbGllbnQubW91c2VVcCkKICAgICAg
ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIHJldHVybiBtX2NsaWVudC5t
b3VzZVVwKHRvQVBJKCZwYWdlT3ZlcmxheSksIHRvQVBJKGV2ZW50LnBvc2l0aW9uKCkpLCB0b0FQ
SShldmVudC5idXR0b24oKSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0K
LSAgICAgICAgY2FzZSBQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlTW92ZWQ6IHsKLSAg
ICAgICAgICAgIGlmIChldmVudC5idXR0b24oKSA9PSBNb3VzZUJ1dHRvbjo6Tm9CdXR0b24pIHsK
KyAgICAgICAgY2FzZSBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlTW92
ZWQ6IHsKKyAgICAgICAgICAgIGlmIChldmVudC5idXR0b24oKSA9PSBXZWJDb3JlOjpNb3VzZUJ1
dHRvbjo6Tm9CdXR0b24pIHsKICAgICAgICAgICAgICAgICBpZiAoIW1fY2xpZW50Lm1vdXNlTW92
ZWQpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL21hYy9XS0J1bmRsZVBh
Z2VCYW5uZXJNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv
QVBJL2MvbWFjL1dLQnVuZGxlUGFnZUJhbm5lck1hYy5tbQppbmRleCBhY2MzNWEyMWI1OWYxYWEz
MWUzMzA1MWE2NmJjMTMwNTk5NjY5OWQzLi4yMWM0ZTVkODMyZGU5NDk1NjI1NjhmZmJkNjcxN2Rl
YzI0MjhiZWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRC
dW5kbGUvQVBJL2MvbWFjL1dLQnVuZGxlUGFnZUJhbm5lck1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvbWFjL1dLQnVuZGxlUGFnZUJhbm5l
ck1hYy5tbQpAQCAtNDAsNyArNDAsNiBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBDbGllbnRUcmFpdHM8
V0tCdW5kbGVQYWdlQmFubmVyQ2xpZW50QmFzZT4gewogfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsK
LXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBjbGFzcyBQYWdlQmFubmVyQ2xpZW50SW1wbCA6
IEFQSTo6Q2xpZW50PFdLQnVuZGxlUGFnZUJhbm5lckNsaWVudEJhc2U+LCBwdWJsaWMgUGFnZUJh
bm5lcjo6Q2xpZW50IHsKIHB1YmxpYzoKQEAgLTYwLDcgKzU5LDcgQEAgcHJpdmF0ZToKICAgICAg
ICAgZGVsZXRlIHRoaXM7CiAgICAgfQogICAgIAotICAgIGJvb2wgbW91c2VFdmVudChQYWdlQmFu
bmVyKiBwYWdlQmFubmVyLCBXZWJFdmVudDo6VHlwZSB0eXBlLCBXZWJNb3VzZUV2ZW50OjpCdXR0
b24gYnV0dG9uLCBjb25zdCBJbnRQb2ludCYgcG9zaXRpb24pIG92ZXJyaWRlCisgICAgYm9vbCBt
b3VzZUV2ZW50KFBhZ2VCYW5uZXIqIHBhZ2VCYW5uZXIsIFdlYkV2ZW50OjpUeXBlIHR5cGUsIFdl
Yk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3Np
dGlvbikgb3ZlcnJpZGUKICAgICB7CiAgICAgICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICBj
YXNlIFdlYkV2ZW50OjpNb3VzZURvd246IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh
Y3kvd2luL01hcnNoYWxsaW5nSGVscGVycy5oIGIvU291cmNlL1dlYktpdExlZ2FjeS93aW4vTWFy
c2hhbGxpbmdIZWxwZXJzLmgKaW5kZXggNjZkZWU4YTQwNDYwZjkyNWM0OGY1OWVmNzdkOGY5MzA0
NjA2OGQ0Ny4uODExOWQ0MmY5ODYyNzAzM2IxMTNhNTQwODZkMWIwYmRhZTc4ZTkyMiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vTWFyc2hhbGxpbmdIZWxwZXJzLmgKKysrIGIv
U291cmNlL1dlYktpdExlZ2FjeS93aW4vTWFyc2hhbGxpbmdIZWxwZXJzLmgKQEAgLTYyLDcgKzYy
LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBDRkRpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcyBrSVVu
a25vd25EaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3M7CiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIENG
QWJzb2x1dGVUaW1lIE1hcnNoYWxsaW5nSGVscGVyczo6d2luZG93c0Vwb2NoQWJzb2x1dGVUaW1l
KCk7CisgICAgc3RhdGljIENGQWJzb2x1dGVUaW1lIHdpbmRvd3NFcG9jaEFic29sdXRlVGltZSgp
OwogCiBwcml2YXRlOgogICAgIE1hcnNoYWxsaW5nSGVscGVycygpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>355708</attachid>
            <date>2018-11-26 20:57:22 -0800</date>
            <delta_ts>2018-11-26 21:01:17 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191995-20181127135720.patch</filename>
            <type>text/plain</type>
            <size>10029</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc3YmNhZDgyOTg5ZDRmZDlj
OTU2NjA5ZjU5NWVkYjJhMDY2MWMxYzUuLjFkNDhmOWVjYzg4MmM1NjMzY2RkOTNlY2YwN2Q0N2M4
MTYyY2Y5YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTgtMTEtMjYgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgUmVtb3ZlICJ1c2lu
ZyBuYW1lc3BhY2UgV2ViQ29yZSIgdW5kZXIgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVj
dGVkQnVuZGxlL0FQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTkxOTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVGhlIHN0YXRlbWVudCAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIHNob3VsZCBiZSBw
bGFjZWQgaW5zaWRlCisgICAgICAgIG5hbWVzcGFjZSBXZWJLaXQgZm9yIHVuaWZpZWQgc291cmNl
IGJ1aWxkcy4gQnV0LCBzb3VyY2UgZmlsZXMKKyAgICAgICAgZGVmaW5pbmcgV2ViS2l0IEFQSSBj
YW4ndCBiZSBlbmNsb3NlZCBieSBuYW1lc3BhY2UgV2ViS2l0IHsgfQorICAgICAgICBiZWN1YXNl
IHRoZXkgYXJlIGRlZmluZWQgaW4gdGhlIGdsb2JhbCBzY29wZS4KKworICAgICAgICAidXNpbmcg
bmFtZXNwYWNlIFdlYkNvcmUiIGluIGdsb2JhbCBzY29wZSBhbmQgdW5pZmllZCBzb3VyY2UKKyAg
ICAgICAgYnVpbGRzIG1heSBjYXVzZSBidWlsZCBicmVha3MgKEJ1ZyAxOTE4NTMpLgorCisgICAg
ICAgIFJlbW92ZSAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIGluIHRoZSBnbG9iYWwgc2NvcGUu
IFVzZQorICAgICAgICAiV2ViQ29yZTo6IiBwcmVmaXggaW5zdGVhZC4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwOgorICAgICAgICAoV0tC
dW5kbGVDbGVhckFsbERhdGFiYXNlcyk6CisgICAgICAgIChXS0J1bmRsZVNldERhdGFiYXNlUXVv
dGEpOgorICAgICAgICAoV0tCdW5kbGVDbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MpOgorICAg
ICAgICAoV0tCdW5kbGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTm90aWZ5T2JzZXJ2ZXIpOgorICAg
ICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVGcmFtZS5jcHA6
CisgICAgICAgIChXS0J1bmRsZUZyYW1lR2V0RnJhbWVMb2FkU3RhdGUpOgorICAgICAgICAoV0tC
dW5kbGVGcmFtZUNsZWFyT3BlbmVyKToKKyAgICAgICAgKFdLQnVuZGxlRnJhbWVDYWxsU2hvdWxk
Q2xvc2VPbldlYlZpZXcpOgorICAgICAgICAoV0tCdW5kbGVGcmFtZUNvcHlTZWN1cml0eU9yaWdp
bik6CisgICAgICAgIChXS0J1bmRsZUZyYW1lRm9jdXMpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwOgorICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHA6Cisg
ICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9tYWMvV0tCdW5kbGVQYWdl
QmFubmVyTWFjLm1tOgorCiAyMDE4LTExLTI2ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A
YXBwbGUuY29tPgogCiAgICAgICAgIEluc2VydCA8YXR0YWNobWVudD4gZWxlbWVudHMgdW5kZXIg
ZWRpdGFibGUgaW1hZ2VzIHRvIG1ha2UgdGhlaXIgYmFja2luZyBkYXRhIGFjY2Vzc2libGUKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9X
S0J1bmRsZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ
L2MvV0tCdW5kbGUuY3BwCmluZGV4IDdmNzRmN2UwNzZhZDI5M2RlZWIyM2QzMDVmMzFmYTk4MjQ3
ODlmMmEuLjFjZTI1MjRlZGJhZjJmYmYxYWE1YjhkOTdlYzhhNWUzMGI4NzU3NTYgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRs
ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j
L1dLQnVuZGxlLmNwcApAQCAtNDgsNyArNDgsNiBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3Vy
Y2VMb2FkT2JzZXJ2ZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NlcnZpY2VXb3JrZXJUaHJlYWRQ
cm94eS5oPgogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJL
aXQ7CiAKIFdLVHlwZUlEIFdLQnVuZGxlR2V0VHlwZUlEKCkKQEAgLTI1MCwxMyArMjQ5LDEzIEBA
IHZvaWQgV0tCdW5kbGVSZXBvcnRFeGNlcHRpb24oSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTVmFs
dWVSZWYgZXhjZXB0aW9uKQogCiB2b2lkIFdLQnVuZGxlQ2xlYXJBbGxEYXRhYmFzZXMoV0tCdW5k
bGVSZWYpCiB7Ci0gICAgRGF0YWJhc2VUcmFja2VyOjpzaW5nbGV0b24oKS5kZWxldGVBbGxEYXRh
YmFzZXNJbW1lZGlhdGVseSgpOworICAgIFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6c2luZ2xl
dG9uKCkuZGVsZXRlQWxsRGF0YWJhc2VzSW1tZWRpYXRlbHkoKTsKIH0KIAogdm9pZCBXS0J1bmRs
ZVNldERhdGFiYXNlUXVvdGEoV0tCdW5kbGVSZWYgYnVuZGxlUmVmLCB1aW50NjRfdCBxdW90YSkK
IHsKICAgICAvLyBIaXN0b3JpY2FsbHksIHdlJ3ZlIHVzZWQgdGhlIGZvbGxvd2luZyAoc29tZXdo
YXQgbm9uc2Vuc2ljYWwpIHN0cmluZyBmb3IgdGhlIGRhdGFiYXNlSWRlbnRpZmllciBvZiBsb2Nh
bCBmaWxlcy4KLSAgICBEYXRhYmFzZVRyYWNrZXI6OnNpbmdsZXRvbigpLnNldFF1b3RhKCpTZWN1
cml0eU9yaWdpbkRhdGE6OmZyb21EYXRhYmFzZUlkZW50aWZpZXIoImZpbGVfXzAiKSwgcXVvdGEp
OworICAgIFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6c2luZ2xldG9uKCkuc2V0UXVvdGEoKlNl
Y3VyaXR5T3JpZ2luRGF0YTo6ZnJvbURhdGFiYXNlSWRlbnRpZmllcigiZmlsZV9fMCIpLCBxdW90
YSk7CiB9CiAKIHZvaWQgV0tCdW5kbGVSZWxlYXNlTWVtb3J5KFdLQnVuZGxlUmVmKQpAQCAtMzIx
LDEyICszMjAsMTIgQEAgdm9pZCBXS0J1bmRsZVNldFRhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50
cyhXS0J1bmRsZVJlZiBidW5kbGVSZWYsIFdLQnVuZGxlUGFnZVIKIAogdm9pZCBXS0J1bmRsZUNs
ZWFyUmVzb3VyY2VMb2FkU3RhdGlzdGljcyhXS0J1bmRsZVJlZikKIHsKLSAgICBSZXNvdXJjZUxv
YWRPYnNlcnZlcjo6c2hhcmVkKCkuY2xlYXJTdGF0ZSgpOworICAgIFdlYkNvcmU6OlJlc291cmNl
TG9hZE9ic2VydmVyOjpzaGFyZWQoKS5jbGVhclN0YXRlKCk7CiB9CiAKIHZvaWQgV0tCdW5kbGVS
ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTm90aWZ5T2JzZXJ2ZXIoV0tCdW5kbGVSZWYpCiB7Ci0gICAg
UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZCgpLm5vdGlmeU9ic2VydmVyKCk7CisgICAgV2Vi
Q29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZCgpLm5vdGlmeU9ic2VydmVyKCk7CiB9
CiAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl
L0FQSS9jL1dLQnVuZGxlRnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVj
dGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlRnJhbWUuY3BwCmluZGV4IDI2NThmZTAzMzI0ZGE5ODVm
MjQyNWJjMTVkNGZkY2M1ZWVlNDFkMDIuLjRiNjk5ZTZjMDQ5NDE2NGM2OGQ0ZTIzZDVjNjJkYTEz
YTg4MGQxMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1
bmRsZS9BUEkvYy9XS0J1bmRsZUZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVGcmFtZS5jcHAKQEAgLTQ1LDcgKzQ1LDYg
QEAKICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFn
ZS5oPgogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7
CiAKIFdLVHlwZUlEIFdLQnVuZGxlRnJhbWVHZXRUeXBlSUQoKQpAQCAtNzUsNyArNzQsNyBAQCBX
S1VSTFJlZiBXS0J1bmRsZUZyYW1lQ29weVByb3Zpc2lvbmFsVVJMKFdLQnVuZGxlRnJhbWVSZWYg
ZnJhbWVSZWYpCiAKIFdLRnJhbWVMb2FkU3RhdGUgV0tCdW5kbGVGcmFtZUdldEZyYW1lTG9hZFN0
YXRlKFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYpCiB7Ci0gICAgRnJhbWUqIGNvcmVGcmFtZSA9
IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOworICAgIFdlYkNvcmU6OkZyYW1lKiBjb3Jl
RnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJhbWUoKTsKICAgICBpZiAoIWNvcmVGcmFt
ZSkKICAgICAgICAgcmV0dXJuIGtXS0ZyYW1lTG9hZFN0YXRlRmluaXNoZWQ7CiAKQEAgLTE0OSw3
ICsxNDgsNyBAQCBXS0J1bmRsZVBhZ2VSZWYgV0tCdW5kbGVGcmFtZUdldFBhZ2UoV0tCdW5kbGVG
cmFtZVJlZiBmcmFtZVJlZikKIAogdm9pZCBXS0J1bmRsZUZyYW1lQ2xlYXJPcGVuZXIoV0tCdW5k
bGVGcmFtZVJlZiBmcmFtZVJlZikKIHsKLSAgICBGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZy
YW1lUmVmKS0+Y29yZUZyYW1lKCk7CisgICAgV2ViQ29yZTo6RnJhbWUqIGNvcmVGcmFtZSA9IHRv
SW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOwogICAgIGlmIChjb3JlRnJhbWUpCiAgICAgICAg
IGNvcmVGcmFtZS0+bG9hZGVyKCkuc2V0T3BlbmVyKDApOwogfQpAQCAtMjYxLDcgKzI2MCw3IEBA
IFdLRGF0YVJlZiBXS0J1bmRsZUZyYW1lQ29weVdlYkFyY2hpdmVGaWx0ZXJpbmdTdWJmcmFtZXMo
V0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlCiAKIGJvb2wgV0tCdW5kbGVGcmFtZUNhbGxTaG91bGRD
bG9zZU9uV2ViVmlldyhXS0J1bmRsZUZyYW1lUmVmIGZyYW1lUmVmKQogewotICAgIEZyYW1lKiBj
b3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJhbWUoKTsKKyAgICBXZWJDb3JlOjpG
cmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CiAgICAgaWYg
KCFjb3JlRnJhbWUpCiAgICAgICAgIHJldHVybiB0cnVlOwogCkBAIC0yNzUsNyArMjc0LDcgQEAg
V0tCdW5kbGVIaXRUZXN0UmVzdWx0UmVmIFdLQnVuZGxlRnJhbWVDcmVhdGVIaXRUZXN0UmVzdWx0
KFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUKIAogV0tTZWN1cml0eU9yaWdpblJlZiBXS0J1bmRsZUZy
YW1lQ29weVNlY3VyaXR5T3JpZ2luKFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYpCiB7Ci0gICAg
RnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOworICAgIFdl
YkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJhbWUoKTsK
ICAgICBpZiAoIWNvcmVGcmFtZSkKICAgICAgICAgcmV0dXJuIDA7CiAKQEAgLTI4NCw3ICsyODMs
NyBAQCBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLQnVuZGxlRnJhbWVDb3B5U2VjdXJpdHlPcmlnaW4o
V0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIAogdm9pZCBXS0J1bmRsZUZyYW1lRm9jdXMoV0tC
dW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIHsKLSAgICBGcmFtZSogY29yZUZyYW1lID0gdG9JbXBs
KGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CisgICAgV2ViQ29yZTo6RnJhbWUqIGNvcmVGcmFtZSA9
IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOwogICAgIGlmICghY29yZUZyYW1lKQogICAg
ICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9Jbmpl
Y3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUluc3BlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwCmluZGV4
IDdjOTMyNGZkNzU0Yzc2ZmU0ZjQzZGZmMmUwZDI1YjVmMTk5NzBlM2YuLjU1ZWIzZGJjMDg3Nzcx
ZGJjYWQ4YjQyZjIyYWU5MzYxZmE4MjY4MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2Vi
UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUluc3BlY3Rvci5jcHAKKysrIGIv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlSW5z
cGVjdG9yLmNwcApAQCAtMzAsNyArMzAsNiBAQAogI2luY2x1ZGUgIldLQnVuZGxlQVBJQ2FzdC5o
IgogI2luY2x1ZGUgIldlYkluc3BlY3Rvci5oIgogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsK
IHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIFdLVHlwZUlEIFdLQnVuZGxlSW5zcGVjdG9yR2V0
VHlwZUlEKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1
bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcAppbmRleCBk
ZjkyODZmNDFjOGJkODM3MDJhZTNlYjE4NDdiNzhmMWZlMjMwNjEyLi5iNzA4MWQ0MjQ0Yjg3ZDg3
Zjc4ODU1ZmRhYjQ2OWJkMzYyOWQwMjAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlBy
b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAKKysrIGIv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFn
ZU92ZXJsYXkuY3BwCkBAIC01Myw3ICs1Myw2IEBAIHRlbXBsYXRlPD4gc3RydWN0IENsaWVudFRy
YWl0czxXS0J1bmRsZVBhZ2VPdmVybGF5QWNjZXNzaWJpbGl0eUNsaWVudEJhc2U+IHsKIAogfQog
Ci11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIGNs
YXNzIFBhZ2VPdmVybGF5Q2xpZW50SW1wbCA6IEFQSTo6Q2xpZW50PFdLQnVuZGxlUGFnZU92ZXJs
YXlDbGllbnRCYXNlPiwgcHVibGljIFdlYlBhZ2VPdmVybGF5OjpDbGllbnQgewpAQCAtODYsNyAr
ODUsNyBAQCBwcml2YXRlOgogICAgICAgICBtX2NsaWVudC5kaWRNb3ZlVG9QYWdlKHRvQVBJKCZw
YWdlT3ZlcmxheSksIHRvQVBJKHBhZ2UpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOwogICAg
IH0KIAotICAgIHZvaWQgZHJhd1JlY3QoV2ViUGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5LCBHcmFw
aGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KSBv
dmVycmlkZQorICAgIHZvaWQgZHJhd1JlY3QoV2ViUGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5LCBX
ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgY29uc3QgV2ViQ29yZTo6
SW50UmVjdCYgZGlydHlSZWN0KSBvdmVycmlkZQogICAgIHsKICAgICAgICAgaWYgKCFtX2NsaWVu
dC5kcmF3UmVjdCkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTk0LDIzICs5MywyMyBAQCBwcml2
YXRlOgogICAgICAgICBtX2NsaWVudC5kcmF3UmVjdCh0b0FQSSgmcGFnZU92ZXJsYXkpLCBncmFw
aGljc0NvbnRleHQucGxhdGZvcm1Db250ZXh0KCksIHRvQVBJKGRpcnR5UmVjdCksIG1fY2xpZW50
LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgfQogICAgIAotICAgIGJvb2wgbW91c2VFdmVudChXZWJQ
YWdlT3ZlcmxheSYgcGFnZU92ZXJsYXksIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZlbnQp
IG92ZXJyaWRlCisgICAgYm9vbCBtb3VzZUV2ZW50KFdlYlBhZ2VPdmVybGF5JiBwYWdlT3Zlcmxh
eSwgY29uc3QgV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkgb3ZlcnJpZGUKICAg
ICB7CiAgICAgICAgIHN3aXRjaCAoZXZlbnQudHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgUGxhdGZv
cm1Nb3VzZUV2ZW50OjpUeXBlOjpNb3VzZVByZXNzZWQ6IHsKKyAgICAgICAgY2FzZSBXZWJDb3Jl
OjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUHJlc3NlZDogewogICAgICAgICAgICAg
aWYgKCFtX2NsaWVudC5tb3VzZURvd24pCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog
CiAgICAgICAgICAgICByZXR1cm4gbV9jbGllbnQubW91c2VEb3duKHRvQVBJKCZwYWdlT3Zlcmxh
eSksIHRvQVBJKGV2ZW50LnBvc2l0aW9uKCkpLCB0b0FQSShldmVudC5idXR0b24oKSksIG1fY2xp
ZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0KLSAgICAgICAgY2FzZSBQbGF0Zm9ybU1v
dXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUmVsZWFzZWQ6IHsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpQ
bGF0Zm9ybU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUmVsZWFzZWQ6IHsKICAgICAgICAgICAgIGlm
ICghbV9jbGllbnQubW91c2VVcCkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg
ICAgICAgICAgIHJldHVybiBtX2NsaWVudC5tb3VzZVVwKHRvQVBJKCZwYWdlT3ZlcmxheSksIHRv
QVBJKGV2ZW50LnBvc2l0aW9uKCkpLCB0b0FQSShldmVudC5idXR0b24oKSksIG1fY2xpZW50LmJh
c2UuY2xpZW50SW5mbyk7CiAgICAgICAgIH0KLSAgICAgICAgY2FzZSBQbGF0Zm9ybU1vdXNlRXZl
bnQ6OlR5cGU6Ok1vdXNlTW92ZWQ6IHsKLSAgICAgICAgICAgIGlmIChldmVudC5idXR0b24oKSA9
PSBNb3VzZUJ1dHRvbjo6Tm9CdXR0b24pIHsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpQbGF0Zm9y
bU1vdXNlRXZlbnQ6OlR5cGU6Ok1vdXNlTW92ZWQ6IHsKKyAgICAgICAgICAgIGlmIChldmVudC5i
dXR0b24oKSA9PSBXZWJDb3JlOjpNb3VzZUJ1dHRvbjo6Tm9CdXR0b24pIHsKICAgICAgICAgICAg
ICAgICBpZiAoIW1fY2xpZW50Lm1vdXNlTW92ZWQpCiAgICAgICAgICAgICAgICAgICAgIHJldHVy
biBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVk
QnVuZGxlL0FQSS9jL21hYy9XS0J1bmRsZVBhZ2VCYW5uZXJNYWMubW0gYi9Tb3VyY2UvV2ViS2l0
L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvbWFjL1dLQnVuZGxlUGFnZUJhbm5lck1h
Yy5tbQppbmRleCBhY2MzNWEyMWI1OWYxYWEzMWUzMzA1MWE2NmJjMTMwNTk5NjY5OWQzLi4yMWM0
ZTVkODMyZGU5NDk1NjI1NjhmZmJkNjcxN2RlYzI0MjhiZWQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvbWFjL1dLQnVuZGxlUGFnZUJh
bm5lck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv
QVBJL2MvbWFjL1dLQnVuZGxlUGFnZUJhbm5lck1hYy5tbQpAQCAtNDAsNyArNDAsNiBAQCB0ZW1w
bGF0ZTw+IHN0cnVjdCBDbGllbnRUcmFpdHM8V0tCdW5kbGVQYWdlQmFubmVyQ2xpZW50QmFzZT4g
ewogfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBj
bGFzcyBQYWdlQmFubmVyQ2xpZW50SW1wbCA6IEFQSTo6Q2xpZW50PFdLQnVuZGxlUGFnZUJhbm5l
ckNsaWVudEJhc2U+LCBwdWJsaWMgUGFnZUJhbm5lcjo6Q2xpZW50IHsKIHB1YmxpYzoKQEAgLTYw
LDcgKzU5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgZGVsZXRlIHRoaXM7CiAgICAgfQogICAgIAot
ICAgIGJvb2wgbW91c2VFdmVudChQYWdlQmFubmVyKiBwYWdlQmFubmVyLCBXZWJFdmVudDo6VHlw
ZSB0eXBlLCBXZWJNb3VzZUV2ZW50OjpCdXR0b24gYnV0dG9uLCBjb25zdCBJbnRQb2ludCYgcG9z
aXRpb24pIG92ZXJyaWRlCisgICAgYm9vbCBtb3VzZUV2ZW50KFBhZ2VCYW5uZXIqIHBhZ2VCYW5u
ZXIsIFdlYkV2ZW50OjpUeXBlIHR5cGUsIFdlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBidXR0b24sIGNv
bnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbikgb3ZlcnJpZGUKICAgICB7CiAgICAgICAg
IHN3aXRjaCAodHlwZSkgewogICAgICAgICBjYXNlIFdlYkV2ZW50OjpNb3VzZURvd246IHsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>355709</attachid>
            <date>2018-11-26 21:01:51 -0800</date>
            <delta_ts>2018-11-26 21:59:38 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191995-20181127140150.patch</filename>
            <type>text/plain</type>
            <size>8887</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc3YmNhZDgyOTg5ZDRmZDlj
OTU2NjA5ZjU5NWVkYjJhMDY2MWMxYzUuLmE2MmJhOWExNDM1ZTVmZWJhZmY5NzUzOTYxYzYxY2U4
NTQyNmEzODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTEtMjYgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgUmVtb3ZlICJ1c2lu
ZyBuYW1lc3BhY2UgV2ViQ29yZSIgdW5kZXIgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVj
dGVkQnVuZGxlL0FQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTkxOTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVGhlIHN0YXRlbWVudCAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIHNob3VsZCBiZSBw
bGFjZWQgaW5zaWRlCisgICAgICAgIG5hbWVzcGFjZSBXZWJLaXQgZm9yIHVuaWZpZWQgc291cmNl
IGJ1aWxkcy4gQnV0LCBzb3VyY2UgZmlsZXMKKyAgICAgICAgZGVmaW5pbmcgV2ViS2l0IEFQSSBj
YW4ndCBiZSBlbmNsb3NlZCBieSBuYW1lc3BhY2UgV2ViS2l0IHsgfQorICAgICAgICBiZWN1YXNl
IHRoZXkgYXJlIGRlZmluZWQgaW4gdGhlIGdsb2JhbCBzY29wZS4KKworICAgICAgICAidXNpbmcg
bmFtZXNwYWNlIFdlYkNvcmUiIGluIGdsb2JhbCBzY29wZSBhbmQgdW5pZmllZCBzb3VyY2UKKyAg
ICAgICAgYnVpbGRzIG1heSBjYXVzZSBidWlsZCBicmVha3MgKEJ1ZyAxOTE4NTMpLgorCisgICAg
ICAgIFJlbW92ZSAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIGluIHRoZSBnbG9iYWwgc2NvcGUu
IFVzZQorICAgICAgICAiV2ViQ29yZTo6IiBwcmVmaXggaW5zdGVhZC4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwOgorICAgICAgICAoV0tC
dW5kbGVDbGVhckFsbERhdGFiYXNlcyk6CisgICAgICAgIChXS0J1bmRsZVNldERhdGFiYXNlUXVv
dGEpOgorICAgICAgICAoV0tCdW5kbGVDbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MpOgorICAg
ICAgICAoV0tCdW5kbGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTm90aWZ5T2JzZXJ2ZXIpOgorICAg
ICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVGcmFtZS5jcHA6
CisgICAgICAgIChXS0J1bmRsZUZyYW1lR2V0RnJhbWVMb2FkU3RhdGUpOgorICAgICAgICAoV0tC
dW5kbGVGcmFtZUNsZWFyT3BlbmVyKToKKyAgICAgICAgKFdLQnVuZGxlRnJhbWVDYWxsU2hvdWxk
Q2xvc2VPbldlYlZpZXcpOgorICAgICAgICAoV0tCdW5kbGVGcmFtZUNvcHlTZWN1cml0eU9yaWdp
bik6CisgICAgICAgIChXS0J1bmRsZUZyYW1lRm9jdXMpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwOgorICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHA6CisK
IDIwMTgtMTEtMjYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAg
ICAgICAgSW5zZXJ0IDxhdHRhY2htZW50PiBlbGVtZW50cyB1bmRlciBlZGl0YWJsZSBpbWFnZXMg
dG8gbWFrZSB0aGVpciBiYWNraW5nIGRhdGEgYWNjZXNzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcCBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHAK
aW5kZXggN2Y3NGY3ZTA3NmFkMjkzZGVlYjIzZDMwNWYzMWZhOTgyNDc4OWYyYS4uMWNlMjUyNGVk
YmFmMmZiZjFhYTViOGQ5N2VjOGE1ZTMwYjg3NTc1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCkBA
IC00OCw3ICs0OCw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUxvYWRPYnNlcnZlci5o
PgogI2luY2x1ZGUgPFdlYkNvcmUvU2VydmljZVdvcmtlclRocmVhZFByb3h5Lmg+CiAKLXVzaW5n
IG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQg
V0tCdW5kbGVHZXRUeXBlSUQoKQpAQCAtMjUwLDEzICsyNDksMTMgQEAgdm9pZCBXS0J1bmRsZVJl
cG9ydEV4Y2VwdGlvbihKU0NvbnRleHRSZWYgY29udGV4dCwgSlNWYWx1ZVJlZiBleGNlcHRpb24p
CiAKIHZvaWQgV0tCdW5kbGVDbGVhckFsbERhdGFiYXNlcyhXS0J1bmRsZVJlZikKIHsKLSAgICBE
YXRhYmFzZVRyYWNrZXI6OnNpbmdsZXRvbigpLmRlbGV0ZUFsbERhdGFiYXNlc0ltbWVkaWF0ZWx5
KCk7CisgICAgV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpzaW5nbGV0b24oKS5kZWxldGVBbGxE
YXRhYmFzZXNJbW1lZGlhdGVseSgpOwogfQogCiB2b2lkIFdLQnVuZGxlU2V0RGF0YWJhc2VRdW90
YShXS0J1bmRsZVJlZiBidW5kbGVSZWYsIHVpbnQ2NF90IHF1b3RhKQogewogICAgIC8vIEhpc3Rv
cmljYWxseSwgd2UndmUgdXNlZCB0aGUgZm9sbG93aW5nIChzb21ld2hhdCBub25zZW5zaWNhbCkg
c3RyaW5nIGZvciB0aGUgZGF0YWJhc2VJZGVudGlmaWVyIG9mIGxvY2FsIGZpbGVzLgotICAgIERh
dGFiYXNlVHJhY2tlcjo6c2luZ2xldG9uKCkuc2V0UXVvdGEoKlNlY3VyaXR5T3JpZ2luRGF0YTo6
ZnJvbURhdGFiYXNlSWRlbnRpZmllcigiZmlsZV9fMCIpLCBxdW90YSk7CisgICAgV2ViQ29yZTo6
RGF0YWJhc2VUcmFja2VyOjpzaW5nbGV0b24oKS5zZXRRdW90YSgqU2VjdXJpdHlPcmlnaW5EYXRh
Ojpmcm9tRGF0YWJhc2VJZGVudGlmaWVyKCJmaWxlX18wIiksIHF1b3RhKTsKIH0KIAogdm9pZCBX
S0J1bmRsZVJlbGVhc2VNZW1vcnkoV0tCdW5kbGVSZWYpCkBAIC0zMjEsMTIgKzMyMCwxMiBAQCB2
b2lkIFdLQnVuZGxlU2V0VGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRzKFdLQnVuZGxlUmVmIGJ1
bmRsZVJlZiwgV0tCdW5kbGVQYWdlUgogCiB2b2lkIFdLQnVuZGxlQ2xlYXJSZXNvdXJjZUxvYWRT
dGF0aXN0aWNzKFdLQnVuZGxlUmVmKQogewotICAgIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFy
ZWQoKS5jbGVhclN0YXRlKCk7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNo
YXJlZCgpLmNsZWFyU3RhdGUoKTsKIH0KIAogdm9pZCBXS0J1bmRsZVJlc291cmNlTG9hZFN0YXRp
c3RpY3NOb3RpZnlPYnNlcnZlcihXS0J1bmRsZVJlZikKIHsKLSAgICBSZXNvdXJjZUxvYWRPYnNl
cnZlcjo6c2hhcmVkKCkubm90aWZ5T2JzZXJ2ZXIoKTsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZUxv
YWRPYnNlcnZlcjo6c2hhcmVkKCkubm90aWZ5T2JzZXJ2ZXIoKTsKIH0KIAogCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVG
cmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv
V0tCdW5kbGVGcmFtZS5jcHAKaW5kZXggMjY1OGZlMDMzMjRkYTk4NWYyNDI1YmMxNWQ0ZmRjYzVl
ZWU0MWQwMi4uNGI2OTllNmMwNDk0MTY0YzY4ZDRlMjNkNWM2MmRhMTNhODgwZDEyZSAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVu
ZGxlRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs
ZS9BUEkvYy9XS0J1bmRsZUZyYW1lLmNwcApAQCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUgPFdl
YkNvcmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAKLXVzaW5nIG5h
bWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tC
dW5kbGVGcmFtZUdldFR5cGVJRCgpCkBAIC03NSw3ICs3NCw3IEBAIFdLVVJMUmVmIFdLQnVuZGxl
RnJhbWVDb3B5UHJvdmlzaW9uYWxVUkwoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIAogV0tG
cmFtZUxvYWRTdGF0ZSBXS0J1bmRsZUZyYW1lR2V0RnJhbWVMb2FkU3RhdGUoV0tCdW5kbGVGcmFt
ZVJlZiBmcmFtZVJlZikKIHsKLSAgICBGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVm
KS0+Y29yZUZyYW1lKCk7CisgICAgV2ViQ29yZTo6RnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChm
cmFtZVJlZiktPmNvcmVGcmFtZSgpOwogICAgIGlmICghY29yZUZyYW1lKQogICAgICAgICByZXR1
cm4ga1dLRnJhbWVMb2FkU3RhdGVGaW5pc2hlZDsKIApAQCAtMTQ5LDcgKzE0OCw3IEBAIFdLQnVu
ZGxlUGFnZVJlZiBXS0J1bmRsZUZyYW1lR2V0UGFnZShXS0J1bmRsZUZyYW1lUmVmIGZyYW1lUmVm
KQogCiB2b2lkIFdLQnVuZGxlRnJhbWVDbGVhck9wZW5lcihXS0J1bmRsZUZyYW1lUmVmIGZyYW1l
UmVmKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJh
bWUoKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVmKS0+
Y29yZUZyYW1lKCk7CiAgICAgaWYgKGNvcmVGcmFtZSkKICAgICAgICAgY29yZUZyYW1lLT5sb2Fk
ZXIoKS5zZXRPcGVuZXIoMCk7CiB9CkBAIC0yNjEsNyArMjYwLDcgQEAgV0tEYXRhUmVmIFdLQnVu
ZGxlRnJhbWVDb3B5V2ViQXJjaGl2ZUZpbHRlcmluZ1N1YmZyYW1lcyhXS0J1bmRsZUZyYW1lUmVm
IGZyYW1lUmUKIAogYm9vbCBXS0J1bmRsZUZyYW1lQ2FsbFNob3VsZENsb3NlT25XZWJWaWV3KFdL
QnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYpCiB7Ci0gICAgRnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1w
bChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOworICAgIFdlYkNvcmU6OkZyYW1lKiBjb3JlRnJhbWUg
PSB0b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJhbWUoKTsKICAgICBpZiAoIWNvcmVGcmFtZSkKICAg
ICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTI3NSw3ICsyNzQsNyBAQCBXS0J1bmRsZUhpdFRlc3RS
ZXN1bHRSZWYgV0tCdW5kbGVGcmFtZUNyZWF0ZUhpdFRlc3RSZXN1bHQoV0tCdW5kbGVGcmFtZVJl
ZiBmcmFtZQogCiBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLQnVuZGxlRnJhbWVDb3B5U2VjdXJpdHlP
cmlnaW4oV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIHsKLSAgICBGcmFtZSogY29yZUZyYW1l
ID0gdG9JbXBsKGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CisgICAgV2ViQ29yZTo6RnJhbWUqIGNv
cmVGcmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOwogICAgIGlmICghY29yZUZy
YW1lKQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMjg0LDcgKzI4Myw3IEBAIFdLU2VjdXJpdHlP
cmlnaW5SZWYgV0tCdW5kbGVGcmFtZUNvcHlTZWN1cml0eU9yaWdpbihXS0J1bmRsZUZyYW1lUmVm
IGZyYW1lUmVmKQogCiB2b2lkIFdLQnVuZGxlRnJhbWVGb2N1cyhXS0J1bmRsZUZyYW1lUmVmIGZy
YW1lUmVmKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5jb3Jl
RnJhbWUoKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVm
KS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAgIHJldHVybjsKIApk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j
L1dLQnVuZGxlSW5zcGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3Rl
ZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUluc3BlY3Rvci5jcHAKaW5kZXggN2M5MzI0ZmQ3NTRjNzZm
ZTRmNDNkZmYyZTBkMjViNWYxOTk3MGUzZi4uNTVlYjNkYmMwODc3NzFkYmNhZDhiNDJmMjJhZTkz
NjFmYTgyNjgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVk
QnVuZGxlL0FQSS9jL1dLQnVuZGxlSW5zcGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwCkBAIC0z
MCw3ICszMCw2IEBACiAjaW5jbHVkZSAiV0tCdW5kbGVBUElDYXN0LmgiCiAjaW5jbHVkZSAiV2Vi
SW5zcGVjdG9yLmgiCiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNl
IFdlYktpdDsKIAogV0tUeXBlSUQgV0tCdW5kbGVJbnNwZWN0b3JHZXRUeXBlSUQoKQpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVu
ZGxlUGFnZU92ZXJsYXkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVu
ZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwCmluZGV4IGRmOTI4NmY0MWM4YmQ4Mzcw
MmFlM2ViMTg0N2I3OGYxZmUyMzA2MTIuLmI3MDgxZDQyNDRiODdkODdmNzg4NTVmZGFiNDY5YmQz
NjI5ZDAyMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1
bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHAKQEAg
LTUzLDcgKzUzLDYgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQ2xpZW50VHJhaXRzPFdLQnVuZGxlUGFn
ZU92ZXJsYXlBY2Nlc3NpYmlsaXR5Q2xpZW50QmFzZT4gewogCiB9CiAKLXVzaW5nIG5hbWVzcGFj
ZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogY2xhc3MgUGFnZU92ZXJsYXlD
bGllbnRJbXBsIDogQVBJOjpDbGllbnQ8V0tCdW5kbGVQYWdlT3ZlcmxheUNsaWVudEJhc2U+LCBw
dWJsaWMgV2ViUGFnZU92ZXJsYXk6OkNsaWVudCB7CkBAIC04Niw3ICs4NSw3IEBAIHByaXZhdGU6
CiAgICAgICAgIG1fY2xpZW50LmRpZE1vdmVUb1BhZ2UodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9B
UEkocGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgfQogCi0gICAgdm9pZCBk
cmF3UmVjdChXZWJQYWdlT3ZlcmxheSYgcGFnZU92ZXJsYXksIEdyYXBoaWNzQ29udGV4dCYgZ3Jh
cGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpIG92ZXJyaWRlCisgICAgdm9p
ZCBkcmF3UmVjdChXZWJQYWdlT3ZlcmxheSYgcGFnZU92ZXJsYXksIFdlYkNvcmU6OkdyYXBoaWNz
Q29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJl
Y3QpIG92ZXJyaWRlCiAgICAgewogICAgICAgICBpZiAoIW1fY2xpZW50LmRyYXdSZWN0KQogICAg
ICAgICAgICAgcmV0dXJuOwpAQCAtOTQsMjMgKzkzLDIzIEBAIHByaXZhdGU6CiAgICAgICAgIG1f
Y2xpZW50LmRyYXdSZWN0KHRvQVBJKCZwYWdlT3ZlcmxheSksIGdyYXBoaWNzQ29udGV4dC5wbGF0
Zm9ybUNvbnRleHQoKSwgdG9BUEkoZGlydHlSZWN0KSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZv
KTsKICAgICB9CiAgICAgCi0gICAgYm9vbCBtb3VzZUV2ZW50KFdlYlBhZ2VPdmVybGF5JiBwYWdl
T3ZlcmxheSwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkgb3ZlcnJpZGUKKyAgICBi
b29sIG1vdXNlRXZlbnQoV2ViUGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5LCBjb25zdCBXZWJDb3Jl
OjpQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KSBvdmVycmlkZQogICAgIHsKICAgICAgICAgc3dp
dGNoIChldmVudC50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBQbGF0Zm9ybU1vdXNlRXZlbnQ6OlR5
cGU6Ok1vdXNlUHJlc3NlZDogeworICAgICAgICBjYXNlIFdlYkNvcmU6OlBsYXRmb3JtTW91c2VF
dmVudDo6VHlwZTo6TW91c2VQcmVzc2VkOiB7CiAgICAgICAgICAgICBpZiAoIW1fY2xpZW50Lm1v
dXNlRG93bikKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgICAgIHJl
dHVybiBtX2NsaWVudC5tb3VzZURvd24odG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEkoZXZlbnQu
cG9zaXRpb24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJ
bmZvKTsKICAgICAgICAgfQotICAgICAgICBjYXNlIFBsYXRmb3JtTW91c2VFdmVudDo6VHlwZTo6
TW91c2VSZWxlYXNlZDogeworICAgICAgICBjYXNlIFdlYkNvcmU6OlBsYXRmb3JtTW91c2VFdmVu
dDo6VHlwZTo6TW91c2VSZWxlYXNlZDogewogICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5tb3Vz
ZVVwKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgcmV0dXJu
IG1fY2xpZW50Lm1vdXNlVXAodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEkoZXZlbnQucG9zaXRp
b24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsK
ICAgICAgICAgfQotICAgICAgICBjYXNlIFBsYXRmb3JtTW91c2VFdmVudDo6VHlwZTo6TW91c2VN
b3ZlZDogewotICAgICAgICAgICAgaWYgKGV2ZW50LmJ1dHRvbigpID09IE1vdXNlQnV0dG9uOjpO
b0J1dHRvbikgeworICAgICAgICBjYXNlIFdlYkNvcmU6OlBsYXRmb3JtTW91c2VFdmVudDo6VHlw
ZTo6TW91c2VNb3ZlZDogeworICAgICAgICAgICAgaWYgKGV2ZW50LmJ1dHRvbigpID09IFdlYkNv
cmU6Ok1vdXNlQnV0dG9uOjpOb0J1dHRvbikgewogICAgICAgICAgICAgICAgIGlmICghbV9jbGll
bnQubW91c2VNb3ZlZCkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>355714</attachid>
            <date>2018-11-26 22:00:13 -0800</date>
            <delta_ts>2018-11-26 23:50:50 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191995-20181127150012.patch</filename>
            <type>text/plain</type>
            <size>9298</size>
            <attacher name="Fujii Hironori">fujii</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc3YmNhZDgyOTg5ZDRmZDlj
OTU2NjA5ZjU5NWVkYjJhMDY2MWMxYzUuLmE2MmJhOWExNDM1ZTVmZWJhZmY5NzUzOTYxYzYxY2U4
NTQyNmEzODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMTEtMjYgIEZ1amlpIEhp
cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgUmVtb3ZlICJ1c2lu
ZyBuYW1lc3BhY2UgV2ViQ29yZSIgdW5kZXIgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVj
dGVkQnVuZGxlL0FQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j
Z2k/aWQ9MTkxOTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg
ICAgICAgVGhlIHN0YXRlbWVudCAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIHNob3VsZCBiZSBw
bGFjZWQgaW5zaWRlCisgICAgICAgIG5hbWVzcGFjZSBXZWJLaXQgZm9yIHVuaWZpZWQgc291cmNl
IGJ1aWxkcy4gQnV0LCBzb3VyY2UgZmlsZXMKKyAgICAgICAgZGVmaW5pbmcgV2ViS2l0IEFQSSBj
YW4ndCBiZSBlbmNsb3NlZCBieSBuYW1lc3BhY2UgV2ViS2l0IHsgfQorICAgICAgICBiZWN1YXNl
IHRoZXkgYXJlIGRlZmluZWQgaW4gdGhlIGdsb2JhbCBzY29wZS4KKworICAgICAgICAidXNpbmcg
bmFtZXNwYWNlIFdlYkNvcmUiIGluIGdsb2JhbCBzY29wZSBhbmQgdW5pZmllZCBzb3VyY2UKKyAg
ICAgICAgYnVpbGRzIG1heSBjYXVzZSBidWlsZCBicmVha3MgKEJ1ZyAxOTE4NTMpLgorCisgICAg
ICAgIFJlbW92ZSAidXNpbmcgbmFtZXNwYWNlIFdlYkNvcmUiIGluIHRoZSBnbG9iYWwgc2NvcGUu
IFVzZQorICAgICAgICAiV2ViQ29yZTo6IiBwcmVmaXggaW5zdGVhZC4KKworICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwOgorICAgICAgICAoV0tC
dW5kbGVDbGVhckFsbERhdGFiYXNlcyk6CisgICAgICAgIChXS0J1bmRsZVNldERhdGFiYXNlUXVv
dGEpOgorICAgICAgICAoV0tCdW5kbGVDbGVhclJlc291cmNlTG9hZFN0YXRpc3RpY3MpOgorICAg
ICAgICAoV0tCdW5kbGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTm90aWZ5T2JzZXJ2ZXIpOgorICAg
ICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVGcmFtZS5jcHA6
CisgICAgICAgIChXS0J1bmRsZUZyYW1lR2V0RnJhbWVMb2FkU3RhdGUpOgorICAgICAgICAoV0tC
dW5kbGVGcmFtZUNsZWFyT3BlbmVyKToKKyAgICAgICAgKFdLQnVuZGxlRnJhbWVDYWxsU2hvdWxk
Q2xvc2VPbldlYlZpZXcpOgorICAgICAgICAoV0tCdW5kbGVGcmFtZUNvcHlTZWN1cml0eU9yaWdp
bik6CisgICAgICAgIChXS0J1bmRsZUZyYW1lRm9jdXMpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
SW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0b3IuY3BwOgorICAgICAgICAqIFdl
YlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3ZlcmxheS5jcHA6CisK
IDIwMTgtMTEtMjYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAg
ICAgICAgSW5zZXJ0IDxhdHRhY2htZW50PiBlbGVtZW50cyB1bmRlciBlZGl0YWJsZSBpbWFnZXMg
dG8gbWFrZSB0aGVpciBiYWNraW5nIGRhdGEgYWNjZXNzaWJsZQpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcCBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZS5jcHAK
aW5kZXggN2Y3NGY3ZTA3NmFkMjkzZGVlYjIzZDMwNWYzMWZhOTgyNDc4OWYyYS4uMWNlMjUyNGVk
YmFmMmZiZjFhYTViOGQ5N2VjOGE1ZTMwYjg3NTc1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGUuY3BwCkBA
IC00OCw3ICs0OCw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUxvYWRPYnNlcnZlci5o
PgogI2luY2x1ZGUgPFdlYkNvcmUvU2VydmljZVdvcmtlclRocmVhZFByb3h5Lmg+CiAKLXVzaW5n
IG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQg
V0tCdW5kbGVHZXRUeXBlSUQoKQpAQCAtMjUwLDEzICsyNDksMTMgQEAgdm9pZCBXS0J1bmRsZVJl
cG9ydEV4Y2VwdGlvbihKU0NvbnRleHRSZWYgY29udGV4dCwgSlNWYWx1ZVJlZiBleGNlcHRpb24p
CiAKIHZvaWQgV0tCdW5kbGVDbGVhckFsbERhdGFiYXNlcyhXS0J1bmRsZVJlZikKIHsKLSAgICBE
YXRhYmFzZVRyYWNrZXI6OnNpbmdsZXRvbigpLmRlbGV0ZUFsbERhdGFiYXNlc0ltbWVkaWF0ZWx5
KCk7CisgICAgV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpzaW5nbGV0b24oKS5kZWxldGVBbGxE
YXRhYmFzZXNJbW1lZGlhdGVseSgpOwogfQogCiB2b2lkIFdLQnVuZGxlU2V0RGF0YWJhc2VRdW90
YShXS0J1bmRsZVJlZiBidW5kbGVSZWYsIHVpbnQ2NF90IHF1b3RhKQogewogICAgIC8vIEhpc3Rv
cmljYWxseSwgd2UndmUgdXNlZCB0aGUgZm9sbG93aW5nIChzb21ld2hhdCBub25zZW5zaWNhbCkg
c3RyaW5nIGZvciB0aGUgZGF0YWJhc2VJZGVudGlmaWVyIG9mIGxvY2FsIGZpbGVzLgotICAgIERh
dGFiYXNlVHJhY2tlcjo6c2luZ2xldG9uKCkuc2V0UXVvdGEoKlNlY3VyaXR5T3JpZ2luRGF0YTo6
ZnJvbURhdGFiYXNlSWRlbnRpZmllcigiZmlsZV9fMCIpLCBxdW90YSk7CisgICAgV2ViQ29yZTo6
RGF0YWJhc2VUcmFja2VyOjpzaW5nbGV0b24oKS5zZXRRdW90YSgqU2VjdXJpdHlPcmlnaW5EYXRh
Ojpmcm9tRGF0YWJhc2VJZGVudGlmaWVyKCJmaWxlX18wIiksIHF1b3RhKTsKIH0KIAogdm9pZCBX
S0J1bmRsZVJlbGVhc2VNZW1vcnkoV0tCdW5kbGVSZWYpCkBAIC0zMjEsMTIgKzMyMCwxMiBAQCB2
b2lkIFdLQnVuZGxlU2V0VGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRzKFdLQnVuZGxlUmVmIGJ1
bmRsZVJlZiwgV0tCdW5kbGVQYWdlUgogCiB2b2lkIFdLQnVuZGxlQ2xlYXJSZXNvdXJjZUxvYWRT
dGF0aXN0aWNzKFdLQnVuZGxlUmVmKQogewotICAgIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFy
ZWQoKS5jbGVhclN0YXRlKCk7CisgICAgV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNo
YXJlZCgpLmNsZWFyU3RhdGUoKTsKIH0KIAogdm9pZCBXS0J1bmRsZVJlc291cmNlTG9hZFN0YXRp
c3RpY3NOb3RpZnlPYnNlcnZlcihXS0J1bmRsZVJlZikKIHsKLSAgICBSZXNvdXJjZUxvYWRPYnNl
cnZlcjo6c2hhcmVkKCkubm90aWZ5T2JzZXJ2ZXIoKTsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZUxv
YWRPYnNlcnZlcjo6c2hhcmVkKCkubm90aWZ5T2JzZXJ2ZXIoKTsKIH0KIAogCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVG
cmFtZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2Mv
V0tCdW5kbGVGcmFtZS5jcHAKaW5kZXggMjY1OGZlMDMzMjRkYTk4NWYyNDI1YmMxNWQ0ZmRjYzVl
ZWU0MWQwMi4uYmVmNTJmYTk1NDg2NGJhNDk2MjkwMWE0YjE0ODRmYjA4MDkzZjdhYiAxMDA2NDQK
LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVu
ZGxlRnJhbWUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs
ZS9BUEkvYy9XS0J1bmRsZUZyYW1lLmNwcApAQCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUgPFdl
YkNvcmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAKLXVzaW5nIG5h
bWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tC
dW5kbGVGcmFtZUdldFR5cGVJRCgpCkBAIC03NSwxNiArNzQsMTYgQEAgV0tVUkxSZWYgV0tCdW5k
bGVGcmFtZUNvcHlQcm92aXNpb25hbFVSTChXS0J1bmRsZUZyYW1lUmVmIGZyYW1lUmVmKQogCiBX
S0ZyYW1lTG9hZFN0YXRlIFdLQnVuZGxlRnJhbWVHZXRGcmFtZUxvYWRTdGF0ZShXS0J1bmRsZUZy
YW1lUmVmIGZyYW1lUmVmKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVS
ZWYpLT5jb3JlRnJhbWUoKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogY29yZUZyYW1lID0gdG9JbXBs
KGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAgIHJl
dHVybiBrV0tGcmFtZUxvYWRTdGF0ZUZpbmlzaGVkOwogCiAgICAgc3dpdGNoIChjb3JlRnJhbWUt
PmxvYWRlcigpLnN0YXRlKCkpIHsKLSAgICBjYXNlIEZyYW1lU3RhdGVQcm92aXNpb25hbDoKKyAg
ICBjYXNlIFdlYkNvcmU6OkZyYW1lU3RhdGVQcm92aXNpb25hbDoKICAgICAgICAgcmV0dXJuIGtX
S0ZyYW1lTG9hZFN0YXRlUHJvdmlzaW9uYWw7Ci0gICAgY2FzZSBGcmFtZVN0YXRlQ29tbWl0dGVk
UGFnZToKKyAgICBjYXNlIFdlYkNvcmU6OkZyYW1lU3RhdGVDb21taXR0ZWRQYWdlOgogICAgICAg
ICByZXR1cm4ga1dLRnJhbWVMb2FkU3RhdGVDb21taXR0ZWQ7Ci0gICAgY2FzZSBGcmFtZVN0YXRl
Q29tcGxldGU6CisgICAgY2FzZSBXZWJDb3JlOjpGcmFtZVN0YXRlQ29tcGxldGU6CiAgICAgICAg
IHJldHVybiBrV0tGcmFtZUxvYWRTdGF0ZUZpbmlzaGVkOwogICAgIH0KIApAQCAtMTQ5LDcgKzE0
OCw3IEBAIFdLQnVuZGxlUGFnZVJlZiBXS0J1bmRsZUZyYW1lR2V0UGFnZShXS0J1bmRsZUZyYW1l
UmVmIGZyYW1lUmVmKQogCiB2b2lkIFdLQnVuZGxlRnJhbWVDbGVhck9wZW5lcihXS0J1bmRsZUZy
YW1lUmVmIGZyYW1lUmVmKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVS
ZWYpLT5jb3JlRnJhbWUoKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogY29yZUZyYW1lID0gdG9JbXBs
KGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKGNvcmVGcmFtZSkKICAgICAgICAgY29y
ZUZyYW1lLT5sb2FkZXIoKS5zZXRPcGVuZXIoMCk7CiB9CkBAIC0yNjEsNyArMjYwLDcgQEAgV0tE
YXRhUmVmIFdLQnVuZGxlRnJhbWVDb3B5V2ViQXJjaGl2ZUZpbHRlcmluZ1N1YmZyYW1lcyhXS0J1
bmRsZUZyYW1lUmVmIGZyYW1lUmUKIAogYm9vbCBXS0J1bmRsZUZyYW1lQ2FsbFNob3VsZENsb3Nl
T25XZWJWaWV3KFdLQnVuZGxlRnJhbWVSZWYgZnJhbWVSZWYpCiB7Ci0gICAgRnJhbWUqIGNvcmVG
cmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOworICAgIFdlYkNvcmU6OkZyYW1l
KiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJhbWVSZWYpLT5jb3JlRnJhbWUoKTsKICAgICBpZiAoIWNv
cmVGcmFtZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKQEAgLTI3NSw3ICsyNzQsNyBAQCBXS0J1
bmRsZUhpdFRlc3RSZXN1bHRSZWYgV0tCdW5kbGVGcmFtZUNyZWF0ZUhpdFRlc3RSZXN1bHQoV0tC
dW5kbGVGcmFtZVJlZiBmcmFtZQogCiBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLQnVuZGxlRnJhbWVD
b3B5U2VjdXJpdHlPcmlnaW4oV0tCdW5kbGVGcmFtZVJlZiBmcmFtZVJlZikKIHsKLSAgICBGcmFt
ZSogY29yZUZyYW1lID0gdG9JbXBsKGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CisgICAgV2ViQ29y
ZTo6RnJhbWUqIGNvcmVGcmFtZSA9IHRvSW1wbChmcmFtZVJlZiktPmNvcmVGcmFtZSgpOwogICAg
IGlmICghY29yZUZyYW1lKQogICAgICAgICByZXR1cm4gMDsKIApAQCAtMjg0LDcgKzI4Myw3IEBA
IFdLU2VjdXJpdHlPcmlnaW5SZWYgV0tCdW5kbGVGcmFtZUNvcHlTZWN1cml0eU9yaWdpbihXS0J1
bmRsZUZyYW1lUmVmIGZyYW1lUmVmKQogCiB2b2lkIFdLQnVuZGxlRnJhbWVGb2N1cyhXS0J1bmRs
ZUZyYW1lUmVmIGZyYW1lUmVmKQogewotICAgIEZyYW1lKiBjb3JlRnJhbWUgPSB0b0ltcGwoZnJh
bWVSZWYpLT5jb3JlRnJhbWUoKTsKKyAgICBXZWJDb3JlOjpGcmFtZSogY29yZUZyYW1lID0gdG9J
bXBsKGZyYW1lUmVmKS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAg
IHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVk
QnVuZGxlL0FQSS9jL1dLQnVuZGxlSW5zcGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv
Y2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZUluc3BlY3Rvci5jcHAKaW5kZXggN2M5
MzI0ZmQ3NTRjNzZmZTRmNDNkZmYyZTBkMjViNWYxOTk3MGUzZi4uNTVlYjNkYmMwODc3NzFkYmNh
ZDhiNDJmMjJhZTkzNjFmYTgyNjgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j
ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlSW5zcGVjdG9yLmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVJbnNwZWN0
b3IuY3BwCkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSAiV0tCdW5kbGVBUElDYXN0LmgiCiAj
aW5jbHVkZSAiV2ViSW5zcGVjdG9yLmgiCiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNp
bmcgbmFtZXNwYWNlIFdlYktpdDsKIAogV0tUeXBlSUQgV0tCdW5kbGVJbnNwZWN0b3JHZXRUeXBl
SUQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl
L0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L0luamVjdGVkQnVuZGxlL0FQSS9jL1dLQnVuZGxlUGFnZU92ZXJsYXkuY3BwCmluZGV4IGRmOTI4
NmY0MWM4YmQ4MzcwMmFlM2ViMTg0N2I3OGYxZmUyMzA2MTIuLmI3MDgxZDQyNDRiODdkODdmNzg4
NTVmZGFiNDY5YmQzNjI5ZDAyMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz
cy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2VPdmVybGF5LmNwcAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlT3Zl
cmxheS5jcHAKQEAgLTUzLDcgKzUzLDYgQEAgdGVtcGxhdGU8PiBzdHJ1Y3QgQ2xpZW50VHJhaXRz
PFdLQnVuZGxlUGFnZU92ZXJsYXlBY2Nlc3NpYmlsaXR5Q2xpZW50QmFzZT4gewogCiB9CiAKLXVz
aW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogY2xhc3Mg
UGFnZU92ZXJsYXlDbGllbnRJbXBsIDogQVBJOjpDbGllbnQ8V0tCdW5kbGVQYWdlT3ZlcmxheUNs
aWVudEJhc2U+LCBwdWJsaWMgV2ViUGFnZU92ZXJsYXk6OkNsaWVudCB7CkBAIC04Niw3ICs4NSw3
IEBAIHByaXZhdGU6CiAgICAgICAgIG1fY2xpZW50LmRpZE1vdmVUb1BhZ2UodG9BUEkoJnBhZ2VP
dmVybGF5KSwgdG9BUEkocGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CiAgICAgfQog
Ci0gICAgdm9pZCBkcmF3UmVjdChXZWJQYWdlT3ZlcmxheSYgcGFnZU92ZXJsYXksIEdyYXBoaWNz
Q29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpIG92ZXJy
aWRlCisgICAgdm9pZCBkcmF3UmVjdChXZWJQYWdlT3ZlcmxheSYgcGFnZU92ZXJsYXksIFdlYkNv
cmU6OkdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBXZWJDb3JlOjpJbnRS
ZWN0JiBkaXJ0eVJlY3QpIG92ZXJyaWRlCiAgICAgewogICAgICAgICBpZiAoIW1fY2xpZW50LmRy
YXdSZWN0KQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtOTQsMjMgKzkzLDIzIEBAIHByaXZhdGU6
CiAgICAgICAgIG1fY2xpZW50LmRyYXdSZWN0KHRvQVBJKCZwYWdlT3ZlcmxheSksIGdyYXBoaWNz
Q29udGV4dC5wbGF0Zm9ybUNvbnRleHQoKSwgdG9BUEkoZGlydHlSZWN0KSwgbV9jbGllbnQuYmFz
ZS5jbGllbnRJbmZvKTsKICAgICB9CiAgICAgCi0gICAgYm9vbCBtb3VzZUV2ZW50KFdlYlBhZ2VP
dmVybGF5JiBwYWdlT3ZlcmxheSwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkgb3Zl
cnJpZGUKKyAgICBib29sIG1vdXNlRXZlbnQoV2ViUGFnZU92ZXJsYXkmIHBhZ2VPdmVybGF5LCBj
b25zdCBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KSBvdmVycmlkZQogICAgIHsK
ICAgICAgICAgc3dpdGNoIChldmVudC50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBQbGF0Zm9ybU1v
dXNlRXZlbnQ6OlR5cGU6Ok1vdXNlUHJlc3NlZDogeworICAgICAgICBjYXNlIFdlYkNvcmU6OlBs
YXRmb3JtTW91c2VFdmVudDo6VHlwZTo6TW91c2VQcmVzc2VkOiB7CiAgICAgICAgICAgICBpZiAo
IW1fY2xpZW50Lm1vdXNlRG93bikKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg
ICAgICAgICAgIHJldHVybiBtX2NsaWVudC5tb3VzZURvd24odG9BUEkoJnBhZ2VPdmVybGF5KSwg
dG9BUEkoZXZlbnQucG9zaXRpb24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9jbGllbnQu
YmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQotICAgICAgICBjYXNlIFBsYXRmb3JtTW91c2VF
dmVudDo6VHlwZTo6TW91c2VSZWxlYXNlZDogeworICAgICAgICBjYXNlIFdlYkNvcmU6OlBsYXRm
b3JtTW91c2VFdmVudDo6VHlwZTo6TW91c2VSZWxlYXNlZDogewogICAgICAgICAgICAgaWYgKCFt
X2NsaWVudC5tb3VzZVVwKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAg
ICAgICAgcmV0dXJuIG1fY2xpZW50Lm1vdXNlVXAodG9BUEkoJnBhZ2VPdmVybGF5KSwgdG9BUEko
ZXZlbnQucG9zaXRpb24oKSksIHRvQVBJKGV2ZW50LmJ1dHRvbigpKSwgbV9jbGllbnQuYmFzZS5j
bGllbnRJbmZvKTsKICAgICAgICAgfQotICAgICAgICBjYXNlIFBsYXRmb3JtTW91c2VFdmVudDo6
VHlwZTo6TW91c2VNb3ZlZDogewotICAgICAgICAgICAgaWYgKGV2ZW50LmJ1dHRvbigpID09IE1v
dXNlQnV0dG9uOjpOb0J1dHRvbikgeworICAgICAgICBjYXNlIFdlYkNvcmU6OlBsYXRmb3JtTW91
c2VFdmVudDo6VHlwZTo6TW91c2VNb3ZlZDogeworICAgICAgICAgICAgaWYgKGV2ZW50LmJ1dHRv
bigpID09IFdlYkNvcmU6Ok1vdXNlQnV0dG9uOjpOb0J1dHRvbikgewogICAgICAgICAgICAgICAg
IGlmICghbV9jbGllbnQubW91c2VNb3ZlZCkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZh
bHNlOwogCg==
</data>
<flag name="review"
          id="372776"
          type_id="1"
          status="+"
          setter="achristensen"
    />
    <flag name="commit-queue"
          id="372778"
          type_id="3"
          status="-"
          setter="commit-queue"
    />
          </attachment>
      

    </bug>

</bugzilla>