<?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>194321</bug_id>
          
          <creation_ts>2019-02-05 17:31:45 -0800</creation_ts>
          <short_desc>Move toNSEventModifierFlags() and toNSButtonNumber() to WebEventFactory.mm</short_desc>
          <delta_ts>2019-02-06 16:24:29 -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>WebKit Misc.</component>
          <version>WebKit Local Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</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="Daniel Bates">dbates</reporter>
          <assigned_to name="Daniel Bates">dbates</assigned_to>
          <cc>jer.noble</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1502632</commentid>
    <comment_count>0</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-05 17:31:45 -0800</bug_when>
    <thetext>Move some helper functions, toNSEventModifierFlags() and toNSButtonNumber(), from WKNavigationAction.mm to WebEventFactory.mm.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1502635</commentid>
    <comment_count>1</comment_count>
      <attachid>361259</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-05 17:34:46 -0800</bug_when>
    <thetext>Created attachment 361259
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503415</commentid>
    <comment_count>2</comment_count>
      <attachid>361311</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-06 12:07:23 -0800</bug_when>
    <thetext>Created attachment 361311
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503441</commentid>
    <comment_count>3</comment_count>
      <attachid>361320</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-06 13:19:42 -0800</bug_when>
    <thetext>Created attachment 361320
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503449</commentid>
    <comment_count>4</comment_count>
      <attachid>361322</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-06 13:32:00 -0800</bug_when>
    <thetext>Created attachment 361322
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503479</commentid>
    <comment_count>5</comment_count>
      <attachid>361332</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-06 14:43:19 -0800</bug_when>
    <thetext>Created attachment 361332
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503525</commentid>
    <comment_count>6</comment_count>
      <attachid>361332</attachid>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-06 16:23:25 -0800</bug_when>
    <thetext>Comment on attachment 361332
Patch

Clearing flags on attachment: 361332

Committed r241109: &lt;https://trac.webkit.org/changeset/241109&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503526</commentid>
    <comment_count>7</comment_count>
    <who name="Daniel Bates">dbates</who>
    <bug_when>2019-02-06 16:23:27 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1503527</commentid>
    <comment_count>8</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2019-02-06 16:24:29 -0800</bug_when>
    <thetext>&lt;rdar://problem/47869587&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>361259</attachid>
            <date>2019-02-05 17:34:46 -0800</date>
            <delta_ts>2019-02-06 12:07:22 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194321-20190205173445.patch</filename>
            <type>text/plain</type>
            <size>9020</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMyNDg4ZGYwM2EyMjc3ZDc4
MzJjNmVhZjcwOGYwMDkyNWViNjg5NjkuLjc1YjI1NGUxNzU2NDQ0ZDA2MjExNjgyMjFhNjk0MDk2
NGNjM2YwM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDItMDUgIERhbmllbCBC
YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgdG9OU0V2ZW50TW9kaWZp
ZXJGbGFncygpIGFuZCB0b05TQnV0dG9uTnVtYmVyKCkgdG8gV2ViRXZlbnRGYWN0b3J5Lm1tCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMjEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNvbWUg
Y29kZSB0byBXZWJFdmVudEZhY3Rvcnkgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGgg
V0tOYXZpZ2F0aW9uQWN0aW9uLm1tCisgICAgICAgIGFuZCBVSURlbGVnYXRlLm1tIGFtb25nIG90
aGVyIGJlbmVmaXRzLgorCisgICAgICAgICogU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaDoK
KyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKFdlYktp
dDo6dG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6CisgICAgICAgIChXZWJLaXQ6OnRvTlNCdXR0b25O
dW1iZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9u
Lm1tOgorICAgICAgICAoLVtXS05hdmlnYXRpb25BY3Rpb24gbW9kaWZpZXJGbGFnc10pOgorICAg
ICAgICAoLVtXS05hdmlnYXRpb25BY3Rpb24gYnV0dG9uTnVtYmVyXSk6CisgICAgICAgICh0b05T
RXZlbnRNb2RpZmllckZsYWdzKTogRGVsZXRlZC4KKyAgICAgICAgKHRvTlNCdXR0b25OdW1iZXIp
OiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tOgorICAg
ICAgICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6bW91c2VEaWRNb3ZlT3ZlckVsZW1l
bnQpOgorICAgICAgICAoV2ViS2l0Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKTogRGVsZXRlZC4K
KwogMjAxOS0wMi0wNSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAg
ICAgQXR0ZW1wdCB0byBmaXggdGhlIGJ1aWxkIGZvbGxvd2luZyByMjQxMDAwCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5LmggYi9Tb3VyY2UvV2Vi
S2l0L1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5LmgKaW5kZXggYmU4NzJjZWI2OGE1YWNjZjdi
YzZiZmFiZDIxZDIzNGRkZDk2NDI2Yy4uY2FmMWI2NmM3NmIyNjc0YjQ5NGE0YTUwYzFjMzA1YWFh
NDI1MjkzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFj
dG9yeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaApA
QCAtNDYsNiArNDYsOSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFdlYldoZWVsRXZlbnQgY3JlYXRl
V2ViV2hlZWxFdmVudChOU0V2ZW50ICosIE5TVmlldyAqd2luZG93Vmlldyk7CiAgICAgc3RhdGlj
IFdlYktleWJvYXJkRXZlbnQgY3JlYXRlV2ViS2V5Ym9hcmRFdmVudChOU0V2ZW50ICosIGJvb2wg
aGFuZGxlZEJ5SW5wdXRNZXRob2QsIGJvb2wgcmVwbGFjZXNTb2Z0U3BhY2UsIGNvbnN0IFZlY3Rv
cjxXZWJDb3JlOjpLZXlwcmVzc0NvbW1hbmQ+Jik7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkQmVI
YW5kbGVkQXNDb250ZXh0Q2xpY2soY29uc3QgV2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50Jik7
CisKKyAgICBzdGF0aWMgTlNFdmVudE1vZGlmaWVyRmxhZ3MgdG9OU0V2ZW50TW9kaWZpZXJGbGFn
cyhPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI+KTsKKyAgICBzdGF0aWMgTlNJ
bnRlZ2VyIHRvTlNCdXR0b25OdW1iZXIoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpCdXR0b24pOwog
I2VuZGlmIC8vIFVTRShBUFBLSVQpCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No
YXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dl
YkV2ZW50RmFjdG9yeS5tbQppbmRleCBlNDMxMTVlOWU5MDgwOGI2NzI5MmEwOGRhZDEwNTZlNjJi
ZGY2NTJlLi4xMzg2MTg2MzkwZDVkYzZmZGEzODMyODUwZGVjY2YyYjlhYjY0MGJiIDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1tCisrKyBiL1Nv
dXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0KQEAgLTQ2Miw2ICs0NjIs
MzggQEAgV2ViS2V5Ym9hcmRFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJk
RXZlbnQoTlNFdmVudCAqZXZlbnQsIGJvb2wgaGEKICAgICByZXR1cm4gV2ViS2V5Ym9hcmRFdmVu
dCh0eXBlLCB0ZXh0LCB1bm1vZGlmaWVkVGV4dCwga2V5LCBjb2RlLCBrZXlJZGVudGlmaWVyLCB3
aW5kb3dzVmlydHVhbEtleUNvZGUsIG5hdGl2ZVZpcnR1YWxLZXlDb2RlLCBtYWNDaGFyQ29kZSwg
aGFuZGxlZEJ5SW5wdXRNZXRob2QsIGNvbW1hbmRzLCBhdXRvUmVwZWF0LCBpc0tleXBhZCwgaXNT
eXN0ZW1LZXksIG1vZGlmaWVycywgdGltZXN0YW1wKTsKIH0KIAorTlNFdmVudE1vZGlmaWVyRmxh
Z3MgdG9OU0V2ZW50TW9kaWZpZXJGbGFncyhPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVudDo6TW9k
aWZpZXI+IG1vZGlmaWVycykKK3sKKyAgICBOU0V2ZW50TW9kaWZpZXJGbGFncyBtb2RpZmllckZs
YWdzID0gMDsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6OkNh
cHNMb2NrS2V5KSkKKyAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q2Fwc0xvY2s7CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpN
b2RpZmllcjo6U2hpZnRLZXkpKQorICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2Rp
ZmllckZsYWdTaGlmdDsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZl
bnQ6Ok1vZGlmaWVyOjpDb250cm9sS2V5KSkKKyAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2
ZW50TW9kaWZpZXJGbGFnQ29udHJvbDsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktp
dDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpBbHRLZXkpKQorICAgICAgICBtb2RpZmllckZsYWdzIHw9
IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb247CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhX
ZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6TWV0YUtleSkpCisgICAgICAgIG1vZGlmaWVyRmxh
Z3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQ7CisgICAgcmV0dXJuIG1vZGlmaWVyRmxh
Z3M7Cit9CisKK05TSW50ZWdlciB0b05TQnV0dG9uTnVtYmVyKFdlYktpdDo6V2ViTW91c2VFdmVu
dDo6QnV0dG9uIG1vdXNlQnV0dG9uKQoreworICAgIHN3aXRjaCAobW91c2VCdXR0b24pIHsKKyAg
ICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6Tm9CdXR0b246CisgICAgICAgIHJldHVybiAw
OworICAgIGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpMZWZ0QnV0dG9uOgorICAgICAgICBy
ZXR1cm4gMSA8PCAwOworICAgIGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpSaWdodEJ1dHRv
bjoKKyAgICAgICAgcmV0dXJuIDEgPDwgMTsKKyAgICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVu
dDo6TWlkZGxlQnV0dG9uOgorICAgICAgICByZXR1cm4gMSA8PCAyOworICAgIH0KKyAgICBBU1NF
UlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi
S2l0CiAKICNlbmRpZiAvLyBVU0UoQVBQS0lUKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0KaW5kZXggMGNmZGVjZGRh
NjYxZDIwMzhiM2RhZmRmMDUyZTk1ZGVmMTRkMTNjYy4uOGU2N2QyMTg3NDg5NGUwMzk2NjZmNzhm
ZWM2YmY5ODk1NDZiNDBhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ
L0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLm1tCkBAIC0zMSw2ICszMSw3IEBACiAjaW1w
b3J0ICJOYXZpZ2F0aW9uQWN0aW9uRGF0YS5oIgogI2ltcG9ydCAiV0tGcmFtZUluZm9JbnRlcm5h
bC5oIgogI2ltcG9ydCAiV0tOYXZpZ2F0aW9uSW50ZXJuYWwuaCIKKyNpbXBvcnQgIldlYkV2ZW50
RmFjdG9yeS5oIgogI2ltcG9ydCAiX1dLVXNlckluaXRpYXRlZEFjdGlvbkludGVybmFsLmgiCiAj
aW1wb3J0IDxXZWJDb3JlL0Zsb2F0UG9pbnQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4K
QEAgLTc0LDQ2ICs3NSw2IEBAIHN0YXRpYyBXS1N5bnRoZXRpY0NsaWNrVHlwZSB0b1dLU3ludGhl
dGljQ2xpY2tUeXBlKFdlYktpdDo6V2ViTW91c2VFdmVudDo6U3ludGhlCiB9CiAjZW5kaWYKIAot
I2lmIFBMQVRGT1JNKE1BQykKLQotLy8gRklYTUU6IFRoaXMgcmVhbGx5IGJlbG9uZ3MgaW4gV2Vi
RXZlbnRGYWN0b3J5Lgotc3RhdGljIE5TRXZlbnRNb2RpZmllckZsYWdzIHRvTlNFdmVudE1vZGlm
aWVyRmxhZ3MoT3B0aW9uU2V0PFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmllcnMp
Ci17Ci0gICAgTlNFdmVudE1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJGbGFncyA9IDA7Ci0gICAgaWYg
KG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6Q2Fwc0xvY2tL
ZXkpKQotICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDYXBzTG9j
azsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVy
OjpTaGlmdEtleSkpCi0gICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxh
Z1NoaWZ0OwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9k
aWZpZXI6OkNvbnRyb2xLZXkpKQotICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2Rp
ZmllckZsYWdDb250cm9sOwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJF
dmVudDo6TW9kaWZpZXI6OkFsdEtleSkpCi0gICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVu
dE1vZGlmaWVyRmxhZ09wdGlvbjsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6
V2ViRXZlbnQ6Ok1vZGlmaWVyOjpNZXRhS2V5KSkKLSAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBO
U0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZDsKLSAgICByZXR1cm4gbW9kaWZpZXJGbGFnczsKLX0K
LQotc3RhdGljIE5TSW50ZWdlciB0b05TQnV0dG9uTnVtYmVyKFdlYktpdDo6V2ViTW91c2VFdmVu
dDo6QnV0dG9uIG1vdXNlQnV0dG9uKQotewotICAgIHN3aXRjaCAobW91c2VCdXR0b24pIHsKLSAg
ICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6Tm9CdXR0b246Ci0gICAgICAgIHJldHVybiAw
OwotCi0gICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkxlZnRCdXR0b246Ci0gICAgICAg
IHJldHVybiAxIDw8IDA7Ci0KLSAgICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6UmlnaHRC
dXR0b246Ci0gICAgICAgIHJldHVybiAxIDw8IDE7Ci0KLSAgICBjYXNlIFdlYktpdDo6V2ViTW91
c2VFdmVudDo6TWlkZGxlQnV0dG9uOgotICAgICAgICByZXR1cm4gMSA8PCAyOwotCi0gICAgZGVm
YXVsdDoKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQotfQotI2VuZGlmCi0KIC0gKHZvaWQpZGVh
bGxvYwogewogICAgIF9uYXZpZ2F0aW9uQWN0aW9uLT5+TmF2aWdhdGlvbkFjdGlvbigpOwpAQCAt
MTY4LDEyICsxMjksMTIgQEAgLSAoQ0dQb2ludClfY2xpY2tMb2NhdGlvbkluUm9vdFZpZXdDb29y
ZGluYXRlcwogI2lmIFBMQVRGT1JNKE1BQykKIC0gKE5TRXZlbnRNb2RpZmllckZsYWdzKW1vZGlm
aWVyRmxhZ3MKIHsKLSAgICByZXR1cm4gdG9OU0V2ZW50TW9kaWZpZXJGbGFncyhfbmF2aWdhdGlv
bkFjdGlvbi0+bW9kaWZpZXJzKCkpOworICAgIHJldHVybiBXZWJFdmVudEZhY3Rvcnk6OnRvTlNF
dmVudE1vZGlmaWVyRmxhZ3MoX25hdmlnYXRpb25BY3Rpb24tPm1vZGlmaWVycygpKTsKIH0KIAog
LSAoTlNJbnRlZ2VyKWJ1dHRvbk51bWJlcgogewotICAgIHJldHVybiB0b05TQnV0dG9uTnVtYmVy
KF9uYXZpZ2F0aW9uQWN0aW9uLT5tb3VzZUJ1dHRvbigpKTsKKyAgICByZXR1cm4gV2ViRXZlbnRG
YWN0b3J5Ojp0b05TQnV0dG9uTnVtYmVyKF9uYXZpZ2F0aW9uQWN0aW9uLT5tb3VzZUJ1dHRvbigp
KTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv
YS9VSURlbGVnYXRlLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0
ZS5tbQppbmRleCBlMTVjZWZhNzM0OWRkOTY2OTg2MTQwOWQ1YjMyNzc0ZDIyZTU3OWEyLi4zZmYw
YjI4NGM3ZmUyYjYwMjIwOWQ4YWE0NzExNTFjYWJlMDJjZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KQEAgLTQ2LDYgKzQ2LDcgQEAKICNpbXBvcnQg
IldLV2ViVmlld0NvbmZpZ3VyYXRpb25JbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXZWJWaWV3SW50
ZXJuYWwuaCIKICNpbXBvcnQgIldLV2luZG93RmVhdHVyZXNJbnRlcm5hbC5oIgorI2ltcG9ydCAi
V2ViRXZlbnRGYWN0b3J5LmgiCiAjaW1wb3J0ICJXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclBy
b3h5LmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbXBvcnQgIl9XS0NvbnRleHRN
ZW51RWxlbWVudEluZm8uaCIKQEAgLTY4NywyMiArNjg4LDYgQEAgdm9pZCBVSURlbGVnYXRlOjpV
SUNsaWVudDo6d2luZG93RnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBGdW5jdGlvbjx2b2lk
KFdlYkMKICAgICB9KS5nZXQoKV07CiB9CiAKLXN0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFncyB0
b05TRXZlbnRNb2RpZmllckZsYWdzKE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IG1vZGlm
aWVycykKLXsKLSAgICBOU0V2ZW50TW9kaWZpZXJGbGFncyBmbGFncyA9IDA7Ci0gICAgaWYgKG1v
ZGlmaWVycy5jb250YWlucyhXZWJFdmVudDo6TW9kaWZpZXI6OlNoaWZ0S2V5KSkKLSAgICAgICAg
ZmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ1NoaWZ0OwotICAgIGlmIChtb2RpZmllcnMuY29u
dGFpbnMoV2ViRXZlbnQ6Ok1vZGlmaWVyOjpDb250cm9sS2V5KSkKLSAgICAgICAgZmxhZ3MgfD0g
TlNFdmVudE1vZGlmaWVyRmxhZ0NvbnRyb2w7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhX
ZWJFdmVudDo6TW9kaWZpZXI6OkFsdEtleSkpCi0gICAgICAgIGZsYWdzIHw9IE5TRXZlbnRNb2Rp
ZmllckZsYWdPcHRpb247Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJFdmVudDo6TW9k
aWZpZXI6Ok1ldGFLZXkpKQotICAgICAgICBmbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ29t
bWFuZDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYkV2ZW50OjpNb2RpZmllcjo6Q2Fw
c0xvY2tLZXkpKQotICAgICAgICBmbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ2Fwc0xvY2s7
Ci0gICAgcmV0dXJuIGZsYWdzOwotfQotCiB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojptb3Vz
ZURpZE1vdmVPdmVyRWxlbWVudChXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJIaXRUZXN0UmVzdWx0
RGF0YSYgZGF0YSwgT3B0aW9uU2V0PFdlYkV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzLCBBUEk6
Ok9iamVjdCogdXNlckluZm8pCiB7CiAgICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZU1l
dGhvZHMud2ViVmlld01vdXNlRGlkTW92ZU92ZXJFbGVtZW50V2l0aEZsYWdzVXNlckluZm8pCkBA
IC03MTMsNyArNjk4LDcgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6bW91c2VEaWRNb3Zl
T3ZlckVsZW1lbnQoV2ViUGFnZVByb3h5JiwgY29uc3QgV2ViSGl0VGUKICAgICAgICAgcmV0dXJu
OwogCiAgICAgYXV0byBhcGlIaXRUZXN0UmVzdWx0ID0gQVBJOjpIaXRUZXN0UmVzdWx0OjpjcmVh
dGUoZGF0YSk7Ci0gICAgWyhpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dlYlZp
ZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyBtb3VzZURpZE1vdmVPdmVyRWxlbWVudDp3cmFwcGVy
KGFwaUhpdFRlc3RSZXN1bHQuZ2V0KCkpIHdpdGhGbGFnczp0b05TRXZlbnRNb2RpZmllckZsYWdz
KG1vZGlmaWVycykgdXNlckluZm86dXNlckluZm8gPyBzdGF0aWNfY2FzdDxpZCA8TlNTZWN1cmVD
b2Rpbmc+Pih1c2VySW5mby0+d3JhcHBlcigpKSA6IG5pbF07CisgICAgWyhpZCA8V0tVSURlbGVn
YXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dlYlZpZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyBtb3Vz
ZURpZE1vdmVPdmVyRWxlbWVudDp3cmFwcGVyKGFwaUhpdFRlc3RSZXN1bHQuZ2V0KCkpIHdpdGhG
bGFnczpXZWJFdmVudEZhY3Rvcnk6OnRvTlNFdmVudE1vZGlmaWVyRmxhZ3MobW9kaWZpZXJzKSB1
c2VySW5mbzp1c2VySW5mbyA/IHN0YXRpY19jYXN0PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJ
bmZvLT53cmFwcGVyKCkpIDogbmlsXTsKIH0KIAogc3RhdGljIF9XS0F1dG9wbGF5RXZlbnRGbGFn
cyB0b1dLQXV0b3BsYXlFdmVudEZsYWdzKE9wdGlvblNldDxXZWJDb3JlOjpBdXRvcGxheUV2ZW50
RmxhZ3M+IGZsYWdzKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>361311</attachid>
            <date>2019-02-06 12:07:23 -0800</date>
            <delta_ts>2019-02-06 13:19:40 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194321-20190206120722.patch</filename>
            <type>text/plain</type>
            <size>9126</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIxNDEwZDg3Y2FmM2IxYmZm
