<?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>220123</bug_id>
          
          <creation_ts>2020-12-23 10:36:30 -0800</creation_ts>
          <short_desc>Use sendWithAsyncReply instead of FontAttributesCallback</short_desc>
          <delta_ts>2021-01-05 10:42:17 -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>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>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Alex Christensen">achristensen</reporter>
          <assigned_to name="Alex Christensen">achristensen</assigned_to>
          <cc>cdumez</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1716470</commentid>
    <comment_count>0</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-12-23 10:36:30 -0800</bug_when>
    <thetext>Use sendWithAsyncReply instead of FontAttributesCallback</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1716471</commentid>
    <comment_count>1</comment_count>
      <attachid>416714</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-12-23 10:36:44 -0800</bug_when>
    <thetext>Created attachment 416714
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1716473</commentid>
    <comment_count>2</comment_count>
      <attachid>416715</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2020-12-23 10:40:19 -0800</bug_when>
    <thetext>Created attachment 416715
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1716846</commentid>
    <comment_count>3</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-12-30 10:37:12 -0800</bug_when>
    <thetext>&lt;rdar://problem/72742140&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1717321</commentid>
    <comment_count>4</comment_count>
      <attachid>416715</attachid>
    <who name="Chris Dumez">cdumez</who>
    <bug_when>2021-01-05 08:40:42 -0800</bug_when>
    <thetext>Comment on attachment 416715
Patch

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

&gt; Source/WebKit/UIProcess/WebPageProxy.cpp:-2360
&gt; -    m_cachedFontAttributesAtSelectionStart = attributes;

Looks like you are no longer updating m_cachedFontAttributesAtSelectionStart ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1717350</commentid>
    <comment_count>5</comment_count>
      <attachid>417012</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-01-05 09:45:05 -0800</bug_when>
    <thetext>Created attachment 417012
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1717388</commentid>
    <comment_count>6</comment_count>
      <attachid>417019</attachid>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-01-05 10:33:29 -0800</bug_when>
    <thetext>Created attachment 417019
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1717391</commentid>
    <comment_count>7</comment_count>
    <who name="Alex Christensen">achristensen</who>
    <bug_when>2021-01-05 10:42:17 -0800</bug_when>
    <thetext>http://trac.webkit.org/r271160</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>416714</attachid>
            <date>2020-12-23 10:36:44 -0800</date>
            <delta_ts>2020-12-23 10:40:18 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220123-20201223103643.patch</filename>
            <type>text/plain</type>
            <size>8888</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0YzY2Y2U2N2U1ODA5YThk
