<?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>191368</bug_id>
          
          <creation_ts>2018-11-07 08:59:55 -0800</creation_ts>
          <short_desc>Layout Test fast/text/international/khmer-selection.html is crashing</short_desc>
          <delta_ts>2019-02-21 15:12:44 -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>Tools / Tests</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>PC</rep_platform>
          <op_sys>Windows 10</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="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Myles C. Maxfield">mmaxfield</assigned_to>
          <cc>achristensen</cc>
    
    <cc>bfulgham</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>lforschler</cc>
    
    <cc>mmaxfield</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1476003</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-11-07 08:59:55 -0800</bug_when>
    <thetext>The following layout test is failing on Windows:

fast/text/international/khmer-selection.html

Probable cause:

Unknown.

Flakiness Dashboard:

https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&amp;tests=fast%2Ftext%2Finternational%2Fkhmer-selection.html</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1506894</commentid>
    <comment_count>1</comment_count>
      <attachid>362192</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-15 17:25:49 -0800</bug_when>
    <thetext>Created attachment 362192
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1506905</commentid>
    <comment_count>2</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-15 17:43:07 -0800</bug_when>
    <thetext>rdar://problem/47922356</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1507553</commentid>
    <comment_count>3</comment_count>
      <attachid>362192</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2019-02-18 17:40:00 -0800</bug_when>
    <thetext>Comment on attachment 362192
Patch

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

&gt; Source/WebCore/platform/graphics/GlyphBuffer.h:161
&gt; +        if (index &gt;= m_offsetsInString-&gt;size())
&gt; +            return GlyphBuffer::noOffset;

It looks like this happens any time complex text is underlined. I wish we could migrate Windows to ComplexTextController. I had a patch at https://bugs.webkit.org/show_bug.cgi?id=167954 but it never got finished.

Can we actually implement this feature instead of simply covering up its symptoms? We could make GlyphBuffer::add() not have any default arguments. Maybe I can do this today.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1507560</commentid>
    <comment_count>4</comment_count>
      <attachid>362361</attachid>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2019-02-18 17:59:49 -0800</bug_when>
    <thetext>Created attachment 362361