NjI3MGU2Mjc5MDg5YjcxOTRjYjE0ZmUuLjE5YTRjMTYyZThkMThjZDk3OTBlYzA3ZTkxZDdkMWQ2
MzgzOWNjZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDItMDYgIERhbmllbCBC
YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgdG9OU0V2ZW50TW9kaWZp
ZXJGbGFncygpIGFuZCB0b05TQnV0dG9uTnVtYmVyKCkgdG8gV2ViRXZlbnRGYWN0b3J5Lm1tCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMjEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNvbWUg
Y29kZSB0byBXZWJFdmVudEZhY3Rvcnkgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGgg
V0tOYXZpZ2F0aW9uQWN0aW9uLm1tCisgICAgICAgIGFuZCBVSURlbGVnYXRlLm1tIGFtb25nIG90
aGVyIGJlbmVmaXRzLgorCisgICAgICAgICogU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaDoK
KyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKFdlYktp
dDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKToKKyAgICAgICAgKFdl
YktpdDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TQnV0dG9uTnVtYmVyKToKKyAgICAgICAgKiBVSVBy
b2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tOYXZp
Z2F0aW9uQWN0aW9uIG1vZGlmaWVyRmxhZ3NdKToKKyAgICAgICAgKC1bV0tOYXZpZ2F0aW9uQWN0
aW9uIGJ1dHRvbk51bWJlcl0pOgorICAgICAgICAodG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERl
bGV0ZWQuCisgICAgICAgICh0b05TQnV0dG9uTnVtYmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0
ZTo6VUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6
dG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERlbGV0ZWQuCisKIDIwMTktMDItMDYgIFBlciBBcm5l
IFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJvbGwgb3V0IHBhcnRzIG9m
IHIyMzg4MTkgc2luY2UgaXQgaXMgYSBQTFQgcGVyZm9ybWFuY2UgcmVncmVzc2lvbi4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaCBiL1NvdXJj
ZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaAppbmRleCBiZTg3MmNlYjY4YTVh
Y2NmN2JjNmJmYWJkMjFkMjM0ZGRkOTY0MjZjLi5jYWYxYjY2Yzc2YjI2NzRiNDk0YTRhNTBjMWMz
MDVhYWE0MjUyOTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZl
bnRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9y
eS5oCkBAIC00Niw2ICs0Niw5IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViV2hlZWxFdmVudCBj
cmVhdGVXZWJXaGVlbEV2ZW50KE5TRXZlbnQgKiwgTlNWaWV3ICp3aW5kb3dWaWV3KTsKICAgICBz
dGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBjcmVhdGVXZWJLZXlib2FyZEV2ZW50KE5TRXZlbnQgKiwg
Ym9vbCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwgYm9vbCByZXBsYWNlc1NvZnRTcGFjZSwgY29uc3Qg
VmVjdG9yPFdlYkNvcmU6OktleXByZXNzQ29tbWFuZD4mKTsKICAgICBzdGF0aWMgYm9vbCBzaG91
bGRCZUhhbmRsZWRBc0NvbnRleHRDbGljayhjb25zdCBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZl
bnQmKTsKKworICAgIHN0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFncyB0b05TRXZlbnRNb2RpZmll
ckZsYWdzKE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcj4pOworICAgIHN0YXRp
YyBOU0ludGVnZXIgdG9OU0J1dHRvbk51bWJlcihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRv
bik7CiAjZW5kaWYgLy8gVVNFKEFQUEtJVCkKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9t
YWMvV2ViRXZlbnRGYWN0b3J5Lm1tCmluZGV4IGU0MzExNWU5ZTkwODA4YjY3MjkyYTA4ZGFkMTA1
NmU2MmJkZjY1MmUuLjJkNjUzOWY3ZWVjZDQ5ZjM5MGM5Y2ZjNGZmMDQyNTA3NjZlMTcwZTkgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0KKysr
IGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbQpAQCAtNDYyLDYg
KzQ2MiwzOCBAQCBXZWJLZXlib2FyZEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViS2V5
Ym9hcmRFdmVudChOU0V2ZW50ICpldmVudCwgYm9vbCBoYQogICAgIHJldHVybiBXZWJLZXlib2Fy
ZEV2ZW50KHR5cGUsIHRleHQsIHVubW9kaWZpZWRUZXh0LCBrZXksIGNvZGUsIGtleUlkZW50aWZp
ZXIsIHdpbmRvd3NWaXJ0dWFsS2V5Q29kZSwgbmF0aXZlVmlydHVhbEtleUNvZGUsIG1hY0NoYXJD
b2RlLCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwgY29tbWFuZHMsIGF1dG9SZXBlYXQsIGlzS2V5cGFk
LCBpc1N5c3RlbUtleSwgbW9kaWZpZXJzLCB0aW1lc3RhbXApOwogfQogCitOU0V2ZW50TW9kaWZp
ZXJGbGFncyBXZWJFdmVudEZhY3Rvcnk6OnRvTlNFdmVudE1vZGlmaWVyRmxhZ3MoT3B0aW9uU2V0
PFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmllcnMpCit7CisgICAgTlNFdmVudE1v
ZGlmaWVyRmxhZ3MgbW9kaWZpZXJGbGFncyA9IDA7CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlu
cyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6Q2Fwc0xvY2tLZXkpKQorICAgICAgICBtb2Rp
ZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDYXBzTG9jazsKKyAgICBpZiAobW9kaWZp
ZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpTaGlmdEtleSkpCisgICAg
ICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ1NoaWZ0OworICAgIGlmICht
b2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkNvbnRyb2xLZXkp
KQorICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDb250cm9sOwor
ICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkFs
dEtleSkpCisgICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ09wdGlv
bjsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVy
OjpNZXRhS2V5KSkKKyAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q29tbWFuZDsKKyAgICByZXR1cm4gbW9kaWZpZXJGbGFnczsKK30KKworTlNJbnRlZ2VyIFdlYkV2
ZW50RmFjdG9yeTo6dG9OU0J1dHRvbk51bWJlcihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRv
biBtb3VzZUJ1dHRvbikKK3sKKyAgICBzd2l0Y2ggKG1vdXNlQnV0dG9uKSB7CisgICAgY2FzZSBX
ZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOgorICAgICAgICByZXR1cm4gMDsKKyAgICBj
YXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6TGVmdEJ1dHRvbjoKKyAgICAgICAgcmV0dXJuIDEg
PDwgMDsKKyAgICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6UmlnaHRCdXR0b246CisgICAg
ICAgIHJldHVybiAxIDw8IDE7CisgICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok1pZGRs
ZUJ1dHRvbjoKKyAgICAgICAgcmV0dXJuIDEgPDwgMjsKKyAgICB9CisgICAgQVNTRVJUX05PVF9S
RUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAj
ZW5kaWYgLy8gVVNFKEFQUEtJVCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLm1tCmluZGV4IDBjZmRlY2RkYTY2MWQyMDM4
YjNkYWZkZjA1MmU5NWRlZjE0ZDEzY2MuLjhlNjdkMjE4NzQ4OTRlMDM5NjY2Zjc4ZmVjNmJmOTg5
NTQ2YjQwYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S05hdmlnYXRpb25BY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQpAQCAtMzEsNiArMzEsNyBAQAogI2ltcG9ydCAiTmF2
aWdhdGlvbkFjdGlvbkRhdGEuaCIKICNpbXBvcnQgIldLRnJhbWVJbmZvSW50ZXJuYWwuaCIKICNp
bXBvcnQgIldLTmF2aWdhdGlvbkludGVybmFsLmgiCisjaW1wb3J0ICJXZWJFdmVudEZhY3Rvcnku
aCIKICNpbXBvcnQgIl9XS1VzZXJJbml0aWF0ZWRBY3Rpb25JbnRlcm5hbC5oIgogI2ltcG9ydCA8
V2ViQ29yZS9GbG9hdFBvaW50Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC03NCw0
NiArNzUsNiBAQCBzdGF0aWMgV0tTeW50aGV0aWNDbGlja1R5cGUgdG9XS1N5bnRoZXRpY0NsaWNr
VHlwZShXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OlN5bnRoZQogfQogI2VuZGlmCiAKLSNpZiBQTEFU
Rk9STShNQUMpCi0KLS8vIEZJWE1FOiBUaGlzIHJlYWxseSBiZWxvbmdzIGluIFdlYkV2ZW50RmFj
dG9yeS4KLXN0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFncyB0b05TRXZlbnRNb2RpZmllckZsYWdz
KE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzKQotewotICAg
IE5TRXZlbnRNb2RpZmllckZsYWdzIG1vZGlmaWVyRmxhZ3MgPSAwOwotICAgIGlmIChtb2RpZmll
cnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkNhcHNMb2NrS2V5KSkKLSAg
ICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ2Fwc0xvY2s7Ci0gICAg
aWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6U2hpZnRL
ZXkpKQotICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdDsK
LSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpD
b250cm9sS2V5KSkKLSAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q29udHJvbDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1v
ZGlmaWVyOjpBbHRLZXkpKQotICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmll
ckZsYWdPcHRpb247Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50
OjpNb2RpZmllcjo6TWV0YUtleSkpCi0gICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1v
ZGlmaWVyRmxhZ0NvbW1hbmQ7Ci0gICAgcmV0dXJuIG1vZGlmaWVyRmxhZ3M7Ci19Ci0KLXN0YXRp
YyBOU0ludGVnZXIgdG9OU0J1dHRvbk51bWJlcihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRv
biBtb3VzZUJ1dHRvbikKLXsKLSAgICBzd2l0Y2ggKG1vdXNlQnV0dG9uKSB7Ci0gICAgY2FzZSBX
ZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOgotICAgICAgICByZXR1cm4gMDsKLQotICAg
IGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpMZWZ0QnV0dG9uOgotICAgICAgICByZXR1cm4g
MSA8PCAwOwotCi0gICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OlJpZ2h0QnV0dG9uOgot
ICAgICAgICByZXR1cm4gMSA8PCAxOwotCi0gICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6
Ok1pZGRsZUJ1dHRvbjoKLSAgICAgICAgcmV0dXJuIDEgPDwgMjsKLQotICAgIGRlZmF1bHQ6Ci0g
ICAgICAgIHJldHVybiAwOwotICAgIH0KLX0KLSNlbmRpZgotCiAtICh2b2lkKWRlYWxsb2MKIHsK
ICAgICBfbmF2aWdhdGlvbkFjdGlvbi0+fk5hdmlnYXRpb25BY3Rpb24oKTsKQEAgLTE2OCwxMiAr
MTI5LDEyIEBAIC0gKENHUG9pbnQpX2NsaWNrTG9jYXRpb25JblJvb3RWaWV3Q29vcmRpbmF0ZXMK
ICNpZiBQTEFURk9STShNQUMpCiAtIChOU0V2ZW50TW9kaWZpZXJGbGFncyltb2RpZmllckZsYWdz
CiB7Ci0gICAgcmV0dXJuIHRvTlNFdmVudE1vZGlmaWVyRmxhZ3MoX25hdmlnYXRpb25BY3Rpb24t
Pm1vZGlmaWVycygpKTsKKyAgICByZXR1cm4gV2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2Rp
ZmllckZsYWdzKF9uYXZpZ2F0aW9uQWN0aW9uLT5tb2RpZmllcnMoKSk7CiB9CiAKIC0gKE5TSW50
ZWdlcilidXR0b25OdW1iZXIKIHsKLSAgICByZXR1cm4gdG9OU0J1dHRvbk51bWJlcihfbmF2aWdh
dGlvbkFjdGlvbi0+bW91c2VCdXR0b24oKSk7CisgICAgcmV0dXJuIFdlYkV2ZW50RmFjdG9yeTo6
dG9OU0J1dHRvbk51bWJlcihfbmF2aWdhdGlvbkFjdGlvbi0+bW91c2VCdXR0b24oKSk7CiB9CiAj
ZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxl
Z2F0ZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KaW5k
ZXggZTE1Y2VmYTczNDlkZDk2Njk4NjE0MDlkNWIzMjc3NGQyMmU1NzlhMi4uM2ZmMGIyODRjN2Zl
MmI2MDIyMDlkOGFhNDcxMTUxY2FiZTAyY2Q0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V
SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9Db2NvYS9VSURlbGVnYXRlLm1tCkBAIC00Niw2ICs0Niw3IEBACiAjaW1wb3J0ICJXS1dlYlZp
ZXdDb25maWd1cmF0aW9uSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgi
CiAjaW1wb3J0ICJXS1dpbmRvd0ZlYXR1cmVzSW50ZXJuYWwuaCIKKyNpbXBvcnQgIldlYkV2ZW50
RmFjdG9yeS5oIgogI2ltcG9ydCAiV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eS5oIgog
I2ltcG9ydCAiV2ViUHJvY2Vzc1Byb3h5LmgiCiAjaW1wb3J0ICJfV0tDb250ZXh0TWVudUVsZW1l
bnRJbmZvLmgiCkBAIC02ODcsMjIgKzY4OCw2IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6
OndpbmRvd0ZyYW1lKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgRnVuY3Rpb248dm9pZChXZWJDCiAg
ICAgfSkuZ2V0KCldOwogfQogCi1zdGF0aWMgTlNFdmVudE1vZGlmaWVyRmxhZ3MgdG9OU0V2ZW50
TW9kaWZpZXJGbGFncyhPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmllcnMpCi17
Ci0gICAgTlNFdmVudE1vZGlmaWVyRmxhZ3MgZmxhZ3MgPSAwOwotICAgIGlmIChtb2RpZmllcnMu
Y29udGFpbnMoV2ViRXZlbnQ6Ok1vZGlmaWVyOjpTaGlmdEtleSkpCi0gICAgICAgIGZsYWdzIHw9
IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdl
YkV2ZW50OjpNb2RpZmllcjo6Q29udHJvbEtleSkpCi0gICAgICAgIGZsYWdzIHw9IE5TRXZlbnRN
b2RpZmllckZsYWdDb250cm9sOwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViRXZlbnQ6
Ok1vZGlmaWVyOjpBbHRLZXkpKQotICAgICAgICBmbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
T3B0aW9uOwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViRXZlbnQ6Ok1vZGlmaWVyOjpN
ZXRhS2V5KSkKLSAgICAgICAgZmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQ7Ci0g
ICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJFdmVudDo6TW9kaWZpZXI6OkNhcHNMb2NrS2V5
KSkKLSAgICAgICAgZmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NhcHNMb2NrOwotICAgIHJl
dHVybiBmbGFnczsKLX0KLQogdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6bW91c2VEaWRNb3Zl
T3ZlckVsZW1lbnQoV2ViUGFnZVByb3h5JiwgY29uc3QgV2ViSGl0VGVzdFJlc3VsdERhdGEmIGRh
dGEsIE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IG1vZGlmaWVycywgQVBJOjpPYmplY3Qq
IHVzZXJJbmZvKQogewogICAgIGlmICghbV91aURlbGVnYXRlLm1fZGVsZWdhdGVNZXRob2RzLndl
YlZpZXdNb3VzZURpZE1vdmVPdmVyRWxlbWVudFdpdGhGbGFnc1VzZXJJbmZvKQpAQCAtNzEzLDcg
KzY5OCw3IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVt
ZW50KFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYkhpdFRlCiAgICAgICAgIHJldHVybjsKIAogICAg
IGF1dG8gYXBpSGl0VGVzdFJlc3VsdCA9IEFQSTo6SGl0VGVzdFJlc3VsdDo6Y3JlYXRlKGRhdGEp
OwotICAgIFsoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KWRlbGVnYXRlIF93ZWJWaWV3Om1fdWlE
ZWxlZ2F0ZS5tX3dlYlZpZXcgbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQ6d3JhcHBlcihhcGlIaXRU
ZXN0UmVzdWx0LmdldCgpKSB3aXRoRmxhZ3M6dG9OU0V2ZW50TW9kaWZpZXJGbGFncyhtb2RpZmll
cnMpIHVzZXJJbmZvOnVzZXJJbmZvID8gc3RhdGljX2Nhc3Q8aWQgPE5TU2VjdXJlQ29kaW5nPj4o
dXNlckluZm8tPndyYXBwZXIoKSkgOiBuaWxdOworICAgIFsoaWQgPFdLVUlEZWxlZ2F0ZVByaXZh
dGU+KWRlbGVnYXRlIF93ZWJWaWV3Om1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcgbW91c2VEaWRNb3Zl
T3ZlckVsZW1lbnQ6d3JhcHBlcihhcGlIaXRUZXN0UmVzdWx0LmdldCgpKSB3aXRoRmxhZ3M6V2Vi
RXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKG1vZGlmaWVycykgdXNlckluZm86
dXNlckluZm8gPyBzdGF0aWNfY2FzdDxpZCA8TlNTZWN1cmVDb2Rpbmc+Pih1c2VySW5mby0+d3Jh
cHBlcigpKSA6IG5pbF07CiB9CiAKIHN0YXRpYyBfV0tBdXRvcGxheUV2ZW50RmxhZ3MgdG9XS0F1
dG9wbGF5RXZlbnRGbGFncyhPcHRpb25TZXQ8V2ViQ29yZTo6QXV0b3BsYXlFdmVudEZsYWdzPiBm
bGFncykK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>361320</attachid>
            <date>2019-02-06 13:19:42 -0800</date>
            <delta_ts>2019-02-06 13:31:59 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194321-20190206131941.patch</filename>
            <type>text/plain</type>
            <size>9142</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIxNDEwZDg3Y2FmM2IxYmZm