NjNmMjdjYTBiZWI1MDk1ZGVhZDJkNWYuLjljNjk2YmNmYjc2OTM5NjI1MGY4NGJiOGQ5YTdiNGQ3
MWUxZGQxNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMTItMjMgIEFsZXggQ2hy
aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2Ugc2VuZFdp
dGhBc3luY1JlcGx5IGluc3RlYWQgb2YgRm9udEF0dHJpYnV0ZXNDYWxsYmFjaworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMTIzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BT
ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW06CisgICAgICAg
IChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0eXBpbmdBdHRyaWJ1dGVzV2l0aENvbXBsZXRpb25IYW5k
bGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdl
YktpdDo6V2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0
KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpmb250QXR0cmlidXRlc0NhbGxiYWNr
KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAg
ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9j
ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlcXVl
c3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv
V2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
bWVzc2FnZXMuaW46CisKIDIwMjAtMTItMjIgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l
eUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2Fubm90IHNlZSAnQWRkIHRvIG15IHN0YXRpb25zJyBi
dXR0b24gaW4gQkJDIFdvcmxkIHNlcnZpY2UgUmFkaW8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvQ29jb2EvV2ViVmlld0ltcGwubW0KaW5kZXggOTJjMmUxOTEwOWVmZWNhMmQ2Zjc1ZDkxMmVh
YzM3NzMwNzZmM2I0Yy4uOTEzMDE5NTFjMTY4ZjE0ZTVkY2VkYTYxMjNlZGVmOGU2ZTIxYTc2NyAx
MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0K
KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTI5
NzksMTIgKzI5NzksNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp0eXBpbmdBdHRyaWJ1dGVzV2l0aENv
bXBsZXRpb25IYW5kbGVyKHZvaWQoXmNvbXBsZXRpb24pKE5TRGljdAogICAgICAgICByZXR1cm47
CiAgICAgfQogCi0gICAgbV9wYWdlLT5yZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0
YXJ0KFtjb21wbGV0aW9uID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb24pXSAoY29uc3QgV2ViQ29y
ZTo6Rm9udEF0dHJpYnV0ZXMmIGF0dHJpYnV0ZXMsIENhbGxiYWNrQmFzZTo6RXJyb3IgZXJyb3Ip
IHsKLSAgICAgICAgaWYgKGVycm9yICE9IENhbGxiYWNrQmFzZTo6RXJyb3I6Ok5vbmUpIHsKLSAg
ICAgICAgICAgIGNvbXBsZXRpb24obmlsKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg
fQotCisgICAgbV9wYWdlLT5yZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KFtj
b21wbGV0aW9uID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRpb24pXSAoY29uc3QgV2ViQ29yZTo6Rm9u
dEF0dHJpYnV0ZXMmIGF0dHJpYnV0ZXMpIHsKICAgICAgICAgYXV0byBhdHRyaWJ1dGVzQXNEaWN0
aW9uYXJ5ID0gYXR0cmlidXRlcy5jcmVhdGVEaWN0aW9uYXJ5KCk7CiAgICAgICAgIGNvbXBsZXRp
b24oYXR0cmlidXRlc0FzRGljdGlvbmFyeS5nZXQoKSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA1NzE2ZDY3ZDcwMGUyZDFhOTdiMzA0YTI5
NDlhYWJjYTI0MzU4ZDVjLi4zYjMzZTBhODA5YWQyMGIzMzlmNjAwNmQ0NGI5NTZmNDQ5OGQ5ODUx
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisr
KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTIzNDQsMjMg
KzIzNDQsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmV4ZWN1dGVFZGl0Q29tbWFuZChjb25zdCBT
dHJpbmcmIGNvbW1hbmROYW1lLCBjb25zdCBTdHJpbmcmIGEKICAgICBzZW5kKE1lc3NhZ2VzOjpX
ZWJQYWdlOjpFeGVjdXRlRWRpdENvbW1hbmQoY29tbWFuZE5hbWUsIGFyZ3VtZW50KSk7CiB9CiAK
LXZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0
KEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmLCBDYWxsYmFja0Jh
c2U6OkVycm9yKT4mJiBjYWxsYmFjaykKK3ZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0
dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2Vi
Q29yZTo6Rm9udEF0dHJpYnV0ZXMmKT4mJiBjYWxsYmFjaykKIHsKLSAgICBpZiAoIWhhc1J1bm5p
bmdQcm9jZXNzKCkpIHsKLSAgICAgICAgY2FsbGJhY2soeyB9LCBDYWxsYmFja0Jhc2U6OkVycm9y
OjpVbmtub3duKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGF1dG8gY2FsbGJhY2tJ
RCA9IG1fY2FsbGJhY2tzLnB1dChXVEZNb3ZlKGNhbGxiYWNrKSwgbV9wcm9jZXNzLT50aHJvdHRs
ZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHkoIldlYlBhZ2VQcm94eTo6cmVxdWVzdEZvbnRBdHRyaWJ1
dGVzQXRTZWxlY3Rpb25TdGFydCJfcykpOwotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlJl
cXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoY2FsbGJhY2tJRCkpOwotfQotCi12
b2lkIFdlYlBhZ2VQcm94eTo6Zm9udEF0dHJpYnV0ZXNDYWxsYmFjayhjb25zdCBXZWJDb3JlOjpG
b250QXR0cmlidXRlcyYgYXR0cmlidXRlcywgQ2FsbGJhY2tJRCBjYWxsYmFja0lEKQotewotICAg
IG1fY2FjaGVkRm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0ID0gYXR0cmlidXRlczsKKyAg
ICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpCisgICAgICAgIHJldHVybiBjYWxsYmFjayh7IH0p
OwogCi0gICAgaWYgKGF1dG8gY2FsbGJhY2sgPSBtX2NhbGxiYWNrcy50YWtlPEZvbnRBdHRyaWJ1
dGVzQ2FsbGJhY2s+KGNhbGxiYWNrSUQpKQotICAgICAgICBjYWxsYmFjay0+cGVyZm9ybUNhbGxi
YWNrV2l0aFJldHVyblZhbHVlKGF0dHJpYnV0ZXMpOworICAgIHNlbmRXaXRoQXN5bmNSZXBseShN
ZXNzYWdlczo6V2ViUGFnZTo6UmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCgp
LCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRFZGl0YWJs
ZShib29sIGVkaXRhYmxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi
UGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRl
eCAwZGY2MTZiNzZmYjc1MDMzZWYyMDE3OWZlNWIyOTZmMjgzNTVlM2UxLi4yMjcwMDUyMDVjMTMx
YTczZGM5ODFjYzQ0ZjlkMDk2MzQ5ZTk2MmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ
UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ
YWdlUHJveHkuaApAQCAtMzc0LDcgKzM3NCw2IEBAIGVudW0gY2xhc3MgV2ViQ29udGVudE1vZGUg
OiB1aW50OF90OwogdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8QVBJOjpEYXRhKj4gRGF0YUNhbGxi
YWNrOwogdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8dWludDY0X3Q+IFVuc2lnbmVkQ2FsbGJhY2s7
CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxjb25zdCBTdHJpbmcmPiBTdHJpbmdDYWxsYmFjazsK
LXR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJj4g
Rm9udEF0dHJpYnV0ZXNDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0IFN0
cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyY+IFNlbGVjdGlvbkNvbnRleHRDYWxs
YmFjazsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGJvb2w+IEJvb2xDYWxsYmFjazsKIApAQCAt
NzIyLDggKzcyMSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzTWVkaWFTdHJlYW1DYXB0dXJlTXV0
ZWQoKSBjb25zdCB7IHJldHVybiBtX211dGVkU3RhdGUgJiBXZWJDb3JlOjpNZWRpYVByb2R1Y2Vy
OjpNZWRpYVN0cmVhbUNhcHR1cmVJc011dGVkOyB9CiAgICAgdm9pZCBzZXRNZWRpYVN0cmVhbUNh
cHR1cmVNdXRlZChib29sKTsKIAotICAgIHZvaWQgcmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxl
Y3Rpb25TdGFydChGdW5jdGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiwg
Q2FsbGJhY2tCYXNlOjpFcnJvcik+JiYpOwotICAgIHZvaWQgZm9udEF0dHJpYnV0ZXNDYWxsYmFj
ayhjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYsIENhbGxiYWNrSUQpOworICAgIHZvaWQg
cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChDb21wbGV0aW9uSGFuZGxlcjx2
b2lkKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJik+JiYpOwogCiAgICAgdm9pZCBzZXRD
YW5TaG93UGxhY2Vob2xkZXIoY29uc3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQmLCBib29sKTsK
IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3Nh
Z2VzLmluIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu
CmluZGV4IGVmOTMyN2Q4ZjZlZTdkM2ZlYzY1MjdmYTUyYTBiMGRjNzFmMzk3YTEuLjRmZTQyNGJl
OWZkNTdjMjE4MWY3YjA3OTBkMTJlZjg2OTFmYmFlN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL
aXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0
L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTE3OSw3ICsxNzksNiBAQCBt
ZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIEF0dHJpYnV0ZWRTdHJpbmdGb3JDaGFyYWN0
ZXJSYW5nZUNhbGxiYWNrKHN0cnVjdCBXZWJDb3JlOjpBdHRyaWJ1dGVkU3RyaW5nIHN0cmluZywg
c3RydWN0IFdlYktpdDo6RWRpdGluZ1JhbmdlIGFjdHVhbFJhbmdlLCBXZWJLaXQ6OkNhbGxiYWNr
SUQgY2FsbGJhY2tJRCkKICAgICBGb250QXRTZWxlY3Rpb25DYWxsYmFjayhzdHJ1Y3QgV2ViS2l0
OjpGb250SW5mbyBmb250SW5mbywgZG91YmxlIGZvbnRTaXplLCBib29sIHNlbGVjdGlvbkhhc011
bHRpcGxlRm9udHMsIFdlYktpdDo6Q2FsbGJhY2tJRCBjYWxsYmFja0lEKQogI2VuZGlmCi0gICAg
Rm9udEF0dHJpYnV0ZXNDYWxsYmFjayhzdHJ1Y3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMgYXR0
cmlidXRlcywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCiAjaWYgUExBVEZPUk0oSU9T
X0ZBTUlMWSkKICAgICBHZXN0dXJlQ2FsbGJhY2soV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIGVu
dW06dWludDhfdCBXZWJLaXQ6Okdlc3R1cmVUeXBlIGdlc3R1cmVUeXBlLCBlbnVtOnVpbnQ4X3Qg
V2ViS2l0OjpHZXN0dXJlUmVjb2duaXplclN0YXRlIGdlc3R1cmVTdGF0ZSwgT3B0aW9uU2V0PFdl
YktpdDo6U2VsZWN0aW9uRmxhZ3M+IGZsYWdzLCBXZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJ
RCkKICAgICBUb3VjaGVzQ2FsbGJhY2soV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIGVudW06dWlu
dDhfdCBXZWJLaXQ6OlNlbGVjdGlvblRvdWNoIHRvdWNoZXMsIE9wdGlvblNldDxXZWJLaXQ6OlNl
bGVjdGlvbkZsYWdzPiBmbGFncywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDMxYTE0YzEy
N2Q4Y2UzMzQyMjU1MGVhYTNlYTRmNDg1MjlkZjViZDkuLjk3ZWNkY2FmMDI3MTNmNTI1ZWQ5M2Nm
NDgwMzU4YmFlM2Q1MjFkYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl
L1dlYlBhZ2UuY3BwCkBAIC0zMDEwLDEwICszMDEwLDkgQEAgdm9pZCBXZWJQYWdlOjpzZXRDdXJy
ZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChXZWJLaXQ6OkJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0
ZSYKICAgICBjb3JlUGFnZSgpLT5tYWluRnJhbWUoKS5sb2FkZXIoKS5oaXN0b3J5KCkuc2V0Q3Vy
cmVudEl0ZW0oaGlzdG9yeUl0ZW1SZWYpOwogfQogCi12b2lkIFdlYlBhZ2U6OnJlcXVlc3RGb250
QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoQ2FsbGJhY2tJRCBjYWxsYmFja0lEKQordm9pZCBX
ZWJQYWdlOjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KENvbXBsZXRpb25I
YW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmKT4mJiBjb21wbGV0aW9u
SGFuZGxlcikKIHsKLSAgICBhdXRvIGF0dHJpYnV0ZXMgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxl
cigpLmZvY3VzZWRPck1haW5GcmFtZSgpLmVkaXRvcigpLmZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rp
b25TdGFydCgpOwotICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6Rm9udEF0dHJpYnV0
ZXNDYWxsYmFjayhhdHRyaWJ1dGVzLCBjYWxsYmFja0lEKSk7CisgICAgY29tcGxldGlvbkhhbmRs
ZXIobV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKS5lZGl0b3Io
KS5mb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoKSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6
Y2FuY2VsR2VzdHVyZXNCbG9ja2VkT25TeW5jaHJvbm91c1JlcGxpZXMoKQpkaWZmIC0tZ2l0IGEv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IGU3YTJiNzliMzYxOTU2M2U4MDFl
MjRlYjM3NWY3ZjhiYzliMzFmOGMuLmRkNTdiOWQwN2UwNmVmNGM0ZTRiM2Y3ZTM0MWNlODY5YTll
YWUxMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh
Z2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAg
LTE1MzUsNyArMTUzNSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVCYWNrRm9yd2FyZExp
c3RGb3JSZWF0dGFjaChjb25zdCBWZWN0b3I8V2ViS2l0OjpCYWNrRm9yd2FyZExpc3RJdGVtU3Rh
dGU+Jik7CiAgICAgdm9pZCBzZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChXZWJLaXQ6
OkJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYmKTsKIAotICAgIHZvaWQgcmVxdWVzdEZvbnRBdHRy
aWJ1dGVzQXRTZWxlY3Rpb25TdGFydChDYWxsYmFja0lEKTsKKyAgICB2b2lkIHJlcXVlc3RGb250
QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBX
ZWJDb3JlOjpGb250QXR0cmlidXRlcyYpPiYmKTsKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVD
VE9SKQogICAgIHZvaWQgc2V0SW5kaWNhdGluZyhib29sKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDJlYWJkY2Y5
NDNiZDAwMDQyMjBjYjAzNjRhMzUxMzdkMmZlOWUyYmUuLmUzZDhmZGQwODRlNThjYTdiMTI3NzU5
ZDlhMGVjNjZiMTc5NThhNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz
L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtMjYzLDcgKzI2Myw3IEBAIEdlbmVyYXRl
U3ludGhldGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50OF90IFdlYktpdDo6U3ludGhldGljRWRp
dGluZ0NvbW1hbmRUeXBlCiAKICAgICBTZXROZWVkc0ZvbnRBdHRyaWJ1dGVzKGJvb2wgbmVlZHNG
b250QXR0cmlidXRlcykKIAotICAgIFJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3Rh
cnQoV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQpCisgICAgUmVxdWVzdEZvbnRBdHRyaWJ1
dGVzQXRTZWxlY3Rpb25TdGFydCgpIC0+IChzdHJ1Y3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMg
YXR0cmlidXRlcykgQXN5bmMKIAogICAgIERpZFJlbW92ZUVkaXRDb21tYW5kKHVpbnQ2NF90IGNv
bW1hbmRJRCkKICAgICBSZWFwcGx5RWRpdENvbW1hbmQodWludDY0X3QgY29tbWFuZElEKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>416715</attachid>
            <date>2020-12-23 10:40:19 -0800</date>
            <delta_ts>2021-01-05 09:45:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220123-20201223104018.patch</filename>
            <type>text/plain</type>
            <size>8855</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM0YzY2Y2U2N2U1ODA5YThk
