<?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>216030</bug_id>
          
          <creation_ts>2020-09-01 01:09:10 -0700</creation_ts>
          <short_desc>Upstream PencilKit text input support</short_desc>
          <delta_ts>2020-10-07 12:32: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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>217436</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Tim Horton">thorton</reporter>
          <assigned_to name="Tim Horton">thorton</assigned_to>
          <cc>andersca</cc>
    
    <cc>bdakin</cc>
    
    <cc>benjamin</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>hi</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1684396</commentid>
    <comment_count>0</comment_count>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-09-01 01:09:10 -0700</bug_when>
    <thetext>Upstream PencilKit text input support</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1684397</commentid>
    <comment_count>1</comment_count>
      <attachid>407662</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-09-01 01:12:51 -0700</bug_when>
    <thetext>Created attachment 407662
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1684399</commentid>
    <comment_count>2</comment_count>
      <attachid>407663</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-09-01 01:20:15 -0700</bug_when>
    <thetext>Created attachment 407663
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1684417</commentid>
    <comment_count>3</comment_count>
      <attachid>407663</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-09-01 02:58:03 -0700</bug_when>
    <thetext>Comment on attachment 407663
Patch

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

&gt; Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:8786
&gt; +- (void)cleanupScribbleInteraction

Capital U</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1684431</commentid>
    <comment_count>4</comment_count>
      <attachid>407671</attachid>
    <who name="Tim Horton">thorton</who>
    <bug_when>2020-09-01 04:01:25 -0700</bug_when>
    <thetext>Created attachment 407671
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1684521</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-09-01 10:09:43 -0700</bug_when>
    <thetext>Committed r266400: &lt;https://trac.webkit.org/changeset/266400&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 407671.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1684522</commentid>
    <comment_count>6</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-09-01 10:10:17 -0700</bug_when>
    <thetext>&lt;rdar://problem/68151147&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407662</attachid>
            <date>2020-09-01 01:12:51 -0700</date>
            <delta_ts>2020-09-01 01:20:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216030-20200901011250.patch</filename>
            <type>text/plain</type>
            <size>9207</size>
            <attacher name="Tim Horton">thorton</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Mzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNkM2I1OTBkZmI5MWM5ODJmZjc4MWM5