NjI3MGU2Mjc5MDg5YjcxOTRjYjE0ZmUuLjE5YTRjMTYyZThkMThjZDk3OTBlYzA3ZTkxZDdkMWQ2
MzgzOWNjZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDItMDYgIERhbmllbCBC
YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgdG9OU0V2ZW50TW9kaWZp
ZXJGbGFncygpIGFuZCB0b05TQnV0dG9uTnVtYmVyKCkgdG8gV2ViRXZlbnRGYWN0b3J5Lm1tCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMjEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNvbWUg
Y29kZSB0byBXZWJFdmVudEZhY3Rvcnkgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGgg
V0tOYXZpZ2F0aW9uQWN0aW9uLm1tCisgICAgICAgIGFuZCBVSURlbGVnYXRlLm1tIGFtb25nIG90
aGVyIGJlbmVmaXRzLgorCisgICAgICAgICogU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaDoK
KyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKFdlYktp
dDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKToKKyAgICAgICAgKFdl
YktpdDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TQnV0dG9uTnVtYmVyKToKKyAgICAgICAgKiBVSVBy
b2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tOYXZp
Z2F0aW9uQWN0aW9uIG1vZGlmaWVyRmxhZ3NdKToKKyAgICAgICAgKC1bV0tOYXZpZ2F0aW9uQWN0
aW9uIGJ1dHRvbk51bWJlcl0pOgorICAgICAgICAodG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERl
bGV0ZWQuCisgICAgICAgICh0b05TQnV0dG9uTnVtYmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0
ZTo6VUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6
dG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERlbGV0ZWQuCisKIDIwMTktMDItMDYgIFBlciBBcm5l
IFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJvbGwgb3V0IHBhcnRzIG9m
IHIyMzg4MTkgc2luY2UgaXQgaXMgYSBQTFQgcGVyZm9ybWFuY2UgcmVncmVzc2lvbi4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaCBiL1NvdXJj
ZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaAppbmRleCBiZTg3MmNlYjY4YTVh
Y2NmN2JjNmJmYWJkMjFkMjM0ZGRkOTY0MjZjLi5jYWYxYjY2Yzc2YjI2NzRiNDk0YTRhNTBjMWMz
MDVhYWE0MjUyOTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZl
bnRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9y
eS5oCkBAIC00Niw2ICs0Niw5IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViV2hlZWxFdmVudCBj
cmVhdGVXZWJXaGVlbEV2ZW50KE5TRXZlbnQgKiwgTlNWaWV3ICp3aW5kb3dWaWV3KTsKICAgICBz
dGF0aWMgV2ViS2V5Ym9hcmRFdmVudCBjcmVhdGVXZWJLZXlib2FyZEV2ZW50KE5TRXZlbnQgKiwg
Ym9vbCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwgYm9vbCByZXBsYWNlc1NvZnRTcGFjZSwgY29uc3Qg
VmVjdG9yPFdlYkNvcmU6OktleXByZXNzQ29tbWFuZD4mKTsKICAgICBzdGF0aWMgYm9vbCBzaG91
bGRCZUhhbmRsZWRBc0NvbnRleHRDbGljayhjb25zdCBXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZl
bnQmKTsKKworICAgIHN0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFncyB0b05TRXZlbnRNb2RpZmll
ckZsYWdzKE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcj4pOworICAgIHN0YXRp
YyBOU0ludGVnZXIgdG9OU0J1dHRvbk51bWJlcihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRv
bik7CiAjZW5kaWYgLy8gVVNFKEFQUEtJVCkKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL
aXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9t
YWMvV2ViRXZlbnRGYWN0b3J5Lm1tCmluZGV4IGU0MzExNWU5ZTkwODA4YjY3MjkyYTA4ZGFkMTA1
NmU2MmJkZjY1MmUuLjJkNjUzOWY3ZWVjZDQ5ZjM5MGM5Y2ZjNGZmMDQyNTA3NjZlMTcwZTkgMTAw
NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0KKysr
IGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbQpAQCAtNDYyLDYg
KzQ2MiwzOCBAQCBXZWJLZXlib2FyZEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViS2V5
Ym9hcmRFdmVudChOU0V2ZW50ICpldmVudCwgYm9vbCBoYQogICAgIHJldHVybiBXZWJLZXlib2Fy
ZEV2ZW50KHR5cGUsIHRleHQsIHVubW9kaWZpZWRUZXh0LCBrZXksIGNvZGUsIGtleUlkZW50aWZp
ZXIsIHdpbmRvd3NWaXJ0dWFsS2V5Q29kZSwgbmF0aXZlVmlydHVhbEtleUNvZGUsIG1hY0NoYXJD
b2RlLCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwgY29tbWFuZHMsIGF1dG9SZXBlYXQsIGlzS2V5cGFk
LCBpc1N5c3RlbUtleSwgbW9kaWZpZXJzLCB0aW1lc3RhbXApOwogfQogCitOU0V2ZW50TW9kaWZp
ZXJGbGFncyBXZWJFdmVudEZhY3Rvcnk6OnRvTlNFdmVudE1vZGlmaWVyRmxhZ3MoT3B0aW9uU2V0
PFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmllcnMpCit7CisgICAgTlNFdmVudE1v
ZGlmaWVyRmxhZ3MgbW9kaWZpZXJGbGFncyA9IDA7CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlu
cyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6Q2Fwc0xvY2tLZXkpKQorICAgICAgICBtb2Rp
ZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDYXBzTG9jazsKKyAgICBpZiAobW9kaWZp
ZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpTaGlmdEtleSkpCisgICAg
ICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ1NoaWZ0OworICAgIGlmICht
b2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkNvbnRyb2xLZXkp
KQorICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDb250cm9sOwor
ICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkFs
dEtleSkpCisgICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ09wdGlv
bjsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVy
OjpNZXRhS2V5KSkKKyAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q29tbWFuZDsKKyAgICByZXR1cm4gbW9kaWZpZXJGbGFnczsKK30KKworTlNJbnRlZ2VyIFdlYkV2
ZW50RmFjdG9yeTo6dG9OU0J1dHRvbk51bWJlcihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRv
biBtb3VzZUJ1dHRvbikKK3sKKyAgICBzd2l0Y2ggKG1vdXNlQnV0dG9uKSB7CisgICAgY2FzZSBX
ZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOgorICAgICAgICByZXR1cm4gMDsKKyAgICBj
YXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6TGVmdEJ1dHRvbjoKKyAgICAgICAgcmV0dXJuIDEg
PDwgMDsKKyAgICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6UmlnaHRCdXR0b246CisgICAg
ICAgIHJldHVybiAxIDw8IDE7CisgICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok1pZGRs
ZUJ1dHRvbjoKKyAgICAgICAgcmV0dXJuIDEgPDwgMjsKKyAgICB9CisgICAgQVNTRVJUX05PVF9S
RUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAj
ZW5kaWYgLy8gVVNFKEFQUEtJVCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLm1tCmluZGV4IDBjZmRlY2RkYTY2MWQyMDM4
YjNkYWZkZjA1MmU5NWRlZjE0ZDEzY2MuLjQ0YzhiYjYwOTJlZGFhMTJjYTNlY2M5YzQ3ZGU1MTBk
NmNmYjZkNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S05hdmlnYXRpb25BY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQpAQCAtMzEsNiArMzEsNyBAQAogI2ltcG9ydCAiTmF2
aWdhdGlvbkFjdGlvbkRhdGEuaCIKICNpbXBvcnQgIldLRnJhbWVJbmZvSW50ZXJuYWwuaCIKICNp
bXBvcnQgIldLTmF2aWdhdGlvbkludGVybmFsLmgiCisjaW1wb3J0ICJXZWJFdmVudEZhY3Rvcnku
aCIKICNpbXBvcnQgIl9XS1VzZXJJbml0aWF0ZWRBY3Rpb25JbnRlcm5hbC5oIgogI2ltcG9ydCA8
V2ViQ29yZS9GbG9hdFBvaW50Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC03NCw0
NiArNzUsNiBAQCBzdGF0aWMgV0tTeW50aGV0aWNDbGlja1R5cGUgdG9XS1N5bnRoZXRpY0NsaWNr
VHlwZShXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OlN5bnRoZQogfQogI2VuZGlmCiAKLSNpZiBQTEFU
Rk9STShNQUMpCi0KLS8vIEZJWE1FOiBUaGlzIHJlYWxseSBiZWxvbmdzIGluIFdlYkV2ZW50RmFj
dG9yeS4KLXN0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFncyB0b05TRXZlbnRNb2RpZmllckZsYWdz
KE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzKQotewotICAg
IE5TRXZlbnRNb2RpZmllckZsYWdzIG1vZGlmaWVyRmxhZ3MgPSAwOwotICAgIGlmIChtb2RpZmll
cnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkNhcHNMb2NrS2V5KSkKLSAg
ICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ2Fwc0xvY2s7Ci0gICAg
aWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6U2hpZnRL
ZXkpKQotICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdDsK
LSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpD
b250cm9sS2V5KSkKLSAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q29udHJvbDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1v
ZGlmaWVyOjpBbHRLZXkpKQotICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmll
ckZsYWdPcHRpb247Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50
OjpNb2RpZmllcjo6TWV0YUtleSkpCi0gICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1v
ZGlmaWVyRmxhZ0NvbW1hbmQ7Ci0gICAgcmV0dXJuIG1vZGlmaWVyRmxhZ3M7Ci19Ci0KLXN0YXRp
YyBOU0ludGVnZXIgdG9OU0J1dHRvbk51bWJlcihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRv
biBtb3VzZUJ1dHRvbikKLXsKLSAgICBzd2l0Y2ggKG1vdXNlQnV0dG9uKSB7Ci0gICAgY2FzZSBX
ZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok5vQnV0dG9uOgotICAgICAgICByZXR1cm4gMDsKLQotICAg
IGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpMZWZ0QnV0dG9uOgotICAgICAgICByZXR1cm4g
MSA8PCAwOwotCi0gICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OlJpZ2h0QnV0dG9uOgot
ICAgICAgICByZXR1cm4gMSA8PCAxOwotCi0gICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6
Ok1pZGRsZUJ1dHRvbjoKLSAgICAgICAgcmV0dXJuIDEgPDwgMjsKLQotICAgIGRlZmF1bHQ6Ci0g
ICAgICAgIHJldHVybiAwOwotICAgIH0KLX0KLSNlbmRpZgotCiAtICh2b2lkKWRlYWxsb2MKIHsK
ICAgICBfbmF2aWdhdGlvbkFjdGlvbi0+fk5hdmlnYXRpb25BY3Rpb24oKTsKQEAgLTE2OCwxMiAr
MTI5LDEyIEBAIC0gKENHUG9pbnQpX2NsaWNrTG9jYXRpb25JblJvb3RWaWV3Q29vcmRpbmF0ZXMK
ICNpZiBQTEFURk9STShNQUMpCiAtIChOU0V2ZW50TW9kaWZpZXJGbGFncyltb2RpZmllckZsYWdz
CiB7Ci0gICAgcmV0dXJuIHRvTlNFdmVudE1vZGlmaWVyRmxhZ3MoX25hdmlnYXRpb25BY3Rpb24t
Pm1vZGlmaWVycygpKTsKKyAgICByZXR1cm4gV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OnRvTlNF
dmVudE1vZGlmaWVyRmxhZ3MoX25hdmlnYXRpb25BY3Rpb24tPm1vZGlmaWVycygpKTsKIH0KIAog
LSAoTlNJbnRlZ2VyKWJ1dHRvbk51bWJlcgogewotICAgIHJldHVybiB0b05TQnV0dG9uTnVtYmVy
KF9uYXZpZ2F0aW9uQWN0aW9uLT5tb3VzZUJ1dHRvbigpKTsKKyAgICByZXR1cm4gV2ViS2l0OjpX
ZWJFdmVudEZhY3Rvcnk6OnRvTlNCdXR0b25OdW1iZXIoX25hdmlnYXRpb25BY3Rpb24tPm1vdXNl
QnV0dG9uKCkpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j
ZXNzL0NvY29hL1VJRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9V
SURlbGVnYXRlLm1tCmluZGV4IGUxNWNlZmE3MzQ5ZGQ5NjY5ODYxNDA5ZDViMzI3NzRkMjJlNTc5
YTIuLjNmZjBiMjg0YzdmZTJiNjAyMjA5ZDhhYTQ3MTE1MWNhYmUwMmNkNDIgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KKysrIGIvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQpAQCAtNDYsNiArNDYsNyBAQAog
I2ltcG9ydCAiV0tXZWJWaWV3Q29uZmlndXJhdGlvbkludGVybmFsLmgiCiAjaW1wb3J0ICJXS1dl
YlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXaW5kb3dGZWF0dXJlc0ludGVybmFsLmgiCisj
aW1wb3J0ICJXZWJFdmVudEZhY3RvcnkuaCIKICNpbXBvcnQgIldlYk9wZW5QYW5lbFJlc3VsdExp
c3RlbmVyUHJveHkuaCIKICNpbXBvcnQgIldlYlByb2Nlc3NQcm94eS5oIgogI2ltcG9ydCAiX1dL
Q29udGV4dE1lbnVFbGVtZW50SW5mby5oIgpAQCAtNjg3LDIyICs2ODgsNiBAQCB2b2lkIFVJRGVs
ZWdhdGU6OlVJQ2xpZW50Ojp3aW5kb3dGcmFtZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEZ1bmN0
aW9uPHZvaWQoV2ViQwogICAgIH0pLmdldCgpXTsKIH0KIAotc3RhdGljIE5TRXZlbnRNb2RpZmll
ckZsYWdzIHRvTlNFdmVudE1vZGlmaWVyRmxhZ3MoT3B0aW9uU2V0PFdlYkV2ZW50OjpNb2RpZmll
cj4gbW9kaWZpZXJzKQotewotICAgIE5TRXZlbnRNb2RpZmllckZsYWdzIGZsYWdzID0gMDsKLSAg
ICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYkV2ZW50OjpNb2RpZmllcjo6U2hpZnRLZXkpKQot
ICAgICAgICBmbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnU2hpZnQ7Ci0gICAgaWYgKG1vZGlm
aWVycy5jb250YWlucyhXZWJFdmVudDo6TW9kaWZpZXI6OkNvbnRyb2xLZXkpKQotICAgICAgICBm
bGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ29udHJvbDsKLSAgICBpZiAobW9kaWZpZXJzLmNv
bnRhaW5zKFdlYkV2ZW50OjpNb2RpZmllcjo6QWx0S2V5KSkKLSAgICAgICAgZmxhZ3MgfD0gTlNF
dmVudE1vZGlmaWVyRmxhZ09wdGlvbjsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYkV2
ZW50OjpNb2RpZmllcjo6TWV0YUtleSkpCi0gICAgICAgIGZsYWdzIHw9IE5TRXZlbnRNb2RpZmll
ckZsYWdDb21tYW5kOwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViRXZlbnQ6Ok1vZGlm
aWVyOjpDYXBzTG9ja0tleSkpCi0gICAgICAgIGZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdD
YXBzTG9jazsKLSAgICByZXR1cm4gZmxhZ3M7Ci19Ci0KIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGll
bnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYkhpdFRl
c3RSZXN1bHREYXRhJiBkYXRhLCBPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmll
cnMsIEFQSTo6T2JqZWN0KiB1c2VySW5mbykKIHsKICAgICBpZiAoIW1fdWlEZWxlZ2F0ZS5tX2Rl
bGVnYXRlTWV0aG9kcy53ZWJWaWV3TW91c2VEaWRNb3ZlT3ZlckVsZW1lbnRXaXRoRmxhZ3NVc2Vy
SW5mbykKQEAgLTcxMyw3ICs2OTgsNyBAQCB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojptb3Vz
ZURpZE1vdmVPdmVyRWxlbWVudChXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJIaXRUZQogICAgICAg
ICByZXR1cm47CiAKICAgICBhdXRvIGFwaUhpdFRlc3RSZXN1bHQgPSBBUEk6OkhpdFRlc3RSZXN1
bHQ6OmNyZWF0ZShkYXRhKTsKLSAgICBbKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilkZWxlZ2F0
ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUubV93ZWJWaWV3IG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50
OndyYXBwZXIoYXBpSGl0VGVzdFJlc3VsdC5nZXQoKSkgd2l0aEZsYWdzOnRvTlNFdmVudE1vZGlm
aWVyRmxhZ3MobW9kaWZpZXJzKSB1c2VySW5mbzp1c2VySW5mbyA/IHN0YXRpY19jYXN0PGlkIDxO
U1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53cmFwcGVyKCkpIDogbmlsXTsKKyAgICBbKGlkIDxX
S1VJRGVsZWdhdGVQcml2YXRlPilkZWxlZ2F0ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUubV93ZWJW
aWV3IG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50OndyYXBwZXIoYXBpSGl0VGVzdFJlc3VsdC5nZXQo
KSkgd2l0aEZsYWdzOldlYkV2ZW50RmFjdG9yeTo6dG9OU0V2ZW50TW9kaWZpZXJGbGFncyhtb2Rp
ZmllcnMpIHVzZXJJbmZvOnVzZXJJbmZvID8gc3RhdGljX2Nhc3Q8aWQgPE5TU2VjdXJlQ29kaW5n
Pj4odXNlckluZm8tPndyYXBwZXIoKSkgOiBuaWxdOwogfQogCiBzdGF0aWMgX1dLQXV0b3BsYXlF
dmVudEZsYWdzIHRvV0tBdXRvcGxheUV2ZW50RmxhZ3MoT3B0aW9uU2V0PFdlYkNvcmU6OkF1dG9w
bGF5RXZlbnRGbGFncz4gZmxhZ3MpCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>361322</attachid>
            <date>2019-02-06 13:32:00 -0800</date>
            <delta_ts>2019-02-06 14:43:18 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194321-20190206133200.patch</filename>
            <type>text/plain</type>
            <size>9281</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIxNDEwZDg3Y2FmM2IxYmZm