NjNmMjdjYTBiZWI1MDk1ZGVhZDJkNWYuLmYxMTE0ODE2YTU0MTNlYTU1YmU5NDE1MjI1MzgxNzcy
MTIxOWRhNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMTItMjMgIEFsZXggQ2hy
aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2Ugc2VuZFdp
dGhBc3luY1JlcGx5IGluc3RlYWQgb2YgRm9udEF0dHJpYnV0ZXNDYWxsYmFjaworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMTIzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2Ev
V2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0eXBpbmdBdHRy
aWJ1dGVzV2l0aENvbXBsZXRpb25IYW5kbGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn
ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0
dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5
Ojpmb250QXR0cmlidXRlc0NhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv
V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl
cy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAg
IChXZWJLaXQ6OldlYlBhZ2U6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQp
OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2Vi
UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisKIDIwMjAtMTItMjIgIEthdGUg
Q2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2Fubm90IHNl
ZSAnQWRkIHRvIG15IHN0YXRpb25zJyBidXR0b24gaW4gQkJDIFdvcmxkIHNlcnZpY2UgUmFkaW8K
ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1t
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KaW5kZXggOTJj
MmUxOTEwOWVmZWNhMmQ2Zjc1ZDkxMmVhYzM3NzMwNzZmM2I0Yy4uOTEzMDE5NTFjMTY4ZjE0ZTVk
Y2VkYTYxMjNlZGVmOGU2ZTIxYTc2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvQ29jb2EvV2ViVmlld0ltcGwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j
b2EvV2ViVmlld0ltcGwubW0KQEAgLTI5NzksMTIgKzI5NzksNyBAQCB2b2lkIFdlYlZpZXdJbXBs
Ojp0eXBpbmdBdHRyaWJ1dGVzV2l0aENvbXBsZXRpb25IYW5kbGVyKHZvaWQoXmNvbXBsZXRpb24p
KE5TRGljdAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9wYWdlLT5yZXF1ZXN0Rm9u
dEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KFtjb21wbGV0aW9uID0gbWFrZUJsb2NrUHRyKGNv
bXBsZXRpb24pXSAoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmIGF0dHJpYnV0ZXMsIENh
bGxiYWNrQmFzZTo6RXJyb3IgZXJyb3IpIHsKLSAgICAgICAgaWYgKGVycm9yICE9IENhbGxiYWNr
QmFzZTo6RXJyb3I6Ok5vbmUpIHsKLSAgICAgICAgICAgIGNvbXBsZXRpb24obmlsKTsKLSAgICAg
ICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCisgICAgbV9wYWdlLT5yZXF1ZXN0Rm9udEF0dHJp
YnV0ZXNBdFNlbGVjdGlvblN0YXJ0KFtjb21wbGV0aW9uID0gbWFrZUJsb2NrUHRyKGNvbXBsZXRp
b24pXSAoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmIGF0dHJpYnV0ZXMpIHsKICAgICAg
ICAgYXV0byBhdHRyaWJ1dGVzQXNEaWN0aW9uYXJ5ID0gYXR0cmlidXRlcy5jcmVhdGVEaWN0aW9u
YXJ5KCk7CiAgICAgICAgIGNvbXBsZXRpb24oYXR0cmlidXRlc0FzRGljdGlvbmFyeS5nZXQoKSk7
CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv
eHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA1
NzE2ZDY3ZDcwMGUyZDFhOTdiMzA0YTI5NDlhYWJjYTI0MzU4ZDVjLi4zYjMzZTBhODA5YWQyMGIz
MzlmNjAwNmQ0NGI5NTZmNDQ5OGQ5ODUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh
Z2VQcm94eS5jcHAKQEAgLTIzNDQsMjMgKzIzNDQsMTIgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmV4
ZWN1dGVFZGl0Q29tbWFuZChjb25zdCBTdHJpbmcmIGNvbW1hbmROYW1lLCBjb25zdCBTdHJpbmcm
IGEKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpFeGVjdXRlRWRpdENvbW1hbmQoY29tbWFu
ZE5hbWUsIGFyZ3VtZW50KSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0
dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9u
dEF0dHJpYnV0ZXMmLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4mJiBjYWxsYmFjaykKK3ZvaWQgV2Vi
UGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KENvbXBsZXRp
b25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmKT4mJiBjYWxsYmFj
aykKIHsKLSAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpIHsKLSAgICAgICAgY2FsbGJhY2so
eyB9LCBDYWxsYmFja0Jhc2U6OkVycm9yOjpVbmtub3duKTsKLSAgICAgICAgcmV0dXJuOwotICAg
IH0KLQotICAgIGF1dG8gY2FsbGJhY2tJRCA9IG1fY2FsbGJhY2tzLnB1dChXVEZNb3ZlKGNhbGxi
YWNrKSwgbV9wcm9jZXNzLT50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHkoIldlYlBhZ2VQ
cm94eTo6cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCJfcykpOwotICAgIHNl
bmQoTWVzc2FnZXM6OldlYlBhZ2U6OlJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3Rh
cnQoY2FsbGJhY2tJRCkpOwotfQotCi12b2lkIFdlYlBhZ2VQcm94eTo6Zm9udEF0dHJpYnV0ZXND
YWxsYmFjayhjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYgYXR0cmlidXRlcywgQ2FsbGJh
Y2tJRCBjYWxsYmFja0lEKQotewotICAgIG1fY2FjaGVkRm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlv
blN0YXJ0ID0gYXR0cmlidXRlczsKKyAgICBpZiAoIWhhc1J1bm5pbmdQcm9jZXNzKCkpCisgICAg
ICAgIHJldHVybiBjYWxsYmFjayh7IH0pOwogCi0gICAgaWYgKGF1dG8gY2FsbGJhY2sgPSBtX2Nh
bGxiYWNrcy50YWtlPEZvbnRBdHRyaWJ1dGVzQ2FsbGJhY2s+KGNhbGxiYWNrSUQpKQotICAgICAg
ICBjYWxsYmFjay0+cGVyZm9ybUNhbGxiYWNrV2l0aFJldHVyblZhbHVlKGF0dHJpYnV0ZXMpOwor
ICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZTo6UmVxdWVzdEZvbnRBdHRy
aWJ1dGVzQXRTZWxlY3Rpb25TdGFydCgpLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiB9CiAKIHZvaWQg
V2ViUGFnZVByb3h5OjpzZXRFZGl0YWJsZShib29sIGVkaXRhYmxlKQpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv
Y2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAwZGY2MTZiNzZmYjc1MDMzZWYyMDE3OWZlNWIyOTZm
MjgzNTVlM2UxLi4yMjcwMDUyMDVjMTMxYTczZGM5ODFjYzQ0ZjlkMDk2MzQ5ZTk2MmM3IDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzc0LDcgKzM3NCw2IEBAIGVu
dW0gY2xhc3MgV2ViQ29udGVudE1vZGUgOiB1aW50OF90OwogdHlwZWRlZiBHZW5lcmljQ2FsbGJh
Y2s8QVBJOjpEYXRhKj4gRGF0YUNhbGxiYWNrOwogdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8dWlu
dDY0X3Q+IFVuc2lnbmVkQ2FsbGJhY2s7CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxjb25zdCBT
dHJpbmcmPiBTdHJpbmdDYWxsYmFjazsKLXR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0IFdl
YkNvcmU6OkZvbnRBdHRyaWJ1dGVzJj4gRm9udEF0dHJpYnV0ZXNDYWxsYmFjazsKIHR5cGVkZWYg
R2VuZXJpY0NhbGxiYWNrPGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmlu
ZyY+IFNlbGVjdGlvbkNvbnRleHRDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGJv
b2w+IEJvb2xDYWxsYmFjazsKIApAQCAtNzIyLDggKzcyMSw3IEBAIHB1YmxpYzoKICAgICBib29s
IGlzTWVkaWFTdHJlYW1DYXB0dXJlTXV0ZWQoKSBjb25zdCB7IHJldHVybiBtX211dGVkU3RhdGUg
JiBXZWJDb3JlOjpNZWRpYVByb2R1Y2VyOjpNZWRpYVN0cmVhbUNhcHR1cmVJc011dGVkOyB9CiAg
ICAgdm9pZCBzZXRNZWRpYVN0cmVhbUNhcHR1cmVNdXRlZChib29sKTsKIAotICAgIHZvaWQgcmVx
dWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChGdW5jdGlvbjx2b2lkKGNvbnN0IFdl
YkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+JiYpOwotICAgIHZv
aWQgZm9udEF0dHJpYnV0ZXNDYWxsYmFjayhjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYs
IENhbGxiYWNrSUQpOworICAgIHZvaWQgcmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25T
dGFydChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVz
Jik+JiYpOwogCiAgICAgdm9pZCBzZXRDYW5TaG93UGxhY2Vob2xkZXIoY29uc3QgV2ViQ29yZTo6
RWxlbWVudENvbnRleHQmLCBib29sKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv
V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IGVmOTMyN2Q4ZjZlZTdkM2ZlYzY1MjdmYTUy
YTBiMGRjNzFmMzk3YTEuLjRmZTQyNGJlOWZkNTdjMjE4MWY3YjA3OTBkMTJlZjg2OTFmYmFlN2Ig
MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl
cy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMu
aW4KQEAgLTE3OSw3ICsxNzksNiBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIEF0
dHJpYnV0ZWRTdHJpbmdGb3JDaGFyYWN0ZXJSYW5nZUNhbGxiYWNrKHN0cnVjdCBXZWJDb3JlOjpB
dHRyaWJ1dGVkU3RyaW5nIHN0cmluZywgc3RydWN0IFdlYktpdDo6RWRpdGluZ1JhbmdlIGFjdHVh
bFJhbmdlLCBXZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJRCkKICAgICBGb250QXRTZWxlY3Rp
b25DYWxsYmFjayhzdHJ1Y3QgV2ViS2l0OjpGb250SW5mbyBmb250SW5mbywgZG91YmxlIGZvbnRT
aXplLCBib29sIHNlbGVjdGlvbkhhc011bHRpcGxlRm9udHMsIFdlYktpdDo6Q2FsbGJhY2tJRCBj
YWxsYmFja0lEKQogI2VuZGlmCi0gICAgRm9udEF0dHJpYnV0ZXNDYWxsYmFjayhzdHJ1Y3QgV2Vi
Q29yZTo6Rm9udEF0dHJpYnV0ZXMgYXR0cmlidXRlcywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxi
YWNrSUQpCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBHZXN0dXJlQ2FsbGJhY2soV2Vi
Q29yZTo6SW50UG9pbnQgcG9pbnQsIGVudW06dWludDhfdCBXZWJLaXQ6Okdlc3R1cmVUeXBlIGdl
c3R1cmVUeXBlLCBlbnVtOnVpbnQ4X3QgV2ViS2l0OjpHZXN0dXJlUmVjb2duaXplclN0YXRlIGdl
c3R1cmVTdGF0ZSwgT3B0aW9uU2V0PFdlYktpdDo6U2VsZWN0aW9uRmxhZ3M+IGZsYWdzLCBXZWJL
aXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJRCkKICAgICBUb3VjaGVzQ2FsbGJhY2soV2ViQ29yZTo6
SW50UG9pbnQgcG9pbnQsIGVudW06dWludDhfdCBXZWJLaXQ6OlNlbGVjdGlvblRvdWNoIHRvdWNo
ZXMsIE9wdGlvblNldDxXZWJLaXQ6OlNlbGVjdGlvbkZsYWdzPiBmbGFncywgV2ViS2l0OjpDYWxs
YmFja0lEIGNhbGxiYWNrSUQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv
V2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl
YlBhZ2UuY3BwCmluZGV4IDMxYTE0YzEyN2Q4Y2UzMzQyMjU1MGVhYTNlYTRmNDg1MjlkZjViZDku
Ljk3ZWNkY2FmMDI3MTNmNTI1ZWQ5M2NmNDgwMzU4YmFlM2Q1MjFkYjYgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9X
ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0zMDEwLDEwICszMDEwLDkg
QEAgdm9pZCBXZWJQYWdlOjpzZXRDdXJyZW50SGlzdG9yeUl0ZW1Gb3JSZWF0dGFjaChXZWJLaXQ6
OkJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYKICAgICBjb3JlUGFnZSgpLT5tYWluRnJhbWUoKS5s
b2FkZXIoKS5oaXN0b3J5KCkuc2V0Q3VycmVudEl0ZW0oaGlzdG9yeUl0ZW1SZWYpOwogfQogCi12
b2lkIFdlYlBhZ2U6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoQ2FsbGJh
Y2tJRCBjYWxsYmFja0lEKQordm9pZCBXZWJQYWdlOjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNl
bGVjdGlvblN0YXJ0KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0
dHJpYnV0ZXMmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBhdXRvIGF0dHJpYnV0ZXMg
PSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLmVkaXRvcigp
LmZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCgpOwotICAgIHNlbmQoTWVzc2FnZXM6Oldl
YlBhZ2VQcm94eTo6Rm9udEF0dHJpYnV0ZXNDYWxsYmFjayhhdHRyaWJ1dGVzLCBjYWxsYmFja0lE
KSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIobV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1
c2VkT3JNYWluRnJhbWUoKS5lZGl0b3IoKS5mb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQo
KSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6Y2FuY2VsR2VzdHVyZXNCbG9ja2VkT25TeW5jaHJvbm91
c1JlcGxpZXMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv
V2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu
ZGV4IGU3YTJiNzliMzYxOTU2M2U4MDFlMjRlYjM3NWY3ZjhiYzliMzFmOGMuLmRkNTdiOWQwN2Uw
NmVmNGM0ZTRiM2Y3ZTM0MWNlODY5YTllYWUxMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv
V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl
c3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTE1MzUsNyArMTUzNSw3IEBAIHByaXZhdGU6CiAgICAg
dm9pZCB1cGRhdGVCYWNrRm9yd2FyZExpc3RGb3JSZWF0dGFjaChjb25zdCBWZWN0b3I8V2ViS2l0
OjpCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+Jik7CiAgICAgdm9pZCBzZXRDdXJyZW50SGlzdG9y
eUl0ZW1Gb3JSZWF0dGFjaChXZWJLaXQ6OkJhY2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZSYmKTsKIAot
ICAgIHZvaWQgcmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChDYWxsYmFja0lE
KTsKKyAgICB2b2lkIHJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoQ29tcGxl
dGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYpPiYmKTsKIAog
I2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQogICAgIHZvaWQgc2V0SW5kaWNhdGluZyhib29s
KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu
bWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l
c3NhZ2VzLmluCmluZGV4IDJlYWJkY2Y5NDNiZDAwMDQyMjBjYjAzNjRhMzUxMzdkMmZlOWUyYmUu
LmUzZDhmZGQwODRlNThjYTdiMTI3NzU5ZDlhMGVjNjZiMTc5NThhNjIgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIv
U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAt
MjYzLDcgKzI2Myw3IEBAIEdlbmVyYXRlU3ludGhldGljRWRpdGluZ0NvbW1hbmQoZW51bTp1aW50
OF90IFdlYktpdDo6U3ludGhldGljRWRpdGluZ0NvbW1hbmRUeXBlCiAKICAgICBTZXROZWVkc0Zv
bnRBdHRyaWJ1dGVzKGJvb2wgbmVlZHNGb250QXR0cmlidXRlcykKIAotICAgIFJlcXVlc3RGb250
QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxiYWNrSUQp
CisgICAgUmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCgpIC0+IChzdHJ1Y3Qg
V2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMgYXR0cmlidXRlcykgQXN5bmMKIAogICAgIERpZFJlbW92
ZUVkaXRDb21tYW5kKHVpbnQ2NF90IGNvbW1hbmRJRCkKICAgICBSZWFwcGx5RWRpdENvbW1hbmQo
dWludDY0X3QgY29tbWFuZElEKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417012</attachid>
            <date>2021-01-05 09:45:05 -0800</date>
            <delta_ts>2021-01-05 10:33:27 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220123-20210105094504.patch</filename>
            <type>text/plain</type>
            <size>9022</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwOTM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZmYzU2M2ZmNjEyMmJkZjVl