NmMyZTg0MDc0YWM1YmEyMjAuLjQwOWE4OTAyZDkwNzIxNjM5MTRhY2EwMWYzNjNmZTI3Y2FkNzdh
ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5
X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gUGVuY2lsS2l0IHRleHQgaW5w
dXQgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgKiB3dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oOgorCiAyMDIwLTA4LTMxICBBbGV4IENocmlz
dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBCaWc1IGVu
Y29kZXIgY29uZm9ybSB0byB0aGUgc3BlY2lmaWNhdGlvbiBhbmQgYmVoYXZpb3Igb2YgQ2hyb21l
IGFuZCBGaXJlZm94CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiNmZlN2YzNTBiNjI4MWEwNmQwOTlmN2RhMzNkNDA2
OTcxYTc3NmYuLmM0ZTY4ZGFiOTJlNjdmYmVmNjVhMWNiYjgwZDZkNGFmNzUzMjc0ODIgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDktMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hv
cnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gUGVuY2lsS2l0IHRleHQgaW5wdXQg
c3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjE2MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
KiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJ
UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0Nv
bnRlbnRWaWV3IHNldFVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBj
bGVhblVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfc2hvdWxkU2lt
dWxhdGVLZXlib2FyZElucHV0T25UZXh0SW5zZXJ0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVu
dFZpZXcgc2V0VXBTY3JpYmJsZUludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZp
ZXcgY2xlYW51cFNjcmliYmxlSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll
dyBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOl0pOgorICAgICAgICAoLVtX
S0NvbnRlbnRWaWV3IF9lbGVtZW50Rm9yVGV4dElucHV0Q29udGV4dElzRm9jdXNlZDpdKToKKyAg
ICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb246cmVxdWVz
dEVsZW1lbnRzSW5SZWN0OmNvbXBsZXRpb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg
aW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmlzRWxlbWVudEZvY3VzZWQ6XSk6CisgICAgICAg
ICgtW1dLQ29udGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmZvY3VzRWxlbWVu
dElmTmVlZGVkOnJlZmVyZW5jZVBvaW50OmNvbXBsZXRpb246XSk6CisgICAgICAgICgtW1dLQ29u
dGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmZyYW1lRm9yRWxlbWVudDpdKToK
KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb246d2ls
bEJlZ2luV3JpdGluZ0luRWxlbWVudDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRp
cmVjdFNjcmliYmxlSW50ZXJhY3Rpb246ZGlkRmluaXNoV3JpdGluZ0luRWxlbWVudDpdKToKKwog
MjAyMC0wOC0zMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBX
ZWJwYWdlcyBmbGFzaCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdpbmRvd3MKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL1Bs
YXRmb3JtRW5hYmxlQ29jb2EuaAppbmRleCA0OTUyNjNhNjBkZWI4Mzk2MzEzN2VhZDFiNjc0M2Yx
ODQ3MTBjMmEyLi4zNDg2YWJhNGJjYTM4NmM0OWIzYjYyZDY4MDBmMmRmZjJhMjRiNmFhIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIvU291cmNl
L1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0zODEsNiArMzgxLDEwIEBACiAjZGVm
aW5lIEVOQUJMRV9QRVJJT0RJQ19NRU1PUllfTU9OSVRPUiAxCiAjZW5kaWYKIAorI2lmICFkZWZp
bmVkKEVOQUJMRV9QRU5DSUxLSVRfVEVYVF9JTlBVVCkgJiYgUExBVEZPUk0oSU9TKSAmJiBfX0lQ
SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDAKKyNkZWZpbmUgRU5BQkxFX1BF
TkNJTEtJVF9URVhUX0lOUFVUIDEKKyNlbmRpZgorCiAjaWYgIWRlZmluZWQoRU5BQkxFX1BMQVRG
T1JNX0RSSVZFTl9URVhUX0NIRUNLSU5HKSAmJiBQTEFURk9STShNQUNDQVRBTFlTVCkKICNkZWZp
bmUgRU5BQkxFX1BMQVRGT1JNX0RSSVZFTl9URVhUX0NIRUNLSU5HIDEKICNlbmRpZgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv
bi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv
bi5oCmluZGV4IDgxYTllYTdmOTE2ZDRjYzE3MjIxMmM5Zjk4NzA4ODY5NzYzNzk3NjYuLjc1MDYy
ZmVkNTUwMjg3MzlkY2UzYTg3Y2E1M2UwNWNhZmIzYzVkOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTI0
NCw2ICsyNDQsMTAgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBXZWJDb3Jl
OjpNb3VzZUV2ZW50UG9saWN5IF9tb3VzZUV2ZW50UG9saWN5OwogI2VuZGlmCiAKKyNpZiBFTkFC
TEUoUEVOQ0lMS0lUX1RFWFRfSU5QVVQpCisgICAgUmV0YWluUHRyPFVJSW5kaXJlY3RTY3JpYmJs
ZUludGVyYWN0aW9uPiBfc2NyaWJibGVJbnRlcmFjdGlvbjsKKyNlbmRpZgorCiAjaWYgSEFWRShV
SV9DVVJTT1JfSU5URVJBQ1RJT04pCiAgICAgUmV0YWluUHRyPF9VSUN1cnNvckludGVyYWN0aW9u
PiBfY3Vyc29ySW50ZXJhY3Rpb247CiAgICAgQk9PTCBfaGFzT3V0c3RhbmRpbmdDdXJzb3JJbnRl
cmFjdGlvblJlcXVlc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv
V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z
L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA0NjVhNDlkNDljZTg3ZTY0MGJjZDI4
NDdhYWNmNmEzYjJlYTQ4NTExLi4zMDlmZThhMTQ0NzBlN2NiNjVlY2M3NTc3NGU3NjMzZGVhNDYy
MmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll
d0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl
bnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTE2MSwxMCArMTYxLDYgQEAKICNpbXBvcnQgIldLV2Vi
RXZlbnQuaCIKICNlbmRpZgogCi0jaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQg
PFdlYktpdEFkZGl0aW9ucy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb25BZGRpdGlvbnMubW0+Ci0j
ZW5kaWYKLQogI2ltcG9ydCA8cGFsL2lvcy9NYW5hZ2VkQ29uZmlndXJhdGlvblNvZnRMaW5rLmg+
CiAKICNpZiBIQVZFKExJTktfUFJFVklFVykgJiYgVVNFKFVJQ09OVEVYVE1FTlUpCkBAIC0xNzks
NiArMTc1LDExIEBAIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoV0tVSUN1cnNvckludGVyYWN0
aW9uRGVsZWdhdGUpIDxfVUlDdXJzb3JJbnRlcmFjdGlvbkRlCiBAZW5kCiAjZW5kaWYKIAorI2lm
IEVOQUJMRShQRU5DSUxLSVRfVEVYVF9JTlBVVCkKK0BpbnRlcmZhY2UgV0tDb250ZW50VmlldyAo
V0tVSUluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbkRlbGVnYXRlKSA8VUlJbmRpcmVjdFNjcmli
YmxlSW50ZXJhY3Rpb25EZWxlZ2F0ZT4KK0BlbmQKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oV0FU
Q0hPUykKIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoV2F0Y2hTdXBwb3J0KSA8V0tGb2N1c2Vk
Rm9ybUNvbnRyb2xWaWV3RGVsZWdhdGUsIFdLU2VsZWN0TWVudUxpc3RWaWV3Q29udHJvbGxlckRl
bGVnYXRlLCBXS1RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlckRlbGVnYXRlPgogQGVuZApAQCAt
ODMwLDYgKzgzMSwxMCBAQCAtICh2b2lkKXNldFVwSW50ZXJhY3Rpb24KICAgICBbc2VsZiBzZXRV
cEN1cnNvckludGVyYWN0aW9uXTsKICNlbmRpZgogCisjaWYgRU5BQkxFKFBFTkNJTEtJVF9URVhU
X0lOUFVUKQorICAgIFtzZWxmIHNldFVwU2NyaWJibGVJbnRlcmFjdGlvbl07CisjZW5kaWYKKwog
I2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAgICAgW3NlbGYgc2V0VXBBZGRpdGlvbmFsSW50
ZXJhY3Rpb25zXTsKICNlbmRpZgpAQCAtOTk4LDYgKzEwMDMsMTAgQEAgLSAodm9pZCljbGVhblVw
SW50ZXJhY3Rpb24KICAgICBfY3Vyc29ySW50ZXJhY3Rpb24gPSBuaWw7CiAjZW5kaWYKIAorI2lm
IEVOQUJMRShQRU5DSUxLSVRfVEVYVF9JTlBVVCkKKyAgICBbc2VsZiBjbGVhblVwU2NyaWJibGVJ
bnRlcmFjdGlvbl07CisjZW5kaWYKKwogI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAgICAg
W3NlbGYgY2xlYW5VcEFkZGl0aW9uYWxJbnRlcmFjdGlvbnNdOwogI2VuZGlmCkBAIC00ODM5LDgg
KzQ4NDgsOCBAQCAtICh2b2lkKWRlbGV0ZUJhY2t3YXJkCiAKIC0gKEJPT0wpX3Nob3VsZFNpbXVs
YXRlS2V5Ym9hcmRJbnB1dE9uVGV4dEluc2VydGlvbgogewotI2lmIFVTRShURVhUX0lOVEVSQUNU
SU9OX0FERElUSU9OUykKLSAgICByZXR1cm4gW3NlbGYgX3Nob3VsZFNpbXVsYXRlS2V5Ym9hcmRJ
bnB1dE9uVGV4dEluc2VydGlvbkludGVybmFsXTsKKyNpZiBFTkFCTEUoUEVOQ0lMS0lUX1RFWFRf
SU5QVVQpCisgICAgcmV0dXJuIFtfc2NyaWJibGVJbnRlcmFjdGlvbiBoYW5kbGluZ1dyaXRpbmdd
OwogI2Vsc2UKICAgICByZXR1cm4gTk87CiAjZW5kaWYKQEAgLTg3NzQsNiArODc4Myw4MSBAQCAt
IChfVUlDdXJzb3JTdHlsZSAqKWN1cnNvckludGVyYWN0aW9uOihfVUlDdXJzb3JJbnRlcmFjdGlv
biAqKWludGVyYWN0aW9uIHN0eWxlRgogCiAjZW5kaWYgLy8gSEFWRShVSV9DVVJTT1JfSU5URVJB
Q1RJT04pCiAKKyNpZiBFTkFCTEUoUEVOQ0lMS0lUX1RFWFRfSU5QVVQpCisKKy0gKHZvaWQpc2V0
VXBTY3JpYmJsZUludGVyYWN0aW9uCit7CisgICAgX3NjcmliYmxlSW50ZXJhY3Rpb24gPSBhZG9w
dE5TKFtbVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb24gYWxsb2NdIGluaXRXaXRoRGVsZWdh
dGU6c2VsZl0pOworICAgIFtzZWxmIGFkZEludGVyYWN0aW9uOl9zY3JpYmJsZUludGVyYWN0aW9u
LmdldCgpXTsKK30KKworLSAodm9pZCljbGVhbnVwU2NyaWJibGVJbnRlcmFjdGlvbgoreworICAg
IFtzZWxmIHJlbW92ZUludGVyYWN0aW9uOl9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpXTsKKyAg
ICBfc2NyaWJibGVJbnRlcmFjdGlvbiA9IG5pbDsKK30KKworLSAoX1dLVGV4dElucHV0Q29udGV4
dCAqKV90ZXh0SW5wdXRDb250ZXh0QnlTY3JpYmJsZUlkZW50aWZpZXI6KFVJU2NyaWJibGVFbGVt
ZW50SWRlbnRpZmllcilpZGVudGlmaWVyCit7CisgICAgX1dLVGV4dElucHV0Q29udGV4dCAqdGV4
dElucHV0Q29udGV4dCA9IChfV0tUZXh0SW5wdXRDb250ZXh0ICopaWRlbnRpZmllcjsKKyAgICBp
ZiAoIVt0ZXh0SW5wdXRDb250ZXh0IGlzS2luZE9mQ2xhc3M6X1dLVGV4dElucHV0Q29udGV4dC5j
bGFzc10pCisgICAgICAgIHJldHVybiBuaWw7CisgICAgYXV0byBlbGVtZW50Q29udGV4dCA9IHRl
eHRJbnB1dENvbnRleHQuX3RleHRJbnB1dENvbnRleHQ7CisgICAgaWYgKGVsZW1lbnRDb250ZXh0
LndlYlBhZ2VJZGVudGlmaWVyICE9IF9wYWdlLT53ZWJQYWdlSUQoKSkKKyAgICAgICAgcmV0dXJu
IG5pbDsKKyAgICByZXR1cm4gdGV4dElucHV0Q29udGV4dDsKK30KKworLSAoQk9PTClfZWxlbWVu
dEZvclRleHRJbnB1dENvbnRleHRJc0ZvY3VzZWQ6KF9XS1RleHRJbnB1dENvbnRleHQgKiljb250
ZXh0Cit7CisgICAgLy8gV2UgaWdub3JlIGJvdW5kaW5nIHJlY3QgY2hhbmdlcyBhcyB0aGUgYm91
bmRpbmcgcmVjdCBvZiB0aGUgZm9jdXNlZCBlbGVtZW50IGlzIG5vdCBrZXB0IHVwLXRvLWRhdGUu
CisgICAgcmV0dXJuIHNlbGYuX2hhc0ZvY3VzZWRFbGVtZW50ICYmIGNvbnRleHQgJiYgY29udGV4
dC5fdGV4dElucHV0Q29udGV4dC5pc1NhbWVFbGVtZW50KF9mb2N1c2VkRWxlbWVudEluZm9ybWF0
aW9uLmVsZW1lbnRDb250ZXh0KTsKK30KKworLSAodm9pZClpbmRpcmVjdFNjcmliYmxlSW50ZXJh
Y3Rpb246KFVJSW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gcmVxdWVz
dEVsZW1lbnRzSW5SZWN0OihDR1JlY3QpcmVjdCBjb21wbGV0aW9uOih2b2lkKF4pKE5TQXJyYXk8
VUlTY3JpYmJsZUVsZW1lbnRJZGVudGlmaWVyPiAqKSljb21wbGV0aW9uCit7CisgICAgQVNTRVJU
KF9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpID09IGludGVyYWN0aW9uKTsKKyAgICBbc2VsZiBf
cmVxdWVzdFRleHRJbnB1dENvbnRleHRzSW5SZWN0OnJlY3QgY29tcGxldGlvbkhhbmRsZXI6Y29t
cGxldGlvbl07Cit9CisKKy0gKEJPT0wpaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOihVSUlu
ZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGlzRWxlbWVudEZvY3VzZWQ6
KFVJU2NyaWJibGVFbGVtZW50SWRlbnRpZmllcilpZGVudGlmaWVyCit7CisgICAgQVNTRVJUKF9z
Y3JpYmJsZUludGVyYWN0aW9uLmdldCgpID09IGludGVyYWN0aW9uKTsKKyAgICByZXR1cm4gW3Nl
bGYgX2VsZW1lbnRGb3JUZXh0SW5wdXRDb250ZXh0SXNGb2N1c2VkOltzZWxmIF90ZXh0SW5wdXRD
b250ZXh0QnlTY3JpYmJsZUlkZW50aWZpZXI6aWRlbnRpZmllcl1dOworfQorCistICh2b2lkKWlu
ZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb24g
KilpbnRlcmFjdGlvbiBmb2N1c0VsZW1lbnRJZk5lZWRlZDooVUlTY3JpYmJsZUVsZW1lbnRJZGVu
dGlmaWVyKWlkZW50aWZpZXIgcmVmZXJlbmNlUG9pbnQ6KENHUG9pbnQpaW5pdGlhbFBvaW50IGNv
bXBsZXRpb246KHZvaWQgKF4pKFVJUmVzcG9uZGVyPFVJVGV4dElucHV0PiAqKSljb21wbGV0aW9u
QmxvY2sKK3sKKyAgICBBU1NFUlQoX3NjcmliYmxlSW50ZXJhY3Rpb24uZ2V0KCkgPT0gaW50ZXJh
Y3Rpb24pOworICAgIGlmIChhdXRvICp0ZXh0SW5wdXRDb250ZXh0ID0gW3NlbGYgX3RleHRJbnB1
dENvbnRleHRCeVNjcmliYmxlSWRlbnRpZmllcjppZGVudGlmaWVyXSkKKyAgICAgICAgW3NlbGYg
X2ZvY3VzVGV4dElucHV0Q29udGV4dDp0ZXh0SW5wdXRDb250ZXh0IHBsYWNlQ2FyZXRBdDppbml0
aWFsUG9pbnQgY29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkJsb2NrXTsKKyAgICBlbHNlCisg
ICAgICAgIGNvbXBsZXRpb25CbG9jayhuaWwpOworfQorCistIChDR1JlY3QpaW5kaXJlY3RTY3Jp
YmJsZUludGVyYWN0aW9uOihVSUluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbiAqKWludGVyYWN0
aW9uIGZyYW1lRm9yRWxlbWVudDooVUlTY3JpYmJsZUVsZW1lbnRJZGVudGlmaWVyKWlkZW50aWZp
ZXIKK3sKKyAgICBBU1NFUlQoX3NjcmliYmxlSW50ZXJhY3Rpb24uZ2V0KCkgPT0gaW50ZXJhY3Rp
b24pOworICAgIGF1dG8gKnRleHRJbnB1dENvbnRleHQgPSBbc2VsZiBfdGV4dElucHV0Q29udGV4
dEJ5U2NyaWJibGVJZGVudGlmaWVyOmlkZW50aWZpZXJdOworICAgIHJldHVybiB0ZXh0SW5wdXRD
b250ZXh0ID8gdGV4dElucHV0Q29udGV4dC5ib3VuZGluZ1JlY3QgOiBDR1JlY3ROdWxsOworfQor
CistICh2b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRpcmVjdFNjcmliYmxl
SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsQmVnaW5Xcml0aW5nSW5FbGVtZW50OihVSVNj
cmliYmxlRWxlbWVudElkZW50aWZpZXIpaWRlbnRpZmllcgoreworICAgIEFTU0VSVChfc2NyaWJi
bGVJbnRlcmFjdGlvbi5nZXQoKSA9PSBpbnRlcmFjdGlvbik7CisgICAgaWYgKGF1dG8gKnRleHRJ
bnB1dENvbnRleHQgPSBbc2VsZiBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVy
OmlkZW50aWZpZXJdKQorICAgICAgICBbc2VsZiBfd2lsbEJlZ2luVGV4dEludGVyYWN0aW9uSW5U
ZXh0SW5wdXRDb250ZXh0OnRleHRJbnB1dENvbnRleHRdOworfQorCistICh2b2lkKWluZGlyZWN0
U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb24gKilpbnRl
cmFjdGlvbiBkaWRGaW5pc2hXcml0aW5nSW5FbGVtZW50OihVSVNjcmliYmxlRWxlbWVudElkZW50
aWZpZXIpaWRlbnRpZmllcgoreworICAgIEFTU0VSVChfc2NyaWJibGVJbnRlcmFjdGlvbi5nZXQo
KSA9PSBpbnRlcmFjdGlvbik7CisgICAgaWYgKGF1dG8gKnRleHRJbnB1dENvbnRleHQgPSBbc2Vs
ZiBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOmlkZW50aWZpZXJdKQorICAg
ICAgICBbc2VsZiBfZGlkRmluaXNoVGV4dEludGVyYWN0aW9uSW5UZXh0SW5wdXRDb250ZXh0OnRl
eHRJbnB1dENvbnRleHRdOworfQorCisjZW5kaWYgLy8gRU5BQkxFKFBFTkNJTEtJVF9URVhUX0lO
UFVUKQorCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKIAogI2lmICFQTEFURk9STShX
QVRDSE9TKSAmJiAhUExBVEZPUk0oQVBQTEVUVikK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407663</attachid>
            <date>2020-09-01 01:20:15 -0700</date>
            <delta_ts>2020-09-01 04:01:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216030-20200901012014.patch</filename>
            <type>text/plain</type>
            <size>9390</size>
            <attacher name="Tim Horton">thorton</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Mzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n
ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGNkM2I1OTBkZmI5MWM5ODJmZjc4MWM5
NmMyZTg0MDc0YWM1YmEyMjAuLjQwOWE4OTAyZDkwNzIxNjM5MTRhY2EwMWYzNjNmZTI3Y2FkNzdh
ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDktMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5
X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gUGVuY2lsS2l0IHRleHQgaW5w
dXQgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjE2MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgKiB3dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oOgorCiAyMDIwLTA4LTMxICBBbGV4IENocmlz
dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBCaWc1IGVu
Y29kZXIgY29uZm9ybSB0byB0aGUgc3BlY2lmaWNhdGlvbiBhbmQgYmVoYXZpb3Igb2YgQ2hyb21l
IGFuZCBGaXJlZm94CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiNmZlN2YzNTBiNjI4MWEwNmQwOTlmN2RhMzNkNDA2
OTcxYTc3NmYuLmM0ZTY4ZGFiOTJlNjdmYmVmNjVhMWNiYjgwZDZkNGFmNzUzMjc0ODIgMTAwNjQ0
Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl
TG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDktMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hv
cnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gUGVuY2lsS2l0IHRleHQgaW5wdXQg
c3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
MjE2MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
KiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJ
UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0Nv
bnRlbnRWaWV3IHNldFVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBj
bGVhblVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfc2hvdWxkU2lt
dWxhdGVLZXlib2FyZElucHV0T25UZXh0SW5zZXJ0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVu
dFZpZXcgc2V0VXBTY3JpYmJsZUludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZp
ZXcgY2xlYW51cFNjcmliYmxlSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll
dyBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOl0pOgorICAgICAgICAoLVtX
S0NvbnRlbnRWaWV3IF9lbGVtZW50Rm9yVGV4dElucHV0Q29udGV4dElzRm9jdXNlZDpdKToKKyAg
ICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb246cmVxdWVz
dEVsZW1lbnRzSW5SZWN0OmNvbXBsZXRpb246XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg
aW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmlzRWxlbWVudEZvY3VzZWQ6XSk6CisgICAgICAg
ICgtW1dLQ29udGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmZvY3VzRWxlbWVu
dElmTmVlZGVkOnJlZmVyZW5jZVBvaW50OmNvbXBsZXRpb246XSk6CisgICAgICAgICgtW1dLQ29u
dGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmZyYW1lRm9yRWxlbWVudDpdKToK
KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb246d2ls
bEJlZ2luV3JpdGluZ0luRWxlbWVudDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRp
cmVjdFNjcmliYmxlSW50ZXJhY3Rpb246ZGlkRmluaXNoV3JpdGluZ0luRWxlbWVudDpdKToKKwog
MjAyMC0wOC0zMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBX
ZWJwYWdlcyBmbGFzaCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdpbmRvd3MKZGlmZiAtLWdpdCBh
L1NvdXJjZS9XVEYvd3RmL1BsYXRmb3JtRW5hYmxlQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL1Bs
YXRmb3JtRW5hYmxlQ29jb2EuaAppbmRleCA0OTUyNjNhNjBkZWI4Mzk2MzEzN2VhZDFiNjc0M2Yx
ODQ3MTBjMmEyLi4zNDg2YWJhNGJjYTM4NmM0OWIzYjYyZDY4MDBmMmRmZjJhMjRiNmFhIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUVuYWJsZUNvY29hLmgKKysrIGIvU291cmNl
L1dURi93dGYvUGxhdGZvcm1FbmFibGVDb2NvYS5oCkBAIC0zODEsNiArMzgxLDEwIEBACiAjZGVm
aW5lIEVOQUJMRV9QRVJJT0RJQ19NRU1PUllfTU9OSVRPUiAxCiAjZW5kaWYKIAorI2lmICFkZWZp
bmVkKEVOQUJMRV9QRU5DSUxLSVRfVEVYVF9JTlBVVCkgJiYgUExBVEZPUk0oSU9TKSAmJiBfX0lQ
SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxNDAwMDAKKyNkZWZpbmUgRU5BQkxFX1BF
TkNJTEtJVF9URVhUX0lOUFVUIDEKKyNlbmRpZgorCiAjaWYgIWRlZmluZWQoRU5BQkxFX1BMQVRG
T1JNX0RSSVZFTl9URVhUX0NIRUNLSU5HKSAmJiBQTEFURk9STShNQUNDQVRBTFlTVCkKICNkZWZp
bmUgRU5BQkxFX1BMQVRGT1JNX0RSSVZFTl9URVhUX0NIRUNLSU5HIDEKICNlbmRpZgpkaWZmIC0t
Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv
bi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv
bi5oCmluZGV4IDgxYTllYTdmOTE2ZDRjYzE3MjIxMmM5Zjk4NzA4ODY5NzYzNzk3NjYuLjc1MDYy
ZmVkNTUwMjg3MzlkY2UzYTg3Y2E1M2UwNWNhZmIzYzVkOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTI0
NCw2ICsyNDQsMTAgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAgICBXZWJDb3Jl
OjpNb3VzZUV2ZW50UG9saWN5IF9tb3VzZUV2ZW50UG9saWN5OwogI2VuZGlmCiAKKyNpZiBFTkFC
TEUoUEVOQ0lMS0lUX1RFWFRfSU5QVVQpCisgICAgUmV0YWluUHRyPFVJSW5kaXJlY3RTY3JpYmJs
ZUludGVyYWN0aW9uPiBfc2NyaWJibGVJbnRlcmFjdGlvbjsKKyNlbmRpZgorCiAjaWYgSEFWRShV
SV9DVVJTT1JfSU5URVJBQ1RJT04pCiAgICAgUmV0YWluUHRyPF9VSUN1cnNvckludGVyYWN0aW9u
PiBfY3Vyc29ySW50ZXJhY3Rpb247CiAgICAgQk9PTCBfaGFzT3V0c3RhbmRpbmdDdXJzb3JJbnRl
cmFjdGlvblJlcXVlc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv
V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z
L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA0NjVhNDlkNDljZTg3ZTY0MGJjZDI4
NDdhYWNmNmEzYjJlYTQ4NTExLi41MzhhYWJhNDQzZjQ2MWUwYzA4MjA5MjhmZjk3ZDUyM2I0NTM1
NDM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll
d0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl
bnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTE2MSwxMCArMTYxLDYgQEAKICNpbXBvcnQgIldLV2Vi
RXZlbnQuaCIKICNlbmRpZgogCi0jaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQg
PFdlYktpdEFkZGl0aW9ucy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb25BZGRpdGlvbnMubW0+Ci0j
ZW5kaWYKLQogI2ltcG9ydCA8cGFsL2lvcy9NYW5hZ2VkQ29uZmlndXJhdGlvblNvZnRMaW5rLmg+
CiAKICNpZiBIQVZFKExJTktfUFJFVklFVykgJiYgVVNFKFVJQ09OVEVYVE1FTlUpCkBAIC0xNzks
NiArMTc1LDExIEBAIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoV0tVSUN1cnNvckludGVyYWN0
aW9uRGVsZWdhdGUpIDxfVUlDdXJzb3JJbnRlcmFjdGlvbkRlCiBAZW5kCiAjZW5kaWYKIAorI2lm
IEVOQUJMRShQRU5DSUxLSVRfVEVYVF9JTlBVVCkKK0BpbnRlcmZhY2UgV0tDb250ZW50VmlldyAo
V0tVSUluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbkRlbGVnYXRlKSA8VUlJbmRpcmVjdFNjcmli
YmxlSW50ZXJhY3Rpb25EZWxlZ2F0ZT4KK0BlbmQKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oV0FU
Q0hPUykKIEBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoV2F0Y2hTdXBwb3J0KSA8V0tGb2N1c2Vk
Rm9ybUNvbnRyb2xWaWV3RGVsZWdhdGUsIFdLU2VsZWN0TWVudUxpc3RWaWV3Q29udHJvbGxlckRl
bGVnYXRlLCBXS1RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlckRlbGVnYXRlPgogQGVuZApAQCAt
ODMwLDggKzgzMSw4IEBAIC0gKHZvaWQpc2V0VXBJbnRlcmFjdGlvbgogICAgIFtzZWxmIHNldFVw
Q3Vyc29ySW50ZXJhY3Rpb25dOwogI2VuZGlmCiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RL
KQotICAgIFtzZWxmIHNldFVwQWRkaXRpb25hbEludGVyYWN0aW9uc107CisjaWYgRU5BQkxFKFBF
TkNJTEtJVF9URVhUX0lOUFVUKQorICAgIFtzZWxmIHNldFVwU2NyaWJibGVJbnRlcmFjdGlvbl07
CiAjZW5kaWYKIAogICAgIF90d29GaW5nZXJTaW5nbGVUYXBHZXN0dXJlUmVjb2duaXplciA9IGFk
b3B0TlMoW1tVSVRhcEdlc3R1cmVSZWNvZ25pemVyIGFsbG9jXSBpbml0V2l0aFRhcmdldDpzZWxm
IGFjdGlvbjpAc2VsZWN0b3IoX3R3b0ZpbmdlclNpbmdsZVRhcEdlc3R1cmVSZWNvZ25pemVkOild
KTsKQEAgLTk5OCw4ICs5OTksOCBAQCAtICh2b2lkKWNsZWFuVXBJbnRlcmFjdGlvbgogICAgIF9j
dXJzb3JJbnRlcmFjdGlvbiA9IG5pbDsKICNlbmRpZgogCi0jaWYgVVNFKEFQUExFX0lOVEVSTkFM
X1NESykKLSAgICBbc2VsZiBjbGVhblVwQWRkaXRpb25hbEludGVyYWN0aW9uc107CisjaWYgRU5B
QkxFKFBFTkNJTEtJVF9URVhUX0lOUFVUKQorICAgIFtzZWxmIGNsZWFuVXBTY3JpYmJsZUludGVy
YWN0aW9uXTsKICNlbmRpZgogCiAgICAgX2luc3BlY3Rvck5vZGVTZWFyY2hFbmFibGVkID0gTk87
CkBAIC00ODM5LDggKzQ4NDAsOCBAQCAtICh2b2lkKWRlbGV0ZUJhY2t3YXJkCiAKIC0gKEJPT0wp
X3Nob3VsZFNpbXVsYXRlS2V5Ym9hcmRJbnB1dE9uVGV4dEluc2VydGlvbgogewotI2lmIFVTRShU
RVhUX0lOVEVSQUNUSU9OX0FERElUSU9OUykKLSAgICByZXR1cm4gW3NlbGYgX3Nob3VsZFNpbXVs
YXRlS2V5Ym9hcmRJbnB1dE9uVGV4dEluc2VydGlvbkludGVybmFsXTsKKyNpZiBFTkFCTEUoUEVO
Q0lMS0lUX1RFWFRfSU5QVVQpCisgICAgcmV0dXJuIFtfc2NyaWJibGVJbnRlcmFjdGlvbiBoYW5k
bGluZ1dyaXRpbmddOwogI2Vsc2UKICAgICByZXR1cm4gTk87CiAjZW5kaWYKQEAgLTg3NzQsNiAr
ODc3NSw4MSBAQCAtIChfVUlDdXJzb3JTdHlsZSAqKWN1cnNvckludGVyYWN0aW9uOihfVUlDdXJz
b3JJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHN0eWxlRgogCiAjZW5kaWYgLy8gSEFWRShVSV9D
VVJTT1JfSU5URVJBQ1RJT04pCiAKKyNpZiBFTkFCTEUoUEVOQ0lMS0lUX1RFWFRfSU5QVVQpCisK
Ky0gKHZvaWQpc2V0VXBTY3JpYmJsZUludGVyYWN0aW9uCit7CisgICAgX3NjcmliYmxlSW50ZXJh
Y3Rpb24gPSBhZG9wdE5TKFtbVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb24gYWxsb2NdIGlu
aXRXaXRoRGVsZWdhdGU6c2VsZl0pOworICAgIFtzZWxmIGFkZEludGVyYWN0aW9uOl9zY3JpYmJs
ZUludGVyYWN0aW9uLmdldCgpXTsKK30KKworLSAodm9pZCljbGVhbnVwU2NyaWJibGVJbnRlcmFj
dGlvbgoreworICAgIFtzZWxmIHJlbW92ZUludGVyYWN0aW9uOl9zY3JpYmJsZUludGVyYWN0aW9u
LmdldCgpXTsKKyAgICBfc2NyaWJibGVJbnRlcmFjdGlvbiA9IG5pbDsKK30KKworLSAoX1dLVGV4
dElucHV0Q29udGV4dCAqKV90ZXh0SW5wdXRDb250ZXh0QnlTY3JpYmJsZUlkZW50aWZpZXI6KFVJ
U2NyaWJibGVFbGVtZW50SWRlbnRpZmllcilpZGVudGlmaWVyCit7CisgICAgX1dLVGV4dElucHV0
Q29udGV4dCAqdGV4dElucHV0Q29udGV4dCA9IChfV0tUZXh0SW5wdXRDb250ZXh0ICopaWRlbnRp
ZmllcjsKKyAgICBpZiAoIVt0ZXh0SW5wdXRDb250ZXh0IGlzS2luZE9mQ2xhc3M6X1dLVGV4dElu
cHV0Q29udGV4dC5jbGFzc10pCisgICAgICAgIHJldHVybiBuaWw7CisgICAgYXV0byBlbGVtZW50
Q29udGV4dCA9IHRleHRJbnB1dENvbnRleHQuX3RleHRJbnB1dENvbnRleHQ7CisgICAgaWYgKGVs
ZW1lbnRDb250ZXh0LndlYlBhZ2VJZGVudGlmaWVyICE9IF9wYWdlLT53ZWJQYWdlSUQoKSkKKyAg
ICAgICAgcmV0dXJuIG5pbDsKKyAgICByZXR1cm4gdGV4dElucHV0Q29udGV4dDsKK30KKworLSAo
Qk9PTClfZWxlbWVudEZvclRleHRJbnB1dENvbnRleHRJc0ZvY3VzZWQ6KF9XS1RleHRJbnB1dENv
bnRleHQgKiljb250ZXh0Cit7CisgICAgLy8gV2UgaWdub3JlIGJvdW5kaW5nIHJlY3QgY2hhbmdl
cyBhcyB0aGUgYm91bmRpbmcgcmVjdCBvZiB0aGUgZm9jdXNlZCBlbGVtZW50IGlzIG5vdCBrZXB0
IHVwLXRvLWRhdGUuCisgICAgcmV0dXJuIHNlbGYuX2hhc0ZvY3VzZWRFbGVtZW50ICYmIGNvbnRl
eHQgJiYgY29udGV4dC5fdGV4dElucHV0Q29udGV4dC5pc1NhbWVFbGVtZW50KF9mb2N1c2VkRWxl
bWVudEluZm9ybWF0aW9uLmVsZW1lbnRDb250ZXh0KTsKK30KKworLSAodm9pZClpbmRpcmVjdFNj
cmliYmxlSW50ZXJhY3Rpb246KFVJSW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uICopaW50ZXJh
Y3Rpb24gcmVxdWVzdEVsZW1lbnRzSW5SZWN0OihDR1JlY3QpcmVjdCBjb21wbGV0aW9uOih2b2lk
KF4pKE5TQXJyYXk8VUlTY3JpYmJsZUVsZW1lbnRJZGVudGlmaWVyPiAqKSljb21wbGV0aW9uCit7
CisgICAgQVNTRVJUKF9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpID09IGludGVyYWN0aW9uKTsK
KyAgICBbc2VsZiBfcmVxdWVzdFRleHRJbnB1dENvbnRleHRzSW5SZWN0OnJlY3QgY29tcGxldGlv
bkhhbmRsZXI6Y29tcGxldGlvbl07Cit9CisKKy0gKEJPT0wpaW5kaXJlY3RTY3JpYmJsZUludGVy
YWN0aW9uOihVSUluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGlzRWxl
bWVudEZvY3VzZWQ6KFVJU2NyaWJibGVFbGVtZW50SWRlbnRpZmllcilpZGVudGlmaWVyCit7Cisg
ICAgQVNTRVJUKF9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpID09IGludGVyYWN0aW9uKTsKKyAg
ICByZXR1cm4gW3NlbGYgX2VsZW1lbnRGb3JUZXh0SW5wdXRDb250ZXh0SXNGb2N1c2VkOltzZWxm
IF90ZXh0SW5wdXRDb250ZXh0QnlTY3JpYmJsZUlkZW50aWZpZXI6aWRlbnRpZmllcl1dOworfQor
CistICh2b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRpcmVjdFNjcmliYmxl
SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBmb2N1c0VsZW1lbnRJZk5lZWRlZDooVUlTY3JpYmJs
ZUVsZW1lbnRJZGVudGlmaWVyKWlkZW50aWZpZXIgcmVmZXJlbmNlUG9pbnQ6KENHUG9pbnQpaW5p
dGlhbFBvaW50IGNvbXBsZXRpb246KHZvaWQgKF4pKFVJUmVzcG9uZGVyPFVJVGV4dElucHV0PiAq
KSljb21wbGV0aW9uQmxvY2sKK3sKKyAgICBBU1NFUlQoX3NjcmliYmxlSW50ZXJhY3Rpb24uZ2V0
KCkgPT0gaW50ZXJhY3Rpb24pOworICAgIGlmIChhdXRvICp0ZXh0SW5wdXRDb250ZXh0ID0gW3Nl
bGYgX3RleHRJbnB1dENvbnRleHRCeVNjcmliYmxlSWRlbnRpZmllcjppZGVudGlmaWVyXSkKKyAg
ICAgICAgW3NlbGYgX2ZvY3VzVGV4dElucHV0Q29udGV4dDp0ZXh0SW5wdXRDb250ZXh0IHBsYWNl
Q2FyZXRBdDppbml0aWFsUG9pbnQgY29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbkJsb2NrXTsK
KyAgICBlbHNlCisgICAgICAgIGNvbXBsZXRpb25CbG9jayhuaWwpOworfQorCistIChDR1JlY3Qp
aW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOihVSUluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlv
biAqKWludGVyYWN0aW9uIGZyYW1lRm9yRWxlbWVudDooVUlTY3JpYmJsZUVsZW1lbnRJZGVudGlm
aWVyKWlkZW50aWZpZXIKK3sKKyAgICBBU1NFUlQoX3NjcmliYmxlSW50ZXJhY3Rpb24uZ2V0KCkg
PT0gaW50ZXJhY3Rpb24pOworICAgIGF1dG8gKnRleHRJbnB1dENvbnRleHQgPSBbc2VsZiBfdGV4
dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOmlkZW50aWZpZXJdOworICAgIHJldHVy
biB0ZXh0SW5wdXRDb250ZXh0ID8gdGV4dElucHV0Q29udGV4dC5ib3VuZGluZ1JlY3QgOiBDR1Jl
Y3ROdWxsOworfQorCistICh2b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRp
cmVjdFNjcmliYmxlSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsQmVnaW5Xcml0aW5nSW5F
bGVtZW50OihVSVNjcmliYmxlRWxlbWVudElkZW50aWZpZXIpaWRlbnRpZmllcgoreworICAgIEFT
U0VSVChfc2NyaWJibGVJbnRlcmFjdGlvbi5nZXQoKSA9PSBpbnRlcmFjdGlvbik7CisgICAgaWYg
KGF1dG8gKnRleHRJbnB1dENvbnRleHQgPSBbc2VsZiBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJi
bGVJZGVudGlmaWVyOmlkZW50aWZpZXJdKQorICAgICAgICBbc2VsZiBfd2lsbEJlZ2luVGV4dElu
dGVyYWN0aW9uSW5UZXh0SW5wdXRDb250ZXh0OnRleHRJbnB1dENvbnRleHRdOworfQorCistICh2
b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJh
Y3Rpb24gKilpbnRlcmFjdGlvbiBkaWRGaW5pc2hXcml0aW5nSW5FbGVtZW50OihVSVNjcmliYmxl
RWxlbWVudElkZW50aWZpZXIpaWRlbnRpZmllcgoreworICAgIEFTU0VSVChfc2NyaWJibGVJbnRl
cmFjdGlvbi5nZXQoKSA9PSBpbnRlcmFjdGlvbik7CisgICAgaWYgKGF1dG8gKnRleHRJbnB1dENv
bnRleHQgPSBbc2VsZiBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOmlkZW50
aWZpZXJdKQorICAgICAgICBbc2VsZiBfZGlkRmluaXNoVGV4dEludGVyYWN0aW9uSW5UZXh0SW5w
dXRDb250ZXh0OnRleHRJbnB1dENvbnRleHRdOworfQorCisjZW5kaWYgLy8gRU5BQkxFKFBFTkNJ
TEtJVF9URVhUX0lOUFVUKQorCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKIAogI2lm
ICFQTEFURk9STShXQVRDSE9TKSAmJiAhUExBVEZPUk0oQVBQTEVUVikK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407671</attachid>
            <date>2020-09-01 04:01:25 -0700</date>
            <delta_ts>2020-09-01 10:09:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-216030-20200901040125.patch</filename>
            <type>text/plain</type>
            <size>8148</size>
            <attacher name="Tim Horton">thorton</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Mzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRiNmZlN2YzNTBiNjI4MWEw