NjI3MGU2Mjc5MDg5YjcxOTRjYjE0ZmUuLjE5YTRjMTYyZThkMThjZDk3OTBlYzA3ZTkxZDdkMWQ2
MzgzOWNjZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDItMDYgIERhbmllbCBC
YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgdG9OU0V2ZW50TW9kaWZp
ZXJGbGFncygpIGFuZCB0b05TQnV0dG9uTnVtYmVyKCkgdG8gV2ViRXZlbnRGYWN0b3J5Lm1tCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMjEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNvbWUg
Y29kZSB0byBXZWJFdmVudEZhY3Rvcnkgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGgg
V0tOYXZpZ2F0aW9uQWN0aW9uLm1tCisgICAgICAgIGFuZCBVSURlbGVnYXRlLm1tIGFtb25nIG90
aGVyIGJlbmVmaXRzLgorCisgICAgICAgICogU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaDoK
KyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKFdlYktp
dDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKToKKyAgICAgICAgKFdl
YktpdDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TQnV0dG9uTnVtYmVyKToKKyAgICAgICAgKiBVSVBy
b2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tOYXZp
Z2F0aW9uQWN0aW9uIG1vZGlmaWVyRmxhZ3NdKToKKyAgICAgICAgKC1bV0tOYXZpZ2F0aW9uQWN0
aW9uIGJ1dHRvbk51bWJlcl0pOgorICAgICAgICAodG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERl
bGV0ZWQuCisgICAgICAgICh0b05TQnV0dG9uTnVtYmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0
ZTo6VUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6
dG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERlbGV0ZWQuCisKIDIwMTktMDItMDYgIFBlciBBcm5l
IFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJvbGwgb3V0IHBhcnRzIG9m
IHIyMzg4MTkgc2luY2UgaXQgaXMgYSBQTFQgcGVyZm9ybWFuY2UgcmVncmVzc2lvbi4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaCBiL1NvdXJj
ZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaAppbmRleCBiZTg3MmNlYjY4YTVh
Y2NmN2JjNmJmYWJkMjFkMjM0ZGRkOTY0MjZjLi4zZWJiZGU4MDJiMDljYzA1NGRkMmRkOGZlZTE3
MTQ1MTE0MjkyMGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZl
bnRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9y
eS5oCkBAIC0yOSw2ICsyOSw4IEBACiAjaW1wb3J0ICJXZWJFdmVudC5oIgogCiAjaWYgVVNFKEFQ
UEtJVCkKKyNpbXBvcnQgPEFwcEtpdC9BcHBLaXQuaD4KKwogbmFtZXNwYWNlIFdlYkNvcmUgewog
Y2xhc3MgUGxhdGZvcm1Nb3VzZUV2ZW50OwogfQpAQCAtNDYsNiArNDgsOSBAQCBwdWJsaWM6CiAg
ICAgc3RhdGljIFdlYldoZWVsRXZlbnQgY3JlYXRlV2ViV2hlZWxFdmVudChOU0V2ZW50ICosIE5T
VmlldyAqd2luZG93Vmlldyk7CiAgICAgc3RhdGljIFdlYktleWJvYXJkRXZlbnQgY3JlYXRlV2Vi
S2V5Ym9hcmRFdmVudChOU0V2ZW50ICosIGJvb2wgaGFuZGxlZEJ5SW5wdXRNZXRob2QsIGJvb2wg
cmVwbGFjZXNTb2Z0U3BhY2UsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpLZXlwcmVzc0NvbW1hbmQ+
Jik7CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkQmVIYW5kbGVkQXNDb250ZXh0Q2xpY2soY29uc3Qg
V2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50Jik7CisKKyAgICBzdGF0aWMgTlNFdmVudE1vZGlm
aWVyRmxhZ3MgdG9OU0V2ZW50TW9kaWZpZXJGbGFncyhPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVu
dDo6TW9kaWZpZXI+KTsKKyAgICBzdGF0aWMgTlNJbnRlZ2VyIHRvTlNCdXR0b25OdW1iZXIoV2Vi
S2l0OjpXZWJNb3VzZUV2ZW50OjpCdXR0b24pOwogI2VuZGlmIC8vIFVTRShBUFBLSVQpCiB9Owog
CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1t
IGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbQppbmRleCBlNDMx
MTVlOWU5MDgwOGI2NzI5MmEwOGRhZDEwNTZlNjJiZGY2NTJlLi4yZDY1MzlmN2VlY2Q0OWYzOTBj
OWNmYzRmZjA0MjUwNzY2ZTE3MGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9t
YWMvV2ViRXZlbnRGYWN0b3J5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJF
dmVudEZhY3RvcnkubW0KQEAgLTQ2Miw2ICs0NjIsMzggQEAgV2ViS2V5Ym9hcmRFdmVudCBXZWJF
dmVudEZhY3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQoTlNFdmVudCAqZXZlbnQsIGJvb2wg
aGEKICAgICByZXR1cm4gV2ViS2V5Ym9hcmRFdmVudCh0eXBlLCB0ZXh0LCB1bm1vZGlmaWVkVGV4
dCwga2V5LCBjb2RlLCBrZXlJZGVudGlmaWVyLCB3aW5kb3dzVmlydHVhbEtleUNvZGUsIG5hdGl2
ZVZpcnR1YWxLZXlDb2RlLCBtYWNDaGFyQ29kZSwgaGFuZGxlZEJ5SW5wdXRNZXRob2QsIGNvbW1h
bmRzLCBhdXRvUmVwZWF0LCBpc0tleXBhZCwgaXNTeXN0ZW1LZXksIG1vZGlmaWVycywgdGltZXN0
YW1wKTsKIH0KIAorTlNFdmVudE1vZGlmaWVyRmxhZ3MgV2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZl
bnRNb2RpZmllckZsYWdzKE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcj4gbW9k
aWZpZXJzKQoreworICAgIE5TRXZlbnRNb2RpZmllckZsYWdzIG1vZGlmaWVyRmxhZ3MgPSAwOwor
ICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkNh
cHNMb2NrS2V5KSkKKyAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q2Fwc0xvY2s7CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpN
b2RpZmllcjo6U2hpZnRLZXkpKQorICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2Rp
ZmllckZsYWdTaGlmdDsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZl
bnQ6Ok1vZGlmaWVyOjpDb250cm9sS2V5KSkKKyAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2
ZW50TW9kaWZpZXJGbGFnQ29udHJvbDsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktp
dDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpBbHRLZXkpKQorICAgICAgICBtb2RpZmllckZsYWdzIHw9
IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb247CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhX
ZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6TWV0YUtleSkpCisgICAgICAgIG1vZGlmaWVyRmxh
Z3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQ7CisgICAgcmV0dXJuIG1vZGlmaWVyRmxh
Z3M7Cit9CisKK05TSW50ZWdlciBXZWJFdmVudEZhY3Rvcnk6OnRvTlNCdXR0b25OdW1iZXIoV2Vi
S2l0OjpXZWJNb3VzZUV2ZW50OjpCdXR0b24gbW91c2VCdXR0b24pCit7CisgICAgc3dpdGNoICht
b3VzZUJ1dHRvbikgeworICAgIGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpOb0J1dHRvbjoK
KyAgICAgICAgcmV0dXJuIDA7CisgICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkxlZnRC
dXR0b246CisgICAgICAgIHJldHVybiAxIDw8IDA7CisgICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNl
RXZlbnQ6OlJpZ2h0QnV0dG9uOgorICAgICAgICByZXR1cm4gMSA8PCAxOworICAgIGNhc2UgV2Vi
S2l0OjpXZWJNb3VzZUV2ZW50OjpNaWRkbGVCdXR0b246CisgICAgICAgIHJldHVybiAxIDw8IDI7
CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAwOworfQorCiB9
IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIFVTRShBUFBLSVQpCmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLm1t
IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5t
bQppbmRleCAwY2ZkZWNkZGE2NjFkMjAzOGIzZGFmZGYwNTJlOTVkZWYxNGQxM2NjLi40NGM4YmI2
MDkyZWRhYTEyY2EzZWNjOWM0N2RlNTEwZDZjZmI2ZDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi
S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0aW9uLm1tCisrKyBiL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0KQEAgLTMx
LDYgKzMxLDcgQEAKICNpbXBvcnQgIk5hdmlnYXRpb25BY3Rpb25EYXRhLmgiCiAjaW1wb3J0ICJX
S0ZyYW1lSW5mb0ludGVybmFsLmgiCiAjaW1wb3J0ICJXS05hdmlnYXRpb25JbnRlcm5hbC5oIgor
I2ltcG9ydCAiV2ViRXZlbnRGYWN0b3J5LmgiCiAjaW1wb3J0ICJfV0tVc2VySW5pdGlhdGVkQWN0
aW9uSW50ZXJuYWwuaCIKICNpbXBvcnQgPFdlYkNvcmUvRmxvYXRQb2ludC5oPgogI2ltcG9ydCA8
d3RmL1JldGFpblB0ci5oPgpAQCAtNzQsNDYgKzc1LDYgQEAgc3RhdGljIFdLU3ludGhldGljQ2xp
Y2tUeXBlIHRvV0tTeW50aGV0aWNDbGlja1R5cGUoV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpTeW50
aGUKIH0KICNlbmRpZgogCi0jaWYgUExBVEZPUk0oTUFDKQotCi0vLyBGSVhNRTogVGhpcyByZWFs
bHkgYmVsb25ncyBpbiBXZWJFdmVudEZhY3RvcnkuCi1zdGF0aWMgTlNFdmVudE1vZGlmaWVyRmxh
Z3MgdG9OU0V2ZW50TW9kaWZpZXJGbGFncyhPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVudDo6TW9k
aWZpZXI+IG1vZGlmaWVycykKLXsKLSAgICBOU0V2ZW50TW9kaWZpZXJGbGFncyBtb2RpZmllckZs
YWdzID0gMDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1v
ZGlmaWVyOjpDYXBzTG9ja0tleSkpCi0gICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1v
ZGlmaWVyRmxhZ0NhcHNMb2NrOwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpX
ZWJFdmVudDo6TW9kaWZpZXI6OlNoaWZ0S2V5KSkKLSAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBO
U0V2ZW50TW9kaWZpZXJGbGFnU2hpZnQ7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJL
aXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6Q29udHJvbEtleSkpCi0gICAgICAgIG1vZGlmaWVyRmxh
Z3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbnRyb2w7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250
YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6QWx0S2V5KSkKLSAgICAgICAgbW9kaWZp
ZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnT3B0aW9uOwotICAgIGlmIChtb2RpZmllcnMu
Y29udGFpbnMoV2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6Ok1ldGFLZXkpKQotICAgICAgICBt
b2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kOwotICAgIHJldHVybiBt
b2RpZmllckZsYWdzOwotfQotCi1zdGF0aWMgTlNJbnRlZ2VyIHRvTlNCdXR0b25OdW1iZXIoV2Vi
S2l0OjpXZWJNb3VzZUV2ZW50OjpCdXR0b24gbW91c2VCdXR0b24pCi17Ci0gICAgc3dpdGNoICht
b3VzZUJ1dHRvbikgewotICAgIGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpOb0J1dHRvbjoK
LSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6TGVm
dEJ1dHRvbjoKLSAgICAgICAgcmV0dXJuIDEgPDwgMDsKLQotICAgIGNhc2UgV2ViS2l0OjpXZWJN
b3VzZUV2ZW50OjpSaWdodEJ1dHRvbjoKLSAgICAgICAgcmV0dXJuIDEgPDwgMTsKLQotICAgIGNh
c2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50OjpNaWRkbGVCdXR0b246Ci0gICAgICAgIHJldHVybiAx
IDw8IDI7Ci0KLSAgICBkZWZhdWx0OgotICAgICAgICByZXR1cm4gMDsKLSAgICB9Ci19Ci0jZW5k
aWYKLQogLSAodm9pZClkZWFsbG9jCiB7CiAgICAgX25hdmlnYXRpb25BY3Rpb24tPn5OYXZpZ2F0
aW9uQWN0aW9uKCk7CkBAIC0xNjgsMTIgKzEyOSwxMiBAQCAtIChDR1BvaW50KV9jbGlja0xvY2F0
aW9uSW5Sb290Vmlld0Nvb3JkaW5hdGVzCiAjaWYgUExBVEZPUk0oTUFDKQogLSAoTlNFdmVudE1v
ZGlmaWVyRmxhZ3MpbW9kaWZpZXJGbGFncwogewotICAgIHJldHVybiB0b05TRXZlbnRNb2RpZmll
ckZsYWdzKF9uYXZpZ2F0aW9uQWN0aW9uLT5tb2RpZmllcnMoKSk7CisgICAgcmV0dXJuIFdlYktp
dDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKF9uYXZpZ2F0aW9uQWN0
aW9uLT5tb2RpZmllcnMoKSk7CiB9CiAKIC0gKE5TSW50ZWdlcilidXR0b25OdW1iZXIKIHsKLSAg
ICByZXR1cm4gdG9OU0J1dHRvbk51bWJlcihfbmF2aWdhdGlvbkFjdGlvbi0+bW91c2VCdXR0b24o
KSk7CisgICAgcmV0dXJuIFdlYktpdDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TQnV0dG9uTnVtYmVy
KF9uYXZpZ2F0aW9uQWN0aW9uLT5tb3VzZUJ1dHRvbigpKTsKIH0KICNlbmRpZgogCmRpZmYgLS1n
aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tIGIvU291cmNl
L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCBlMTVjZWZhNzM0OWRk
OTY2OTg2MTQwOWQ1YjMyNzc0ZDIyZTU3OWEyLi4zZmYwYjI4NGM3ZmUyYjYwMjIwOWQ4YWE0NzEx
NTFjYWJlMDJjZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9V
SURlbGVnYXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdh
dGUubW0KQEAgLTQ2LDYgKzQ2LDcgQEAKICNpbXBvcnQgIldLV2ViVmlld0NvbmZpZ3VyYXRpb25J
bnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXZWJWaWV3SW50ZXJuYWwuaCIKICNpbXBvcnQgIldLV2lu
ZG93RmVhdHVyZXNJbnRlcm5hbC5oIgorI2ltcG9ydCAiV2ViRXZlbnRGYWN0b3J5LmgiCiAjaW1w
b3J0ICJXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclByb3h5LmgiCiAjaW1wb3J0ICJXZWJQcm9j
ZXNzUHJveHkuaCIKICNpbXBvcnQgIl9XS0NvbnRleHRNZW51RWxlbWVudEluZm8uaCIKQEAgLTY4
NywyMiArNjg4LDYgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6d2luZG93RnJhbWUoV2Vi
S2l0OjpXZWJQYWdlUHJveHkmLCBGdW5jdGlvbjx2b2lkKFdlYkMKICAgICB9KS5nZXQoKV07CiB9
CiAKLXN0YXRpYyBOU0V2ZW50TW9kaWZpZXJGbGFncyB0b05TRXZlbnRNb2RpZmllckZsYWdzKE9w
dGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IG1vZGlmaWVycykKLXsKLSAgICBOU0V2ZW50TW9k
aWZpZXJGbGFncyBmbGFncyA9IDA7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJFdmVu
dDo6TW9kaWZpZXI6OlNoaWZ0S2V5KSkKLSAgICAgICAgZmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVy
RmxhZ1NoaWZ0OwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViRXZlbnQ6Ok1vZGlmaWVy
OjpDb250cm9sS2V5KSkKLSAgICAgICAgZmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbnRy
b2w7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJFdmVudDo6TW9kaWZpZXI6OkFsdEtl
eSkpCi0gICAgICAgIGZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb247Ci0gICAgaWYg
KG1vZGlmaWVycy5jb250YWlucyhXZWJFdmVudDo6TW9kaWZpZXI6Ok1ldGFLZXkpKQotICAgICAg
ICBmbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZDsKLSAgICBpZiAobW9kaWZpZXJz
LmNvbnRhaW5zKFdlYkV2ZW50OjpNb2RpZmllcjo6Q2Fwc0xvY2tLZXkpKQotICAgICAgICBmbGFn
cyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ2Fwc0xvY2s7Ci0gICAgcmV0dXJuIGZsYWdzOwotfQot
CiB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojptb3VzZURpZE1vdmVPdmVyRWxlbWVudChXZWJQ
YWdlUHJveHkmLCBjb25zdCBXZWJIaXRUZXN0UmVzdWx0RGF0YSYgZGF0YSwgT3B0aW9uU2V0PFdl
YkV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzLCBBUEk6Ok9iamVjdCogdXNlckluZm8pCiB7CiAg
ICAgaWYgKCFtX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZU1ldGhvZHMud2ViVmlld01vdXNlRGlkTW92
ZU92ZXJFbGVtZW50V2l0aEZsYWdzVXNlckluZm8pCkBAIC03MTMsNyArNjk4LDcgQEAgdm9pZCBV
SURlbGVnYXRlOjpVSUNsaWVudDo6bW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQoV2ViUGFnZVByb3h5
JiwgY29uc3QgV2ViSGl0VGUKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBhcGlIaXRUZXN0
UmVzdWx0ID0gQVBJOjpIaXRUZXN0UmVzdWx0OjpjcmVhdGUoZGF0YSk7Ci0gICAgWyhpZCA8V0tV
SURlbGVnYXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dlYlZpZXc6bV91aURlbGVnYXRlLm1fd2ViVmll
dyBtb3VzZURpZE1vdmVPdmVyRWxlbWVudDp3cmFwcGVyKGFwaUhpdFRlc3RSZXN1bHQuZ2V0KCkp
IHdpdGhGbGFnczp0b05TRXZlbnRNb2RpZmllckZsYWdzKG1vZGlmaWVycykgdXNlckluZm86dXNl
ckluZm8gPyBzdGF0aWNfY2FzdDxpZCA8TlNTZWN1cmVDb2Rpbmc+Pih1c2VySW5mby0+d3JhcHBl
cigpKSA6IG5pbF07CisgICAgWyhpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pZGVsZWdhdGUgX3dl
YlZpZXc6bV91aURlbGVnYXRlLm1fd2ViVmlldyBtb3VzZURpZE1vdmVPdmVyRWxlbWVudDp3cmFw
cGVyKGFwaUhpdFRlc3RSZXN1bHQuZ2V0KCkpIHdpdGhGbGFnczpXZWJFdmVudEZhY3Rvcnk6OnRv
TlNFdmVudE1vZGlmaWVyRmxhZ3MobW9kaWZpZXJzKSB1c2VySW5mbzp1c2VySW5mbyA/IHN0YXRp
Y19jYXN0PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53cmFwcGVyKCkpIDogbmlsXTsK
IH0KIAogc3RhdGljIF9XS0F1dG9wbGF5RXZlbnRGbGFncyB0b1dLQXV0b3BsYXlFdmVudEZsYWdz
KE9wdGlvblNldDxXZWJDb3JlOjpBdXRvcGxheUV2ZW50RmxhZ3M+IGZsYWdzKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>361332</attachid>
            <date>2019-02-06 14:43:19 -0800</date>
            <delta_ts>2019-02-06 16:23:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-194321-20190206144319.patch</filename>
            <type>text/plain</type>
            <size>9514</size>
            <attacher name="Daniel Bates">dbates</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDIxNDEwZDg3Y2FmM2IxYmZm