Alternative patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1507561</commentid>
    <comment_count>5</comment_count>
    <who name="Myles C. Maxfield">mmaxfield</who>
    <bug_when>2019-02-18 18:00:42 -0800</bug_when>
    <thetext>How about a patch like this? I don&apos;t know if it builds because I don&apos;t have a Windows machine, but it seems preferable to fix this problem by implementing the feature instead of failing gracefully.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1507697</commentid>
    <comment_count>6</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-19 10:09:10 -0800</bug_when>
    <thetext>(In reply to Myles C. Maxfield from comment #5)
&gt; How about a patch like this? I don&apos;t know if it builds because I don&apos;t have
&gt; a Windows machine, but it seems preferable to fix this problem by
&gt; implementing the feature instead of failing gracefully.

Thanks, looks great, Myles! I am not sure why it is not building, probably just a small adjustment needed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508164</commentid>
    <comment_count>7</comment_count>
      <attachid>362519</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-20 11:33:05 -0800</bug_when>
    <thetext>Created attachment 362519
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508165</commentid>
    <comment_count>8</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-20 11:33:40 -0800</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #7)
&gt; Created attachment 362519 [details]
&gt; Patch

This is Myles&apos; patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508212</commentid>
    <comment_count>9</comment_count>
      <attachid>362533</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-20 13:25:48 -0800</bug_when>
    <thetext>Created attachment 362533
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508293</commentid>
    <comment_count>10</comment_count>
      <attachid>362552</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-20 15:09:25 -0800</bug_when>
    <thetext>Created attachment 362552
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508322</commentid>
    <comment_count>11</comment_count>
      <attachid>362558</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-20 15:52:34 -0800</bug_when>
    <thetext>Created attachment 362558
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508537</commentid>
    <comment_count>12</comment_count>
      <attachid>362613</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-21 09:04:55 -0800</bug_when>
    <thetext>Created attachment 362613
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508678</commentid>
    <comment_count>13</comment_count>
      <attachid>362613</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2019-02-21 14:46:17 -0800</bug_when>
    <thetext>Comment on attachment 362613
Patch

Very nice! r=me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508681</commentid>
    <comment_count>14</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2019-02-21 14:55:38 -0800</bug_when>
    <thetext>(In reply to Brent Fulgham from comment #13)
&gt; Comment on attachment 362613 [details]
&gt; Patch
&gt; 
&gt; Very nice! r=me.

Thanks to Myles for creating the patch, and to Brent for reviewing :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508690</commentid>
    <comment_count>15</comment_count>
      <attachid>362613</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-02-21 15:12:42 -0800</bug_when>
    <thetext>Comment on attachment 362613
Patch

Clearing flags on attachment: 362613

Committed r241915: &lt;https://trac.webkit.org/changeset/241915&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1508691</commentid>
    <comment_count>16</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-02-21 15:12:44 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362192</attachid>
            <date>2019-02-15 17:25:49 -0800</date>
            <delta_ts>2019-02-21 09:04:52 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191368-20190216022548.patch</filename>
            <type>text/plain</type>
            <size>3430</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTYzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTAyLTE1ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBmYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBpcyBjcmFzaGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzY4CisgICAg
ICAgIDxyZGFyOi8vcHJvYmxlbS80NzkyMjM1Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP
RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYW4gb3V0IG9mIGJvdW5kcyBjaGVjayBmb3IgR2x5
cGhCdWZmZXIncyBvZmZzZXRzIGluIHN0cmluZyBhcnJheS4KKworICAgICAgICBObyBuZXcgdGVz
dHMsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw
aGljcy9HbHlwaEJ1ZmZlci5oOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6Om9mZnNl
dEluU3RyaW5nIGNvbnN0KToKKwogMjAxOS0wMi0xNSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBs
ZS5jb20+CiAKICAgICAgICAgQWxsb3cgZW11bGF0aW9uIG9mIHVzZXIgZ2VzdHVyZXMgZnJvbSBX
ZWIgSW5zcGVjdG9yIGNvbnNvbGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo
aWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
Z3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNpb24gMjQxNTk1KQorKysgU291cmNlL1dlYkNv
cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTU3
LDYgKzE1Nyw4IEBAIHB1YmxpYzoKICAgICBpbnQgb2Zmc2V0SW5TdHJpbmcodW5zaWduZWQgaW5k
ZXgpIGNvbnN0CiAgICAgewogICAgICAgICBBU1NFUlQobV9vZmZzZXRzSW5TdHJpbmcpOworICAg
ICAgICBpZiAoaW5kZXggPj0gbV9vZmZzZXRzSW5TdHJpbmctPnNpemUoKSkKKyAgICAgICAgICAg
IHJldHVybiBHbHlwaEJ1ZmZlcjo6bm9PZmZzZXQ7CiAgICAgICAgIHJldHVybiAoKm1fb2Zmc2V0
c0luU3RyaW5nKVtpbmRleF07CiAgICAgfQogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDE1OTUpCisr
KyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMiBAQAor
MjAxOS0wMi0xNSAgUGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CisKKyAgICAg
ICAgTGF5b3V0IFRlc3QgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwva2htZXItc2VsZWN0aW9uLmh0
bWwgaXMgY3Jhc2hpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu
Y2dpP2lkPTE5MTM2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgICogcGxhdGZvcm0vd2luL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTktMDItMTUgIFph
bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBPdXQtb2YtZmxv
dyBib3ggaXMgbmV2ZXIgYSBmbG9hdCBib3gKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL3dp
bi9UZXN0RXhwZWN0YXRpb25zCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3dp
bi9UZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAyNDE1OTUpCisrKyBMYXlvdXRUZXN0cy9wbGF0
Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucwkod29ya2luZyBjb3B5KQpAQCAtMjUwNiw3ICsyNTA2
LDcgQEAgZmFzdC9mcmFtZXMvZnJhbWUtbmF2aWdhdGlvbi5odG1sIFsgU2tpcAogCiBmYXN0L3Rl
eHQvYXRzdWktcG9pbnR0b29mZnNldC1jYWxscy1jZy5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIGZh
c3QvdGV4dC9pbnRlcm5hdGlvbmFsL2hpbmRpLXdoaXRlc3BhY2UuaHRtbCBbIEZhaWx1cmUgXQot
ZmFzdC90ZXh0L2ludGVybmF0aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwgWyBGYWlsdXJlIENy
YXNoIF0KK2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2tobWVyLXNlbGVjdGlvbi5odG1sIFsgRmFp
bHVyZSBdCiB3ZWJraXQub3JnL2IvMTQwMjMxIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL3BsYW5l
Mi5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMzU5NzMgZmFzdC9tdWx0aWNvbC9oaXQt
dGVzdC1hYm92ZS1vci1iZWxvdy5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvNDk3Njkg
ZmFzdC9kb20vSFRNTFByb2dyZXNzRWxlbWVudC9wcm9ncmVzcy1lbGVtZW50LXdpdGgtY2hpbGQt
Y3Jhc2guaHRtbCBbIEZhaWx1cmUgXQpAQCAtNDIyMiwxMCArNDIyMiw2IEBAIHdlYmtpdC5vcmcv
Yi8xOTEzNjYgZmFzdC9ibG9jay9iYXNpYy9jaGkKIHdlYmtpdC5vcmcvYi8xOTEzNjYgZmFzdC9i
bG9jay9iYXNpYy9oZWlnaHQtcGVyY2VudGFnZS1zaW1wbGUuaHRtbCBbIEZhaWx1cmUgXQogd2Vi
a2l0Lm9yZy9iLzE5MTM2NiBmYXN0L2Jsb2NrL2Jhc2ljL3F1aXJrLW1vZGUtcGVyY2VudC1oZWln
aHQuaHRtbCBbIEZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMTkxMzY4IGZhc3QvdGV4dC9zdHJv
a2luZy1kZWNvcmF0aW9ucy5odG1sIFsgQ3Jhc2ggXQotd2Via2l0Lm9yZy9iLzE5MTM2OCBpbXBv
cnRlZC9ibGluay9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9jb21wbGV4LXRleHQtdHJhaWxpbmct
c3BhY2UuaHRtbCBbIENyYXNoIF0KLXdlYmtpdC5vcmcvYi8xOTEzNjggaW1wb3J0ZWQvYmxpbmsv
ZmFzdC90ZXh0L3N1Yi1waXhlbC9jb21wbGV4LXRleHQtcHJlZmVycmVkLXdpZHRoLmh0bWwgWyBD
cmFzaCBdCi0KIHdlYmtpdC5vcmcvYi8xOTE1ODQgYW5pbWF0aW9ucy9hbmltYXRpb24tZGlyZWN0
aW9uLW5vcm1hbC5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTkxNTg0IGFuaW1hdGlv
bnMvYW5pbWF0aW9uLWRpcmVjdGlvbi1yZXZlcnNlLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5v
cmcvYi8xOTE1ODQgYW5pbWF0aW9ucy9keW5hbWljLXN0eWxlc2hlZXQtbG9hZGluZy5odG1sIFsg
RmFpbHVyZSBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362361</attachid>
            <date>2019-02-18 17:59:49 -0800</date>
            <delta_ts>2019-02-21 09:04:53 -0800</delta_ts>
            <desc>Alternative patch</desc>
            <filename>bug-191368-20190218175948.patch</filename>
            <type>text/plain</type>
            <size>6224</size>
            <attacher name="Myles C. Maxfield">mmaxfield</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U4NmVhOTRjODA1ZjY3
YzU4YzQxMmY3M2IzMzMwOTI2ZTIyZjdkNi4uNGFmNzZmYWY5NTlkYzQxZGYyYzYwZDUxZWMxMWE0
YzY3NmJjOTlkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAyLTE4ICBNeWxl
cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5b3V0IFRl
c3QgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwgaXMgY3Jhc2hp
bmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MTM2
OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdseXBo
QnVmZmVyJ3Mgb2Zmc2V0IGFycmF5IHdhc24ndCBnZXR0aW5nIGZpbGxlZCBieSBVbmlzY3JpYmVD
b250cm9sbGVyLgorICAgICAgICBPdXIgdW5kZXJsaW5pbmcgY29kZSByZXF1aXJlcyB0aGlzIGFy
cmF5LgorCisgICAgICAgIFVuaXNjcmliZSBnaXZlcyB1cyBhIGNoYXJhY3RlciAtPiBnbHlwaCBt
YXBwaW5nLCBzbyB3ZSBqdXN0IGhhdmUgdG8gY29tcHV0ZQorICAgICAgICB0aGUgaW52ZXJzZSBh
bmQgZ2l2ZSBpdCB0byB0aGUgR2x5cGhCdWZmZXIuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0
L2ludGVybmF0aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9y
bS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6
OmFkZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xs
ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxlcjo6YWR2YW5jZSk6
CisgICAgICAgIChXZWJDb3JlOjpVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXplU2hhcGVBbmRQ
bGFjZSk6CisgICAgICAgIChXZWJDb3JlOjpVbmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBs
YWNlSXRlbSk6CisKIDIwMTktMDItMTggIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBs
ZS5jb20+CiAKICAgICAgICAgQWRkIE1TRSBsb2dnaW5nIGNvbmZpZ3VyYXRpb24KZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmggYi9Tb3Vy
Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oCmluZGV4IGJmMGU5NGM3
NjdiODMxMDA4ZWRmZDUzN2ViMDQwMjNlZjFiNWQ1OGYuLmE1OGRiNmJmZjBjOGY3OTNmMTVlNWRi
NzhlZWQzNDk4ZGE0NTVmNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy
YXBoaWNzL0dseXBoQnVmZmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp
Y3MvR2x5cGhCdWZmZXIuaApAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgYWRk
KGdseXBoLCBmb250LCBhZHZhbmNlLCBvZmZzZXRJblN0cmluZyk7CiAgICAgfQogCi0gICAgdm9p
ZCBhZGQoR2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEdseXBoQnVmZmVyQWR2YW5jZSBh
ZHZhbmNlLCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQorICAgIHZvaWQgYWRk
KEdseXBoIGdseXBoLCBjb25zdCBGb250KiBmb250LCBHbHlwaEJ1ZmZlckFkdmFuY2UgYWR2YW5j
ZSwgdW5zaWduZWQgb2Zmc2V0SW5TdHJpbmcpCiAgICAgewogICAgICAgICBtX2ZvbnQuYXBwZW5k
KGZvbnQpOwogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwpkaWZmIC0tZ2l0IGEvU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3Bw
IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xs
ZXIuY3BwCmluZGV4IDQ0MGEwYTFlMWNkZDIxMTA0NDgwMjQxN2YyZDlmMWMzYzlkMzhhZWMuLjc3
YWJiMzQ2MjM3ZGQ5Zjg0YTkwNGNiOGQwMDA2MzgyMGMwNmU4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9VbmlzY3JpYmVDb250cm9sbGVyLmNwcAor
KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vVW5pc2NyaWJlQ29udHJv
bGxlci5jcHAKQEAgLTE3MSw3ICsxNzEsNyBAQCB2b2lkIFVuaXNjcmliZUNvbnRyb2xsZXI6OmFk
dmFuY2UodW5zaWduZWQgb2Zmc2V0LCBHbHlwaEJ1ZmZlciogZ2x5cGhCdWZmZXIpCiAgICAgICAg
ICAgICBpbnQgaXRlbVN0YXJ0ID0gbV9ydW4ucnRsKCkgPyBpbmRleCArIDEgOiBpbmRleE9mRm9u
dFRyYW5zaXRpb247CiAgICAgICAgICAgICBpbnQgaXRlbUxlbmd0aCA9IG1fcnVuLnJ0bCgpID8g
aW5kZXhPZkZvbnRUcmFuc2l0aW9uIC0gaW5kZXggOiBpbmRleCAtIGluZGV4T2ZGb250VHJhbnNp
dGlvbjsKICAgICAgICAgICAgIG1fY3VycmVudENoYXJhY3RlciA9IGJhc2VDaGFyYWN0ZXIgKyBp
dGVtU3RhcnQ7Ci0gICAgICAgICAgICBpdGVtaXplU2hhcGVBbmRQbGFjZSgoaXNTbWFsbENhcHMg
PyBzbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsgaXRlbVN0YXJ0LCBpdGVtTGVuZ3RoLCBm
b250RGF0YSwgZ2x5cGhCdWZmZXIpOworICAgICAgICAgICAgaXRlbWl6ZVNoYXBlQW5kUGxhY2Uo
KGlzU21hbGxDYXBzID8gc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFydCwg
aXRlbVN0YXJ0LCBpdGVtTGVuZ3RoLCBmb250RGF0YSwgZ2x5cGhCdWZmZXIpOwogICAgICAgICAg
ICAgaW5kZXhPZkZvbnRUcmFuc2l0aW9uID0gaW5kZXg7CiAgICAgICAgIH0KICAgICB9CkBAIC0x
ODMsMTMgKzE4MywxMyBAQCB2b2lkIFVuaXNjcmliZUNvbnRyb2xsZXI6OmFkdmFuY2UodW5zaWdu
ZWQgb2Zmc2V0LCBHbHlwaEJ1ZmZlciogZ2x5cGhCdWZmZXIpCiAKICAgICAgICAgaW50IGl0ZW1T
dGFydCA9IG1fcnVuLnJ0bCgpID8gMCA6IGluZGV4T2ZGb250VHJhbnNpdGlvbjsKICAgICAgICAg
bV9jdXJyZW50Q2hhcmFjdGVyID0gYmFzZUNoYXJhY3RlciArIGl0ZW1TdGFydDsKLSAgICAgICAg
aXRlbWl6ZVNoYXBlQW5kUGxhY2UoKG5leHRJc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5k
YXRhKCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1MZW5ndGgsIG5leHRGb250RGF0YSwgZ2x5cGhC
dWZmZXIpOworICAgICAgICBpdGVtaXplU2hhcGVBbmRQbGFjZSgobmV4dElzU21hbGxDYXBzID8g
c21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFydCwgaXRlbVN0YXJ0LCBpdGVt
TGVuZ3RoLCBuZXh0Rm9udERhdGEsIGdseXBoQnVmZmVyKTsKICAgICB9CiAKICAgICBtX2N1cnJl
bnRDaGFyYWN0ZXIgPSBiYXNlQ2hhcmFjdGVyICsgbGVuZ3RoOwogfQogCi12b2lkIFVuaXNjcmli
ZUNvbnRyb2xsZXI6Oml0ZW1pemVTaGFwZUFuZFBsYWNlKGNvbnN0IFVDaGFyKiBjcCwgdW5zaWdu
ZWQgbGVuZ3RoLCBjb25zdCBGb250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVy
KQordm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBV
Q2hhciogY3AsIHVuc2lnbmVkIHN0cmluZ09mZnNldCwgdW5zaWduZWQgbGVuZ3RoLCBjb25zdCBG
b250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8vIFNjcmlw
dEl0ZW1pemUgKGluIFdpbmRvd3MgWFAgdmVyc2lvbnMgcHJpb3IgdG8gU1AyKSBjYW4gb3ZlcmZs
b3cgYnkgMS4gIFRoaXMgaXMgd2h5IHRoZXJlIGlzIGFuIGV4dHJhIGVtcHR5IGl0ZW0KICAgICAv
LyBoYW5naW5nIG91dCBhdCB0aGUgZW5kIG9mIHRoZSBhcnJheQpAQCAtMjA4LDEyICsyMDgsMTIg
QEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBV
Q2hhciogY3AsIHVuc2lnbmVkIGxlbmd0aCwKIAogICAgIGlmIChtX3J1bi5ydGwoKSkgewogICAg
ICAgICBmb3IgKGludCBpID0gbV9pdGVtcy5zaXplKCkgLSAyOyBpID49IDA7IGktLSkgewotICAg
ICAgICAgICAgaWYgKCFzaGFwZUFuZFBsYWNlSXRlbShjcCwgaSwgZm9udERhdGEsIGdseXBoQnVm
ZmVyKSkKKyAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0ZW0oY3AsIHN0cmluZ09mZnNl
dCwgaSwgZm9udERhdGEsIGdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAg
ICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg
bV9pdGVtcy5zaXplKCkgLSAxOyBpKyspIHsKLSAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFj
ZUl0ZW0oY3AsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikpCisgICAgICAgICAgICBpZiAoIXNo
YXBlQW5kUGxhY2VJdGVtKGNwLCBzdHJpbmdPZmZzZXQsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZl
cikpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMxLDcg
KzIzMSw3IEBAIHZvaWQgVW5pc2NyaWJlQ29udHJvbGxlcjo6cmVzZXRDb250cm9sQW5kU3RhdGUo
KQogICAgIG1fc3RhdGUuZk92ZXJyaWRlRGlyZWN0aW9uID0gbV9ydW4uZGlyZWN0aW9uYWxPdmVy
cmlkZSgpOwogfQogCi1ib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVt
KGNvbnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgaSwgY29uc3QgRm9udCogZm9udERhdGEsIEdseXBo
QnVmZmVyKiBnbHlwaEJ1ZmZlcikKK2Jvb2wgVW5pc2NyaWJlQ29udHJvbGxlcjo6c2hhcGVBbmRQ
bGFjZUl0ZW0oY29uc3QgVUNoYXIqIGNwLCB1bnNpZ25lZCBzdHJpbmdPZmZzZXQsIHVuc2lnbmVk
IGksIGNvbnN0IEZvbnQqIGZvbnREYXRhLCBHbHlwaEJ1ZmZlciogZ2x5cGhCdWZmZXIpCiB7CiAg
ICAgLy8gRGV0ZXJtaW5lIHRoZSBzdHJpbmcgZm9yIHRoaXMgaXRlbS4KICAgICBjb25zdCBVQ2hh
ciogc3RyID0gY3AgKyBtX2l0ZW1zW2ldLmlDaGFyUG9zOwpAQCAtMjUzLDYgKzI1MywxNCBAQCBi
b29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVtKGNvbnN0IFVDaGFyKiBj
cCwgdW5zaWduZWQgaSwgY29uc3QgRgogICAgIGlmICghc2hhcGUoc3RyLCBsZW4sIGl0ZW0sIGZv
bnREYXRhLCBnbHlwaHMsIGNsdXN0ZXJzLCB2aXN1YWxBdHRyaWJ1dGVzKSkKICAgICAgICAgcmV0
dXJuIHRydWU7CiAKKyAgICBWZWN0b3I8T3B0aW9uYWw8dW5zaWduZWQ+PiBzdHJpbmdPZmZzZXRz
KGdseXBocy5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVuOyArK2kpIHsK
KyAgICAgICAgaWYgKHN0cmluZ09mZnNldHNbY2x1c3RlcnNbaV1dKQorICAgICAgICAgICAgc3Ry
aW5nT2Zmc2V0c1tjbHVzdGVyc1tpXV0gPSBzdGQ6Om1pbigqc3RyaW5nT2Zmc2V0c1tjbHVzdGVy
c1tpXV0sIGkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzdHJpbmdPZmZzZXRzW2NsdXN0
ZXJzW2ldXSA9IGk7CisgICAgfQorCiAgICAgLy8gV2Ugbm93IGhhdmUgYSBjb2xsZWN0aW9uIG9m
IGdseXBocy4KICAgICBWZWN0b3I8R09GRlNFVD4gb2Zmc2V0czsKICAgICBWZWN0b3I8aW50PiBh
ZHZhbmNlczsKQEAgLTM2Nyw3ICszNzUsNyBAQCBib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNo
YXBlQW5kUGxhY2VJdGVtKGNvbnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgaSwgY29uc3QgRgogICAg
ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGdseXBoQnVmZmVyLT5leHBhbmRMYXN0QWR2
YW5jZShvcmlnaW4pOwogICAgICAgICAgICAgR2x5cGhCdWZmZXJBZHZhbmNlIGdseXBoQWR2YW5j
ZSgtb3JpZ2luLndpZHRoKCkgKyBhZHZhbmNlLCAtb3JpZ2luLmhlaWdodCgpKTsKLSAgICAgICAg
ICAgIGdseXBoQnVmZmVyLT5hZGQoZ2x5cGgsIGZvbnREYXRhLCBnbHlwaEFkdmFuY2UpOworICAg
ICAgICAgICAgZ2x5cGhCdWZmZXItPmFkZChnbHlwaCwgZm9udERhdGEsIGdseXBoQWR2YW5jZSwg
c3RyaW5nT2Zmc2V0c1trXS52YWx1ZV9vcigwKSArIHN0cmluZ09mZnNldCk7CiAgICAgICAgIH0K
IAogICAgICAgICBGbG9hdFJlY3QgZ2x5cGhCb3VuZHMgPSBmb250RGF0YS0+Ym91bmRzRm9yR2x5
cGgoZ2x5cGgpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362519</attachid>
            <date>2019-02-20 11:33:05 -0800</date>
            <delta_ts>2019-02-20 13:26:20 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191368-20190220113304.patch</filename>
            <type>text/plain</type>
            <size>6709</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTgyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE5LTAyLTIwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBmYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBpcyBjcmFzaGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzY4CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2x5cGhCdWZmZXIn
cyBvZmZzZXQgYXJyYXkgd2Fzbid0IGdldHRpbmcgZmlsbGVkIGJ5IFVuaXNjcmliZUNvbnRyb2xs
ZXIuCisgICAgICAgIE91ciB1bmRlcmxpbmluZyBjb2RlIHJlcXVpcmVzIHRoaXMgYXJyYXkuCisg
CisgICAgICAgIFVuaXNjcmliZSBnaXZlcyB1cyBhIGNoYXJhY3RlciAtPiBnbHlwaCBtYXBwaW5n
LCBzbyB3ZSBqdXN0IGhhdmUgdG8gY29tcHV0ZQorICAgICAgICB0aGUgaW52ZXJzZSBhbmQgZ2l2
ZSBpdCB0byB0aGUgR2x5cGhCdWZmZXIuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpcyB3cml0dGVu
IGJ5IE15bGVzIEMuIE1heGZpZWxkLgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC9pbnRlcm5h
dGlvbmFsL2tobWVyLXNlbGVjdGlvbi5odG1sLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp
Y3MvR2x5cGhCdWZmZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoQnVmZmVyOjphZGQpOgor
ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1z
LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpEcmF3R2x5cGhzOjpnZW5lcmF0
ZUdseXBoQnVmZmVyIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vVW5p
c2NyaWJlQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVbmlzY3JpYmVDb250cm9s
bGVyOjphZHZhbmNlKToKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRyb2xsZXI6Oml0
ZW1pemVTaGFwZUFuZFBsYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRyb2xs
ZXI6OnNoYXBlQW5kUGxhY2VJdGVtKToKKwogMjAxOS0wMi0yMCAgVGltb3RoeSBIYXRjaGVyICA8
dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVyVGhlbWVJT1Mgc2hvdWxkIHVzZSBS
ZW5kZXJUaGVtZSdzIGNvbG9yIGNhY2hlIGluc3RlYWQgb2YgaXRzIG93bi4KSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNpb24g
MjQxODE3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIu
aAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgYWRk
KGdseXBoLCBmb250LCBhZHZhbmNlLCBvZmZzZXRJblN0cmluZyk7CiAgICAgfQogCi0gICAgdm9p
ZCBhZGQoR2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEdseXBoQnVmZmVyQWR2YW5jZSBh
ZHZhbmNlLCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQorICAgIHZvaWQgYWRk
KEdseXBoIGdseXBoLCBjb25zdCBGb250KiBmb250LCBHbHlwaEJ1ZmZlckFkdmFuY2UgYWR2YW5j
ZSwgdW5zaWduZWQgb2Zmc2V0SW5TdHJpbmcpCiAgICAgewogICAgICAgICBtX2ZvbnQuYXBwZW5k
KGZvbnQpOwogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwpJbmRleDogU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3Bw
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXls
aXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmNwcAkocmV2aXNpb24gMjQxODE3KQorKysgU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3Bw
CSh3b3JraW5nIGNvcHkpCkBAIC0zNjQsNyArMzY0LDcgQEAgaW5saW5lIEdseXBoQnVmZmVyIERy
YXdHbHlwaHM6OmdlbmVyYXRlRwogewogICAgIEdseXBoQnVmZmVyIHJlc3VsdDsKICAgICBmb3Ig
KHNpemVfdCBpID0gMDsgaSA8IG1fZ2x5cGhzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIHJlc3Vs
dC5hZGQobV9nbHlwaHNbaV0sICZtX2ZvbnQuZ2V0KCksIG1fYWR2YW5jZXNbaV0pOworICAgICAg
ICByZXN1bHQuYWRkKG1fZ2x5cGhzW2ldLCAmbV9mb250LmdldCgpLCBtX2FkdmFuY2VzW2ldLCBH
bHlwaEJ1ZmZlcjo6bm9PZmZzZXQpOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQpJbmRl
eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xs
ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp
bi9VbmlzY3JpYmVDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjQxODE3KQorKysgU291cmNlL1dl
YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjph
ZHZhbmNlKHVuc2lnbgogICAgICAgICAgICAgaW50IGl0ZW1TdGFydCA9IG1fcnVuLnJ0bCgpID8g
aW5kZXggKyAxIDogaW5kZXhPZkZvbnRUcmFuc2l0aW9uOwogICAgICAgICAgICAgaW50IGl0ZW1M
ZW5ndGggPSBtX3J1bi5ydGwoKSA/IGluZGV4T2ZGb250VHJhbnNpdGlvbiAtIGluZGV4IDogaW5k
ZXggLSBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgICAgICBtX2N1cnJlbnRDaGFyYWN0
ZXIgPSBiYXNlQ2hhcmFjdGVyICsgaXRlbVN0YXJ0OwotICAgICAgICAgICAgaXRlbWl6ZVNoYXBl
QW5kUGxhY2UoKGlzU21hbGxDYXBzID8gc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0
ZW1TdGFydCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgICAg
IGl0ZW1pemVTaGFwZUFuZFBsYWNlKChpc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRh
KCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGds
eXBoQnVmZmVyKTsKICAgICAgICAgICAgIGluZGV4T2ZGb250VHJhbnNpdGlvbiA9IGluZGV4Owog
ICAgICAgICB9CiAgICAgfQpAQCAtMTgzLDEzICsxODMsMTMgQEAgdm9pZCBVbmlzY3JpYmVDb250
cm9sbGVyOjphZHZhbmNlKHVuc2lnbgogCiAgICAgICAgIGludCBpdGVtU3RhcnQgPSBtX3J1bi5y
dGwoKSA/IDAgOiBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgIG1fY3VycmVudENoYXJh
Y3RlciA9IGJhc2VDaGFyYWN0ZXIgKyBpdGVtU3RhcnQ7Ci0gICAgICAgIGl0ZW1pemVTaGFwZUFu
ZFBsYWNlKChuZXh0SXNTbWFsbENhcHMgPyBzbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsg
aXRlbVN0YXJ0LCBpdGVtTGVuZ3RoLCBuZXh0Rm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAg
ICAgaXRlbWl6ZVNoYXBlQW5kUGxhY2UoKG5leHRJc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZl
ci5kYXRhKCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgbmV4dEZv
bnREYXRhLCBnbHlwaEJ1ZmZlcik7CiAgICAgfQogCiAgICAgbV9jdXJyZW50Q2hhcmFjdGVyID0g
YmFzZUNoYXJhY3RlciArIGxlbmd0aDsKIH0KIAotdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjpp
dGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciogY3AsIHVuc2lnbmVkIGxlbmd0aCwgY29u
c3QgRm9udCogZm9udERhdGEsIEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlcikKK3ZvaWQgVW5pc2Ny
aWJlQ29udHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqIGNwLCB1bnNp
Z25lZCBzdHJpbmdPZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udCogZm9udERhdGEs
IEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlcikKIHsKICAgICAvLyBTY3JpcHRJdGVtaXplIChpbiBX
aW5kb3dzIFhQIHZlcnNpb25zIHByaW9yIHRvIFNQMikgY2FuIG92ZXJmbG93IGJ5IDEuICBUaGlz
IGlzIHdoeSB0aGVyZSBpcyBhbiBleHRyYSBlbXB0eSBpdGVtCiAgICAgLy8gaGFuZ2luZyBvdXQg
YXQgdGhlIGVuZCBvZiB0aGUgYXJyYXkKQEAgLTIwOCwxMiArMjA4LDEyIEBAIHZvaWQgVW5pc2Ny
aWJlQ29udHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW4KIAogICAgIGlmIChtX3J1bi5ydGwoKSkgewog
ICAgICAgICBmb3IgKGludCBpID0gbV9pdGVtcy5zaXplKCkgLSAyOyBpID49IDA7IGktLSkgewot
ICAgICAgICAgICAgaWYgKCFzaGFwZUFuZFBsYWNlSXRlbShjcCwgaSwgZm9udERhdGEsIGdseXBo
QnVmZmVyKSkKKyAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0ZW0oY3AsIHN0cmluZ09m
ZnNldCwgaSwgZm9udERhdGEsIGdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICByZXR1cm47
CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp
IDwgbV9pdGVtcy5zaXplKCkgLSAxOyBpKyspIHsKLSAgICAgICAgICAgIGlmICghc2hhcGVBbmRQ
bGFjZUl0ZW0oY3AsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikpCisgICAgICAgICAgICBpZiAo
IXNoYXBlQW5kUGxhY2VJdGVtKGNwLCBzdHJpbmdPZmZzZXQsIGksIGZvbnREYXRhLCBnbHlwaEJ1
ZmZlcikpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMx
LDcgKzIzMSw3IEBAIHZvaWQgVW5pc2NyaWJlQ29udHJvbGxlcjo6cmVzZXRDb250cm9sQW4KICAg
ICBtX3N0YXRlLmZPdmVycmlkZURpcmVjdGlvbiA9IG1fcnVuLmRpcmVjdGlvbmFsT3ZlcnJpZGUo
KTsKIH0KIAotYm9vbCBVbmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSXRlbShjb25z
dCBVQ2hhciogY3AsIHVuc2lnbmVkIGksIGNvbnN0IEZvbnQqIGZvbnREYXRhLCBHbHlwaEJ1ZmZl
ciogZ2x5cGhCdWZmZXIpCitib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJ
dGVtKGNvbnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpLCBj
b25zdCBGb250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8v
IERldGVybWluZSB0aGUgc3RyaW5nIGZvciB0aGlzIGl0ZW0uCiAgICAgY29uc3QgVUNoYXIqIHN0
ciA9IGNwICsgbV9pdGVtc1tpXS5pQ2hhclBvczsKQEAgLTI1Myw2ICsyNTMsMTQgQEAgYm9vbCBV
bmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSQogICAgIGlmICghc2hhcGUoc3RyLCBs
ZW4sIGl0ZW0sIGZvbnREYXRhLCBnbHlwaHMsIGNsdXN0ZXJzLCB2aXN1YWxBdHRyaWJ1dGVzKSkK
ICAgICAgICAgcmV0dXJuIHRydWU7CiAKKyAgICBWZWN0b3I8T3B0aW9uYWw8dW5zaWduZWQ+PiBz
dHJpbmdPZmZzZXRzKGdseXBocy5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg
bGVuOyArK2kpIHsKKyAgICAgICAgaWYgKHN0cmluZ09mZnNldHNbY2x1c3RlcnNbaV1dKQorICAg
ICAgICAgICAgc3RyaW5nT2Zmc2V0c1tjbHVzdGVyc1tpXV0gPSBzdGQ6Om1pbigqc3RyaW5nT2Zm
c2V0c1tjbHVzdGVyc1tpXV0sIGkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzdHJpbmdP
ZmZzZXRzW2NsdXN0ZXJzW2ldXSA9IGk7CisgICAgfQorCiAgICAgLy8gV2Ugbm93IGhhdmUgYSBj
b2xsZWN0aW9uIG9mIGdseXBocy4KICAgICBWZWN0b3I8R09GRlNFVD4gb2Zmc2V0czsKICAgICBW
ZWN0b3I8aW50PiBhZHZhbmNlczsKQEAgLTM2Nyw3ICszNzUsNyBAQCBib29sIFVuaXNjcmliZUNv
bnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAg
ICAgZ2x5cGhCdWZmZXItPmV4cGFuZExhc3RBZHZhbmNlKG9yaWdpbik7CiAgICAgICAgICAgICBH
bHlwaEJ1ZmZlckFkdmFuY2UgZ2x5cGhBZHZhbmNlKC1vcmlnaW4ud2lkdGgoKSArIGFkdmFuY2Us
IC1vcmlnaW4uaGVpZ2h0KCkpOwotICAgICAgICAgICAgZ2x5cGhCdWZmZXItPmFkZChnbHlwaCwg
Zm9udERhdGEsIGdseXBoQWR2YW5jZSk7CisgICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRkKGds
eXBoLCBmb250RGF0YSwgZ2x5cGhBZHZhbmNlLCBzdHJpbmdPZmZzZXRzW2tdLnZhbHVlX29yKDAp
ICsgc3RyaW5nT2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAgIEZsb2F0UmVjdCBnbHlwaEJv
dW5kcyA9IGZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChnbHlwaCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362533</attachid>
            <date>2019-02-20 13:25:48 -0800</date>
            <delta_ts>2019-02-20 15:10:08 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191368-20190220132547.patch</filename>
            <type>text/plain</type>
            <size>7773</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTIwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBmYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBpcyBjcmFzaGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzY4CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2x5cGhCdWZmZXIn
cyBvZmZzZXQgYXJyYXkgd2Fzbid0IGdldHRpbmcgZmlsbGVkIGJ5IFVuaXNjcmliZUNvbnRyb2xs
ZXIuCisgICAgICAgIE91ciB1bmRlcmxpbmluZyBjb2RlIHJlcXVpcmVzIHRoaXMgYXJyYXkuCisK
KyAgICAgICAgVW5pc2NyaWJlIGdpdmVzIHVzIGEgY2hhcmFjdGVyIC0+IGdseXBoIG1hcHBpbmcs
IHNvIHdlIGp1c3QgaGF2ZSB0byBjb21wdXRlCisgICAgICAgIHRoZSBpbnZlcnNlIGFuZCBnaXZl
IGl0IHRvIHRoZSBHbHlwaEJ1ZmZlci4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIHdyaXR0ZW4g
YnkgTXlsZXMgQy4gTWF4ZmllbGQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2ludGVybmF0
aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6Cisg
ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmdlbmVyYXRl
R2x5cGhCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRyb2xs
ZXI6OmFkdmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxlcjo6aXRl
bWl6ZVNoYXBlQW5kUGxhY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxl
cjo6c2hhcGVBbmRQbGFjZUl0ZW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9V
bmlzY3JpYmVDb250cm9sbGVyLmg6CisKIDIwMTktMDItMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI0MTc4OD4pOiBBU1NF
UlRJT04gRkFJTEVEOiAhbV9ub3JtYWxGbG93TGlzdERpcnR5IGluIFRlc3RXZWJLaXRBUEkuV2Vi
S2l0LlJlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3IHRlc3QKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNpb24gMjQxODMw
KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkod29y
a2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgYWRkKGdseXBo
LCBmb250LCBhZHZhbmNlLCBvZmZzZXRJblN0cmluZyk7CiAgICAgfQogCi0gICAgdm9pZCBhZGQo
R2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEdseXBoQnVmZmVyQWR2YW5jZSBhZHZhbmNl
LCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQorICAgIHZvaWQgYWRkKEdseXBo
IGdseXBoLCBjb25zdCBGb250KiBmb250LCBHbHlwaEJ1ZmZlckFkdmFuY2UgYWR2YW5jZSwgdW5z
aWduZWQgb2Zmc2V0SW5TdHJpbmcpCiAgICAgewogICAgICAgICBtX2ZvbnQuYXBwZW5kKGZvbnQp
OwogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9E
aXNwbGF5TGlzdEl0ZW1zLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC0zNjQsNyArMzY0LDcgQEAgaW5saW5lIEdseXBoQnVmZmVyIERyYXdHbHlw
aHM6OmdlbmVyYXRlRwogewogICAgIEdseXBoQnVmZmVyIHJlc3VsdDsKICAgICBmb3IgKHNpemVf
dCBpID0gMDsgaSA8IG1fZ2x5cGhzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIHJlc3VsdC5hZGQo
bV9nbHlwaHNbaV0sICZtX2ZvbnQuZ2V0KCksIG1fYWR2YW5jZXNbaV0pOworICAgICAgICByZXN1
bHQuYWRkKG1fZ2x5cGhzW2ldLCAmbV9mb250LmdldCgpLCBtX2FkdmFuY2VzW2ldLCBHbHlwaEJ1
ZmZlcjo6bm9PZmZzZXQpOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQpJbmRleDogU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3Bw
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjphZHZhbmNl
KHVuc2lnbgogICAgICAgICAgICAgaW50IGl0ZW1TdGFydCA9IG1fcnVuLnJ0bCgpID8gaW5kZXgg
KyAxIDogaW5kZXhPZkZvbnRUcmFuc2l0aW9uOwogICAgICAgICAgICAgaW50IGl0ZW1MZW5ndGgg
PSBtX3J1bi5ydGwoKSA/IGluZGV4T2ZGb250VHJhbnNpdGlvbiAtIGluZGV4IDogaW5kZXggLSBp
bmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgICAgICBtX2N1cnJlbnRDaGFyYWN0ZXIgPSBi
YXNlQ2hhcmFjdGVyICsgaXRlbVN0YXJ0OwotICAgICAgICAgICAgaXRlbWl6ZVNoYXBlQW5kUGxh
Y2UoKGlzU21hbGxDYXBzID8gc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFy
dCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgICAgIGl0ZW1p
emVTaGFwZUFuZFBsYWNlKChpc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRhKCkgOiBj
cCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVm
ZmVyKTsKICAgICAgICAgICAgIGluZGV4T2ZGb250VHJhbnNpdGlvbiA9IGluZGV4OwogICAgICAg
ICB9CiAgICAgfQpAQCAtMTgzLDEzICsxODMsMTMgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVy
OjphZHZhbmNlKHVuc2lnbgogCiAgICAgICAgIGludCBpdGVtU3RhcnQgPSBtX3J1bi5ydGwoKSA/
IDAgOiBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgIG1fY3VycmVudENoYXJhY3RlciA9
IGJhc2VDaGFyYWN0ZXIgKyBpdGVtU3RhcnQ7Ci0gICAgICAgIGl0ZW1pemVTaGFwZUFuZFBsYWNl
KChuZXh0SXNTbWFsbENhcHMgPyBzbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsgaXRlbVN0
YXJ0LCBpdGVtTGVuZ3RoLCBuZXh0Rm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgaXRl
bWl6ZVNoYXBlQW5kUGxhY2UoKG5leHRJc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRh
KCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgbmV4dEZvbnREYXRh
LCBnbHlwaEJ1ZmZlcik7CiAgICAgfQogCiAgICAgbV9jdXJyZW50Q2hhcmFjdGVyID0gYmFzZUNo
YXJhY3RlciArIGxlbmd0aDsKIH0KIAotdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXpl
U2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciogY3AsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9u
dCogZm9udERhdGEsIEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlcikKK3ZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqIGNwLCB1bnNpZ25lZCBz
dHJpbmdPZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udCogZm9udERhdGEsIEdseXBo
QnVmZmVyKiBnbHlwaEJ1ZmZlcikKIHsKICAgICAvLyBTY3JpcHRJdGVtaXplIChpbiBXaW5kb3dz
IFhQIHZlcnNpb25zIHByaW9yIHRvIFNQMikgY2FuIG92ZXJmbG93IGJ5IDEuICBUaGlzIGlzIHdo
eSB0aGVyZSBpcyBhbiBleHRyYSBlbXB0eSBpdGVtCiAgICAgLy8gaGFuZ2luZyBvdXQgYXQgdGhl
IGVuZCBvZiB0aGUgYXJyYXkKQEAgLTIwOCwxMiArMjA4LDEyIEBAIHZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW4KIAogICAgIGlmIChtX3J1bi5ydGwoKSkgewogICAgICAg
ICBmb3IgKGludCBpID0gbV9pdGVtcy5zaXplKCkgLSAyOyBpID49IDA7IGktLSkgewotICAgICAg
ICAgICAgaWYgKCFzaGFwZUFuZFBsYWNlSXRlbShjcCwgaSwgZm9udERhdGEsIGdseXBoQnVmZmVy
KSkKKyAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0ZW0oY3AsIHN0cmluZ09mZnNldCwg
aSwgZm9udERhdGEsIGdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9p
dGVtcy5zaXplKCkgLSAxOyBpKyspIHsKLSAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0
ZW0oY3AsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikpCisgICAgICAgICAgICBpZiAoIXNoYXBl
QW5kUGxhY2VJdGVtKGNwLCBzdHJpbmdPZmZzZXQsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikp
CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMxLDcgKzIz
MSw3IEBAIHZvaWQgVW5pc2NyaWJlQ29udHJvbGxlcjo6cmVzZXRDb250cm9sQW4KICAgICBtX3N0
YXRlLmZPdmVycmlkZURpcmVjdGlvbiA9IG1fcnVuLmRpcmVjdGlvbmFsT3ZlcnJpZGUoKTsKIH0K
IAotYm9vbCBVbmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSXRlbShjb25zdCBVQ2hh
ciogY3AsIHVuc2lnbmVkIGksIGNvbnN0IEZvbnQqIGZvbnREYXRhLCBHbHlwaEJ1ZmZlciogZ2x5
cGhCdWZmZXIpCitib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVtKGNv
bnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpLCBjb25zdCBG
b250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8vIERldGVy
bWluZSB0aGUgc3RyaW5nIGZvciB0aGlzIGl0ZW0uCiAgICAgY29uc3QgVUNoYXIqIHN0ciA9IGNw
ICsgbV9pdGVtc1tpXS5pQ2hhclBvczsKQEAgLTI1Myw2ICsyNTMsMTQgQEAgYm9vbCBVbmlzY3Jp
YmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSQogICAgIGlmICghc2hhcGUoc3RyLCBsZW4sIGl0
ZW0sIGZvbnREYXRhLCBnbHlwaHMsIGNsdXN0ZXJzLCB2aXN1YWxBdHRyaWJ1dGVzKSkKICAgICAg
ICAgcmV0dXJuIHRydWU7CiAKKyAgICBWZWN0b3I8T3B0aW9uYWw8dW5zaWduZWQ+PiBzdHJpbmdP
ZmZzZXRzKGdseXBocy5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVuOyAr
K2kpIHsKKyAgICAgICAgaWYgKHN0cmluZ09mZnNldHNbY2x1c3RlcnNbaV1dKQorICAgICAgICAg
ICAgc3RyaW5nT2Zmc2V0c1tjbHVzdGVyc1tpXV0gPSBzdGQ6Om1pbigqc3RyaW5nT2Zmc2V0c1tj
bHVzdGVyc1tpXV0sIGkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzdHJpbmdPZmZzZXRz
W2NsdXN0ZXJzW2ldXSA9IGk7CisgICAgfQorCiAgICAgLy8gV2Ugbm93IGhhdmUgYSBjb2xsZWN0
aW9uIG9mIGdseXBocy4KICAgICBWZWN0b3I8R09GRlNFVD4gb2Zmc2V0czsKICAgICBWZWN0b3I8
aW50PiBhZHZhbmNlczsKQEAgLTM2Nyw3ICszNzUsNyBAQCBib29sIFVuaXNjcmliZUNvbnRyb2xs
ZXI6OnNoYXBlQW5kUGxhY2VJCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgZ2x5
cGhCdWZmZXItPmV4cGFuZExhc3RBZHZhbmNlKG9yaWdpbik7CiAgICAgICAgICAgICBHbHlwaEJ1
ZmZlckFkdmFuY2UgZ2x5cGhBZHZhbmNlKC1vcmlnaW4ud2lkdGgoKSArIGFkdmFuY2UsIC1vcmln
aW4uaGVpZ2h0KCkpOwotICAgICAgICAgICAgZ2x5cGhCdWZmZXItPmFkZChnbHlwaCwgZm9udERh
dGEsIGdseXBoQWR2YW5jZSk7CisgICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRkKGdseXBoLCBm
b250RGF0YSwgZ2x5cGhBZHZhbmNlLCBzdHJpbmdPZmZzZXRzW2tdLnZhbHVlX29yKDApICsgc3Ry
aW5nT2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAgIEZsb2F0UmVjdCBnbHlwaEJvdW5kcyA9
IGZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChnbHlwaCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy93aW4vVW5pc2NyaWJlQ29udHJvbGxlci5oCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9VbmlzY3JpYmVDb250cm9sbGVy
LmgJKHJldmlzaW9uIDI0MTgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L3dpbi9VbmlzY3JpYmVDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDggKzU0LDgg
QEAgcHVibGljOgogcHJpdmF0ZTogICAgCiAgICAgdm9pZCByZXNldENvbnRyb2xBbmRTdGF0ZSgp
OwogCi0gICAgdm9pZCBpdGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciosIHVuc2lnbmVk
IGxlbmd0aCwgY29uc3QgRm9udCosIEdseXBoQnVmZmVyKik7Ci0gICAgYm9vbCBzaGFwZUFuZFBs
YWNlSXRlbShjb25zdCBVQ2hhciosIHVuc2lnbmVkIGluZGV4LCBjb25zdCBGb250KiwgR2x5cGhC
dWZmZXIqKTsKKyAgICB2b2lkIGl0ZW1pemVTaGFwZUFuZFBsYWNlKGNvbnN0IFVDaGFyKiwgdW5z
aWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IEZvbnQqLCBHbHlwaEJ1
ZmZlciopOworICAgIGJvb2wgc2hhcGVBbmRQbGFjZUl0ZW0oY29uc3QgVUNoYXIqLCB1bnNpZ25l
ZCBzdHJpbmdPZmZzZXQsIHVuc2lnbmVkIGluZGV4LCBjb25zdCBGb250KiwgR2x5cGhCdWZmZXIq
KQogICAgIGJvb2wgc2hhcGUoY29uc3QgVUNoYXIqIHN0ciwgaW50IGxlbiwgU0NSSVBUX0lURU0s
IGNvbnN0IEZvbnQqLAogICAgICAgICAgICAgICAgVmVjdG9yPFdPUkQ+JiBnbHlwaHMsIFZlY3Rv
cjxXT1JEPiYgY2x1c3RlcnMsCiAgICAgICAgICAgICAgICBWZWN0b3I8U0NSSVBUX1ZJU0FUVFI+
JiB2aXN1YWxBdHRyaWJ1dGVzKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362552</attachid>
            <date>2019-02-20 15:09:25 -0800</date>
            <delta_ts>2019-02-20 15:53:10 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191368-20190220150924.patch</filename>
            <type>text/plain</type>
            <size>7774</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTIwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBmYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBpcyBjcmFzaGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzY4CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2x5cGhCdWZmZXIn
cyBvZmZzZXQgYXJyYXkgd2Fzbid0IGdldHRpbmcgZmlsbGVkIGJ5IFVuaXNjcmliZUNvbnRyb2xs
ZXIuCisgICAgICAgIE91ciB1bmRlcmxpbmluZyBjb2RlIHJlcXVpcmVzIHRoaXMgYXJyYXkuCisK
KyAgICAgICAgVW5pc2NyaWJlIGdpdmVzIHVzIGEgY2hhcmFjdGVyIC0+IGdseXBoIG1hcHBpbmcs
IHNvIHdlIGp1c3QgaGF2ZSB0byBjb21wdXRlCisgICAgICAgIHRoZSBpbnZlcnNlIGFuZCBnaXZl
IGl0IHRvIHRoZSBHbHlwaEJ1ZmZlci4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIHdyaXR0ZW4g
YnkgTXlsZXMgQy4gTWF4ZmllbGQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2ludGVybmF0
aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6Cisg
ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmdlbmVyYXRl
R2x5cGhCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRyb2xs
ZXI6OmFkdmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxlcjo6aXRl
bWl6ZVNoYXBlQW5kUGxhY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxl
cjo6c2hhcGVBbmRQbGFjZUl0ZW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9V
bmlzY3JpYmVDb250cm9sbGVyLmg6CisKIDIwMTktMDItMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI0MTc4OD4pOiBBU1NF
UlRJT04gRkFJTEVEOiAhbV9ub3JtYWxGbG93TGlzdERpcnR5IGluIFRlc3RXZWJLaXRBUEkuV2Vi
S2l0LlJlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3IHRlc3QKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNpb24gMjQxODMw
KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkod29y
a2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgYWRkKGdseXBo
LCBmb250LCBhZHZhbmNlLCBvZmZzZXRJblN0cmluZyk7CiAgICAgfQogCi0gICAgdm9pZCBhZGQo
R2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEdseXBoQnVmZmVyQWR2YW5jZSBhZHZhbmNl
LCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQorICAgIHZvaWQgYWRkKEdseXBo
IGdseXBoLCBjb25zdCBGb250KiBmb250LCBHbHlwaEJ1ZmZlckFkdmFuY2UgYWR2YW5jZSwgdW5z
aWduZWQgb2Zmc2V0SW5TdHJpbmcpCiAgICAgewogICAgICAgICBtX2ZvbnQuYXBwZW5kKGZvbnQp
OwogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9E
aXNwbGF5TGlzdEl0ZW1zLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC0zNjQsNyArMzY0LDcgQEAgaW5saW5lIEdseXBoQnVmZmVyIERyYXdHbHlw
aHM6OmdlbmVyYXRlRwogewogICAgIEdseXBoQnVmZmVyIHJlc3VsdDsKICAgICBmb3IgKHNpemVf
dCBpID0gMDsgaSA8IG1fZ2x5cGhzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIHJlc3VsdC5hZGQo
bV9nbHlwaHNbaV0sICZtX2ZvbnQuZ2V0KCksIG1fYWR2YW5jZXNbaV0pOworICAgICAgICByZXN1
bHQuYWRkKG1fZ2x5cGhzW2ldLCAmbV9mb250LmdldCgpLCBtX2FkdmFuY2VzW2ldLCBHbHlwaEJ1
ZmZlcjo6bm9PZmZzZXQpOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQpJbmRleDogU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3Bw
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjphZHZhbmNl
KHVuc2lnbgogICAgICAgICAgICAgaW50IGl0ZW1TdGFydCA9IG1fcnVuLnJ0bCgpID8gaW5kZXgg
KyAxIDogaW5kZXhPZkZvbnRUcmFuc2l0aW9uOwogICAgICAgICAgICAgaW50IGl0ZW1MZW5ndGgg
PSBtX3J1bi5ydGwoKSA/IGluZGV4T2ZGb250VHJhbnNpdGlvbiAtIGluZGV4IDogaW5kZXggLSBp
bmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgICAgICBtX2N1cnJlbnRDaGFyYWN0ZXIgPSBi
YXNlQ2hhcmFjdGVyICsgaXRlbVN0YXJ0OwotICAgICAgICAgICAgaXRlbWl6ZVNoYXBlQW5kUGxh
Y2UoKGlzU21hbGxDYXBzID8gc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFy
dCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgICAgIGl0ZW1p
emVTaGFwZUFuZFBsYWNlKChpc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRhKCkgOiBj
cCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVm
ZmVyKTsKICAgICAgICAgICAgIGluZGV4T2ZGb250VHJhbnNpdGlvbiA9IGluZGV4OwogICAgICAg
ICB9CiAgICAgfQpAQCAtMTgzLDEzICsxODMsMTMgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVy
OjphZHZhbmNlKHVuc2lnbgogCiAgICAgICAgIGludCBpdGVtU3RhcnQgPSBtX3J1bi5ydGwoKSA/
IDAgOiBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgIG1fY3VycmVudENoYXJhY3RlciA9
IGJhc2VDaGFyYWN0ZXIgKyBpdGVtU3RhcnQ7Ci0gICAgICAgIGl0ZW1pemVTaGFwZUFuZFBsYWNl
KChuZXh0SXNTbWFsbENhcHMgPyBzbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsgaXRlbVN0
YXJ0LCBpdGVtTGVuZ3RoLCBuZXh0Rm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgaXRl
bWl6ZVNoYXBlQW5kUGxhY2UoKG5leHRJc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRh
KCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgbmV4dEZvbnREYXRh
LCBnbHlwaEJ1ZmZlcik7CiAgICAgfQogCiAgICAgbV9jdXJyZW50Q2hhcmFjdGVyID0gYmFzZUNo
YXJhY3RlciArIGxlbmd0aDsKIH0KIAotdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXpl
U2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciogY3AsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9u
dCogZm9udERhdGEsIEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlcikKK3ZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqIGNwLCB1bnNpZ25lZCBz
dHJpbmdPZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udCogZm9udERhdGEsIEdseXBo
QnVmZmVyKiBnbHlwaEJ1ZmZlcikKIHsKICAgICAvLyBTY3JpcHRJdGVtaXplIChpbiBXaW5kb3dz
IFhQIHZlcnNpb25zIHByaW9yIHRvIFNQMikgY2FuIG92ZXJmbG93IGJ5IDEuICBUaGlzIGlzIHdo
eSB0aGVyZSBpcyBhbiBleHRyYSBlbXB0eSBpdGVtCiAgICAgLy8gaGFuZ2luZyBvdXQgYXQgdGhl
IGVuZCBvZiB0aGUgYXJyYXkKQEAgLTIwOCwxMiArMjA4LDEyIEBAIHZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW4KIAogICAgIGlmIChtX3J1bi5ydGwoKSkgewogICAgICAg
ICBmb3IgKGludCBpID0gbV9pdGVtcy5zaXplKCkgLSAyOyBpID49IDA7IGktLSkgewotICAgICAg
ICAgICAgaWYgKCFzaGFwZUFuZFBsYWNlSXRlbShjcCwgaSwgZm9udERhdGEsIGdseXBoQnVmZmVy
KSkKKyAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0ZW0oY3AsIHN0cmluZ09mZnNldCwg
aSwgZm9udERhdGEsIGdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9p
dGVtcy5zaXplKCkgLSAxOyBpKyspIHsKLSAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0
ZW0oY3AsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikpCisgICAgICAgICAgICBpZiAoIXNoYXBl
QW5kUGxhY2VJdGVtKGNwLCBzdHJpbmdPZmZzZXQsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikp
CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMxLDcgKzIz
MSw3IEBAIHZvaWQgVW5pc2NyaWJlQ29udHJvbGxlcjo6cmVzZXRDb250cm9sQW4KICAgICBtX3N0
YXRlLmZPdmVycmlkZURpcmVjdGlvbiA9IG1fcnVuLmRpcmVjdGlvbmFsT3ZlcnJpZGUoKTsKIH0K
IAotYm9vbCBVbmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSXRlbShjb25zdCBVQ2hh
ciogY3AsIHVuc2lnbmVkIGksIGNvbnN0IEZvbnQqIGZvbnREYXRhLCBHbHlwaEJ1ZmZlciogZ2x5
cGhCdWZmZXIpCitib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVtKGNv
bnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpLCBjb25zdCBG
b250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8vIERldGVy
bWluZSB0aGUgc3RyaW5nIGZvciB0aGlzIGl0ZW0uCiAgICAgY29uc3QgVUNoYXIqIHN0ciA9IGNw
ICsgbV9pdGVtc1tpXS5pQ2hhclBvczsKQEAgLTI1Myw2ICsyNTMsMTQgQEAgYm9vbCBVbmlzY3Jp
YmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSQogICAgIGlmICghc2hhcGUoc3RyLCBsZW4sIGl0
ZW0sIGZvbnREYXRhLCBnbHlwaHMsIGNsdXN0ZXJzLCB2aXN1YWxBdHRyaWJ1dGVzKSkKICAgICAg
ICAgcmV0dXJuIHRydWU7CiAKKyAgICBWZWN0b3I8T3B0aW9uYWw8dW5zaWduZWQ+PiBzdHJpbmdP
ZmZzZXRzKGdseXBocy5zaXplKCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVuOyAr
K2kpIHsKKyAgICAgICAgaWYgKHN0cmluZ09mZnNldHNbY2x1c3RlcnNbaV1dKQorICAgICAgICAg
ICAgc3RyaW5nT2Zmc2V0c1tjbHVzdGVyc1tpXV0gPSBzdGQ6Om1pbigqc3RyaW5nT2Zmc2V0c1tj
bHVzdGVyc1tpXV0sIGkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBzdHJpbmdPZmZzZXRz
W2NsdXN0ZXJzW2ldXSA9IGk7CisgICAgfQorCiAgICAgLy8gV2Ugbm93IGhhdmUgYSBjb2xsZWN0
aW9uIG9mIGdseXBocy4KICAgICBWZWN0b3I8R09GRlNFVD4gb2Zmc2V0czsKICAgICBWZWN0b3I8
aW50PiBhZHZhbmNlczsKQEAgLTM2Nyw3ICszNzUsNyBAQCBib29sIFVuaXNjcmliZUNvbnRyb2xs
ZXI6OnNoYXBlQW5kUGxhY2VJCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgZ2x5
cGhCdWZmZXItPmV4cGFuZExhc3RBZHZhbmNlKG9yaWdpbik7CiAgICAgICAgICAgICBHbHlwaEJ1
ZmZlckFkdmFuY2UgZ2x5cGhBZHZhbmNlKC1vcmlnaW4ud2lkdGgoKSArIGFkdmFuY2UsIC1vcmln
aW4uaGVpZ2h0KCkpOwotICAgICAgICAgICAgZ2x5cGhCdWZmZXItPmFkZChnbHlwaCwgZm9udERh
dGEsIGdseXBoQWR2YW5jZSk7CisgICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRkKGdseXBoLCBm
b250RGF0YSwgZ2x5cGhBZHZhbmNlLCBzdHJpbmdPZmZzZXRzW2tdLnZhbHVlX29yKDApICsgc3Ry
aW5nT2Zmc2V0KTsKICAgICAgICAgfQogCiAgICAgICAgIEZsb2F0UmVjdCBnbHlwaEJvdW5kcyA9
IGZvbnREYXRhLT5ib3VuZHNGb3JHbHlwaChnbHlwaCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9ncmFwaGljcy93aW4vVW5pc2NyaWJlQ29udHJvbGxlci5oCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9VbmlzY3JpYmVDb250cm9sbGVy
LmgJKHJldmlzaW9uIDI0MTgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz
L3dpbi9VbmlzY3JpYmVDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDggKzU0LDgg
QEAgcHVibGljOgogcHJpdmF0ZTogICAgCiAgICAgdm9pZCByZXNldENvbnRyb2xBbmRTdGF0ZSgp
OwogCi0gICAgdm9pZCBpdGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciosIHVuc2lnbmVk
IGxlbmd0aCwgY29uc3QgRm9udCosIEdseXBoQnVmZmVyKik7Ci0gICAgYm9vbCBzaGFwZUFuZFBs
YWNlSXRlbShjb25zdCBVQ2hhciosIHVuc2lnbmVkIGluZGV4LCBjb25zdCBGb250KiwgR2x5cGhC
dWZmZXIqKTsKKyAgICB2b2lkIGl0ZW1pemVTaGFwZUFuZFBsYWNlKGNvbnN0IFVDaGFyKiwgdW5z
aWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IEZvbnQqLCBHbHlwaEJ1
ZmZlciopOworICAgIGJvb2wgc2hhcGVBbmRQbGFjZUl0ZW0oY29uc3QgVUNoYXIqLCB1bnNpZ25l
ZCBzdHJpbmdPZmZzZXQsIHVuc2lnbmVkIGluZGV4LCBjb25zdCBGb250KiwgR2x5cGhCdWZmZXIq
KTsKICAgICBib29sIHNoYXBlKGNvbnN0IFVDaGFyKiBzdHIsIGludCBsZW4sIFNDUklQVF9JVEVN
LCBjb25zdCBGb250KiwKICAgICAgICAgICAgICAgIFZlY3RvcjxXT1JEPiYgZ2x5cGhzLCBWZWN0
b3I8V09SRD4mIGNsdXN0ZXJzLAogICAgICAgICAgICAgICAgVmVjdG9yPFNDUklQVF9WSVNBVFRS
PiYgdmlzdWFsQXR0cmlidXRlcyk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362558</attachid>
            <date>2019-02-20 15:52:34 -0800</date>
            <delta_ts>2019-02-21 09:04:54 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191368-20190220155233.patch</filename>
            <type>text/plain</type>
            <size>7775</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTIwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBmYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBpcyBjcmFzaGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzY4CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2x5cGhCdWZmZXIn
cyBvZmZzZXQgYXJyYXkgd2Fzbid0IGdldHRpbmcgZmlsbGVkIGJ5IFVuaXNjcmliZUNvbnRyb2xs
ZXIuCisgICAgICAgIE91ciB1bmRlcmxpbmluZyBjb2RlIHJlcXVpcmVzIHRoaXMgYXJyYXkuCisK
KyAgICAgICAgVW5pc2NyaWJlIGdpdmVzIHVzIGEgY2hhcmFjdGVyIC0+IGdseXBoIG1hcHBpbmcs
IHNvIHdlIGp1c3QgaGF2ZSB0byBjb21wdXRlCisgICAgICAgIHRoZSBpbnZlcnNlIGFuZCBnaXZl
IGl0IHRvIHRoZSBHbHlwaEJ1ZmZlci4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIHdyaXR0ZW4g
YnkgTXlsZXMgQy4gTWF4ZmllbGQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2ludGVybmF0
aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6Cisg
ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmdlbmVyYXRl
R2x5cGhCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRyb2xs
ZXI6OmFkdmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxlcjo6aXRl
bWl6ZVNoYXBlQW5kUGxhY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxl
cjo6c2hhcGVBbmRQbGFjZUl0ZW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9V
bmlzY3JpYmVDb250cm9sbGVyLmg6CisKIDIwMTktMDItMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI0MTc4OD4pOiBBU1NF
UlRJT04gRkFJTEVEOiAhbV9ub3JtYWxGbG93TGlzdERpcnR5IGluIFRlc3RXZWJLaXRBUEkuV2Vi
S2l0LlJlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3IHRlc3QKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNpb24gMjQxODMw
KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkod29y
a2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgYWRkKGdseXBo
LCBmb250LCBhZHZhbmNlLCBvZmZzZXRJblN0cmluZyk7CiAgICAgfQogCi0gICAgdm9pZCBhZGQo
R2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEdseXBoQnVmZmVyQWR2YW5jZSBhZHZhbmNl
LCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQorICAgIHZvaWQgYWRkKEdseXBo
IGdseXBoLCBjb25zdCBGb250KiBmb250LCBHbHlwaEJ1ZmZlckFkdmFuY2UgYWR2YW5jZSwgdW5z
aWduZWQgb2Zmc2V0SW5TdHJpbmcpCiAgICAgewogICAgICAgICBtX2ZvbnQuYXBwZW5kKGZvbnQp
OwogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9E
aXNwbGF5TGlzdEl0ZW1zLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC0zNjQsNyArMzY0LDcgQEAgaW5saW5lIEdseXBoQnVmZmVyIERyYXdHbHlw
aHM6OmdlbmVyYXRlRwogewogICAgIEdseXBoQnVmZmVyIHJlc3VsdDsKICAgICBmb3IgKHNpemVf
dCBpID0gMDsgaSA8IG1fZ2x5cGhzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIHJlc3VsdC5hZGQo
bV9nbHlwaHNbaV0sICZtX2ZvbnQuZ2V0KCksIG1fYWR2YW5jZXNbaV0pOworICAgICAgICByZXN1
bHQuYWRkKG1fZ2x5cGhzW2ldLCAmbV9mb250LmdldCgpLCBtX2FkdmFuY2VzW2ldLCBHbHlwaEJ1
ZmZlcjo6bm9PZmZzZXQpOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQpJbmRleDogU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3Bw
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjphZHZhbmNl
KHVuc2lnbgogICAgICAgICAgICAgaW50IGl0ZW1TdGFydCA9IG1fcnVuLnJ0bCgpID8gaW5kZXgg
KyAxIDogaW5kZXhPZkZvbnRUcmFuc2l0aW9uOwogICAgICAgICAgICAgaW50IGl0ZW1MZW5ndGgg
PSBtX3J1bi5ydGwoKSA/IGluZGV4T2ZGb250VHJhbnNpdGlvbiAtIGluZGV4IDogaW5kZXggLSBp
bmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgICAgICBtX2N1cnJlbnRDaGFyYWN0ZXIgPSBi
YXNlQ2hhcmFjdGVyICsgaXRlbVN0YXJ0OwotICAgICAgICAgICAgaXRlbWl6ZVNoYXBlQW5kUGxh
Y2UoKGlzU21hbGxDYXBzID8gc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFy
dCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgICAgIGl0ZW1p
emVTaGFwZUFuZFBsYWNlKChpc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRhKCkgOiBj
cCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVm
ZmVyKTsKICAgICAgICAgICAgIGluZGV4T2ZGb250VHJhbnNpdGlvbiA9IGluZGV4OwogICAgICAg
ICB9CiAgICAgfQpAQCAtMTgzLDEzICsxODMsMTMgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVy
OjphZHZhbmNlKHVuc2lnbgogCiAgICAgICAgIGludCBpdGVtU3RhcnQgPSBtX3J1bi5ydGwoKSA/
IDAgOiBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgIG1fY3VycmVudENoYXJhY3RlciA9
IGJhc2VDaGFyYWN0ZXIgKyBpdGVtU3RhcnQ7Ci0gICAgICAgIGl0ZW1pemVTaGFwZUFuZFBsYWNl
KChuZXh0SXNTbWFsbENhcHMgPyBzbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsgaXRlbVN0
YXJ0LCBpdGVtTGVuZ3RoLCBuZXh0Rm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgaXRl
bWl6ZVNoYXBlQW5kUGxhY2UoKG5leHRJc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRh
KCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgbmV4dEZvbnREYXRh
LCBnbHlwaEJ1ZmZlcik7CiAgICAgfQogCiAgICAgbV9jdXJyZW50Q2hhcmFjdGVyID0gYmFzZUNo
YXJhY3RlciArIGxlbmd0aDsKIH0KIAotdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXpl
U2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciogY3AsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9u
dCogZm9udERhdGEsIEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlcikKK3ZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqIGNwLCB1bnNpZ25lZCBz
dHJpbmdPZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udCogZm9udERhdGEsIEdseXBo
QnVmZmVyKiBnbHlwaEJ1ZmZlcikKIHsKICAgICAvLyBTY3JpcHRJdGVtaXplIChpbiBXaW5kb3dz
IFhQIHZlcnNpb25zIHByaW9yIHRvIFNQMikgY2FuIG92ZXJmbG93IGJ5IDEuICBUaGlzIGlzIHdo
eSB0aGVyZSBpcyBhbiBleHRyYSBlbXB0eSBpdGVtCiAgICAgLy8gaGFuZ2luZyBvdXQgYXQgdGhl
IGVuZCBvZiB0aGUgYXJyYXkKQEAgLTIwOCwxMiArMjA4LDEyIEBAIHZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW4KIAogICAgIGlmIChtX3J1bi5ydGwoKSkgewogICAgICAg
ICBmb3IgKGludCBpID0gbV9pdGVtcy5zaXplKCkgLSAyOyBpID49IDA7IGktLSkgewotICAgICAg
ICAgICAgaWYgKCFzaGFwZUFuZFBsYWNlSXRlbShjcCwgaSwgZm9udERhdGEsIGdseXBoQnVmZmVy
KSkKKyAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0ZW0oY3AsIHN0cmluZ09mZnNldCwg
aSwgZm9udERhdGEsIGdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9p
dGVtcy5zaXplKCkgLSAxOyBpKyspIHsKLSAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0
ZW0oY3AsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikpCisgICAgICAgICAgICBpZiAoIXNoYXBl
QW5kUGxhY2VJdGVtKGNwLCBzdHJpbmdPZmZzZXQsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikp
CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMxLDcgKzIz
MSw3IEBAIHZvaWQgVW5pc2NyaWJlQ29udHJvbGxlcjo6cmVzZXRDb250cm9sQW4KICAgICBtX3N0
YXRlLmZPdmVycmlkZURpcmVjdGlvbiA9IG1fcnVuLmRpcmVjdGlvbmFsT3ZlcnJpZGUoKTsKIH0K
IAotYm9vbCBVbmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSXRlbShjb25zdCBVQ2hh
ciogY3AsIHVuc2lnbmVkIGksIGNvbnN0IEZvbnQqIGZvbnREYXRhLCBHbHlwaEJ1ZmZlciogZ2x5
cGhCdWZmZXIpCitib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVtKGNv
bnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpLCBjb25zdCBG
b250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8vIERldGVy
bWluZSB0aGUgc3RyaW5nIGZvciB0aGlzIGl0ZW0uCiAgICAgY29uc3QgVUNoYXIqIHN0ciA9IGNw
ICsgbV9pdGVtc1tpXS5pQ2hhclBvczsKQEAgLTI1Myw2ICsyNTMsMTQgQEAgYm9vbCBVbmlzY3Jp
YmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSQogICAgIGlmICghc2hhcGUoc3RyLCBsZW4sIGl0
ZW0sIGZvbnREYXRhLCBnbHlwaHMsIGNsdXN0ZXJzLCB2aXN1YWxBdHRyaWJ1dGVzKSkKICAgICAg
ICAgcmV0dXJuIHRydWU7CiAKKyAgICBWZWN0b3I8T3B0aW9uYWw8dW5zaWduZWQ+PiBzdHJpbmdP
ZmZzZXRzKGdseXBocy5zaXplKCkpOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW47
ICsraSkgeworICAgICAgICBpZiAoc3RyaW5nT2Zmc2V0c1tjbHVzdGVyc1tpXV0pCisgICAgICAg
ICAgICBzdHJpbmdPZmZzZXRzW2NsdXN0ZXJzW2ldXSA9IHN0ZDo6bWluKCpzdHJpbmdPZmZzZXRz
W2NsdXN0ZXJzW2ldXSwgaSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHN0cmluZ09mZnNl
dHNbY2x1c3RlcnNbaV1dID0gaTsKKyAgICB9CisKICAgICAvLyBXZSBub3cgaGF2ZSBhIGNvbGxl
Y3Rpb24gb2YgZ2x5cGhzLgogICAgIFZlY3RvcjxHT0ZGU0VUPiBvZmZzZXRzOwogICAgIFZlY3Rv
cjxpbnQ+IGFkdmFuY2VzOwpAQCAtMzY3LDcgKzM3NSw3IEBAIGJvb2wgVW5pc2NyaWJlQ29udHJv
bGxlcjo6c2hhcGVBbmRQbGFjZUkKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBn
bHlwaEJ1ZmZlci0+ZXhwYW5kTGFzdEFkdmFuY2Uob3JpZ2luKTsKICAgICAgICAgICAgIEdseXBo
QnVmZmVyQWR2YW5jZSBnbHlwaEFkdmFuY2UoLW9yaWdpbi53aWR0aCgpICsgYWR2YW5jZSwgLW9y
aWdpbi5oZWlnaHQoKSk7Ci0gICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRkKGdseXBoLCBmb250
RGF0YSwgZ2x5cGhBZHZhbmNlKTsKKyAgICAgICAgICAgIGdseXBoQnVmZmVyLT5hZGQoZ2x5cGgs
IGZvbnREYXRhLCBnbHlwaEFkdmFuY2UsIHN0cmluZ09mZnNldHNba10udmFsdWVPcigwKSArIHN0
cmluZ09mZnNldCk7CiAgICAgICAgIH0KIAogICAgICAgICBGbG9hdFJlY3QgZ2x5cGhCb3VuZHMg
PSBmb250RGF0YS0+Ym91bmRzRm9yR2x5cGgoZ2x5cGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vVW5pc2NyaWJlQ29udHJvbGxl
ci5oCShyZXZpc2lvbiAyNDE4MzApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy93aW4vVW5pc2NyaWJlQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw4ICs1NCw4
IEBAIHB1YmxpYzoKIHByaXZhdGU6ICAgIAogICAgIHZvaWQgcmVzZXRDb250cm9sQW5kU3RhdGUo
KTsKIAotICAgIHZvaWQgaXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqLCB1bnNpZ25l
ZCBsZW5ndGgsIGNvbnN0IEZvbnQqLCBHbHlwaEJ1ZmZlciopOwotICAgIGJvb2wgc2hhcGVBbmRQ
bGFjZUl0ZW0oY29uc3QgVUNoYXIqLCB1bnNpZ25lZCBpbmRleCwgY29uc3QgRm9udCosIEdseXBo
QnVmZmVyKik7CisgICAgdm9pZCBpdGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciosIHVu
c2lnbmVkIHN0cmluZ09mZnNldCwgdW5zaWduZWQgbGVuZ3RoLCBjb25zdCBGb250KiwgR2x5cGhC
dWZmZXIqKTsKKyAgICBib29sIHNoYXBlQW5kUGxhY2VJdGVtKGNvbnN0IFVDaGFyKiwgdW5zaWdu
ZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpbmRleCwgY29uc3QgRm9udCosIEdseXBoQnVmZmVy
Kik7CiAgICAgYm9vbCBzaGFwZShjb25zdCBVQ2hhciogc3RyLCBpbnQgbGVuLCBTQ1JJUFRfSVRF
TSwgY29uc3QgRm9udCosCiAgICAgICAgICAgICAgICBWZWN0b3I8V09SRD4mIGdseXBocywgVmVj
dG9yPFdPUkQ+JiBjbHVzdGVycywKICAgICAgICAgICAgICAgIFZlY3RvcjxTQ1JJUFRfVklTQVRU
Uj4mIHZpc3VhbEF0dHJpYnV0ZXMpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>362613</attachid>
            <date>2019-02-21 09:04:55 -0800</date>
            <delta_ts>2019-02-21 15:12:42 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-191368-20190221090454.patch</filename>
            <type>text/plain</type>
            <size>9867</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MTgzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTIwICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBmYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBpcyBjcmFzaGluZworICAg
ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkxMzY4CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2x5cGhCdWZmZXIn
cyBvZmZzZXQgYXJyYXkgd2Fzbid0IGdldHRpbmcgZmlsbGVkIGJ5IFVuaXNjcmliZUNvbnRyb2xs
ZXIuCisgICAgICAgIE91ciB1bmRlcmxpbmluZyBjb2RlIHJlcXVpcmVzIHRoaXMgYXJyYXkuCisK
KyAgICAgICAgVW5pc2NyaWJlIGdpdmVzIHVzIGEgY2hhcmFjdGVyIC0+IGdseXBoIG1hcHBpbmcs
IHNvIHdlIGp1c3QgaGF2ZSB0byBjb21wdXRlCisgICAgICAgIHRoZSBpbnZlcnNlIGFuZCBnaXZl
IGl0IHRvIHRoZSBHbHlwaEJ1ZmZlci4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIHdyaXR0ZW4g
YnkgTXlsZXMgQy4gTWF4ZmllbGQuCisKKyAgICAgICAgVGVzdDogZmFzdC90ZXh0L2ludGVybmF0
aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj
cy9HbHlwaEJ1ZmZlci5oOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhCdWZmZXI6OmFkZCk6Cisg
ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMu
Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OkRyYXdHbHlwaHM6OmdlbmVyYXRl
R2x5cGhCdWZmZXIgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlVuaXNjcmliZUNvbnRyb2xs
ZXI6OmFkdmFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxlcjo6aXRl
bWl6ZVNoYXBlQW5kUGxhY2UpOgorICAgICAgICAoV2ViQ29yZTo6VW5pc2NyaWJlQ29udHJvbGxl
cjo6c2hhcGVBbmRQbGFjZUl0ZW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9V
bmlzY3JpYmVDb250cm9sbGVyLmg6CisKIDIwMTktMDItMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9u
LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjI0MTc4OD4pOiBBU1NF
UlRJT04gRkFJTEVEOiAhbV9ub3JtYWxGbG93TGlzdERpcnR5IGluIFRlc3RXZWJLaXRBUEkuV2Vi
S2l0LlJlc2l6ZVJldmVyc2VQYWdpbmF0ZWRXZWJWaWV3IHRlc3QKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkocmV2aXNpb24gMjQxODMw
KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhCdWZmZXIuaAkod29y
a2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3IEBAIHB1YmxpYzoKICAgICAgICAgYWRkKGdseXBo
LCBmb250LCBhZHZhbmNlLCBvZmZzZXRJblN0cmluZyk7CiAgICAgfQogCi0gICAgdm9pZCBhZGQo
R2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEdseXBoQnVmZmVyQWR2YW5jZSBhZHZhbmNl
LCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zmc2V0KQorICAgIHZvaWQgYWRkKEdseXBo
IGdseXBoLCBjb25zdCBGb250KiBmb250LCBHbHlwaEJ1ZmZlckFkdmFuY2UgYWR2YW5jZSwgdW5z
aWduZWQgb2Zmc2V0SW5TdHJpbmcpCiAgICAgewogICAgICAgICBtX2ZvbnQuYXBwZW5kKGZvbnQp
OwogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9E
aXNwbGF5TGlzdEl0ZW1zLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCSh3b3Jr
aW5nIGNvcHkpCkBAIC0zNjQsNyArMzY0LDcgQEAgaW5saW5lIEdseXBoQnVmZmVyIERyYXdHbHlw
aHM6OmdlbmVyYXRlRwogewogICAgIEdseXBoQnVmZmVyIHJlc3VsdDsKICAgICBmb3IgKHNpemVf
dCBpID0gMDsgaSA8IG1fZ2x5cGhzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIHJlc3VsdC5hZGQo
bV9nbHlwaHNbaV0sICZtX2ZvbnQuZ2V0KCksIG1fYWR2YW5jZXNbaV0pOworICAgICAgICByZXN1
bHQuYWRkKG1fZ2x5cGhzW2ldLCAmbV9mb250LmdldCgpLCBtX2FkdmFuY2VzW2ldLCBHbHlwaEJ1
ZmZlcjo6bm9PZmZzZXQpOwogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQpJbmRleDogU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3Bw
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Vbmlz
Y3JpYmVDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMjQxODMwKQorKysgU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv
cHkpCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjphZHZhbmNl
KHVuc2lnbgogICAgICAgICAgICAgaW50IGl0ZW1TdGFydCA9IG1fcnVuLnJ0bCgpID8gaW5kZXgg
KyAxIDogaW5kZXhPZkZvbnRUcmFuc2l0aW9uOwogICAgICAgICAgICAgaW50IGl0ZW1MZW5ndGgg
PSBtX3J1bi5ydGwoKSA/IGluZGV4T2ZGb250VHJhbnNpdGlvbiAtIGluZGV4IDogaW5kZXggLSBp
bmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgICAgICBtX2N1cnJlbnRDaGFyYWN0ZXIgPSBi
YXNlQ2hhcmFjdGVyICsgaXRlbVN0YXJ0OwotICAgICAgICAgICAgaXRlbWl6ZVNoYXBlQW5kUGxh
Y2UoKGlzU21hbGxDYXBzID8gc21hbGxDYXBzQnVmZmVyLmRhdGEoKSA6IGNwKSArIGl0ZW1TdGFy
dCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgICAgIGl0ZW1p
emVTaGFwZUFuZFBsYWNlKChpc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRhKCkgOiBj
cCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgZm9udERhdGEsIGdseXBoQnVm
ZmVyKTsKICAgICAgICAgICAgIGluZGV4T2ZGb250VHJhbnNpdGlvbiA9IGluZGV4OwogICAgICAg
ICB9CiAgICAgfQpAQCAtMTgzLDEzICsxODMsMTMgQEAgdm9pZCBVbmlzY3JpYmVDb250cm9sbGVy
OjphZHZhbmNlKHVuc2lnbgogCiAgICAgICAgIGludCBpdGVtU3RhcnQgPSBtX3J1bi5ydGwoKSA/
IDAgOiBpbmRleE9mRm9udFRyYW5zaXRpb247CiAgICAgICAgIG1fY3VycmVudENoYXJhY3RlciA9
IGJhc2VDaGFyYWN0ZXIgKyBpdGVtU3RhcnQ7Ci0gICAgICAgIGl0ZW1pemVTaGFwZUFuZFBsYWNl
KChuZXh0SXNTbWFsbENhcHMgPyBzbWFsbENhcHNCdWZmZXIuZGF0YSgpIDogY3ApICsgaXRlbVN0
YXJ0LCBpdGVtTGVuZ3RoLCBuZXh0Rm9udERhdGEsIGdseXBoQnVmZmVyKTsKKyAgICAgICAgaXRl
bWl6ZVNoYXBlQW5kUGxhY2UoKG5leHRJc1NtYWxsQ2FwcyA/IHNtYWxsQ2Fwc0J1ZmZlci5kYXRh
KCkgOiBjcCkgKyBpdGVtU3RhcnQsIGl0ZW1TdGFydCwgaXRlbUxlbmd0aCwgbmV4dEZvbnREYXRh
LCBnbHlwaEJ1ZmZlcik7CiAgICAgfQogCiAgICAgbV9jdXJyZW50Q2hhcmFjdGVyID0gYmFzZUNo
YXJhY3RlciArIGxlbmd0aDsKIH0KIAotdm9pZCBVbmlzY3JpYmVDb250cm9sbGVyOjppdGVtaXpl
U2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciogY3AsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9u
dCogZm9udERhdGEsIEdseXBoQnVmZmVyKiBnbHlwaEJ1ZmZlcikKK3ZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqIGNwLCB1bnNpZ25lZCBz
dHJpbmdPZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udCogZm9udERhdGEsIEdseXBo
QnVmZmVyKiBnbHlwaEJ1ZmZlcikKIHsKICAgICAvLyBTY3JpcHRJdGVtaXplIChpbiBXaW5kb3dz
IFhQIHZlcnNpb25zIHByaW9yIHRvIFNQMikgY2FuIG92ZXJmbG93IGJ5IDEuICBUaGlzIGlzIHdo
eSB0aGVyZSBpcyBhbiBleHRyYSBlbXB0eSBpdGVtCiAgICAgLy8gaGFuZ2luZyBvdXQgYXQgdGhl
IGVuZCBvZiB0aGUgYXJyYXkKQEAgLTIwOCwxMiArMjA4LDEyIEBAIHZvaWQgVW5pc2NyaWJlQ29u
dHJvbGxlcjo6aXRlbWl6ZVNoYXBlQW4KIAogICAgIGlmIChtX3J1bi5ydGwoKSkgewogICAgICAg
ICBmb3IgKGludCBpID0gbV9pdGVtcy5zaXplKCkgLSAyOyBpID49IDA7IGktLSkgewotICAgICAg
ICAgICAgaWYgKCFzaGFwZUFuZFBsYWNlSXRlbShjcCwgaSwgZm9udERhdGEsIGdseXBoQnVmZmVy
KSkKKyAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0ZW0oY3AsIHN0cmluZ09mZnNldCwg
aSwgZm9udERhdGEsIGdseXBoQnVmZmVyKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAg
ICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9p
dGVtcy5zaXplKCkgLSAxOyBpKyspIHsKLSAgICAgICAgICAgIGlmICghc2hhcGVBbmRQbGFjZUl0
ZW0oY3AsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikpCisgICAgICAgICAgICBpZiAoIXNoYXBl
QW5kUGxhY2VJdGVtKGNwLCBzdHJpbmdPZmZzZXQsIGksIGZvbnREYXRhLCBnbHlwaEJ1ZmZlcikp
CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMjMxLDcgKzIz
MSw3IEBAIHZvaWQgVW5pc2NyaWJlQ29udHJvbGxlcjo6cmVzZXRDb250cm9sQW4KICAgICBtX3N0
YXRlLmZPdmVycmlkZURpcmVjdGlvbiA9IG1fcnVuLmRpcmVjdGlvbmFsT3ZlcnJpZGUoKTsKIH0K
IAotYm9vbCBVbmlzY3JpYmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSXRlbShjb25zdCBVQ2hh
ciogY3AsIHVuc2lnbmVkIGksIGNvbnN0IEZvbnQqIGZvbnREYXRhLCBHbHlwaEJ1ZmZlciogZ2x5
cGhCdWZmZXIpCitib29sIFVuaXNjcmliZUNvbnRyb2xsZXI6OnNoYXBlQW5kUGxhY2VJdGVtKGNv
bnN0IFVDaGFyKiBjcCwgdW5zaWduZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpLCBjb25zdCBG
b250KiBmb250RGF0YSwgR2x5cGhCdWZmZXIqIGdseXBoQnVmZmVyKQogewogICAgIC8vIERldGVy
bWluZSB0aGUgc3RyaW5nIGZvciB0aGlzIGl0ZW0uCiAgICAgY29uc3QgVUNoYXIqIHN0ciA9IGNw
ICsgbV9pdGVtc1tpXS5pQ2hhclBvczsKQEAgLTI1Myw2ICsyNTMsMTQgQEAgYm9vbCBVbmlzY3Jp
YmVDb250cm9sbGVyOjpzaGFwZUFuZFBsYWNlSQogICAgIGlmICghc2hhcGUoc3RyLCBsZW4sIGl0
ZW0sIGZvbnREYXRhLCBnbHlwaHMsIGNsdXN0ZXJzLCB2aXN1YWxBdHRyaWJ1dGVzKSkKICAgICAg
ICAgcmV0dXJuIHRydWU7CiAKKyAgICBWZWN0b3I8T3B0aW9uYWw8dW5zaWduZWQ+PiBzdHJpbmdP
ZmZzZXRzKGdseXBocy5zaXplKCkpOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW47
ICsraSkgeworICAgICAgICBpZiAoc3RyaW5nT2Zmc2V0c1tjbHVzdGVyc1tpXV0pCisgICAgICAg
ICAgICBzdHJpbmdPZmZzZXRzW2NsdXN0ZXJzW2ldXSA9IHN0ZDo6bWluKCpzdHJpbmdPZmZzZXRz
W2NsdXN0ZXJzW2ldXSwgaSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHN0cmluZ09mZnNl
dHNbY2x1c3RlcnNbaV1dID0gaTsKKyAgICB9CisKICAgICAvLyBXZSBub3cgaGF2ZSBhIGNvbGxl
Y3Rpb24gb2YgZ2x5cGhzLgogICAgIFZlY3RvcjxHT0ZGU0VUPiBvZmZzZXRzOwogICAgIFZlY3Rv
cjxpbnQ+IGFkdmFuY2VzOwpAQCAtMzY3LDcgKzM3NSw3IEBAIGJvb2wgVW5pc2NyaWJlQ29udHJv
bGxlcjo6c2hhcGVBbmRQbGFjZUkKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBn
bHlwaEJ1ZmZlci0+ZXhwYW5kTGFzdEFkdmFuY2Uob3JpZ2luKTsKICAgICAgICAgICAgIEdseXBo
QnVmZmVyQWR2YW5jZSBnbHlwaEFkdmFuY2UoLW9yaWdpbi53aWR0aCgpICsgYWR2YW5jZSwgLW9y
aWdpbi5oZWlnaHQoKSk7Ci0gICAgICAgICAgICBnbHlwaEJ1ZmZlci0+YWRkKGdseXBoLCBmb250
RGF0YSwgZ2x5cGhBZHZhbmNlKTsKKyAgICAgICAgICAgIGdseXBoQnVmZmVyLT5hZGQoZ2x5cGgs
IGZvbnREYXRhLCBnbHlwaEFkdmFuY2UsIHN0cmluZ09mZnNldHNba10udmFsdWVPcigwKSArIHN0
cmluZ09mZnNldCk7CiAgICAgICAgIH0KIAogICAgICAgICBGbG9hdFJlY3QgZ2x5cGhCb3VuZHMg
PSBmb250RGF0YS0+Ym91bmRzRm9yR2x5cGgoZ2x5cGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv
cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1VuaXNjcmliZUNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vVW5pc2NyaWJlQ29udHJvbGxl
ci5oCShyZXZpc2lvbiAyNDE4MzApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj
cy93aW4vVW5pc2NyaWJlQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw4ICs1NCw4
IEBAIHB1YmxpYzoKIHByaXZhdGU6ICAgIAogICAgIHZvaWQgcmVzZXRDb250cm9sQW5kU3RhdGUo
KTsKIAotICAgIHZvaWQgaXRlbWl6ZVNoYXBlQW5kUGxhY2UoY29uc3QgVUNoYXIqLCB1bnNpZ25l
ZCBsZW5ndGgsIGNvbnN0IEZvbnQqLCBHbHlwaEJ1ZmZlciopOwotICAgIGJvb2wgc2hhcGVBbmRQ
bGFjZUl0ZW0oY29uc3QgVUNoYXIqLCB1bnNpZ25lZCBpbmRleCwgY29uc3QgRm9udCosIEdseXBo
QnVmZmVyKik7CisgICAgdm9pZCBpdGVtaXplU2hhcGVBbmRQbGFjZShjb25zdCBVQ2hhciosIHVu
c2lnbmVkIHN0cmluZ09mZnNldCwgdW5zaWduZWQgbGVuZ3RoLCBjb25zdCBGb250KiwgR2x5cGhC
dWZmZXIqKTsKKyAgICBib29sIHNoYXBlQW5kUGxhY2VJdGVtKGNvbnN0IFVDaGFyKiwgdW5zaWdu
ZWQgc3RyaW5nT2Zmc2V0LCB1bnNpZ25lZCBpbmRleCwgY29uc3QgRm9udCosIEdseXBoQnVmZmVy
Kik7CiAgICAgYm9vbCBzaGFwZShjb25zdCBVQ2hhciogc3RyLCBpbnQgbGVuLCBTQ1JJUFRfSVRF
TSwgY29uc3QgRm9udCosCiAgICAgICAgICAgICAgICBWZWN0b3I8V09SRD4mIGdseXBocywgVmVj
dG9yPFdPUkQ+JiBjbHVzdGVycywKICAgICAgICAgICAgICAgIFZlY3RvcjxTQ1JJUFRfVklTQVRU
Uj4mIHZpc3VhbEF0dHJpYnV0ZXMpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxODY1KQorKysgTGF5
b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTkt
MDItMjEgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgorCisgICAgICAgIExh
eW91dCBUZXN0IGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2tobWVyLXNlbGVjdGlvbi5odG1sIGlz
IGNyYXNoaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p
ZD0xOTEzNjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICAqIHBsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE5LTAyLTIxICBEaWVnbyBQ
aW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gR2FyZGVuaW5n
IGZvciB1bmV4cGVjdGVkIHBhc3NlcwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rl
c3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1Rl
c3RFeHBlY3RhdGlvbnMJKHJldmlzaW9uIDI0MTgzMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3Jt
L3dpbi9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC0yNTA1LDcgKzI1MDUsNyBA
QCBmYXN0L2ZyYW1lcy9mcmFtZS1uYXZpZ2F0aW9uLmh0bWwgWyBTa2lwCiAKIGZhc3QvdGV4dC9h
dHN1aS1wb2ludHRvb2Zmc2V0LWNhbGxzLWNnLmh0bWwgWyBQYXNzIEZhaWx1cmUgXQogZmFzdC90
ZXh0L2ludGVybmF0aW9uYWwvaGluZGktd2hpdGVzcGFjZS5odG1sIFsgRmFpbHVyZSBdCi1mYXN0
L3RleHQvaW50ZXJuYXRpb25hbC9raG1lci1zZWxlY3Rpb24uaHRtbCBbIEZhaWx1cmUgQ3Jhc2gg
XQorZmFzdC90ZXh0L2ludGVybmF0aW9uYWwva2htZXItc2VsZWN0aW9uLmh0bWwgWyBGYWlsdXJl
IF0KIHdlYmtpdC5vcmcvYi8xNDAyMzEgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvcGxhbmUyLmh0
bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8zNTk3MyBmYXN0L211bHRpY29sL2hpdC10ZXN0
LWFib3ZlLW9yLWJlbG93Lmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi80OTc2OSBmYXN0
L2RvbS9IVE1MUHJvZ3Jlc3NFbGVtZW50L3Byb2dyZXNzLWVsZW1lbnQtd2l0aC1jaGlsZC1jcmFz
aC5odG1sIFsgRmFpbHVyZSBdCkBAIC00MjIxLDEwICs0MjIxLDYgQEAgd2Via2l0Lm9yZy9iLzE5
MTM2NiBmYXN0L2Jsb2NrL2Jhc2ljL2NoaQogd2Via2l0Lm9yZy9iLzE5MTM2NiBmYXN0L2Jsb2Nr
L2Jhc2ljL2hlaWdodC1wZXJjZW50YWdlLXNpbXBsZS5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQu
b3JnL2IvMTkxMzY2IGZhc3QvYmxvY2svYmFzaWMvcXVpcmstbW9kZS1wZXJjZW50LWhlaWdodC5o
dG1sIFsgRmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8xOTEzNjggZmFzdC90ZXh0L3N0cm9raW5n
LWRlY29yYXRpb25zLmh0bWwgWyBDcmFzaCBdCi13ZWJraXQub3JnL2IvMTkxMzY4IGltcG9ydGVk
L2JsaW5rL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2NvbXBsZXgtdGV4dC10cmFpbGluZy1zcGFj
ZS5odG1sIFsgQ3Jhc2ggXQotd2Via2l0Lm9yZy9iLzE5MTM2OCBpbXBvcnRlZC9ibGluay9mYXN0
L3RleHQvc3ViLXBpeGVsL2NvbXBsZXgtdGV4dC1wcmVmZXJyZWQtd2lkdGguaHRtbCBbIENyYXNo
IF0KLQogd2Via2l0Lm9yZy9iLzE5MTU4NCBhbmltYXRpb25zL2FuaW1hdGlvbi1kaXJlY3Rpb24t
bm9ybWFsLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xOTE1ODQgYW5pbWF0aW9ucy9h
bmltYXRpb24tZGlyZWN0aW9uLXJldmVyc2UuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9i
LzE5MTU4NCBhbmltYXRpb25zL2R5bmFtaWMtc3R5bGVzaGVldC1sb2FkaW5nLmh0bWwgWyBGYWls
dXJlIF0K
</data>

          </attachment>
      

    </bug>

</bugzilla>