ZGRmYmEwZDRkNGNmZDQyNTRhMmExMDMuLmI3ODE3YjU3OGRiYWIwYmU4NTJlODUyODE3MjFjNGJm
NzNkZDJkNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDEtMDUgIEFsZXggQ2hy
aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBVc2Ugc2VuZFdp
dGhBc3luY1JlcGx5IGluc3RlYWQgb2YgRm9udEF0dHJpYnV0ZXNDYWxsYmFjaworICAgICAgICBo
dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwMTIzCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2Ev
V2ViVmlld0ltcGwubW06CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0eXBpbmdBdHRy
aWJ1dGVzV2l0aENvbXBsZXRpb25IYW5kbGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn
ZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0
dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5
Ojpmb250QXR0cmlidXRlc0NhbGxiYWNrKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mv
V2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl
cy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAg
IChXZWJLaXQ6OldlYlBhZ2U6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQp
OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2Vi
UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisKIDIwMjAtMTItMTcgIFJvYiBC
dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBNYWtlIEZvbnRDYXNjYWRlOjpDb2Rl
UGF0aCBhbiBlbnVtIGNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D
b2NvYS9XZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZp
ZXdJbXBsLm1tCmluZGV4IDkyYzJlMTkxMDllZmVjYTJkNmY3NWQ5MTJlYWMzNzczMDc2ZjNiNGMu
LjkxMzAxOTUxYzE2OGYxNGU1ZGNlZGE2MTIzZWRlZjhlNmUyMWE3NjcgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC0yOTc5LDEyICsyOTc5LDcg
QEAgdm9pZCBXZWJWaWV3SW1wbDo6dHlwaW5nQXR0cmlidXRlc1dpdGhDb21wbGV0aW9uSGFuZGxl
cih2b2lkKF5jb21wbGV0aW9uKShOU0RpY3QKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAg
IG1fcGFnZS0+cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChbY29tcGxldGlv
biA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uKV0gKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1
dGVzJiBhdHRyaWJ1dGVzLCBDYWxsYmFja0Jhc2U6OkVycm9yIGVycm9yKSB7Ci0gICAgICAgIGlm
IChlcnJvciAhPSBDYWxsYmFja0Jhc2U6OkVycm9yOjpOb25lKSB7Ci0gICAgICAgICAgICBjb21w
bGV0aW9uKG5pbCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQorICAgIG1fcGFn
ZS0+cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChbY29tcGxldGlvbiA9IG1h
a2VCbG9ja1B0cihjb21wbGV0aW9uKV0gKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiBh
dHRyaWJ1dGVzKSB7CiAgICAgICAgIGF1dG8gYXR0cmlidXRlc0FzRGljdGlvbmFyeSA9IGF0dHJp
YnV0ZXMuY3JlYXRlRGljdGlvbmFyeSgpOwogICAgICAgICBjb21wbGV0aW9uKGF0dHJpYnV0ZXNB
c0RpY3Rpb25hcnkuZ2V0KCkpOwogICAgIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh
Z2VQcm94eS5jcHAKaW5kZXggNmUwY2YyZTdkZmMwMGY4NmZiNzk0MzNjNGJmMTE2ZDNlMWNiY2Rm
OS4uZjI0YzNkYzg5MjNjYjRhYjljM2Q1ZDNiZGMyNjNmOWQ1NGMwYjgyYyAxMDA2NDQKLS0tIGEv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0yMzQ0LDIzICsyMzQ0LDE1IEBAIHZv
aWQgV2ViUGFnZVByb3h5OjpleGVjdXRlRWRpdENvbW1hbmQoY29uc3QgU3RyaW5nJiBjb21tYW5k
TmFtZSwgY29uc3QgU3RyaW5nJiBhCiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RXhlY3V0
ZUVkaXRDb21tYW5kKGNvbW1hbmROYW1lLCBhcmd1bWVudCkpOwogfQogCi12b2lkIFdlYlBhZ2VQ
cm94eTo6cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChGdW5jdGlvbjx2b2lk
KGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+JiYg
Y2FsbGJhY2spCit2b2lkIFdlYlBhZ2VQcm94eTo6cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxl
Y3Rpb25TdGFydChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRy
aWJ1dGVzJik+JiYgY2FsbGJhY2spCiB7Ci0gICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKSB7
Ci0gICAgICAgIGNhbGxiYWNrKHsgfSwgQ2FsbGJhY2tCYXNlOjpFcnJvcjo6VW5rbm93bik7Ci0g
ICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBhdXRvIGNhbGxiYWNrSUQgPSBtX2NhbGxiYWNr
cy5wdXQoV1RGTW92ZShjYWxsYmFjayksIG1fcHJvY2Vzcy0+dGhyb3R0bGVyKCkuYmFja2dyb3Vu
ZEFjdGl2aXR5KCJXZWJQYWdlUHJveHk6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9u
U3RhcnQiX3MpKTsKLSAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpSZXF1ZXN0Rm9udEF0dHJp
YnV0ZXNBdFNlbGVjdGlvblN0YXJ0KGNhbGxiYWNrSUQpKTsKLX0KLQotdm9pZCBXZWJQYWdlUHJv
eHk6OmZvbnRBdHRyaWJ1dGVzQ2FsbGJhY2soY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMm
IGF0dHJpYnV0ZXMsIENhbGxiYWNrSUQgY2FsbGJhY2tJRCkKLXsKLSAgICBtX2NhY2hlZEZvbnRB
dHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCA9IGF0dHJpYnV0ZXM7CisgICAgaWYgKCFoYXNSdW5u
aW5nUHJvY2VzcygpKQorICAgICAgICByZXR1cm4gY2FsbGJhY2soeyB9KTsKIAotICAgIGlmIChh
dXRvIGNhbGxiYWNrID0gbV9jYWxsYmFja3MudGFrZTxGb250QXR0cmlidXRlc0NhbGxiYWNrPihj
YWxsYmFja0lEKSkKLSAgICAgICAgY2FsbGJhY2stPnBlcmZvcm1DYWxsYmFja1dpdGhSZXR1cm5W
YWx1ZShhdHRyaWJ1dGVzKTsKKyAgICBzZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBh
Z2U6OlJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoKSwgW3RoaXMsIHByb3Rl
Y3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0g
KGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiBhdHRyaWJ1dGVzKSBtdXRhYmxlIHsKKyAg
ICAgICAgbV9jYWNoZWRGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQgPSBhdHRyaWJ1dGVz
OworICAgICAgICBjYWxsYmFjayhhdHRyaWJ1dGVzKTsKKyAgICB9KTsKIH0KIAogdm9pZCBXZWJQ
YWdlUHJveHk6OnNldEVkaXRhYmxlKGJvb2wgZWRpdGFibGUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlBhZ2VQcm94eS5oCmluZGV4IDcxNDRlZWMwOWYxNzVjNWIwMDc0NTFjYmNiODhhM2RlZjcx
YTEzNTQuLjRjZTMwODQwZjMzNmYxMzBiODBmMWQ5OTIxNzBiZjVlNTgyMzQ5ZmUgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9X
ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0zNzQsNyArMzc0LDYgQEAgZW51bSBj
bGFzcyBXZWJDb250ZW50TW9kZSA6IHVpbnQ4X3Q7CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazxB
UEk6OkRhdGEqPiBEYXRhQ2FsbGJhY2s7CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazx1aW50NjRf
dD4gVW5zaWduZWRDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0IFN0cmlu
ZyY+IFN0cmluZ0NhbGxiYWNrOwotdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8Y29uc3QgV2ViQ29y
ZTo6Rm9udEF0dHJpYnV0ZXMmPiBGb250QXR0cmlidXRlc0NhbGxiYWNrOwogdHlwZWRlZiBHZW5l
cmljQ2FsbGJhY2s8Y29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgY29uc3QgU3RyaW5nJj4g
U2VsZWN0aW9uQ29udGV4dENhbGxiYWNrOwogdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8Ym9vbD4g
Qm9vbENhbGxiYWNrOwogCkBAIC03MjIsOCArNzIxLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNN
ZWRpYVN0cmVhbUNhcHR1cmVNdXRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbXV0ZWRTdGF0ZSAmIFdl
YkNvcmU6Ok1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RyZWFtQ2FwdHVyZUlzTXV0ZWQ7IH0KICAgICB2
b2lkIHNldE1lZGlhU3RyZWFtQ2FwdHVyZU11dGVkKGJvb2wpOwogCi0gICAgdm9pZCByZXF1ZXN0
Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KEZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29y
ZTo6Rm9udEF0dHJpYnV0ZXMmLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4mJik7Ci0gICAgdm9pZCBm
b250QXR0cmlidXRlc0NhbGxiYWNrKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiwgQ2Fs
bGJhY2tJRCk7CisgICAgdm9pZCByZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0
KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmKT4m
Jik7CiAKICAgICB2b2lkIHNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3JlOjpFbGVt
ZW50Q29udGV4dCYsIGJvb2wpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ
YWdlUHJveHkubWVzc2FnZXMuaW4KaW5kZXggMDJmN2YzZGM1ZmQyMzVlMzkyMWUzNmI1YzRkY2Y1
N2YwZTg3OTZiYy4uMmJjMzZhMGMzYzVjY2NkNWJiMTU5NDFhYzIxNjBjNmZiMWQ5MjU3MiAxMDA2
NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmlu
CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgpA
QCAtMTc5LDcgKzE3OSw2IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgQXR0cmli
dXRlZFN0cmluZ0ZvckNoYXJhY3RlclJhbmdlQ2FsbGJhY2soc3RydWN0IFdlYkNvcmU6OkF0dHJp
YnV0ZWRTdHJpbmcgc3RyaW5nLCBzdHJ1Y3QgV2ViS2l0OjpFZGl0aW5nUmFuZ2UgYWN0dWFsUmFu
Z2UsIFdlYktpdDo6Q2FsbGJhY2tJRCBjYWxsYmFja0lEKQogICAgIEZvbnRBdFNlbGVjdGlvbkNh
bGxiYWNrKHN0cnVjdCBXZWJLaXQ6OkZvbnRJbmZvIGZvbnRJbmZvLCBkb3VibGUgZm9udFNpemUs
IGJvb2wgc2VsZWN0aW9uSGFzTXVsdGlwbGVGb250cywgV2ViS2l0OjpDYWxsYmFja0lEIGNhbGxi
YWNrSUQpCiAjZW5kaWYKLSAgICBGb250QXR0cmlidXRlc0NhbGxiYWNrKHN0cnVjdCBXZWJDb3Jl
OjpGb250QXR0cmlidXRlcyBhdHRyaWJ1dGVzLCBXZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJ
RCkKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgIEdlc3R1cmVDYWxsYmFjayhXZWJDb3Jl
OjpJbnRQb2ludCBwb2ludCwgZW51bTp1aW50OF90IFdlYktpdDo6R2VzdHVyZVR5cGUgZ2VzdHVy
ZVR5cGUsIGVudW06dWludDhfdCBXZWJLaXQ6Okdlc3R1cmVSZWNvZ25pemVyU3RhdGUgZ2VzdHVy
ZVN0YXRlLCBPcHRpb25TZXQ8V2ViS2l0OjpTZWxlY3Rpb25GbGFncz4gZmxhZ3MsIFdlYktpdDo6
Q2FsbGJhY2tJRCBjYWxsYmFja0lEKQogICAgIFRvdWNoZXNDYWxsYmFjayhXZWJDb3JlOjpJbnRQ
b2ludCBwb2ludCwgZW51bTp1aW50OF90IFdlYktpdDo6U2VsZWN0aW9uVG91Y2ggdG91Y2hlcywg
T3B0aW9uU2V0PFdlYktpdDo6U2VsZWN0aW9uRmxhZ3M+IGZsYWdzLCBXZWJLaXQ6OkNhbGxiYWNr
SUQgY2FsbGJhY2tJRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
YWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5jcHAKaW5kZXggZmU3ZGY0MGZlMTVhM2U2MjE1OGEwYTU1ODE3MjBkZDM3NGIyZWM3MS4uMDIw
NmYxNDA4ZjNiYzQ1ZjE1MTJhNGFjYmVlMWI3MjI0ZTA0MmI3YyAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTMwMTAsMTAgKzMwMTAsOSBAQCB2
b2lkIFdlYlBhZ2U6OnNldEN1cnJlbnRIaXN0b3J5SXRlbUZvclJlYXR0YWNoKFdlYktpdDo6QmFj
a0ZvcndhcmRMaXN0SXRlbVN0YXRlJgogICAgIGNvcmVQYWdlKCktPm1haW5GcmFtZSgpLmxvYWRl
cigpLmhpc3RvcnkoKS5zZXRDdXJyZW50SXRlbShoaXN0b3J5SXRlbVJlZik7CiB9CiAKLXZvaWQg
V2ViUGFnZTo6cmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChDYWxsYmFja0lE
IGNhbGxiYWNrSUQpCit2b2lkIFdlYlBhZ2U6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0
aW9uU3RhcnQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpGb250QXR0cmli
dXRlcyYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGF1dG8gYXR0cmlidXRlcyA9IG1f
cGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCkuZWRpdG9yKCkuZm9u
dEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KCk7Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFn
ZVByb3h5OjpGb250QXR0cmlidXRlc0NhbGxiYWNrKGF0dHJpYnV0ZXMsIGNhbGxiYWNrSUQpKTsK
KyAgICBjb21wbGV0aW9uSGFuZGxlcihtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRP
ck1haW5GcmFtZSgpLmVkaXRvcigpLmZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCgpKTsK
IH0KIAogdm9pZCBXZWJQYWdlOjpjYW5jZWxHZXN0dXJlc0Jsb2NrZWRPblN5bmNocm9ub3VzUmVw
bGllcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ
YWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXgg
ZTdhMmI3OWIzNjE5NTYzZTgwMWUyNGViMzc1ZjdmOGJjOWIzMWY4Yy4uZGQ1N2I5ZDA3ZTA2ZWY0
YzRlNGIzZjdlMzQxY2U4NjlhOWVhZTEwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ
cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X
ZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTUzNSw3ICsxNTM1LDcgQEAgcHJpdmF0ZToKICAgICB2b2lk
IHVwZGF0ZUJhY2tGb3J3YXJkTGlzdEZvclJlYXR0YWNoKGNvbnN0IFZlY3RvcjxXZWJLaXQ6OkJh
Y2tGb3J3YXJkTGlzdEl0ZW1TdGF0ZT4mKTsKICAgICB2b2lkIHNldEN1cnJlbnRIaXN0b3J5SXRl
bUZvclJlYXR0YWNoKFdlYktpdDo6QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlJiYpOwogCi0gICAg
dm9pZCByZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KENhbGxiYWNrSUQpOwor
ICAgIHZvaWQgcmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydChDb21wbGV0aW9u
SGFuZGxlcjx2b2lkKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJik+JiYpOwogCiAjaWYg
RU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCiAgICAgdm9pZCBzZXRJbmRpY2F0aW5nKGJvb2wpOwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz
YWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn
ZXMuaW4KaW5kZXggMmVhYmRjZjk0M2JkMDAwNDIyMGNiMDM2NGEzNTEzN2QyZmU5ZTJiZS4uZTNk
OGZkZDA4NGU1OGNhN2IxMjc3NTlkOWEwZWM2NmIxNzk1OGE2MiAxMDA2NDQKLS0tIGEvU291cmNl
L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3Vy
Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0yNjMs
NyArMjYzLDcgQEAgR2VuZXJhdGVTeW50aGV0aWNFZGl0aW5nQ29tbWFuZChlbnVtOnVpbnQ4X3Qg
V2ViS2l0OjpTeW50aGV0aWNFZGl0aW5nQ29tbWFuZFR5cGUKIAogICAgIFNldE5lZWRzRm9udEF0
dHJpYnV0ZXMoYm9vbCBuZWVkc0ZvbnRBdHRyaWJ1dGVzKQogCi0gICAgUmVxdWVzdEZvbnRBdHRy
aWJ1dGVzQXRTZWxlY3Rpb25TdGFydChXZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJRCkKKyAg
ICBSZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KCkgLT4gKHN0cnVjdCBXZWJD
b3JlOjpGb250QXR0cmlidXRlcyBhdHRyaWJ1dGVzKSBBc3luYwogCiAgICAgRGlkUmVtb3ZlRWRp
dENvbW1hbmQodWludDY0X3QgY29tbWFuZElEKQogICAgIFJlYXBwbHlFZGl0Q29tbWFuZCh1aW50
NjRfdCBjb21tYW5kSUQpCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>417019</attachid>
            <date>2021-01-05 10:33:29 -0800</date>
            <delta_ts>2021-01-05 10:42:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-220123-20210105103329.patch</filename>
            <type>text/plain</type>
            <size>8420</size>
            <attacher name="Alex Christensen">achristensen</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzExNTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDIxLTAxLTA1ICBBbGV4IENocmlz
dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVXNlIHNlbmRXaXRo
QXN5bmNSZXBseSBpbnN0ZWFkIG9mIEZvbnRBdHRyaWJ1dGVzQ2FsbGJhY2sKKyAgICAgICAgaHR0
cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDEyMworCisgICAgICAgIFJl
dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dl
YlZpZXdJbXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dHlwaW5nQXR0cmli
dXRlc1dpdGhDb21wbGV0aW9uSGFuZGxlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQ
cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVxdWVzdEZvbnRBdHRy
aWJ1dGVzQXRTZWxlY3Rpb25TdGFydCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6
Zm9udEF0dHJpYnV0ZXNDYWxsYmFjayk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1dl
YlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMu
aW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAo
V2ViS2l0OjpXZWJQYWdlOjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KToK
KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlBy
b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDIxLTAxLTA1ICBBbGV4IENo
cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNlIHNlbmRX
aXRoQXN5bmNSZXBseSBpbnN0ZWFkIG9mIFJlY3RGb3JDaGFyYWN0ZXJSYW5nZUNhbGxiYWNrCklu
ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDI3
MTE1NykKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtp
bmcgY29weSkKQEAgLTIzNDQsMjMgKzIzNDQsMTUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmV4ZWN1
dGVFZGl0Q29tbWFuZChjbwogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkV4ZWN1dGVFZGl0
Q29tbWFuZChjb21tYW5kTmFtZSwgYXJndW1lbnQpKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6
OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoRnVuY3Rpb248dm9pZChjb25z
dCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYsIENhbGxiYWNrQmFzZTo6RXJyb3IpPiYmIGNhbGxi
YWNrKQordm9pZCBXZWJQYWdlUHJveHk6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9u
U3RhcnQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRl
cyYpPiYmIGNhbGxiYWNrKQogewotICAgIGlmICghaGFzUnVubmluZ1Byb2Nlc3MoKSkgewotICAg
ICAgICBjYWxsYmFjayh7IH0sIENhbGxiYWNrQmFzZTo6RXJyb3I6OlVua25vd24pOwotICAgICAg
ICByZXR1cm47Ci0gICAgfQotCi0gICAgYXV0byBjYWxsYmFja0lEID0gbV9jYWxsYmFja3MucHV0
KFdURk1vdmUoY2FsbGJhY2spLCBtX3Byb2Nlc3MtPnRocm90dGxlcigpLmJhY2tncm91bmRBY3Rp
dml0eSgiV2ViUGFnZVByb3h5OjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0
Il9zKSk7Ci0gICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UmVxdWVzdEZvbnRBdHRyaWJ1dGVz
QXRTZWxlY3Rpb25TdGFydChjYWxsYmFja0lEKSk7Ci19Ci0KLXZvaWQgV2ViUGFnZVByb3h5Ojpm
b250QXR0cmlidXRlc0NhbGxiYWNrKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVzJiBhdHRy
aWJ1dGVzLCBDYWxsYmFja0lEIGNhbGxiYWNrSUQpCi17Ci0gICAgbV9jYWNoZWRGb250QXR0cmli
dXRlc0F0U2VsZWN0aW9uU3RhcnQgPSBhdHRyaWJ1dGVzOworICAgIGlmICghaGFzUnVubmluZ1By
b2Nlc3MoKSkKKyAgICAgICAgcmV0dXJuIGNhbGxiYWNrKHsgfSk7CiAKLSAgICBpZiAoYXV0byBj
YWxsYmFjayA9IG1fY2FsbGJhY2tzLnRha2U8Rm9udEF0dHJpYnV0ZXNDYWxsYmFjaz4oY2FsbGJh
Y2tJRCkpCi0gICAgICAgIGNhbGxiYWNrLT5wZXJmb3JtQ2FsbGJhY2tXaXRoUmV0dXJuVmFsdWUo
YXR0cmlidXRlcyk7CisgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlOjpS
ZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KCksIFt0aGlzLCBwcm90ZWN0ZWRU
aGlzID0gbWFrZVJlZigqdGhpcyksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldIChjb25z
dCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYgYXR0cmlidXRlcykgbXV0YWJsZSB7CisgICAgICAg
IG1fY2FjaGVkRm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0ID0gYXR0cmlidXRlczsKKyAg
ICAgICAgY2FsbGJhY2soYXR0cmlidXRlcyk7CisgICAgfSk7CiB9CiAKIHZvaWQgV2ViUGFnZVBy
b3h5OjpzZXRFZGl0YWJsZShib29sIGVkaXRhYmxlKQpJbmRleDogU291cmNlL1dlYktpdC9VSVBy
b2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nl
c3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDI3MTE1NykKKysrIFNvdXJjZS9XZWJLaXQvVUlQ
cm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNzQsNyArMzc0LDYgQEAg
ZW51bSBjbGFzcyBXZWJDb250ZW50TW9kZSA6IHVpbnQ4X3Q7CiB0eXBlZGVmIEdlbmVyaWNDYWxs
YmFjazxBUEk6OkRhdGEqPiBEYXRhQ2FsbGJhY2s7CiB0eXBlZGVmIEdlbmVyaWNDYWxsYmFjazx1
aW50NjRfdD4gVW5zaWduZWRDYWxsYmFjazsKIHR5cGVkZWYgR2VuZXJpY0NhbGxiYWNrPGNvbnN0
IFN0cmluZyY+IFN0cmluZ0NhbGxiYWNrOwotdHlwZWRlZiBHZW5lcmljQ2FsbGJhY2s8Y29uc3Qg
V2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmPiBGb250QXR0cmlidXRlc0NhbGxiYWNrOwogdHlwZWRl
ZiBHZW5lcmljQ2FsbGJhY2s8Ym9vbD4gQm9vbENhbGxiYWNrOwogCiAjaWYgSEFWRShWSVNJQklM
SVRZX1BST1BBR0FUSU9OX1ZJRVcpCkBAIC03MjAsOCArNzE5LDcgQEAgcHVibGljOgogICAgIGJv
b2wgaXNNZWRpYVN0cmVhbUNhcHR1cmVNdXRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbXV0ZWRTdGF0
ZSAmIFdlYkNvcmU6Ok1lZGlhUHJvZHVjZXI6Ok1lZGlhU3RyZWFtQ2FwdHVyZUlzTXV0ZWQ7IH0K
ICAgICB2b2lkIHNldE1lZGlhU3RyZWFtQ2FwdHVyZU11dGVkKGJvb2wpOwogCi0gICAgdm9pZCBy
ZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0KEZ1bmN0aW9uPHZvaWQoY29uc3Qg
V2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4mJik7Ci0gICAg
dm9pZCBmb250QXR0cmlidXRlc0NhbGxiYWNrKGNvbnN0IFdlYkNvcmU6OkZvbnRBdHRyaWJ1dGVz
JiwgQ2FsbGJhY2tJRCk7CisgICAgdm9pZCByZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlv
blN0YXJ0KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0
ZXMmKT4mJik7CiAKICAgICB2b2lkIHNldENhblNob3dQbGFjZWhvbGRlcihjb25zdCBXZWJDb3Jl
OjpFbGVtZW50Q29udGV4dCYsIGJvb2wpOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAyNzExNTcpCisrKyBT
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcg
Y29weSkKQEAgLTE3OCw3ICsxNzgsNiBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAg
IEF0dHJpYnV0ZWRTdHJpbmdGb3JDaGFyYWN0ZXJSYW5nZUNhbGxiYWNrKHN0cnVjdCBXZWJDb3Jl
OjpBdHRyaWJ1dGVkU3RyaW5nIHN0cmluZywgc3RydWN0IFdlYktpdDo6RWRpdGluZ1JhbmdlIGFj
dHVhbFJhbmdlLCBXZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJRCkKICAgICBGb250QXRTZWxl
Y3Rpb25DYWxsYmFjayhzdHJ1Y3QgV2ViS2l0OjpGb250SW5mbyBmb250SW5mbywgZG91YmxlIGZv
bnRTaXplLCBib29sIHNlbGVjdGlvbkhhc011bHRpcGxlRm9udHMsIFdlYktpdDo6Q2FsbGJhY2tJ
RCBjYWxsYmFja0lEKQogI2VuZGlmCi0gICAgRm9udEF0dHJpYnV0ZXNDYWxsYmFjayhzdHJ1Y3Qg
V2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMgYXR0cmlidXRlcywgV2ViS2l0OjpDYWxsYmFja0lEIGNh
bGxiYWNrSUQpCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBHZXN0dXJlQ2FsbGJhY2so
V2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIGVudW06dWludDhfdCBXZWJLaXQ6Okdlc3R1cmVUeXBl
IGdlc3R1cmVUeXBlLCBlbnVtOnVpbnQ4X3QgV2ViS2l0OjpHZXN0dXJlUmVjb2duaXplclN0YXRl
IGdlc3R1cmVTdGF0ZSwgT3B0aW9uU2V0PFdlYktpdDo6U2VsZWN0aW9uRmxhZ3M+IGZsYWdzLCBX
ZWJLaXQ6OkNhbGxiYWNrSUQgY2FsbGJhY2tJRCkKICAgICBUb3VjaGVzQ2FsbGJhY2soV2ViQ29y
ZTo6SW50UG9pbnQgcG9pbnQsIGVudW06dWludDhfdCBXZWJLaXQ6OlNlbGVjdGlvblRvdWNoIHRv
dWNoZXMsIE9wdGlvblNldDxXZWJLaXQ6OlNlbGVjdGlvbkZsYWdzPiBmbGFncywgV2ViS2l0OjpD
YWxsYmFja0lEIGNhbGxiYWNrSUQpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv
YS9XZWJWaWV3SW1wbC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D
b2NvYS9XZWJWaWV3SW1wbC5tbQkocmV2aXNpb24gMjcxMTU3KQorKysgU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5NzksMTIg
KzI5NzksNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjp0eXBpbmdBdHRyaWJ1dGVzV2l0aENvCiAgICAg
ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX3BhZ2UtPnJlcXVlc3RGb250QXR0cmlidXRlc0F0
U2VsZWN0aW9uU3RhcnQoW2NvbXBsZXRpb24gPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbildIChj
b25zdCBXZWJDb3JlOjpGb250QXR0cmlidXRlcyYgYXR0cmlidXRlcywgQ2FsbGJhY2tCYXNlOjpF
cnJvciBlcnJvcikgewotICAgICAgICBpZiAoZXJyb3IgIT0gQ2FsbGJhY2tCYXNlOjpFcnJvcjo6
Tm9uZSkgewotICAgICAgICAgICAgY29tcGxldGlvbihuaWwpOwotICAgICAgICAgICAgcmV0dXJu
OwotICAgICAgICB9Ci0KKyAgICBtX3BhZ2UtPnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0
aW9uU3RhcnQoW2NvbXBsZXRpb24gPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbildIChjb25zdCBX
ZWJDb3JlOjpGb250QXR0cmlidXRlcyYgYXR0cmlidXRlcykgewogICAgICAgICBhdXRvIGF0dHJp
YnV0ZXNBc0RpY3Rpb25hcnkgPSBhdHRyaWJ1dGVzLmNyZWF0ZURpY3Rpb25hcnkoKTsKICAgICAg
ICAgY29tcGxldGlvbihhdHRyaWJ1dGVzQXNEaWN0aW9uYXJ5LmdldCgpKTsKICAgICB9KTsKSW5k
ZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZp
c2lvbiAyNzExNTcpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl
LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAxMCwxMCArMzAxMCw5IEBAIHZvaWQgV2ViUGFnZTo6
c2V0Q3VycmVudEhpc3RvcnlJdGVtRm9yUmUKICAgICBjb3JlUGFnZSgpLT5tYWluRnJhbWUoKS5s
b2FkZXIoKS5oaXN0b3J5KCkuc2V0Q3VycmVudEl0ZW0oaGlzdG9yeUl0ZW1SZWYpOwogfQogCi12
b2lkIFdlYlBhZ2U6OnJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoQ2FsbGJh
Y2tJRCBjYWxsYmFja0lEKQordm9pZCBXZWJQYWdlOjpyZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNl
bGVjdGlvblN0YXJ0KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0
dHJpYnV0ZXMmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBhdXRvIGF0dHJpYnV0ZXMg
PSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLmVkaXRvcigp
LmZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rpb25TdGFydCgpOwotICAgIHNlbmQoTWVzc2FnZXM6Oldl
YlBhZ2VQcm94eTo6Rm9udEF0dHJpYnV0ZXNDYWxsYmFjayhhdHRyaWJ1dGVzLCBjYWxsYmFja0lE
KSk7CisgICAgY29tcGxldGlvbkhhbmRsZXIobV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1
c2VkT3JNYWluRnJhbWUoKS5lZGl0b3IoKS5mb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQo
KSk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6Y2FuY2VsR2VzdHVyZXNCbG9ja2VkT25TeW5jaHJvbm91
c1JlcGxpZXMoKQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn
ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh
Z2UuaAkocmV2aXNpb24gMjcxMTU3KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh
Z2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTM1LDcgKzE1MzUsNyBAQCBwcml2YXRl
OgogICAgIHZvaWQgdXBkYXRlQmFja0ZvcndhcmRMaXN0Rm9yUmVhdHRhY2goY29uc3QgVmVjdG9y
PFdlYktpdDo6QmFja0ZvcndhcmRMaXN0SXRlbVN0YXRlPiYpOwogICAgIHZvaWQgc2V0Q3VycmVu
dEhpc3RvcnlJdGVtRm9yUmVhdHRhY2goV2ViS2l0OjpCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGUm
Jik7CiAKLSAgICB2b2lkIHJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoQ2Fs
bGJhY2tJRCk7CisgICAgdm9pZCByZXF1ZXN0Rm9udEF0dHJpYnV0ZXNBdFNlbGVjdGlvblN0YXJ0
KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMmKT4m
Jik7CiAKICNpZiBFTkFCTEUoUkVNT1RFX0lOU1BFQ1RPUikKICAgICB2b2lkIHNldEluZGljYXRp
bmcoYm9vbCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl
Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ
YWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDI3MTE1NykKKysrIFNvdXJjZS9XZWJL
aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkK
QEAgLTI2Myw3ICsyNjMsNyBAQCBHZW5lcmF0ZVN5bnRoZXRpY0VkaXRpbmdDb21tYW5kKGVudW06
dWluCiAKICAgICBTZXROZWVkc0ZvbnRBdHRyaWJ1dGVzKGJvb2wgbmVlZHNGb250QXR0cmlidXRl
cykKIAotICAgIFJlcXVlc3RGb250QXR0cmlidXRlc0F0U2VsZWN0aW9uU3RhcnQoV2ViS2l0OjpD
YWxsYmFja0lEIGNhbGxiYWNrSUQpCisgICAgUmVxdWVzdEZvbnRBdHRyaWJ1dGVzQXRTZWxlY3Rp
b25TdGFydCgpIC0+IChzdHJ1Y3QgV2ViQ29yZTo6Rm9udEF0dHJpYnV0ZXMgYXR0cmlidXRlcykg
QXN5bmMKIAogICAgIERpZFJlbW92ZUVkaXRDb21tYW5kKHVpbnQ2NF90IGNvbW1hbmRJRCkKICAg
ICBSZWFwcGx5RWRpdENvbW1hbmQodWludDY0X3QgY29tbWFuZElEKQo=
</data>
<flag name="review"
          id="434637"
          type_id="1"
          status="+"
          setter="cdumez"
    />
          </attachment>
      

    </bug>

</bugzilla>