NjI3MGU2Mjc5MDg5YjcxOTRjYjE0ZmUuLjE5YTRjMTYyZThkMThjZDk3OTBlYzA3ZTkxZDdkMWQ2
MzgzOWNjZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj
ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDItMDYgIERhbmllbCBC
YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgdG9OU0V2ZW50TW9kaWZp
ZXJGbGFncygpIGFuZCB0b05TQnV0dG9uTnVtYmVyKCkgdG8gV2ViRXZlbnRGYWN0b3J5Lm1tCisg
ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTQzMjEKKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNvbWUg
Y29kZSB0byBXZWJFdmVudEZhY3Rvcnkgc28gdGhhdCBpdCBjYW4gYmUgc2hhcmVkIGJ5IGJvdGgg
V0tOYXZpZ2F0aW9uQWN0aW9uLm1tCisgICAgICAgIGFuZCBVSURlbGVnYXRlLm1tIGFtb25nIG90
aGVyIGJlbmVmaXRzLgorCisgICAgICAgICogU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaDoK
KyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAgICAgKFdlYktp
dDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TRXZlbnRNb2RpZmllckZsYWdzKToKKyAgICAgICAgKFdl
YktpdDo6V2ViRXZlbnRGYWN0b3J5Ojp0b05TQnV0dG9uTnVtYmVyKToKKyAgICAgICAgKiBVSVBy
b2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tOYXZp
Z2F0aW9uQWN0aW9uIG1vZGlmaWVyRmxhZ3NdKToKKyAgICAgICAgKC1bV0tOYXZpZ2F0aW9uQWN0
aW9uIGJ1dHRvbk51bWJlcl0pOgorICAgICAgICAodG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERl
bGV0ZWQuCisgICAgICAgICh0b05TQnV0dG9uTnVtYmVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0
ZTo6VUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6
dG9OU0V2ZW50TW9kaWZpZXJGbGFncyk6IERlbGV0ZWQuCisKIDIwMTktMDItMDYgIFBlciBBcm5l
IFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJvbGwgb3V0IHBhcnRzIG9m
IHIyMzg4MTkgc2luY2UgaXQgaXMgYSBQTFQgcGVyZm9ybWFuY2UgcmVncmVzc2lvbi4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaCBiL1NvdXJj
ZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkuaAppbmRleCBiZTg3MmNlYjY4YTVh
Y2NmN2JjNmJmYWJkMjFkMjM0ZGRkOTY0MjZjLi45Mjk3MmZjYThjNGVjNTYzMTE5ZWYzZGE5OTRh
ZTU2NWJlZmNjNDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZl
bnRGYWN0b3J5LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9y
eS5oCkBAIC0yMywxMiArMjMsMTUgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH
RS4KICAqLwogCi0jaWZuZGVmIFdlYkV2ZW50RmFjdG9yeV9oCi0jZGVmaW5lIFdlYkV2ZW50RmFj
dG9yeV9oCisjcHJhZ21hIG9uY2UKIAogI2ltcG9ydCAiV2ViRXZlbnQuaCIKIAogI2lmIFVTRShB
UFBLSVQpCisjaWYgZGVmaW5lZChfX09CSkNfXykKKyNpbmNsdWRlIDxBcHBLaXQvQXBwS2l0Lmg+
CisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgUGxhdGZvcm1Nb3VzZUV2ZW50
OwogfQpAQCAtNDYsOSArNDksMTIgQEAgcHVibGljOgogICAgIHN0YXRpYyBXZWJXaGVlbEV2ZW50
IGNyZWF0ZVdlYldoZWVsRXZlbnQoTlNFdmVudCAqLCBOU1ZpZXcgKndpbmRvd1ZpZXcpOwogICAg
IHN0YXRpYyBXZWJLZXlib2FyZEV2ZW50IGNyZWF0ZVdlYktleWJvYXJkRXZlbnQoTlNFdmVudCAq
LCBib29sIGhhbmRsZWRCeUlucHV0TWV0aG9kLCBib29sIHJlcGxhY2VzU29mdFNwYWNlLCBjb25z
dCBWZWN0b3I8V2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kPiYpOwogICAgIHN0YXRpYyBib29sIHNo
b3VsZEJlSGFuZGxlZEFzQ29udGV4dENsaWNrKGNvbnN0IFdlYkNvcmU6OlBsYXRmb3JtTW91c2VF
dmVudCYpOworCisjaWYgZGVmaW5lZChfX09CSkNfXykKKyAgICBzdGF0aWMgTlNFdmVudE1vZGlm
aWVyRmxhZ3MgdG9OU0V2ZW50TW9kaWZpZXJGbGFncyhPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVu
dDo6TW9kaWZpZXI+KTsKKyAgICBzdGF0aWMgTlNJbnRlZ2VyIHRvTlNCdXR0b25OdW1iZXIoV2Vi
S2l0OjpXZWJNb3VzZUV2ZW50OjpCdXR0b24pOworI2VuZGlmCiAjZW5kaWYgLy8gVVNFKEFQUEtJ
VCkKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAotCi0jZW5kaWYgLy8gV2ViRXZlbnRGYWN0
b3J5X2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9XZWJFdmVudEZhY3Rv
cnkubW0gYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1tCmluZGV4
IGU0MzExNWU5ZTkwODA4YjY3MjkyYTA4ZGFkMTA1NmU2MmJkZjY1MmUuLjJkNjUzOWY3ZWVjZDQ5
ZjM5MGM5Y2ZjNGZmMDQyNTA3NjZlMTcwZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh
cmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0KKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFj
L1dlYkV2ZW50RmFjdG9yeS5tbQpAQCAtNDYyLDYgKzQ2MiwzOCBAQCBXZWJLZXlib2FyZEV2ZW50
IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViS2V5Ym9hcmRFdmVudChOU0V2ZW50ICpldmVudCwg
Ym9vbCBoYQogICAgIHJldHVybiBXZWJLZXlib2FyZEV2ZW50KHR5cGUsIHRleHQsIHVubW9kaWZp
ZWRUZXh0LCBrZXksIGNvZGUsIGtleUlkZW50aWZpZXIsIHdpbmRvd3NWaXJ0dWFsS2V5Q29kZSwg
bmF0aXZlVmlydHVhbEtleUNvZGUsIG1hY0NoYXJDb2RlLCBoYW5kbGVkQnlJbnB1dE1ldGhvZCwg
Y29tbWFuZHMsIGF1dG9SZXBlYXQsIGlzS2V5cGFkLCBpc1N5c3RlbUtleSwgbW9kaWZpZXJzLCB0
aW1lc3RhbXApOwogfQogCitOU0V2ZW50TW9kaWZpZXJGbGFncyBXZWJFdmVudEZhY3Rvcnk6OnRv
TlNFdmVudE1vZGlmaWVyRmxhZ3MoT3B0aW9uU2V0PFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVy
PiBtb2RpZmllcnMpCit7CisgICAgTlNFdmVudE1vZGlmaWVyRmxhZ3MgbW9kaWZpZXJGbGFncyA9
IDA7CisgICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmll
cjo6Q2Fwc0xvY2tLZXkpKQorICAgICAgICBtb2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmll
ckZsYWdDYXBzTG9jazsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYktpdDo6V2ViRXZl
bnQ6Ok1vZGlmaWVyOjpTaGlmdEtleSkpCisgICAgICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVu
dE1vZGlmaWVyRmxhZ1NoaWZ0OworICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpX
ZWJFdmVudDo6TW9kaWZpZXI6OkNvbnRyb2xLZXkpKQorICAgICAgICBtb2RpZmllckZsYWdzIHw9
IE5TRXZlbnRNb2RpZmllckZsYWdDb250cm9sOworICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMo
V2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI6OkFsdEtleSkpCisgICAgICAgIG1vZGlmaWVyRmxh
Z3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ09wdGlvbjsKKyAgICBpZiAobW9kaWZpZXJzLmNvbnRh
aW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpNZXRhS2V5KSkKKyAgICAgICAgbW9kaWZp
ZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZDsKKyAgICByZXR1cm4gbW9kaWZp
ZXJGbGFnczsKK30KKworTlNJbnRlZ2VyIFdlYkV2ZW50RmFjdG9yeTo6dG9OU0J1dHRvbk51bWJl
cihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBtb3VzZUJ1dHRvbikKK3sKKyAgICBzd2l0
Y2ggKG1vdXNlQnV0dG9uKSB7CisgICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok5vQnV0
dG9uOgorICAgICAgICByZXR1cm4gMDsKKyAgICBjYXNlIFdlYktpdDo6V2ViTW91c2VFdmVudDo6
TGVmdEJ1dHRvbjoKKyAgICAgICAgcmV0dXJuIDEgPDwgMDsKKyAgICBjYXNlIFdlYktpdDo6V2Vi
TW91c2VFdmVudDo6UmlnaHRCdXR0b246CisgICAgICAgIHJldHVybiAxIDw8IDE7CisgICAgY2Fz
ZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok1pZGRsZUJ1dHRvbjoKKyAgICAgICAgcmV0dXJuIDEg
PDwgMjsKKyAgICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9
CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gVVNFKEFQUEtJVCkKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rp
b24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uQWN0
aW9uLm1tCmluZGV4IDBjZmRlY2RkYTY2MWQyMDM4YjNkYWZkZjA1MmU5NWRlZjE0ZDEzY2MuLjQ0
YzhiYjYwOTJlZGFhMTJjYTNlY2M5YzQ3ZGU1MTBkNmNmYjZkNzMgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25BY3Rpb24ubW0KKysrIGIv
U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkFjdGlvbi5tbQpA
QCAtMzEsNiArMzEsNyBAQAogI2ltcG9ydCAiTmF2aWdhdGlvbkFjdGlvbkRhdGEuaCIKICNpbXBv
cnQgIldLRnJhbWVJbmZvSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLTmF2aWdhdGlvbkludGVybmFs
LmgiCisjaW1wb3J0ICJXZWJFdmVudEZhY3RvcnkuaCIKICNpbXBvcnQgIl9XS1VzZXJJbml0aWF0
ZWRBY3Rpb25JbnRlcm5hbC5oIgogI2ltcG9ydCA8V2ViQ29yZS9GbG9hdFBvaW50Lmg+CiAjaW1w
b3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC03NCw0NiArNzUsNiBAQCBzdGF0aWMgV0tTeW50aGV0
aWNDbGlja1R5cGUgdG9XS1N5bnRoZXRpY0NsaWNrVHlwZShXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6
OlN5bnRoZQogfQogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpCi0KLS8vIEZJWE1FOiBUaGlz
IHJlYWxseSBiZWxvbmdzIGluIFdlYkV2ZW50RmFjdG9yeS4KLXN0YXRpYyBOU0V2ZW50TW9kaWZp
ZXJGbGFncyB0b05TRXZlbnRNb2RpZmllckZsYWdzKE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50
OjpNb2RpZmllcj4gbW9kaWZpZXJzKQotewotICAgIE5TRXZlbnRNb2RpZmllckZsYWdzIG1vZGlm
aWVyRmxhZ3MgPSAwOwotICAgIGlmIChtb2RpZmllcnMuY29udGFpbnMoV2ViS2l0OjpXZWJFdmVu
dDo6TW9kaWZpZXI6OkNhcHNMb2NrS2V5KSkKLSAgICAgICAgbW9kaWZpZXJGbGFncyB8PSBOU0V2
ZW50TW9kaWZpZXJGbGFnQ2Fwc0xvY2s7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJL
aXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6U2hpZnRLZXkpKQotICAgICAgICBtb2RpZmllckZsYWdz
IHw9IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5z
KFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpDb250cm9sS2V5KSkKLSAgICAgICAgbW9kaWZp
ZXJGbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFnQ29udHJvbDsKLSAgICBpZiAobW9kaWZpZXJz
LmNvbnRhaW5zKFdlYktpdDo6V2ViRXZlbnQ6Ok1vZGlmaWVyOjpBbHRLZXkpKQotICAgICAgICBt
b2RpZmllckZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb247Ci0gICAgaWYgKG1vZGlm
aWVycy5jb250YWlucyhXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmllcjo6TWV0YUtleSkpCi0gICAg
ICAgIG1vZGlmaWVyRmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQ7Ci0gICAgcmV0
dXJuIG1vZGlmaWVyRmxhZ3M7Ci19Ci0KLXN0YXRpYyBOU0ludGVnZXIgdG9OU0J1dHRvbk51bWJl
cihXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6OkJ1dHRvbiBtb3VzZUJ1dHRvbikKLXsKLSAgICBzd2l0
Y2ggKG1vdXNlQnV0dG9uKSB7Ci0gICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok5vQnV0
dG9uOgotICAgICAgICByZXR1cm4gMDsKLQotICAgIGNhc2UgV2ViS2l0OjpXZWJNb3VzZUV2ZW50
OjpMZWZ0QnV0dG9uOgotICAgICAgICByZXR1cm4gMSA8PCAwOwotCi0gICAgY2FzZSBXZWJLaXQ6
OldlYk1vdXNlRXZlbnQ6OlJpZ2h0QnV0dG9uOgotICAgICAgICByZXR1cm4gMSA8PCAxOwotCi0g
ICAgY2FzZSBXZWJLaXQ6OldlYk1vdXNlRXZlbnQ6Ok1pZGRsZUJ1dHRvbjoKLSAgICAgICAgcmV0
dXJuIDEgPDwgMjsKLQotICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KLX0K
LSNlbmRpZgotCiAtICh2b2lkKWRlYWxsb2MKIHsKICAgICBfbmF2aWdhdGlvbkFjdGlvbi0+fk5h
dmlnYXRpb25BY3Rpb24oKTsKQEAgLTE2OCwxMiArMTI5LDEyIEBAIC0gKENHUG9pbnQpX2NsaWNr
TG9jYXRpb25JblJvb3RWaWV3Q29vcmRpbmF0ZXMKICNpZiBQTEFURk9STShNQUMpCiAtIChOU0V2
ZW50TW9kaWZpZXJGbGFncyltb2RpZmllckZsYWdzCiB7Ci0gICAgcmV0dXJuIHRvTlNFdmVudE1v
ZGlmaWVyRmxhZ3MoX25hdmlnYXRpb25BY3Rpb24tPm1vZGlmaWVycygpKTsKKyAgICByZXR1cm4g
V2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OnRvTlNFdmVudE1vZGlmaWVyRmxhZ3MoX25hdmlnYXRp
b25BY3Rpb24tPm1vZGlmaWVycygpKTsKIH0KIAogLSAoTlNJbnRlZ2VyKWJ1dHRvbk51bWJlcgog
ewotICAgIHJldHVybiB0b05TQnV0dG9uTnVtYmVyKF9uYXZpZ2F0aW9uQWN0aW9uLT5tb3VzZUJ1
dHRvbigpKTsKKyAgICByZXR1cm4gV2ViS2l0OjpXZWJFdmVudEZhY3Rvcnk6OnRvTlNCdXR0b25O
dW1iZXIoX25hdmlnYXRpb25BY3Rpb24tPm1vdXNlQnV0dG9uKCkpOwogfQogI2VuZGlmCiAKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0gYi9T
b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCmluZGV4IGUxNWNlZmE3
MzQ5ZGQ5NjY5ODYxNDA5ZDViMzI3NzRkMjJlNTc5YTIuLjNmZjBiMjg0YzdmZTJiNjAyMjA5ZDhh
YTQ3MTE1MWNhYmUwMmNkNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv
Y29hL1VJRGVsZWdhdGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlE
ZWxlZ2F0ZS5tbQpAQCAtNDYsNiArNDYsNyBAQAogI2ltcG9ydCAiV0tXZWJWaWV3Q29uZmlndXJh
dGlvbkludGVybmFsLmgiCiAjaW1wb3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAi
V0tXaW5kb3dGZWF0dXJlc0ludGVybmFsLmgiCisjaW1wb3J0ICJXZWJFdmVudEZhY3RvcnkuaCIK
ICNpbXBvcnQgIldlYk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyUHJveHkuaCIKICNpbXBvcnQgIldl
YlByb2Nlc3NQcm94eS5oIgogI2ltcG9ydCAiX1dLQ29udGV4dE1lbnVFbGVtZW50SW5mby5oIgpA
QCAtNjg3LDIyICs2ODgsNiBAQCB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojp3aW5kb3dGcmFt
ZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIEZ1bmN0aW9uPHZvaWQoV2ViQwogICAgIH0pLmdldCgp
XTsKIH0KIAotc3RhdGljIE5TRXZlbnRNb2RpZmllckZsYWdzIHRvTlNFdmVudE1vZGlmaWVyRmxh
Z3MoT3B0aW9uU2V0PFdlYkV2ZW50OjpNb2RpZmllcj4gbW9kaWZpZXJzKQotewotICAgIE5TRXZl
bnRNb2RpZmllckZsYWdzIGZsYWdzID0gMDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdl
YkV2ZW50OjpNb2RpZmllcjo6U2hpZnRLZXkpKQotICAgICAgICBmbGFncyB8PSBOU0V2ZW50TW9k
aWZpZXJGbGFnU2hpZnQ7Ci0gICAgaWYgKG1vZGlmaWVycy5jb250YWlucyhXZWJFdmVudDo6TW9k
aWZpZXI6OkNvbnRyb2xLZXkpKQotICAgICAgICBmbGFncyB8PSBOU0V2ZW50TW9kaWZpZXJGbGFn
Q29udHJvbDsKLSAgICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYkV2ZW50OjpNb2RpZmllcjo6
QWx0S2V5KSkKLSAgICAgICAgZmxhZ3MgfD0gTlNFdmVudE1vZGlmaWVyRmxhZ09wdGlvbjsKLSAg
ICBpZiAobW9kaWZpZXJzLmNvbnRhaW5zKFdlYkV2ZW50OjpNb2RpZmllcjo6TWV0YUtleSkpCi0g
ICAgICAgIGZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kOwotICAgIGlmIChtb2Rp
ZmllcnMuY29udGFpbnMoV2ViRXZlbnQ6Ok1vZGlmaWVyOjpDYXBzTG9ja0tleSkpCi0gICAgICAg
IGZsYWdzIHw9IE5TRXZlbnRNb2RpZmllckZsYWdDYXBzTG9jazsKLSAgICByZXR1cm4gZmxhZ3M7
Ci19Ci0KIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6Om1vdXNlRGlkTW92ZU92ZXJFbGVtZW50
KFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHREYXRhJiBkYXRhLCBPcHRpb25T
ZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmllcnMsIEFQSTo6T2JqZWN0KiB1c2VySW5mbykK
IHsKICAgICBpZiAoIW1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlTWV0aG9kcy53ZWJWaWV3TW91c2VE
aWRNb3ZlT3ZlckVsZW1lbnRXaXRoRmxhZ3NVc2VySW5mbykKQEAgLTcxMyw3ICs2OTgsNyBAQCB2
b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50Ojptb3VzZURpZE1vdmVPdmVyRWxlbWVudChXZWJQYWdl
UHJveHkmLCBjb25zdCBXZWJIaXRUZQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvIGFwaUhp
dFRlc3RSZXN1bHQgPSBBUEk6OkhpdFRlc3RSZXN1bHQ6OmNyZWF0ZShkYXRhKTsKLSAgICBbKGlk
IDxXS1VJRGVsZWdhdGVQcml2YXRlPilkZWxlZ2F0ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUubV93
ZWJWaWV3IG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50OndyYXBwZXIoYXBpSGl0VGVzdFJlc3VsdC5n
ZXQoKSkgd2l0aEZsYWdzOnRvTlNFdmVudE1vZGlmaWVyRmxhZ3MobW9kaWZpZXJzKSB1c2VySW5m
bzp1c2VySW5mbyA/IHN0YXRpY19jYXN0PGlkIDxOU1NlY3VyZUNvZGluZz4+KHVzZXJJbmZvLT53
cmFwcGVyKCkpIDogbmlsXTsKKyAgICBbKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPilkZWxlZ2F0
ZSBfd2ViVmlldzptX3VpRGVsZWdhdGUubV93ZWJWaWV3IG1vdXNlRGlkTW92ZU92ZXJFbGVtZW50
OndyYXBwZXIoYXBpSGl0VGVzdFJlc3VsdC5nZXQoKSkgd2l0aEZsYWdzOldlYkV2ZW50RmFjdG9y
eTo6dG9OU0V2ZW50TW9kaWZpZXJGbGFncyhtb2RpZmllcnMpIHVzZXJJbmZvOnVzZXJJbmZvID8g
c3RhdGljX2Nhc3Q8aWQgPE5TU2VjdXJlQ29kaW5nPj4odXNlckluZm8tPndyYXBwZXIoKSkgOiBu
aWxdOwogfQogCiBzdGF0aWMgX1dLQXV0b3BsYXlFdmVudEZsYWdzIHRvV0tBdXRvcGxheUV2ZW50
RmxhZ3MoT3B0aW9uU2V0PFdlYkNvcmU6OkF1dG9wbGF5RXZlbnRGbGFncz4gZmxhZ3MpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>