<?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>158609</bug_id>
          
          <creation_ts>2016-06-09 22:10:41 -0700</creation_ts>
          <short_desc>REGRESSION(r201894): This change broke the Windows build (Requested by ryanhaddad on #webkit).</short_desc>
          <delta_ts>2016-06-09 23:38:13 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>158588</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="WebKit Commit Bot">commit-queue</reporter>
          <assigned_to name="WebKit Commit Bot">commit-queue</assigned_to>
          <cc>achristensen</cc>
    
    <cc>andersca</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1201150</commentid>
    <comment_count>0</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-06-09 22:10:41 -0700</bug_when>
    <thetext>http://trac.webkit.org/changeset/201894 broke the build:
This change broke the Windows build (Requested by ryanhaddad on #webkit).

This is an automatic bug report generated by webkitbot. If this bug
report was created because of a flaky test, please file a bug for the flaky
test (if we don&apos;t already have one on file) and dup this bug against that bug
so that we can track how often these flaky tests fail.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1201152</commentid>
    <comment_count>1</comment_count>
      <attachid>280991</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-06-09 22:11:14 -0700</bug_when>
    <thetext>Created attachment 280991
ROLLOUT of r201894

Any committer can land this patch automatically by marking it commit-queue+.  The commit-queue will build and test the patch before landing to ensure that the rollout will be successful.  This process takes approximately 15 minutes.

If you would like to land the rollout faster, you can use the following command:

  webkit-patch land-attachment ATTACHMENT_ID

where ATTACHMENT_ID is the ID of this attachment.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1201158</commentid>
    <comment_count>2</comment_count>
      <attachid>280991</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2016-06-09 22:17:29 -0700</bug_when>
    <thetext>Comment on attachment 280991
ROLLOUT of r201894

Fixed manually in http://trac.webkit.org/changeset/201905</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1201183</commentid>
    <comment_count>3</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2016-06-09 23:38:13 -0700</bug_when>
    <thetext>So marking fixed.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>280991</attachid>
            <date>2016-06-09 22:11:14 -0700</date>
            <delta_ts>2016-06-09 22:17:29 -0700</delta_ts>
            <desc>ROLLOUT of r201894</desc>
            <filename>bug-158609-20160609221243.patch</filename>
            <type>text/plain</type>
            <size>21478</size>
            <attacher name="WebKit Commit Bot">commit-queue</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxOTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQ2ODVkNDgwNmViMGI5
NWI2NTlhMDAxNzNiYjg2OTVkNmQ1ODA5YS4uNjAxMThjMzVkOGU1NzA4NWU5MjUxZTNhNjNmZjJi
MmI1ODJjNzgzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA2LTA5ICBDb21t
aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk
LCByb2xsaW5nIG91dCByMjAxODk0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MTU4NjA5CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYnJva2UgdGhlIFdp
bmRvd3MgYnVpbGQgKFJlcXVlc3RlZCBieSByeWFuaGFkZGFkCisgICAgICAgIG9uICN3ZWJraXQp
LgorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAiQ2xlYW4gdXAgRWRp
dG9yQ2xpZW50IGxpZmV0aW1lIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTU4NTg4CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdl
c2V0LzIwMTg5NAorCiAyMDE2LTA2LTA5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+
CiAKICAgICAgICAgQWRkcmVzcyBEYXJpbidzIHJldmlldyBjb21tZW50IG9uIHIyMDE4OTguCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21h
Yy9DaGFuZ2VMb2cKaW5kZXggODZjZDQ1NTM4ZjM1NzI1ZjljZjExOTI4MGE5NzUyYjExMThjMWRl
Yi4uMjU5MDJmNWQzZTUzNzI3YmM5NWNhZDI0MGI2MDdiNzcwNjBlZWEwOCAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n
ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA2LTA5ICBDb21taXQgUXVldWUgIDxjb21taXQt
cXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjAx
ODk0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4
NjA5CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYnJva2UgdGhlIFdpbmRvd3MgYnVpbGQgKFJlcXVl
c3RlZCBieSByeWFuaGFkZGFkCisgICAgICAgIG9uICN3ZWJraXQpLgorCisgICAgICAgIFJldmVy
dGVkIGNoYW5nZXNldDoKKworICAgICAgICAiQ2xlYW4gdXAgRWRpdG9yQ2xpZW50IGxpZmV0aW1l
IgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTg4
CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzIwMTg5NAorCiAyMDE2
LTA2LTA5ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgQ2xlYW4gdXAgRWRpdG9yQ2xpZW50IGxpZmV0aW1lCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjgzNDFh
ZTM2NDlkMDNlNGQ5ZGFkZDk0MDk0NzkwM2IzNDQxMDBjYi4uYTk4MjUyNjFjNDE2MzE0MTlmMGY2
ZjExNGI4ZDI2YzBjZGRkMTViYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n
CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA2
LTA5ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBV
bnJldmlld2VkLCByb2xsaW5nIG91dCByMjAxODk0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi
a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NjA5CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYnJv
a2UgdGhlIFdpbmRvd3MgYnVpbGQgKFJlcXVlc3RlZCBieSByeWFuaGFkZGFkCisgICAgICAgIG9u
ICN3ZWJraXQpLgorCisgICAgICAgIFJldmVydGVkIGNoYW5nZXNldDoKKworICAgICAgICAiQ2xl
YW4gdXAgRWRpdG9yQ2xpZW50IGxpZmV0aW1lIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0
Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTg4CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5v
cmcvY2hhbmdlc2V0LzIwMTg5NAorCiAyMDE2LTA2LTA5ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0
c0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gLXdlYmtpdC1vdmVyZmxvdy1zY3JvbGxpbmc6
IHRvdWNoOyBpZ25vcmVzIHBvaW50ZXItZXZlbnRzOiBub25lOwpkaWZmIC0tZ2l0IGEvU291cmNl
L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dlYkNvcmUv
aW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCmluZGV4IDI4ZjdhYzA1ZjBjNmIyNjdiYWQ4
YzQ4MGY5N2NiMDRlZDVhYjY5NDYuLjhlOTg5MzNhMTMwMmY0M2I2MmQ0ZDdjNWFkNGIzNTFhOGU3
M2MxNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVy
bGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5j
cHAKQEAgLTg2Niw3ICs4NjYsNyBAQCBQYWdlKiBJbnNwZWN0b3JPdmVybGF5OjpvdmVybGF5UGFn
ZSgpCiAKICAgICBQYWdlQ29uZmlndXJhdGlvbiBwYWdlQ29uZmlndXJhdGlvbjsKICAgICBmaWxs
V2l0aEVtcHR5Q2xpZW50cyhwYWdlQ29uZmlndXJhdGlvbik7Ci0gICAgbV9vdmVybGF5UGFnZSA9
IHN0ZDo6bWFrZV91bmlxdWU8UGFnZT4oV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbikpOworICAg
IG1fb3ZlcmxheVBhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFBhZ2U+KHBhZ2VDb25maWd1cmF0aW9u
KTsKIAogICAgIFNldHRpbmdzJiBzZXR0aW5ncyA9IG1fcGFnZS5zZXR0aW5ncygpOwogICAgIFNl
dHRpbmdzJiBvdmVybGF5U2V0dGluZ3MgPSBtX292ZXJsYXlQYWdlLT5zZXR0aW5ncygpOwpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAgYi9Tb3VyY2Uv
V2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcAppbmRleCA5NWMyMGE5MDZhMjEwMjc1ZGNl
ZTk0MjM2NDg1ZDVjMzRmNDJkNzAyLi5mMGNkYWNiZDgyZDVmNjJjMmMxOGJjYWI5MDJlYzM0Mjg4
NTI1ZmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNw
cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmNwcApAQCAtMTI5LDgg
KzEyOSw5IEBAIHZvaWQgZmlsbFdpdGhFbXB0eUNsaWVudHMoUGFnZUNvbmZpZ3VyYXRpb24mIHBh
Z2VDb25maWd1cmF0aW9uKQogICAgIHBhZ2VDb25maWd1cmF0aW9uLmRyYWdDbGllbnQgPSAmZHVt
bXlEcmFnQ2xpZW50LmdldCgpOwogI2VuZGlmCiAKLSAgICBwYWdlQ29uZmlndXJhdGlvbi5lZGl0
b3JDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPEVtcHR5RWRpdG9yQ2xpZW50PigpOwotICAgIAor
ICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxFbXB0eUVkaXRvckNsaWVudD4gZHVtbXlFZGl0b3JD
bGllbnQ7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24uZWRpdG9yQ2xpZW50ID0gJmR1bW15RWRpdG9y
Q2xpZW50LmdldCgpOworCiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEVtcHR5SW5zcGVjdG9y
Q2xpZW50PiBkdW1teUluc3BlY3RvckNsaWVudDsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5pbnNw
ZWN0b3JDbGllbnQgPSAmZHVtbXlJbnNwZWN0b3JDbGllbnQuZ2V0KCk7CiAKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2xv
YWRlci9FbXB0eUNsaWVudHMuaAppbmRleCAxMGU3ZWU4YTZjMTliZjU3MjA0ZWI3YTczYTE5NTk5
ZGQ3NzU5Y2M4Li40MTM5MjgzMjJlMzIyMDkzNzQwNWEyZTQxZjkxMTM2N2MxNTFmOGZjIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRW1wdHlDbGllbnRzLmgKKysrIGIvU291cmNl
L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCkBAIC00MCw2ICs0MCw3IEBACiAjaW5jbHVk
ZSAiRm9jdXNEaXJlY3Rpb24uaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2lu
Y2x1ZGUgIkluc3BlY3RvckNsaWVudC5oIgorI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQ
cm9ncmVzc1RyYWNrZXJDbGllbnQuaCIKICNpbmNsdWRlICJSZXNvdXJjZUVycm9yLmgiCiAjaW5j
bHVkZSAiVGV4dENoZWNrZXJDbGllbnQuaCIKQEAgLTcwLDcgKzcxLDYgQEAKIG5hbWVzcGFjZSBX
ZWJDb3JlIHsKIAogY2xhc3MgR3JhcGhpY3NDb250ZXh0M0Q7Ci1jbGFzcyBQYWdlOwogCiBjbGFz
cyBFbXB0eUNocm9tZUNsaWVudCA6IHB1YmxpYyBDaHJvbWVDbGllbnQgewogICAgIFdURl9NQUtF
X0ZBU1RfQUxMT0NBVEVEOwpAQCAtNDM2LDYgKzQzNiw3IEBAIGNsYXNzIEVtcHR5RWRpdG9yQ2xp
ZW50IDogcHVibGljIEVkaXRvckNsaWVudCB7CiBwdWJsaWM6CiAgICAgRW1wdHlFZGl0b3JDbGll
bnQoKSB7IH0KICAgICB2aXJ0dWFsIH5FbXB0eUVkaXRvckNsaWVudCgpIHsgfQorICAgIHZvaWQg
cGFnZURlc3Ryb3llZCgpIG92ZXJyaWRlIHsgfQogCiAgICAgYm9vbCBzaG91bGREZWxldGVSYW5n
ZShSYW5nZSopIG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNlOyB9CiAgICAgYm9vbCBzbWFydEluc2Vy
dERlbGV0ZUVuYWJsZWQoKSBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYkNvcmUvcGFnZS9FZGl0b3JDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv
RWRpdG9yQ2xpZW50LmgKaW5kZXggMDViMDgwYTE4ZTVjOTNjZWY0Zjk2MjgyODc0MzQwZmZmMDA5
YWU4My4uMGI0M2E2YmQ1ZDhlZmU5YzEwMThkZjc0NmUyOTE4YjlhOWVmNTFmYSAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FZGl0b3JDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL0VkaXRvckNsaWVudC5oCkBAIC03MCw2ICs3MCw3IEBAIHN0cnVjdCBHcmFtbWFyRGV0
YWlsOwogY2xhc3MgRWRpdG9yQ2xpZW50IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5FZGl0b3JD
bGllbnQoKSB7ICB9CisgICAgdmlydHVhbCB2b2lkIHBhZ2VEZXN0cm95ZWQoKSA9IDA7CiAKICAg
ICB2aXJ0dWFsIGJvb2wgc2hvdWxkRGVsZXRlUmFuZ2UoUmFuZ2UqKSA9IDA7CiAgICAgdmlydHVh
bCBib29sIHNtYXJ0SW5zZXJ0RGVsZXRlRW5hYmxlZCgpID0gMDsgCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcApp
bmRleCBhODA0NTNlMzNlN2M2OWNkOGRiODU4N2YyZjQ4MWNlZTkyNzc1MGIwLi43MTBlOGUxNTYy
MmQ1OGE4ZmEyM2VjMzc2ODk0M2MzNGRlOWI4MjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTE1
Niw3ICsxNTYsNyBAQCBzdGF0aWMgdm9pZCBuZXR3b3JrU3RhdGVDaGFuZ2VkKGJvb2wgaXNPbkxp
bmUpCiAKIHN0YXRpYyBjb25zdCBWaWV3U3RhdGU6OkZsYWdzIFBhZ2VJbml0aWFsVmlld1N0YXRl
ID0gVmlld1N0YXRlOjpJc1Zpc2libGUgfCBWaWV3U3RhdGU6OklzSW5XaW5kb3c7CiAKLVBhZ2U6
OlBhZ2UoUGFnZUNvbmZpZ3VyYXRpb24mJiBwYWdlQ29uZmlndXJhdGlvbikKK1BhZ2U6OlBhZ2Uo
UGFnZUNvbmZpZ3VyYXRpb24mIHBhZ2VDb25maWd1cmF0aW9uKQogICAgIDogbV9jaHJvbWUoc3Rk
OjptYWtlX3VuaXF1ZTxDaHJvbWU+KCp0aGlzLCAqcGFnZUNvbmZpZ3VyYXRpb24uY2hyb21lQ2xp
ZW50KSkKICAgICAsIG1fZHJhZ0NhcmV0Q29udHJvbGxlcihzdGQ6Om1ha2VfdW5pcXVlPERyYWdD
YXJldENvbnRyb2xsZXI+KCkpCiAjaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkKQEAgLTE3OSw3ICsx
NzksNyBAQCBQYWdlOjpQYWdlKFBhZ2VDb25maWd1cmF0aW9uJiYgcGFnZUNvbmZpZ3VyYXRpb24p
CiAgICAgLCBtX2JhY2tGb3J3YXJkQ29udHJvbGxlcihzdGQ6Om1ha2VfdW5pcXVlPEJhY2tGb3J3
YXJkQ29udHJvbGxlcj4oKnRoaXMsIFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24uYmFja0Zvcndh
cmRDbGllbnQpKSkKICAgICAsIG1fbWFpbkZyYW1lKE1haW5GcmFtZTo6Y3JlYXRlKCp0aGlzLCBw
YWdlQ29uZmlndXJhdGlvbikpCiAgICAgLCBtX3RoZW1lKFJlbmRlclRoZW1lOjp0aGVtZUZvclBh
Z2UodGhpcykpCi0gICAgLCBtX2VkaXRvckNsaWVudChXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9u
LmVkaXRvckNsaWVudCkpCisgICAgLCBtX2VkaXRvckNsaWVudCgqcGFnZUNvbmZpZ3VyYXRpb24u
ZWRpdG9yQ2xpZW50KQogICAgICwgbV9wbHVnSW5DbGllbnQocGFnZUNvbmZpZ3VyYXRpb24ucGx1
Z0luQ2xpZW50KQogICAgICwgbV92YWxpZGF0aW9uTWVzc2FnZUNsaWVudChwYWdlQ29uZmlndXJh
dGlvbi52YWxpZGF0aW9uTWVzc2FnZUNsaWVudCkKICAgICAsIG1fZGlhZ25vc3RpY0xvZ2dpbmdD
bGllbnQoV1RGTW92ZShwYWdlQ29uZmlndXJhdGlvbi5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCkp
CkBAIC0yMzgsNyArMjM4LDYgQEAgUGFnZTo6UGFnZShQYWdlQ29uZmlndXJhdGlvbiYmIHBhZ2VD
b25maWd1cmF0aW9uKQogICAgICwgbV9zZXNzaW9uSUQoU2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lv
bklEKCkpCiAgICAgLCBtX2lzQ2xvc2luZyhmYWxzZSkKIHsKLSAgICBBU1NFUlQobV9lZGl0b3JD
bGllbnQpOwogICAgIHVwZGF0ZVRpbWVyVGhyb3R0bGluZ1N0YXRlKCk7CiAKICAgICBtX3N0b3Jh
Z2VOYW1lc3BhY2VQcm92aWRlci0+YWRkUGFnZSgqdGhpcyk7CkBAIC0yODQsNiArMjgzLDcgQEAg
UGFnZTo6flBhZ2UoKQogICAgICAgICBmcmFtZS0+ZGV0YWNoRnJvbVBhZ2UoKTsKICAgICB9CiAK
KyAgICBtX2VkaXRvckNsaWVudC5wYWdlRGVzdHJveWVkKCk7CiAgICAgaWYgKG1fcGx1Z0luQ2xp
ZW50KQogICAgICAgICBtX3BsdWdJbkNsaWVudC0+cGFnZURlc3Ryb3llZCgpOwogICAgIGlmICht
X2FsdGVybmF0aXZlVGV4dENsaWVudCkKQEAgLTQxMiw2ICs0MTIsOCBAQCB2b2lkIFBhZ2U6OnNl
dFZpZXdNb2RlKFZpZXdNb2RlIHZpZXdNb2RlKQogCiAgICAgbV92aWV3TW9kZSA9IHZpZXdNb2Rl
OwogCisgICAgaWYgKCFtX21haW5GcmFtZSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1f
bWFpbkZyYW1lLT52aWV3KCkpCiAgICAgICAgIG1fbWFpbkZyYW1lLT52aWV3KCktPmZvcmNlTGF5
b3V0KCk7CkBAIC03NDgsNyArNzUwLDcgQEAgdm9pZCBQYWdlOjpzZXREZWZlcnNMb2FkaW5nKGJv
b2wgZGVmZXJzKQogCiB2b2lkIFBhZ2U6OmNsZWFyVW5kb1JlZG9PcGVyYXRpb25zKCkKIHsKLSAg
ICBtX2VkaXRvckNsaWVudC0+Y2xlYXJVbmRvUmVkb09wZXJhdGlvbnMoKTsKKyAgICBtX2VkaXRv
ckNsaWVudC5jbGVhclVuZG9SZWRvT3BlcmF0aW9ucygpOwogfQogCiBib29sIFBhZ2U6OmluTG93
UXVhbGl0eUltYWdlSW50ZXJwb2xhdGlvbk1vZGUoKSBjb25zdApAQCAtMTEyMCw3ICsxMTIyLDcg
QEAgY29uc3QgU3RyaW5nJiBQYWdlOjp1c2VyU3R5bGVTaGVldCgpIGNvbnN0CiAKIHZvaWQgUGFn
ZTo6aW52YWxpZGF0ZVN0eWxlc0ZvckFsbExpbmtzKCkKIHsKLSAgICBmb3IgKEZyYW1lKiBmcmFt
ZSA9ICZtX21haW5GcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2
ZXJzZU5leHQoKSkgeworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7
IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKICAgICAgICAg
aWYgKCFmcmFtZS0+ZG9jdW1lbnQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBm
cmFtZS0+ZG9jdW1lbnQoKS0+dmlzaXRlZExpbmtTdGF0ZSgpLmludmFsaWRhdGVTdHlsZUZvckFs
bExpbmtzKCk7CkBAIC0xMTI5LDcgKzExMzEsNyBAQCB2b2lkIFBhZ2U6OmludmFsaWRhdGVTdHls
ZXNGb3JBbGxMaW5rcygpCiAKIHZvaWQgUGFnZTo6aW52YWxpZGF0ZVN0eWxlc0ZvckxpbmsoTGlu
a0hhc2ggbGlua0hhc2gpCiB7Ci0gICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbV9tYWluRnJhbWUu
Z2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKKyAg
ICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fbWFpbkZyYW1lLmdldCgpOyBmcmFtZTsgZnJhbWUgPSBm
cmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKSB7CiAgICAgICAgIGlmICghZnJhbWUtPmRvY3Vt
ZW50KCkpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgZnJhbWUtPmRvY3VtZW50KCkt
PnZpc2l0ZWRMaW5rU3RhdGUoKS5pbnZhbGlkYXRlU3R5bGVGb3JMaW5rKGxpbmtIYXNoKTsKQEAg
LTExMzgsNyArMTE0MCw3IEBAIHZvaWQgUGFnZTo6aW52YWxpZGF0ZVN0eWxlc0ZvckxpbmsoTGlu
a0hhc2ggbGlua0hhc2gpCiAKIHZvaWQgUGFnZTo6aW52YWxpZGF0ZUluamVjdGVkU3R5bGVTaGVl
dENhY2hlSW5BbGxGcmFtZXMoKQogewotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJm1fbWFpbkZy
YW1lLmdldCgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKSB7
CisgICAgZm9yIChGcmFtZSogZnJhbWUgPSBtX21haW5GcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1l
ID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgewogICAgICAgICBEb2N1bWVudCogZG9j
dW1lbnQgPSBmcmFtZS0+ZG9jdW1lbnQoKTsKICAgICAgICAgaWYgKCFkb2N1bWVudCkKICAgICAg
ICAgICAgIGNvbnRpbnVlOwpAQCAtMTE1NCw3ICsxMTU2LDcgQEAgdm9pZCBQYWdlOjpzZXREZWJ1
Z2dlcihKU0M6OkRlYnVnZ2VyKiBkZWJ1Z2dlcikKIAogICAgIG1fZGVidWdnZXIgPSBkZWJ1Z2dl
cjsKIAotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJm1fbWFpbkZyYW1lLmdldCgpOyBmcmFtZTsg
ZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKQorICAgIGZvciAoRnJhbWUqIGZy
YW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJh
dmVyc2VOZXh0KCkpCiAgICAgICAgIGZyYW1lLT5zY3JpcHQoKS5hdHRhY2hEZWJ1Z2dlcihtX2Rl
YnVnZ2VyKTsKIH0KIApAQCAtMTQ4NSw3ICsxNDg3LDcgQEAgdm9pZCBQYWdlOjpzZXRJc1Zpc2li
bGVJbnRlcm5hbChib29sIGlzVmlzaWJsZSkKICAgICB9CiAKICAgICBWZWN0b3I8UmVmPERvY3Vt
ZW50Pj4gZG9jdW1lbnRzOwotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJm1fbWFpbkZyYW1lLmdl
dCgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKQorICAgIGZv
ciAoRnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1l
LT50cmVlKCkudHJhdmVyc2VOZXh0KCkpCiAgICAgICAgIGRvY3VtZW50cy5hcHBlbmQoKmZyYW1l
LT5kb2N1bWVudCgpKTsKIAogICAgIGZvciAoYXV0byYgZG9jdW1lbnQgOiBkb2N1bWVudHMpCkBA
IC0xOTgzLDcgKzE5ODUsNyBAQCB2b2lkIFBhZ2U6OnNldEFsbG93c01lZGlhRG9jdW1lbnRJbmxp
bmVQbGF5YmFjayhib29sIGZsYWcpCiAgICAgbV9hbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxh
eWJhY2sgPSBmbGFnOwogCiAgICAgVmVjdG9yPFJlZjxEb2N1bWVudD4+IGRvY3VtZW50czsKLSAg
ICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZtX21haW5GcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1lID0g
ZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkKKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1f
bWFpbkZyYW1lLmdldCgpOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4
dCgpKQogICAgICAgICBkb2N1bWVudHMuYXBwZW5kKCpmcmFtZS0+ZG9jdW1lbnQoKSk7CiAKICAg
ICBmb3IgKGF1dG8mIGRvY3VtZW50IDogZG9jdW1lbnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl
YkNvcmUvcGFnZS9QYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaAppbmRleCBmOTQw
YTNkOWQzMjgxNWIzMjMxYWI0N2MxZTc2MGVlZjk3NGMyMmM3Li5jNTY5ODQwYWJkNGQzYmQ3YmY4
NWU2NTlhNjBjZTIxYjk5NWRiZTc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bh
Z2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaApAQCAtMTgsNyArMTgsOCBAQAog
ICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCiAgKi8KIAotI3ByYWdtYSBvbmNlCisjaWZu
ZGVmIFBhZ2VfaAorI2RlZmluZSBQYWdlX2gKIAogI2luY2x1ZGUgIkZpbmRPcHRpb25zLmgiCiAj
aW5jbHVkZSAiRnJhbWVMb2FkZXJUeXBlcy5oIgpAQCAtMTQwLDcgKzE0MSw3IEBAIHB1YmxpYzoK
ICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgdm9pZCB1cGRhdGVTdHlsZUZvckFsbFBhZ2VzQWZ0
ZXJHbG9iYWxDaGFuZ2VJbkVudmlyb25tZW50KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj
IHZvaWQgY2xlYXJQcmV2aW91c0l0ZW1Gcm9tQWxsUGFnZXMoSGlzdG9yeUl0ZW0qKTsKIAotICAg
IFdFQkNPUkVfRVhQT1JUIGV4cGxpY2l0IFBhZ2UoUGFnZUNvbmZpZ3VyYXRpb24mJik7CisgICAg
V0VCQ09SRV9FWFBPUlQgZXhwbGljaXQgUGFnZShQYWdlQ29uZmlndXJhdGlvbiYpOwogICAgIFdF
QkNPUkVfRVhQT1JUIH5QYWdlKCk7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB1aW50NjRfdCByZW5k
ZXJUcmVlU2l6ZSgpIGNvbnN0OwpAQCAtMTU3LDExICsxNTgsMTEgQEAgcHVibGljOgogICAgIFdF
QkNPUkVfRVhQT1JUIHZvaWQgc2V0Q2FuU3RhcnRNZWRpYShib29sKTsKICAgICBib29sIGNhblN0
YXJ0TWVkaWEoKSBjb25zdCB7IHJldHVybiBtX2NhblN0YXJ0TWVkaWE7IH0KIAotICAgIEVkaXRv
ckNsaWVudCYgZWRpdG9yQ2xpZW50KCkgY29uc3QgeyByZXR1cm4gKm1fZWRpdG9yQ2xpZW50OyB9
CisgICAgRWRpdG9yQ2xpZW50JiBlZGl0b3JDbGllbnQoKSB7IHJldHVybiBtX2VkaXRvckNsaWVu
dDsgfQogICAgIFBsdWdJbkNsaWVudCogcGx1Z0luQ2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9w
bHVnSW5DbGllbnQ7IH0KIAotICAgIE1haW5GcmFtZSYgbWFpbkZyYW1lKCkgeyByZXR1cm4gbV9t
YWluRnJhbWUuZ2V0KCk7IH0KLSAgICBjb25zdCBNYWluRnJhbWUmIG1haW5GcmFtZSgpIGNvbnN0
IHsgcmV0dXJuIG1fbWFpbkZyYW1lLmdldCgpOyB9CisgICAgTWFpbkZyYW1lJiBtYWluRnJhbWUo
KSB7IEFTU0VSVChtX21haW5GcmFtZSk7IHJldHVybiAqbV9tYWluRnJhbWU7IH0KKyAgICBjb25z
dCBNYWluRnJhbWUmIG1haW5GcmFtZSgpIGNvbnN0IHsgQVNTRVJUKG1fbWFpbkZyYW1lKTsgcmV0
dXJuICptX21haW5GcmFtZTsgfQogCiAgICAgYm9vbCBpblBhZ2VDYWNoZSgpIGNvbnN0OwogCkBA
IC01NzcsMTMgKzU3OCwxMyBAQCBwcml2YXRlOgogICAgIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxQ
cm9ncmVzc1RyYWNrZXI+IG1fcHJvZ3Jlc3M7CiAKICAgICBjb25zdCBzdGQ6OnVuaXF1ZV9wdHI8
QmFja0ZvcndhcmRDb250cm9sbGVyPiBtX2JhY2tGb3J3YXJkQ29udHJvbGxlcjsKLSAgICBSZWY8
TWFpbkZyYW1lPiBtX21haW5GcmFtZTsKKyAgICBjb25zdCBSZWZQdHI8TWFpbkZyYW1lPiBtX21h
aW5GcmFtZTsKIAogICAgIG11dGFibGUgUmVmUHRyPFBsdWdpbkRhdGE+IG1fcGx1Z2luRGF0YTsK
IAogICAgIFJlZlB0cjxSZW5kZXJUaGVtZT4gbV90aGVtZTsKIAotICAgIHN0ZDo6dW5pcXVlX3B0
cjxFZGl0b3JDbGllbnQ+IG1fZWRpdG9yQ2xpZW50OworICAgIEVkaXRvckNsaWVudCYgbV9lZGl0
b3JDbGllbnQ7CiAgICAgUGx1Z0luQ2xpZW50KiBtX3BsdWdJbkNsaWVudDsKICAgICBWYWxpZGF0
aW9uTWVzc2FnZUNsaWVudCogbV92YWxpZGF0aW9uTWVzc2FnZUNsaWVudDsKICAgICBzdGQ6OnVu
aXF1ZV9wdHI8RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQ+IG1fZGlhZ25vc3RpY0xvZ2dpbmdDbGll
bnQ7CkBAIC03MjMsMyArNzI0LDUgQEAgaW5saW5lIFBhZ2VHcm91cCYgUGFnZTo6Z3JvdXAoKQog
fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisgICAgCisjZW5kaWYgLy8gUGFnZV9oCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25maWd1cmF0aW9uLmNwcCBiL1NvdXJj
ZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uY3BwCmluZGV4IDZjMTE3ZGMyZjFkNjRk
NmMxMjE3MWZkN2E5ZTg0OWIwYzliYmE3MTQuLjhmZTc3OTkxMzYyNGQzNDgxNGQ1ZjM2OWQ3NDcz
YzYwNDEwN2Q1ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3Vy
YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUNvbmZpZ3VyYXRpb24uY3Bw
CkBAIC0zMCw3ICszMCw2IEBACiAjaW5jbHVkZSAiQmFja0ZvcndhcmRDbGllbnQuaCIKICNpbmNs
dWRlICJEYXRhYmFzZVByb3ZpZGVyLmgiCiAjaW5jbHVkZSAiRGlhZ25vc3RpY0xvZ2dpbmdDbGll
bnQuaCIKLSNpbmNsdWRlICJFZGl0b3JDbGllbnQuaCIKICNpbmNsdWRlICJTdG9yYWdlTmFtZXNw
YWNlUHJvdmlkZXIuaCIKICNpbmNsdWRlICJVc2VyQ29udGVudENvbnRyb2xsZXIuaCIKICNpbmNs
dWRlICJWaXNpdGVkTGlua1N0b3JlLmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl
L1BhZ2VDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VDb25maWd1cmF0
aW9uLmgKaW5kZXggNDU4ZWMzZGM4ZTJlN2FmNTVkY2I0ZTMzZmNjNjQ2ODU2ODY5N2NkZC4uZTYw
N2I0NzM3MzVjMTQwNjYzMjg2ZDg5MWNhMGI1OGVlMmNhZmJhOSAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYkNvcmUvcGFnZS9QYWdlQ29uZmlndXJhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh
Z2UvUGFnZUNvbmZpZ3VyYXRpb24uaApAQCAtNjcsNyArNjcsNyBAQCBwdWJsaWM6CiAjaWYgRU5B
QkxFKENPTlRFWFRfTUVOVVMpCiAgICAgQ29udGV4dE1lbnVDbGllbnQqIGNvbnRleHRNZW51Q2xp
ZW50IHsgbnVsbHB0ciB9OwogI2VuZGlmCi0gICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRvckNsaWVu
dD4gZWRpdG9yQ2xpZW50OworICAgIEVkaXRvckNsaWVudCogZWRpdG9yQ2xpZW50IHsgbnVsbHB0
ciB9OwogICAgIERyYWdDbGllbnQqIGRyYWdDbGllbnQgeyBudWxscHRyIH07CiAgICAgSW5zcGVj
dG9yQ2xpZW50KiBpbnNwZWN0b3JDbGllbnQgeyBudWxscHRyIH07CiAgICAgUGx1Z0luQ2xpZW50
KiBwbHVnSW5DbGllbnQgeyBudWxscHRyIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w
YWdlL21hYy9QYWdlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvUGFnZU1hYy5tbQpp
bmRleCBhYTQ5ZDlmMDNkNDRmZWRjOTQzNWQ5ZDEzZGZjNzczNGZmOWQ0NmU1Li5mNDljZGViYjE3
NWMyZmNjNjY1YjJiNTA4ZjljZGRjM2E3ZTNkMmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y
ZS9wYWdlL21hYy9QYWdlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL1BhZ2VN
YWMubW0KQEAgLTcwLDcgKzcwLDcgQEAgdm9pZCBQYWdlOjphZGRTY2hlZHVsZVBhaXIoUmVmPFNj
aGVkdWxlUGFpcj4mJiBwYWlyKQogICAgIG1fc2NoZWR1bGVkUnVuTG9vcFBhaXJzLT5hZGQocGFp
ci5wdHIoKSk7CiAKICNpZiAhVVNFKENGTkVUV09SSykKLSAgICBmb3IgKEZyYW1lKiBmcmFtZSA9
ICZtX21haW5GcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJz
ZU5leHQoKSkgeworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7IGZy
YW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCkpIHsKICAgICAgICAgaWYg
KERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS5kb2N1bWVu
dExvYWRlcigpKQogICAgICAgICAgICAgZG9jdW1lbnRMb2FkZXItPnNjaGVkdWxlKHBhaXIpOwog
ICAgICAgICBpZiAoRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gZnJhbWUtPmxvYWRl
cigpLnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSkKQEAgLTkwLDcgKzkwLDcgQEAgdm9pZCBQ
YWdlOjpyZW1vdmVTY2hlZHVsZVBhaXIoUmVmPFNjaGVkdWxlUGFpcj4mJiBwYWlyKQogICAgIG1f
c2NoZWR1bGVkUnVuTG9vcFBhaXJzLT5yZW1vdmUocGFpci5wdHIoKSk7CiAKICNpZiAhVVNFKENG
TkVUV09SSykKLSAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZtX21haW5GcmFtZS5nZXQoKTsgZnJh
bWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgeworICAgIGZvciAoRnJh
bWUqIGZyYW1lID0gbV9tYWluRnJhbWUuZ2V0KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVl
KCkudHJhdmVyc2VOZXh0KCkpIHsKICAgICAgICAgaWYgKERvY3VtZW50TG9hZGVyKiBkb2N1bWVu
dExvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpKQogICAgICAgICAgICAg
ZG9jdW1lbnRMb2FkZXItPnVuc2NoZWR1bGUocGFpcik7CiAgICAgICAgIGlmIChEb2N1bWVudExv
YWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCkucHJvdmlzaW9uYWxEb2N1bWVu
dExvYWRlcigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0lt
YWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKaW5kZXgg
ZDNlNDdhYzViM2QyM2Q4NmUyZjRiZjNmMTBjZWYwYTBiZTU4NmE0ZS4uNGU4MTgwOGM4Yzc0YmZl
ZDM0M2ZkYjdiODg4NGQwYWNmNThjMmY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Zn
L2dyYXBoaWNzL1NWR0ltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3Mv
U1ZHSW1hZ2UuY3BwCkBAIC0zOTAsNyArMzkwLDcgQEAgYm9vbCBTVkdJbWFnZTo6ZGF0YUNoYW5n
ZWQoYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCiAgICAgICAgIC8vIFRoaXMgd2lsbCBiZWNvbWUgYW4g
aXNzdWUgd2hlbiBTVkdJbWFnZSB3aWxsIGJlIGFibGUgdG8gbG9hZCBvdGhlcgogICAgICAgICAv
LyBTVkdJbWFnZSBvYmplY3RzLCBidXQgd2UncmUgc2FmZSBub3csIGJlY2F1c2UgU1ZHSW1hZ2Ug
Y2FuIG9ubHkgYmUKICAgICAgICAgLy8gbG9hZGVkIGJ5IGEgdG9wLWxldmVsIGRvY3VtZW50Lgot
ICAgICAgICBtX3BhZ2UgPSBzdGQ6Om1ha2VfdW5pcXVlPFBhZ2U+KFdURk1vdmUocGFnZUNvbmZp
Z3VyYXRpb24pKTsKKyAgICAgICAgbV9wYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlPihwYWdl
Q29uZmlndXJhdGlvbik7CiAgICAgICAgIG1fcGFnZS0+c2V0dGluZ3MoKS5zZXRNZWRpYUVuYWJs
ZWQoZmFsc2UpOwogICAgICAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0U2NyaXB0RW5hYmxlZChm
YWxzZSk7CiAgICAgICAgIG1fcGFnZS0+c2V0dGluZ3MoKS5zZXRQbHVnaW5zRW5hYmxlZChmYWxz
ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0
b3JDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNs
aWVudC5oCmluZGV4IDk5NzBlYjQ4ODVlM2JmNWRhZDUxYzY5OGU4MzMyNTJjYzIyYmVjYTguLmM3
MmI1Zjc5MmQyZDNhY2Y3YTZhNDJjNTIyNjFlNjdiZGM3ZjQ1M2MgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCisrKyBiL1NvdXJj
ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCkBAIC01MSw2ICs1
MSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZENoZWNrU3VjY2VlZChpbnQgc2VxdWVuY2UsIE5T
QXJyYXkgKnJlc3VsdHMpOwogCiBwcml2YXRlOgorICAgIHZvaWQgcGFnZURlc3Ryb3llZCgpIG92
ZXJyaWRlOworCiAgICAgYm9vbCBpc0dyYW1tYXJDaGVja2luZ0VuYWJsZWQoKSBvdmVycmlkZTsK
ICAgICB2b2lkIHRvZ2dsZUdyYW1tYXJDaGVja2luZygpIG92ZXJyaWRlOwogICAgIGJvb2wgaXND
b250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQoKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbSBiL1NvdXJj
ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5tbQppbmRleCAzMGEz
MDVmYzVjYzc1ZWM5MWY4MTRkODFiOWM1N2ZmMDQwNTEyOTBlLi41ZWI2YWI1YjhmMjliOGQ4ZWQy
M2VhNjhlNTdhNDE4NGUyMDk1ODYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD
b3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2Vi
Q29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50Lm1tCkBAIC0xODMsNiArMTgzLDExIEBAIHN0YXRp
YyBXZWJWaWV3SW5zZXJ0QWN0aW9uIGtpdChFZGl0b3JJbnNlcnRBY3Rpb24gY29yZUFjdGlvbikK
IAogQGVuZAogCit2b2lkIFdlYkVkaXRvckNsaWVudDo6cGFnZURlc3Ryb3llZCgpCit7CisgICAg
ZGVsZXRlIHRoaXM7Cit9CisKIFdlYkVkaXRvckNsaWVudDo6V2ViRWRpdG9yQ2xpZW50KFdlYlZp
ZXcgKndlYlZpZXcpCiAgICAgOiBtX3dlYlZpZXcod2ViVmlldykKICAgICAsIG1fdW5kb1Rhcmdl
dChhZG9wdE5TKFtbV2ViRWRpdG9yVW5kb1RhcmdldCBhbGxvY10gaW5pdF0pKQpkaWZmIC0tZ2l0
IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9t
YWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDExNzA3ZDYyMzdiNTIwNTY3N2QyYjE0NmRlOWRi
NmQ1Y2Y1NzRmNzQuLmIwMTRiNmI4ZGEwNGQ3MTljYzg4MTZiZmM1NGQ0ZDZmOTAxOGE2Y2QgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9Tb3Vy
Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTEwMDQsNyArMTAwNCw3IEBAIHN0
YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgpCiAj
aW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV2ViVmlld0luaXRpYWxpemF0aW9uLm1tPgogI2VuZGlm
CiAKLSAgICBwYWdlQ29uZmlndXJhdGlvbi5lZGl0b3JDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVl
PFdlYkVkaXRvckNsaWVudD4oc2VsZik7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24uZWRpdG9yQ2xp
ZW50ID0gbmV3IFdlYkVkaXRvckNsaWVudChzZWxmKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5h
bHRlcm5hdGl2ZVRleHRDbGllbnQgPSBuZXcgV2ViQWx0ZXJuYXRpdmVUZXh0Q2xpZW50KHNlbGYp
OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFtZSA9IG5ldyBX
ZWJGcmFtZUxvYWRlckNsaWVudDsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5wcm9ncmVzc1RyYWNr
ZXJDbGllbnQgPSBuZXcgV2ViUHJvZ3Jlc3NUcmFja2VyQ2xpZW50KHNlbGYpOwpAQCAtMTAxMyw3
ICsxMDEzLDcgQEAgc3RhdGljIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZUdhbWVwYWRQcm92aWRlcklm
TmVjZXNzYXJ5KCkKICAgICBwYWdlQ29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNlUHJvdmlk
ZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsKICAgICBw
YWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudFByb3ZpZGVyID0gJl9wcml2YXRlLT5ncm91cC0+
dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udmlzaXRlZExp
bmtTdG9yZSA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsKLSAgICBfcHJp
dmF0ZS0+cGFnZSA9IG5ldyBQYWdlKFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKKyAgICBf
cHJpdmF0ZS0+cGFnZSA9IG5ldyBQYWdlKHBhZ2VDb25maWd1cmF0aW9uKTsKIAogICAgIF9wcml2
YXRlLT5wYWdlLT5zZXRHcm91cE5hbWUoZ3JvdXBOYW1lKTsKIApAQCAtMTI0OCw3ICsxMjQ4LDcg
QEAgc3RhdGljIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZUdhbWVwYWRQcm92aWRlcklmTmVjZXNzYXJ5
KCkKICNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9XZWJWaWV3SW5pdGlhbGl6YXRpb24ubW0+CiAj
ZW5kaWYKIAotICAgIHBhZ2VDb25maWd1cmF0aW9uLmVkaXRvckNsaWVudCA9IHN0ZDo6bWFrZV91
bmlxdWU8V2ViRWRpdG9yQ2xpZW50PihzZWxmKTsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi5lZGl0
b3JDbGllbnQgPSBuZXcgV2ViRWRpdG9yQ2xpZW50KHNlbGYpOwogICAgIHBhZ2VDb25maWd1cmF0
aW9uLmluc3BlY3RvckNsaWVudCA9IG5ldyBXZWJJbnNwZWN0b3JDbGllbnQoc2VsZik7CiAgICAg
cGFnZUNvbmZpZ3VyYXRpb24ubG9hZGVyQ2xpZW50Rm9yTWFpbkZyYW1lID0gbmV3IFdlYkZyYW1l
TG9hZGVyQ2xpZW50OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVu
dCA9IG5ldyBXZWJQcm9ncmVzc1RyYWNrZXJDbGllbnQoc2VsZik7CkBAIC0xMjU4LDcgKzEyNTgs
NyBAQCBzdGF0aWMgdm9pZCBXZWJLaXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVySWZOZWNlc3Nh
cnkoKQogICAgIHBhZ2VDb25maWd1cmF0aW9uLnVzZXJDb250ZW50UHJvdmlkZXIgPSAmX3ByaXZh
dGUtPmdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsKICAgICBwYWdlQ29uZmlndXJhdGlv
bi52aXNpdGVkTGlua1N0b3JlID0gJl9wcml2YXRlLT5ncm91cC0+dmlzaXRlZExpbmtTdG9yZSgp
OwogCi0gICAgX3ByaXZhdGUtPnBhZ2UgPSBuZXcgUGFnZShXVEZNb3ZlKHBhZ2VDb25maWd1cmF0
aW9uKSk7CisgICAgX3ByaXZhdGUtPnBhZ2UgPSBuZXcgUGFnZShwYWdlQ29uZmlndXJhdGlvbik7
CiAgICAgCiAgICAgW3NlbGYgc2V0U21hcnRJbnNlcnREZWxldGVFbmFibGVkOllFU107CiAgICAg
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl
YkVkaXRvckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw
b3J0L1dlYkVkaXRvckNsaWVudC5jcHAKaW5kZXggNDJmYzI0OGNlMmM2M2U1NjgyNGY4MjkwY2Qx
OTdlMDI4ZjJiZGRkYS4uZTEwMDIyMDczOTJmYzU1OThmYjI4OTJmZmY2NGUyZDk4ZGRiMGJiNCAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJF
ZGl0b3JDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1
cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcApAQCAtNzAsNiArNzAsMTEgQEAgc3RhdGljIHVpbnQ2
NF90IGdlbmVyYXRlVGV4dENoZWNraW5nUmVxdWVzdElEKCkKICAgICByZXR1cm4gdW5pcXVlVGV4
dENoZWNraW5nUmVxdWVzdElEKys7CiB9CiAKK3ZvaWQgV2ViRWRpdG9yQ2xpZW50OjpwYWdlRGVz
dHJveWVkKCkKK3sKKyAgICBkZWxldGUgdGhpczsKK30KKwogYm9vbCBXZWJFZGl0b3JDbGllbnQ6
OnNob3VsZERlbGV0ZVJhbmdlKFJhbmdlKiByYW5nZSkKIHsKICAgICBib29sIHJlc3VsdCA9IG1f
cGFnZS0+aW5qZWN0ZWRCdW5kbGVFZGl0b3JDbGllbnQoKS5zaG91bGREZWxldGVSYW5nZShtX3Bh
Z2UsIHJhbmdlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y
ZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl
YkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCmluZGV4IDYxZjBhODE5ZjMzMDdiZTk3ZWY2
ZDg0NzRmODk5NmJhZTdmMGVmZWYuLjc2MjYxNjgwZDIzMjhkNmIzOWEwZjhkMmMyODkyZmY0ZDli
NGJmZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv
cnQvV2ViRWRpdG9yQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD
b3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuaApAQCAtNDEsNiArNDEsOCBAQCBwdWJsaWM6CiAg
ICAgfQogCiBwcml2YXRlOgorICAgIHZvaWQgcGFnZURlc3Ryb3llZCgpIG92ZXJyaWRlOworCiAg
ICAgYm9vbCBzaG91bGREZWxldGVSYW5nZShXZWJDb3JlOjpSYW5nZSopIG92ZXJyaWRlOwogICAg
IGJvb2wgc21hcnRJbnNlcnREZWxldGVFbmFibGVkKCkgb3ZlcnJpZGU7CiAgICAgYm9vbCBpc1Nl
bGVjdFRyYWlsaW5nV2hpdGVzcGFjZUVuYWJsZWQoKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL
aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBhNzlkZjBmMjJhZGUzMzIz
M2YxMTc1YTE0NmFlYzcyOTYzYzlmZTdlLi5kMTBkYTZlOGM5YjYyOTQwYjU4Y2M0YmEyY2NlMWE1
ZGExM2Q5MTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv
V2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh
Z2UuY3BwCkBAIC0zODksNyArMzg5LDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdl
SUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAjaWYgRU5B
QkxFKENPTlRFWFRfTUVOVVMpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uY29udGV4dE1lbnVDbGll
bnQgPSBuZXcgV2ViQ29udGV4dE1lbnVDbGllbnQodGhpcyk7CiAjZW5kaWYKLSAgICBwYWdlQ29u
ZmlndXJhdGlvbi5lZGl0b3JDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYkVkaXRvckNsaWVu
dD4odGhpcyk7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24uZWRpdG9yQ2xpZW50ID0gbmV3IFdlYkVk
aXRvckNsaWVudCh0aGlzKTsKICNpZiBFTkFCTEUoRFJBR19TVVBQT1JUKQogICAgIHBhZ2VDb25m
aWd1cmF0aW9uLmRyYWdDbGllbnQgPSBuZXcgV2ViRHJhZ0NsaWVudCh0aGlzKTsKICNlbmRpZgpA
QCAtNDE0LDcgKzQxNCw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25z
dCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogI2luY2x1ZGUgPFdlYktp
dEFkZGl0aW9ucy9XZWJQYWdlSW5pdGlhbGl6YXRpb24uaD4KICNlbmRpZgogCi0gICAgbV9wYWdl
ID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlPihXVEZNb3ZlKHBhZ2VDb25maWd1cmF0aW9uKSk7Cisg
ICAgbV9wYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlPihwYWdlQ29uZmlndXJhdGlvbik7CiAg
ICAgdXBkYXRlUHJlZmVyZW5jZXMocGFyYW1ldGVycy5zdG9yZSk7CiAKICAgICBtX2RyYXdpbmdB
cmVhID0gRHJhd2luZ0FyZWE6OmNyZWF0ZSgqdGhpcywgcGFyYW1ldGVycyk7Cg==
</data>
<flag name="commit-queue"
          id="304856"
          type_id="3"
          status="-"
          setter="achristensen"
    />
          </attachment>
      

    </bug>

</bugzilla>