NmQwOTlmN2RhMzNkNDA2OTcxYTc3NmYuLjdlYzhkMjc3OGVlYzlmZTJkMzNmNjA1ZTlkODkzNTUz
M2Y5YTc4OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjAtMDktMDEgIFRpbSBIb3J0
b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gUGVuY2ls
S2l0IHRleHQgaW5wdXQgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MjE2MDMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT
ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5o
OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgor
ICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHNldFVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1b
V0tDb250ZW50VmlldyBjbGVhblVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50
VmlldyBfc2hvdWxkU2ltdWxhdGVLZXlib2FyZElucHV0T25UZXh0SW5zZXJ0aW9uXSk6CisgICAg
ICAgICgtW1dLQ29udGVudFZpZXcgc2V0VXBTY3JpYmJsZUludGVyYWN0aW9uXSk6CisgICAgICAg
ICgtW1dLQ29udGVudFZpZXcgY2xlYW5VcFNjcmliYmxlSW50ZXJhY3Rpb25dKToKKyAgICAgICAg
KC1bV0tDb250ZW50VmlldyBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOl0p
OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9lbGVtZW50Rm9yVGV4dElucHV0Q29udGV4dElz
Rm9jdXNlZDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxlSW50
ZXJhY3Rpb246cmVxdWVzdEVsZW1lbnRzSW5SZWN0OmNvbXBsZXRpb246XSk6CisgICAgICAgICgt
W1dLQ29udGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmlzRWxlbWVudEZvY3Vz
ZWQ6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0
aW9uOmZvY3VzRWxlbWVudElmTmVlZGVkOnJlZmVyZW5jZVBvaW50OmNvbXBsZXRpb246XSk6Cisg
ICAgICAgICgtW1dLQ29udGVudFZpZXcgaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOmZyYW1l
Rm9yRWxlbWVudDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxl
SW50ZXJhY3Rpb246d2lsbEJlZ2luV3JpdGluZ0luRWxlbWVudDpdKToKKyAgICAgICAgKC1bV0tD
b250ZW50VmlldyBpbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb246ZGlkRmluaXNoV3JpdGluZ0lu
RWxlbWVudDpdKToKKwogMjAyMC0wOC0zMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNv
bT4KIAogICAgICAgICBXZWJwYWdlcyBmbGFzaCB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIHdpbmRv
d3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3
SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3
SW50ZXJhY3Rpb24uaAppbmRleCA4MWE5ZWE3ZjkxNmQ0Y2MxNzIyMTJjOWY5ODcwODg2OTc2Mzc5
NzY2Li43NTA2MmZlZDU1MDI4NzM5ZGNlM2E4N2NhNTNlMDVjYWZiM2M1ZDhhIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgK
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv
bi5oCkBAIC0yNDQsNiArMjQ0LDEwIEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7CiAg
ICAgV2ViQ29yZTo6TW91c2VFdmVudFBvbGljeSBfbW91c2VFdmVudFBvbGljeTsKICNlbmRpZgog
CisjaWYgRU5BQkxFKFBFTkNJTEtJVF9URVhUX0lOUFVUKQorICAgIFJldGFpblB0cjxVSUluZGly
ZWN0U2NyaWJibGVJbnRlcmFjdGlvbj4gX3NjcmliYmxlSW50ZXJhY3Rpb247CisjZW5kaWYKKwog
I2lmIEhBVkUoVUlfQ1VSU09SX0lOVEVSQUNUSU9OKQogICAgIFJldGFpblB0cjxfVUlDdXJzb3JJ
bnRlcmFjdGlvbj4gX2N1cnNvckludGVyYWN0aW9uOwogICAgIEJPT0wgX2hhc091dHN0YW5kaW5n
Q3Vyc29ySW50ZXJhY3Rpb25SZXF1ZXN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggNDY1YTQ5ZDQ5Y2U4
N2U2NDBiY2QyODQ3YWFjZjZhM2IyZWE0ODUxMS4uNjE3N2QwOGMzYjdhYzBlMzgyZTRmODljY2Mz
MmU4MzZiYmYxNDQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL
Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p
b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xNjEsMTAgKzE2MSw2IEBACiAjaW1w
b3J0ICJXS1dlYkV2ZW50LmgiCiAjZW5kaWYKIAotI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREsp
Ci0jaW1wb3J0IDxXZWJLaXRBZGRpdGlvbnMvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uQWRkaXRp
b25zLm1tPgotI2VuZGlmCi0KICNpbXBvcnQgPHBhbC9pb3MvTWFuYWdlZENvbmZpZ3VyYXRpb25T
b2Z0TGluay5oPgogCiAjaWYgSEFWRShMSU5LX1BSRVZJRVcpICYmIFVTRShVSUNPTlRFWFRNRU5V
KQpAQCAtMTc5LDYgKzE3NSwxMSBAQCBAaW50ZXJmYWNlIFdLQ29udGVudFZpZXcgKFdLVUlDdXJz
b3JJbnRlcmFjdGlvbkRlbGVnYXRlKSA8X1VJQ3Vyc29ySW50ZXJhY3Rpb25EZQogQGVuZAogI2Vu
ZGlmCiAKKyNpZiBFTkFCTEUoUEVOQ0lMS0lUX1RFWFRfSU5QVVQpCitAaW50ZXJmYWNlIFdLQ29u
dGVudFZpZXcgKFdLVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb25EZWxlZ2F0ZSkgPFVJSW5k
aXJlY3RTY3JpYmJsZUludGVyYWN0aW9uRGVsZWdhdGU+CitAZW5kCisjZW5kaWYKKwogI2lmIFBM
QVRGT1JNKFdBVENIT1MpCiBAaW50ZXJmYWNlIFdLQ29udGVudFZpZXcgKFdhdGNoU3VwcG9ydCkg
PFdLRm9jdXNlZEZvcm1Db250cm9sVmlld0RlbGVnYXRlLCBXS1NlbGVjdE1lbnVMaXN0Vmlld0Nv
bnRyb2xsZXJEZWxlZ2F0ZSwgV0tUZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXJEZWxlZ2F0ZT4K
IEBlbmQKQEAgLTgzMCw4ICs4MzEsOCBAQCAtICh2b2lkKXNldFVwSW50ZXJhY3Rpb24KICAgICBb
c2VsZiBzZXRVcEN1cnNvckludGVyYWN0aW9uXTsKICNlbmRpZgogCi0jaWYgVVNFKEFQUExFX0lO
VEVSTkFMX1NESykKLSAgICBbc2VsZiBzZXRVcEFkZGl0aW9uYWxJbnRlcmFjdGlvbnNdOworI2lm
IEVOQUJMRShQRU5DSUxLSVRfVEVYVF9JTlBVVCkKKyAgICBbc2VsZiBzZXRVcFNjcmliYmxlSW50
ZXJhY3Rpb25dOwogI2VuZGlmCiAKICAgICBfdHdvRmluZ2VyU2luZ2xlVGFwR2VzdHVyZVJlY29n
bml6ZXIgPSBhZG9wdE5TKFtbVUlUYXBHZXN0dXJlUmVjb2duaXplciBhbGxvY10gaW5pdFdpdGhU
YXJnZXQ6c2VsZiBhY3Rpb246QHNlbGVjdG9yKF90d29GaW5nZXJTaW5nbGVUYXBHZXN0dXJlUmVj
b2duaXplZDopXSk7CkBAIC05OTgsOCArOTk5LDggQEAgLSAodm9pZCljbGVhblVwSW50ZXJhY3Rp
b24KICAgICBfY3Vyc29ySW50ZXJhY3Rpb24gPSBuaWw7CiAjZW5kaWYKIAotI2lmIFVTRShBUFBM
RV9JTlRFUk5BTF9TREspCi0gICAgW3NlbGYgY2xlYW5VcEFkZGl0aW9uYWxJbnRlcmFjdGlvbnNd
OworI2lmIEVOQUJMRShQRU5DSUxLSVRfVEVYVF9JTlBVVCkKKyAgICBbc2VsZiBjbGVhblVwU2Ny
aWJibGVJbnRlcmFjdGlvbl07CiAjZW5kaWYKIAogICAgIF9pbnNwZWN0b3JOb2RlU2VhcmNoRW5h
YmxlZCA9IE5POwpAQCAtNDgzOSw4ICs0ODQwLDggQEAgLSAodm9pZClkZWxldGVCYWNrd2FyZAog
CiAtIChCT09MKV9zaG91bGRTaW11bGF0ZUtleWJvYXJkSW5wdXRPblRleHRJbnNlcnRpb24KIHsK
LSNpZiBVU0UoVEVYVF9JTlRFUkFDVElPTl9BRERJVElPTlMpCi0gICAgcmV0dXJuIFtzZWxmIF9z
aG91bGRTaW11bGF0ZUtleWJvYXJkSW5wdXRPblRleHRJbnNlcnRpb25JbnRlcm5hbF07CisjaWYg
RU5BQkxFKFBFTkNJTEtJVF9URVhUX0lOUFVUKQorICAgIHJldHVybiBbX3NjcmliYmxlSW50ZXJh
Y3Rpb24gaXNIYW5kbGluZ1dyaXRpbmddOwogI2Vsc2UKICAgICByZXR1cm4gTk87CiAjZW5kaWYK
QEAgLTg3NzQsNiArODc3NSw4MSBAQCAtIChfVUlDdXJzb3JTdHlsZSAqKWN1cnNvckludGVyYWN0
aW9uOihfVUlDdXJzb3JJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHN0eWxlRgogCiAjZW5kaWYg
Ly8gSEFWRShVSV9DVVJTT1JfSU5URVJBQ1RJT04pCiAKKyNpZiBFTkFCTEUoUEVOQ0lMS0lUX1RF
WFRfSU5QVVQpCisKKy0gKHZvaWQpc2V0VXBTY3JpYmJsZUludGVyYWN0aW9uCit7CisgICAgX3Nj
cmliYmxlSW50ZXJhY3Rpb24gPSBhZG9wdE5TKFtbVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rp
b24gYWxsb2NdIGluaXRXaXRoRGVsZWdhdGU6c2VsZl0pOworICAgIFtzZWxmIGFkZEludGVyYWN0
aW9uOl9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpXTsKK30KKworLSAodm9pZCljbGVhblVwU2Ny
aWJibGVJbnRlcmFjdGlvbgoreworICAgIFtzZWxmIHJlbW92ZUludGVyYWN0aW9uOl9zY3JpYmJs
ZUludGVyYWN0aW9uLmdldCgpXTsKKyAgICBfc2NyaWJibGVJbnRlcmFjdGlvbiA9IG5pbDsKK30K
KworLSAoX1dLVGV4dElucHV0Q29udGV4dCAqKV90ZXh0SW5wdXRDb250ZXh0QnlTY3JpYmJsZUlk
ZW50aWZpZXI6KFVJU2NyaWJibGVFbGVtZW50SWRlbnRpZmllcilpZGVudGlmaWVyCit7CisgICAg
X1dLVGV4dElucHV0Q29udGV4dCAqdGV4dElucHV0Q29udGV4dCA9IChfV0tUZXh0SW5wdXRDb250
ZXh0ICopaWRlbnRpZmllcjsKKyAgICBpZiAoIVt0ZXh0SW5wdXRDb250ZXh0IGlzS2luZE9mQ2xh
c3M6X1dLVGV4dElucHV0Q29udGV4dC5jbGFzc10pCisgICAgICAgIHJldHVybiBuaWw7CisgICAg
YXV0byBlbGVtZW50Q29udGV4dCA9IHRleHRJbnB1dENvbnRleHQuX3RleHRJbnB1dENvbnRleHQ7
CisgICAgaWYgKGVsZW1lbnRDb250ZXh0LndlYlBhZ2VJZGVudGlmaWVyICE9IF9wYWdlLT53ZWJQ
YWdlSUQoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICByZXR1cm4gdGV4dElucHV0Q29udGV4
dDsKK30KKworLSAoQk9PTClfZWxlbWVudEZvclRleHRJbnB1dENvbnRleHRJc0ZvY3VzZWQ6KF9X
S1RleHRJbnB1dENvbnRleHQgKiljb250ZXh0Cit7CisgICAgLy8gV2UgaWdub3JlIGJvdW5kaW5n
IHJlY3QgY2hhbmdlcyBhcyB0aGUgYm91bmRpbmcgcmVjdCBvZiB0aGUgZm9jdXNlZCBlbGVtZW50
IGlzIG5vdCBrZXB0IHVwLXRvLWRhdGUuCisgICAgcmV0dXJuIHNlbGYuX2hhc0ZvY3VzZWRFbGVt
ZW50ICYmIGNvbnRleHQgJiYgY29udGV4dC5fdGV4dElucHV0Q29udGV4dC5pc1NhbWVFbGVtZW50
KF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRDb250ZXh0KTsKK30KKworLSAodm9p
ZClpbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb246KFVJSW5kaXJlY3RTY3JpYmJsZUludGVyYWN0
aW9uICopaW50ZXJhY3Rpb24gcmVxdWVzdEVsZW1lbnRzSW5SZWN0OihDR1JlY3QpcmVjdCBjb21w
bGV0aW9uOih2b2lkKF4pKE5TQXJyYXk8VUlTY3JpYmJsZUVsZW1lbnRJZGVudGlmaWVyPiAqKSlj
b21wbGV0aW9uCit7CisgICAgQVNTRVJUKF9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpID09IGlu
dGVyYWN0aW9uKTsKKyAgICBbc2VsZiBfcmVxdWVzdFRleHRJbnB1dENvbnRleHRzSW5SZWN0OnJl
Y3QgY29tcGxldGlvbkhhbmRsZXI6Y29tcGxldGlvbl07Cit9CisKKy0gKEJPT0wpaW5kaXJlY3RT
Y3JpYmJsZUludGVyYWN0aW9uOihVSUluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbiAqKWludGVy
YWN0aW9uIGlzRWxlbWVudEZvY3VzZWQ6KFVJU2NyaWJibGVFbGVtZW50SWRlbnRpZmllcilpZGVu
dGlmaWVyCit7CisgICAgQVNTRVJUKF9zY3JpYmJsZUludGVyYWN0aW9uLmdldCgpID09IGludGVy
YWN0aW9uKTsKKyAgICByZXR1cm4gW3NlbGYgX2VsZW1lbnRGb3JUZXh0SW5wdXRDb250ZXh0SXNG
b2N1c2VkOltzZWxmIF90ZXh0SW5wdXRDb250ZXh0QnlTY3JpYmJsZUlkZW50aWZpZXI6aWRlbnRp
Zmllcl1dOworfQorCistICh2b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRp
cmVjdFNjcmliYmxlSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBmb2N1c0VsZW1lbnRJZk5lZWRl
ZDooVUlTY3JpYmJsZUVsZW1lbnRJZGVudGlmaWVyKWlkZW50aWZpZXIgcmVmZXJlbmNlUG9pbnQ6
KENHUG9pbnQpaW5pdGlhbFBvaW50IGNvbXBsZXRpb246KHZvaWQgKF4pKFVJUmVzcG9uZGVyPFVJ
VGV4dElucHV0PiAqKSljb21wbGV0aW9uQmxvY2sKK3sKKyAgICBBU1NFUlQoX3NjcmliYmxlSW50
ZXJhY3Rpb24uZ2V0KCkgPT0gaW50ZXJhY3Rpb24pOworICAgIGlmIChhdXRvICp0ZXh0SW5wdXRD
b250ZXh0ID0gW3NlbGYgX3RleHRJbnB1dENvbnRleHRCeVNjcmliYmxlSWRlbnRpZmllcjppZGVu
dGlmaWVyXSkKKyAgICAgICAgW3NlbGYgX2ZvY3VzVGV4dElucHV0Q29udGV4dDp0ZXh0SW5wdXRD
b250ZXh0IHBsYWNlQ2FyZXRBdDppbml0aWFsUG9pbnQgY29tcGxldGlvbkhhbmRsZXI6Y29tcGxl
dGlvbkJsb2NrXTsKKyAgICBlbHNlCisgICAgICAgIGNvbXBsZXRpb25CbG9jayhuaWwpOworfQor
CistIChDR1JlY3QpaW5kaXJlY3RTY3JpYmJsZUludGVyYWN0aW9uOihVSUluZGlyZWN0U2NyaWJi
bGVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIGZyYW1lRm9yRWxlbWVudDooVUlTY3JpYmJsZUVs
ZW1lbnRJZGVudGlmaWVyKWlkZW50aWZpZXIKK3sKKyAgICBBU1NFUlQoX3NjcmliYmxlSW50ZXJh
Y3Rpb24uZ2V0KCkgPT0gaW50ZXJhY3Rpb24pOworICAgIGF1dG8gKnRleHRJbnB1dENvbnRleHQg
PSBbc2VsZiBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOmlkZW50aWZpZXJd
OworICAgIHJldHVybiB0ZXh0SW5wdXRDb250ZXh0ID8gdGV4dElucHV0Q29udGV4dC5ib3VuZGlu
Z1JlY3QgOiBDR1JlY3ROdWxsOworfQorCistICh2b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFj
dGlvbjooVUlJbmRpcmVjdFNjcmliYmxlSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsQmVn
aW5Xcml0aW5nSW5FbGVtZW50OihVSVNjcmliYmxlRWxlbWVudElkZW50aWZpZXIpaWRlbnRpZmll
cgoreworICAgIEFTU0VSVChfc2NyaWJibGVJbnRlcmFjdGlvbi5nZXQoKSA9PSBpbnRlcmFjdGlv
bik7CisgICAgaWYgKGF1dG8gKnRleHRJbnB1dENvbnRleHQgPSBbc2VsZiBfdGV4dElucHV0Q29u
dGV4dEJ5U2NyaWJibGVJZGVudGlmaWVyOmlkZW50aWZpZXJdKQorICAgICAgICBbc2VsZiBfd2ls
bEJlZ2luVGV4dEludGVyYWN0aW9uSW5UZXh0SW5wdXRDb250ZXh0OnRleHRJbnB1dENvbnRleHRd
OworfQorCistICh2b2lkKWluZGlyZWN0U2NyaWJibGVJbnRlcmFjdGlvbjooVUlJbmRpcmVjdFNj
cmliYmxlSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBkaWRGaW5pc2hXcml0aW5nSW5FbGVtZW50
OihVSVNjcmliYmxlRWxlbWVudElkZW50aWZpZXIpaWRlbnRpZmllcgoreworICAgIEFTU0VSVChf
c2NyaWJibGVJbnRlcmFjdGlvbi5nZXQoKSA9PSBpbnRlcmFjdGlvbik7CisgICAgaWYgKGF1dG8g
KnRleHRJbnB1dENvbnRleHQgPSBbc2VsZiBfdGV4dElucHV0Q29udGV4dEJ5U2NyaWJibGVJZGVu
dGlmaWVyOmlkZW50aWZpZXJdKQorICAgICAgICBbc2VsZiBfZGlkRmluaXNoVGV4dEludGVyYWN0
aW9uSW5UZXh0SW5wdXRDb250ZXh0OnRleHRJbnB1dENvbnRleHRdOworfQorCisjZW5kaWYgLy8g
RU5BQkxFKFBFTkNJTEtJVF9URVhUX0lOUFVUKQorCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxF
TUVOVCkKIAogI2lmICFQTEFURk9STShXQVRDSE9TKSAmJiAhUExBVEZPUk0oQVBQTEVUVikK
</data>

          </attachment>
      

    </bug>

</bugzilla>